Skip to content

Commit ece4fd2

Browse files
dazumadazuma
authored
feat: Updated rails to 8.0 (#1173)
fix: Updated template names for Rails 8 fix: Preloaded helper classes
1 parent 9bce315 commit ece4fd2

File tree

194 files changed

+209
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+209
-149
lines changed

‎gapic-generator-ads/Gemfile.lock‎

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ../gapic-generator
33
specs:
44
gapic-generator (0.44.0)
5-
actionpack (~> 5.2)
5+
actionpack (~> 8.0)
66
bigdecimal (~> 3.0)
77
google-cloud-common (~> 1.2)
88
google-protobuf (~> 3.25, >= 3.25.1)
@@ -18,29 +18,43 @@ PATH
1818
GEM
1919
remote: https://rubygems.org/
2020
specs:
21-
actionpack (5.2.8.1)
22-
actionview (= 5.2.8.1)
23-
activesupport (= 5.2.8.1)
24-
rack (~> 2.0, >= 2.0.8)
21+
actionpack (8.0.2)
22+
actionview (= 8.0.2)
23+
activesupport (= 8.0.2)
24+
nokogiri (>= 1.8.5)
25+
rack (>= 2.2.4)
26+
rack-session (>= 1.0.1)
2527
rack-test (>= 0.6.3)
26-
rails-dom-testing (~> 2.0)
27-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
28-
actionview (5.2.8.1)
29-
activesupport (= 5.2.8.1)
28+
rails-dom-testing (~> 2.2)
29+
rails-html-sanitizer (~> 1.6)
30+
useragent (~> 0.16)
31+
actionview (8.0.2)
32+
activesupport (= 8.0.2)
3033
builder (~> 3.1)
31-
erubi (~> 1.4)
32-
rails-dom-testing (~> 2.0)
33-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
34-
activesupport (5.2.8.1)
35-
concurrent-ruby (~> 1.0, >= 1.0.2)
36-
i18n (>= 0.7, < 2)
37-
minitest (~> 5.1)
38-
tzinfo (~> 1.1)
34+
erubi (~> 1.11)
35+
rails-dom-testing (~> 2.2)
36+
rails-html-sanitizer (~> 1.6)
37+
activesupport (8.0.2)
38+
base64
39+
benchmark (>= 0.3)
40+
bigdecimal
41+
concurrent-ruby (~> 1.0, >= 1.3.1)
42+
connection_pool (>= 2.2.5)
43+
drb
44+
i18n (>= 1.6, < 2)
45+
logger (>= 1.4.2)
46+
minitest (>= 5.1)
47+
securerandom (>= 0.3)
48+
tzinfo (~> 2.0, >= 2.0.5)
49+
uri (>= 0.13.1)
3950
ast (2.4.3)
51+
base64 (0.2.0)
52+
benchmark (0.4.0)
4053
bigdecimal (3.1.9)
4154
builder (3.3.0)
4255
coderay (1.1.3)
4356
concurrent-ruby (1.3.5)
57+
connection_pool (2.5.3)
4458
crass (1.0.6)
4559
drb (2.2.1)
4660
erubi (1.13.1)
@@ -58,6 +72,7 @@ GEM
5872
json (2.11.3)
5973
language_server-protocol (3.17.0.4)
6074
lint_roller (1.1.0)
75+
logger (1.7.0)
6176
loofah (2.24.0)
6277
crass (~> 1.0.2)
6378
nokogiri (>= 1.12.0)
@@ -83,7 +98,10 @@ GEM
8398
coderay (~> 1.1)
8499
method_source (~> 1.0)
85100
racc (1.8.1)
86-
rack (2.2.13)
101+
rack (3.1.13)
102+
rack-session (2.1.0)
103+
base64 (>= 0.1.0)
104+
rack (>= 3.0.0)
87105
rack-test (2.2.0)
88106
rack (>= 1.3)
89107
rails-dom-testing (2.2.0)
@@ -111,12 +129,14 @@ GEM
111129
parser (>= 3.3.7.2)
112130
prism (~> 1.4)
113131
ruby-progressbar (1.13.0)
114-
thread_safe (0.3.6)
115-
tzinfo (1.2.11)
116-
thread_safe (~> 0.1)
132+
securerandom (0.4.1)
133+
tzinfo (2.0.6)
134+
concurrent-ruby (~> 1.0)
117135
unicode-display_width (3.1.4)
118136
unicode-emoji (~> 4.0, >= 4.0.4)
119137
unicode-emoji (4.0.4)
138+
uri (1.0.3)
139+
useragent (0.16.11)
120140
yard (0.9.37)
121141

122142
PLATFORMS

‎gapic-generator-ads/lib/gapic/generators/ads_generator.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,24 @@ def generate
5555

5656
gem.packages.each do |package|
5757
# Package level files
58-
files << g("package.erb", "lib/#{package.package_file_path}", package: package)
58+
files << g("package", "lib/#{package.package_file_path}", package: package)
5959
package.services.each do |service|
6060
# Service level files
61-
files << g("service.erb", "lib/#{service.service_file_path}", service: service)
62-
files << g("service/client.erb", "lib/#{service.client_file_path}", service: service)
63-
files << g("service/credentials.erb", "lib/#{service.credentials_file_path}", service: service)
64-
files << g("service/paths.erb", "lib/#{service.paths_file_path}", service: service) if service.paths?
65-
files << g("service/operations.erb", "lib/#{service.operations_file_path}", service: service) if service.lro?
61+
files << g("service", "lib/#{service.service_file_path}", service: service)
62+
files << g("service/client", "lib/#{service.client_file_path}", service: service)
63+
files << g("service/credentials", "lib/#{service.credentials_file_path}", service: service)
64+
files << g("service/paths", "lib/#{service.paths_file_path}", service: service) if service.paths?
65+
files << g("service/operations", "lib/#{service.operations_file_path}", service: service) if service.lro?
6666
end
6767
end
6868

6969
# Gem level files
70-
files << g("gem/version.erb", "lib/#{gem.version_file_path}", gem: gem)
70+
files << g("gem/version", "lib/#{gem.version_file_path}", gem: gem)
7171

7272
gem.proto_files.each do |proto_file|
73-
files << g("proto_docs/proto_file.erb", "proto_docs/#{proto_file.docs_file_path}", file: proto_file)
73+
files << g("proto_docs/proto_file", "proto_docs/#{proto_file.docs_file_path}", file: proto_file)
7474
end
75-
files << g("proto_docs/readme.erb", "proto_docs/README.md", gem: gem)
75+
files << g("proto_docs/readme", "proto_docs/README.md", gem: gem)
7676

7777
format_files files
7878

gapic-generator-ads/templates/ads/service/client/_requires.erb renamed to gapic-generator-ads/templates/ads/service/client/_requires.text.erb

File renamed without changes.

gapic-generator-ads/templates/ads/service/client/method/def/_rescue.erb renamed to gapic-generator-ads/templates/ads/service/client/method/def/_rescue.text.erb

File renamed without changes.

gapic-generator-ads/templates/ads/service/client/method/docs/_error.erb renamed to gapic-generator-ads/templates/ads/service/client/method/docs/_error.text.erb

File renamed without changes.

gapic-generator-ads/templates/ads/shared/_license.erb renamed to gapic-generator-ads/templates/ads/shared/_license.text.erb

File renamed without changes.

‎gapic-generator-cloud/Gemfile.lock‎

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ../gapic-generator
33
specs:
44
gapic-generator (0.44.0)
5-
actionpack (~> 5.2)
5+
actionpack (~> 8.0)
66
bigdecimal (~> 3.0)
77
google-cloud-common (~> 1.2)
88
google-protobuf (~> 3.25, >= 3.25.1)
@@ -18,29 +18,43 @@ PATH
1818
GEM
1919
remote: https://rubygems.org/
2020
specs:
21-
actionpack (5.2.8.1)
22-
actionview (= 5.2.8.1)
23-
activesupport (= 5.2.8.1)
24-
rack (~> 2.0, >= 2.0.8)
21+
actionpack (8.0.2)
22+
actionview (= 8.0.2)
23+
activesupport (= 8.0.2)
24+
nokogiri (>= 1.8.5)
25+
rack (>= 2.2.4)
26+
rack-session (>= 1.0.1)
2527
rack-test (>= 0.6.3)
26-
rails-dom-testing (~> 2.0)
27-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
28-
actionview (5.2.8.1)
29-
activesupport (= 5.2.8.1)
28+
rails-dom-testing (~> 2.2)
29+
rails-html-sanitizer (~> 1.6)
30+
useragent (~> 0.16)
31+
actionview (8.0.2)
32+
activesupport (= 8.0.2)
3033
builder (~> 3.1)
31-
erubi (~> 1.4)
32-
rails-dom-testing (~> 2.0)
33-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
34-
activesupport (5.2.8.1)
35-
concurrent-ruby (~> 1.0, >= 1.0.2)
36-
i18n (>= 0.7, < 2)
37-
minitest (~> 5.1)
38-
tzinfo (~> 1.1)
34+
erubi (~> 1.11)
35+
rails-dom-testing (~> 2.2)
36+
rails-html-sanitizer (~> 1.6)
37+
activesupport (8.0.2)
38+
base64
39+
benchmark (>= 0.3)
40+
bigdecimal
41+
concurrent-ruby (~> 1.0, >= 1.3.1)
42+
connection_pool (>= 2.2.5)
43+
drb
44+
i18n (>= 1.6, < 2)
45+
logger (>= 1.4.2)
46+
minitest (>= 5.1)
47+
securerandom (>= 0.3)
48+
tzinfo (~> 2.0, >= 2.0.5)
49+
uri (>= 0.13.1)
3950
ast (2.4.3)
51+
base64 (0.2.0)
52+
benchmark (0.4.0)
4053
bigdecimal (3.1.9)
4154
builder (3.3.0)
4255
coderay (1.1.3)
4356
concurrent-ruby (1.3.5)
57+
connection_pool (2.5.3)
4458
crass (1.0.6)
4559
drb (2.2.1)
4660
erubi (1.13.1)
@@ -58,6 +72,7 @@ GEM
5872
json (2.11.3)
5973
language_server-protocol (3.17.0.4)
6074
lint_roller (1.1.0)
75+
logger (1.7.0)
6176
loofah (2.24.0)
6277
crass (~> 1.0.2)
6378
nokogiri (>= 1.12.0)
@@ -83,7 +98,10 @@ GEM
8398
coderay (~> 1.1)
8499
method_source (~> 1.0)
85100
racc (1.8.1)
86-
rack (2.2.13)
101+
rack (3.1.13)
102+
rack-session (2.1.0)
103+
base64 (>= 0.1.0)
104+
rack (>= 3.0.0)
87105
rack-test (2.2.0)
88106
rack (>= 1.3)
89107
rails-dom-testing (2.2.0)
@@ -111,12 +129,14 @@ GEM
111129
parser (>= 3.3.7.2)
112130
prism (~> 1.4)
113131
ruby-progressbar (1.13.0)
114-
thread_safe (0.3.6)
115-
tzinfo (1.2.11)
116-
thread_safe (~> 0.1)
132+
securerandom (0.4.1)
133+
tzinfo (2.0.6)
134+
concurrent-ruby (~> 1.0)
117135
unicode-display_width (3.1.4)
118136
unicode-emoji (~> 4.0, >= 4.0.4)
119137
unicode-emoji (4.0.4)
138+
uri (1.0.3)
139+
useragent (0.16.11)
120140
yard (0.9.37)
121141

122142
PLATFORMS

‎gapic-generator-cloud/lib/gapic/generators/cloud_generator.rb‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ def generate gem_presenter: nil
5858

5959
# Additional Gem level files
6060
cloud_files = []
61-
cloud_files << g("gem/repo-metadata.erb", ".repo-metadata.json", gem: gem)
61+
cloud_files << g("gem/repo-metadata", ".repo-metadata.json", gem: gem)
6262
unless gem.services.empty? || gem.generic_endpoint?
63-
cloud_files << g("gem/authentication.erb", "AUTHENTICATION.md", gem: gem)
63+
cloud_files << g("gem/authentication", "AUTHENTICATION.md", gem: gem)
6464
end
6565

6666
format_files cloud_files
@@ -82,24 +82,24 @@ def generate_wrapper
8282

8383
gem = Gapic::Presenters.wrapper_gem_presenter @api
8484

85-
files << g("gem/gitignore.erb", ".gitignore", gem: gem)
86-
files << g("gem/repo-metadata.erb", ".repo-metadata.json", gem: gem)
87-
files << g("wrapper_gem/rubocop.erb", ".rubocop.yml", gem: gem)
88-
files << g("gem/toys.erb", ".toys.rb", gem: gem)
89-
files << g("wrapper_gem/yardopts.erb", ".yardopts", gem: gem)
90-
files << g("gem/authentication.erb", "AUTHENTICATION.md", gem: gem) unless gem.generic_endpoint?
91-
files << g("gem/changelog.erb", "CHANGELOG.md", gem: gem)
92-
files << g("wrapper_gem/gemfile.erb", "Gemfile", gem: gem)
93-
files << g("gem/license.erb", "LICENSE.md", gem: gem)
94-
files << g("wrapper_gem/rakefile.erb", "Rakefile", gem: gem)
95-
files << g("wrapper_gem/readme.erb", "README.md", gem: gem)
96-
files << g("wrapper_gem/gemspec.erb", "#{gem.name}.gemspec", gem: gem)
97-
files << g("wrapper_gem/entrypoint.erb", "lib/#{gem.name}.rb", gem: gem) if gem.needs_entrypoint?
98-
files << g("wrapper_gem/main.erb", "lib/#{gem.namespace_file_path}", gem: gem)
99-
files << g("gem/version.erb", "lib/#{gem.version_file_path}", gem: gem)
100-
files << g("gem/test_helper.erb", "test/helper.rb", gem: gem)
101-
files << g("wrapper_gem/client_test.erb", "test/#{gem.namespace_require}/client_test.rb", gem: gem)
102-
files << g("wrapper_gem/version_test.erb", "test/#{gem.namespace_require}/version_test.rb", gem: gem)
85+
files << g("gem/gitignore", ".gitignore", gem: gem)
86+
files << g("gem/repo-metadata", ".repo-metadata.json", gem: gem)
87+
files << g("wrapper_gem/rubocop", ".rubocop.yml", gem: gem)
88+
files << g("gem/toys", ".toys.rb", gem: gem)
89+
files << g("wrapper_gem/yardopts", ".yardopts", gem: gem)
90+
files << g("gem/authentication", "AUTHENTICATION.md", gem: gem) unless gem.generic_endpoint?
91+
files << g("gem/changelog", "CHANGELOG.md", gem: gem)
92+
files << g("wrapper_gem/gemfile", "Gemfile", gem: gem)
93+
files << g("gem/license", "LICENSE.md", gem: gem)
94+
files << g("wrapper_gem/rakefile", "Rakefile", gem: gem)
95+
files << g("wrapper_gem/readme", "README.md", gem: gem)
96+
files << g("wrapper_gem/gemspec", "#{gem.name}.gemspec", gem: gem)
97+
files << g("wrapper_gem/entrypoint", "lib/#{gem.name}.rb", gem: gem) if gem.needs_entrypoint?
98+
files << g("wrapper_gem/main", "lib/#{gem.namespace_file_path}", gem: gem)
99+
files << g("gem/version", "lib/#{gem.version_file_path}", gem: gem)
100+
files << g("gem/test_helper", "test/helper.rb", gem: gem)
101+
files << g("wrapper_gem/client_test", "test/#{gem.namespace_require}/client_test.rb", gem: gem)
102+
files << g("wrapper_gem/version_test", "test/#{gem.namespace_require}/version_test.rb", gem: gem)
103103

104104
format_files files
105105

gapic-generator-cloud/templates/cloud/gem/authentication.erb renamed to gapic-generator-cloud/templates/cloud/gem/authentication.text.erb

File renamed without changes.

gapic-generator-cloud/templates/cloud/gem/gitignore.erb renamed to gapic-generator-cloud/templates/cloud/gem/gitignore.text.erb

File renamed without changes.

0 commit comments

Comments
 (0)