rbs_rails 0.11.0 → 0.12.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (23) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +1 -1
  3. data/CHANGELOG.md +13 -0
  4. data/Gemfile +3 -3
  5. data/Gemfile.lock +179 -125
  6. data/README.md +1 -0
  7. data/Steepfile +5 -0
  8. data/lib/generators/rbs_rails/install_generator.rb +16 -12
  9. data/lib/rbs_rails/active_record.rb +58 -46
  10. data/lib/rbs_rails/dependency_builder.rb +5 -1
  11. data/lib/rbs_rails/rake_task.rb +7 -7
  12. data/lib/rbs_rails/util.rb +14 -10
  13. data/lib/rbs_rails/version.rb +1 -1
  14. data/rbs_collection.lock.yaml +228 -48
  15. data/rbs_collection.yaml +0 -2
  16. data/rbs_rails.gemspec +1 -1
  17. data/sig/rbs_rails/active_record.rbs +9 -3
  18. data/sig/rbs_rails/dependency_builder.rbs +4 -0
  19. data/sig/rbs_rails/rake_task.rbs +1 -1
  20. data/sig/rbs_rails/util.rbs +1 -1
  21. metadata +4 -9
  22. data/sig/_internal/fileutils.rbs +0 -4
  23. data/sig/_internal/thor.rbs +0 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 66770df53a677c589c39cfd828149a60b4ef261979e11cc7dc823a1df475495f
4
- data.tar.gz: 88de9ae8cc7597b4e28978f9a72a696742a5ece83b4d401fed92061fdd2b1590
3
+ metadata.gz: 548705372663c4a155d0af70f4e0a3fb3541e19f87494810423730133b9f8f03
4
+ data.tar.gz: 408c17d1cc880a7e842f8924a8a8fa4e03c249cad492c9841b07a25946c4bd86
5
5
  SHA512:
6
- metadata.gz: e76c5de12b626f50db6f7e032dc323de1c79067a3cb9f8e0c4e3ba5ebd71d30d4e1679144573b3eec2788d75edd33b4ff084c5ffb7ccb8839f2293e5f061595e
7
- data.tar.gz: b259952abf7664a8335a8cebda843e869a1b38c27fa010d0a927134aa56d11d63e4df20ce3850c9c2d12f62228593bd14f75ff95b7f782d00dc90d19610e71c1
6
+ metadata.gz: b14c2090fa99f4ad9e6aee151dde75902bbf25cd113502c43971eb3cb0bf8b85a211b5b2775c34da292f310d71ef6ace1593abb9bf7e82a8d96cc303e41cc24e
7
+ data.tar.gz: 70795ec8af65615efa4db6e018f3f14c06aee9d87a57020d367034ec29cb72494df431467f8619afe81710486a48178bc6b5fb9ece5b773953ea082a2627065e
data/.github/workflows/ci.yml CHANGED
@@ -15,7 +15,7 @@ jobs:
15
15
  strategy:
16
16
  fail-fast: false
17
17
  matrix:
18
- ruby: [2.6, 2.7, '3.0', 3.1, head]
18
+ ruby: ['3.2', '3.3', head]
19
19
  runs-on: ubuntu-latest
20
20
  steps:
21
21
  - uses: actions/checkout@v2
data/CHANGELOG.md CHANGED
@@ -2,6 +2,19 @@
2
2
 
3
3
  ## master (unreleased)
4
4
 
5
+ ## 0.12.1
6
+
7
+ * Drop support for old Rubies. [#284](https://github.com/pocke/rbs_rails/pull/284)
8
+ * Make type names absolute to avoid referring to incorrect class. [#265](https://github.com/pocke/rbs_rails/pull/265)
9
+ * Avoid to create directory on initialization. [#261](https://github.com/pocke/rbs_rails/pull/261)
10
+ * Make `build_*` methods parameters optional. [#258](https://github.com/pocke/rbs_rails/pull/258)
11
+ * Skip to define rake tasks when rbs_rails is not able to load. [#251](https://github.com/pocke/rbs_rails/pull/251)
12
+
13
+ ## 0.12.0
14
+
15
+ * Support RBS v3. [#246](https://github.com/pocke/rbs_rails/pull/246)
16
+ * Ignore `_scope` as enum field name. [#249](https://github.com/pocke/rbs_rails/pull/249)
17
+
5
18
  ## 0.11.0 (2022-03-24)
6
19
 
7
20
  ### New Features
data/Gemfile CHANGED
@@ -6,7 +6,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
6
6
  gemspec
7
7
 
8
8
  gem "rake", "~> 13.0"
9
- gem 'rails', '< 7', '>= 6.0'
10
- gem 'rbs', '>= 2'
11
- gem 'steep'
9
+ gem 'rails', '>= 7.0'
10
+ gem 'rbs', '>= 3'
11
+ gem 'steep', '>= 1.4'
12
12
  gem 'minitest'
data/Gemfile.lock CHANGED
@@ -1,177 +1,231 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rbs_rails (0.11.0)
4
+ rbs_rails (0.12.1)
5
5
  parser
6
6
  rbs (>= 1)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
10
10
  specs:
11
- actioncable (6.1.5)
12
- actionpack (= 6.1.5)
13
- activesupport (= 6.1.5)
11
+ actioncable (7.2.2)
12
+ actionpack (= 7.2.2)
13
+ activesupport (= 7.2.2)
14
14
  nio4r (~> 2.0)
15
15
  websocket-driver (>= 0.6.1)
16
- actionmailbox (6.1.5)
17
- actionpack (= 6.1.5)
18
- activejob (= 6.1.5)
19
- activerecord (= 6.1.5)
20
- activestorage (= 6.1.5)
21
- activesupport (= 6.1.5)
22
- mail (>= 2.7.1)
23
- actionmailer (6.1.5)
24
- actionpack (= 6.1.5)
25
- actionview (= 6.1.5)
26
- activejob (= 6.1.5)
27
- activesupport (= 6.1.5)
28
- mail (~> 2.5, >= 2.5.4)
29
- rails-dom-testing (~> 2.0)
30
- actionpack (6.1.5)
31
- actionview (= 6.1.5)
32
- activesupport (= 6.1.5)
33
- rack (~> 2.0, >= 2.0.9)
16
+ zeitwerk (~> 2.6)
17
+ actionmailbox (7.2.2)
18
+ actionpack (= 7.2.2)
19
+ activejob (= 7.2.2)
20
+ activerecord (= 7.2.2)
21
+ activestorage (= 7.2.2)
22
+ activesupport (= 7.2.2)
23
+ mail (>= 2.8.0)
24
+ actionmailer (7.2.2)
25
+ actionpack (= 7.2.2)
26
+ actionview (= 7.2.2)
27
+ activejob (= 7.2.2)
28
+ activesupport (= 7.2.2)
29
+ mail (>= 2.8.0)
30
+ rails-dom-testing (~> 2.2)
31
+ actionpack (7.2.2)
32
+ actionview (= 7.2.2)
33
+ activesupport (= 7.2.2)
34
+ nokogiri (>= 1.8.5)
35
+ racc
36
+ rack (>= 2.2.4, < 3.2)
37
+ rack-session (>= 1.0.1)
34
38
  rack-test (>= 0.6.3)
35
- rails-dom-testing (~> 2.0)
36
- rails-html-sanitizer (~> 1.0, >= 1.2.0)
37
- actiontext (6.1.5)
38
- actionpack (= 6.1.5)
39
- activerecord (= 6.1.5)
40
- activestorage (= 6.1.5)
41
- activesupport (= 6.1.5)
39
+ rails-dom-testing (~> 2.2)
40
+ rails-html-sanitizer (~> 1.6)
41
+ useragent (~> 0.16)
42
+ actiontext (7.2.2)
43
+ actionpack (= 7.2.2)
44
+ activerecord (= 7.2.2)
45
+ activestorage (= 7.2.2)
46
+ activesupport (= 7.2.2)
47
+ globalid (>= 0.6.0)
42
48
  nokogiri (>= 1.8.5)
43
- actionview (6.1.5)
44
- activesupport (= 6.1.5)
49
+ actionview (7.2.2)
50
+ activesupport (= 7.2.2)
45
51
  builder (~> 3.1)
46
- erubi (~> 1.4)
47
- rails-dom-testing (~> 2.0)
48
- rails-html-sanitizer (~> 1.1, >= 1.2.0)
49
- activejob (6.1.5)
50
- activesupport (= 6.1.5)
52
+ erubi (~> 1.11)
53
+ rails-dom-testing (~> 2.2)
54
+ rails-html-sanitizer (~> 1.6)
55
+ activejob (7.2.2)
56
+ activesupport (= 7.2.2)
51
57
  globalid (>= 0.3.6)
52
- activemodel (6.1.5)
53
- activesupport (= 6.1.5)
54
- activerecord (6.1.5)
55
- activemodel (= 6.1.5)
56
- activesupport (= 6.1.5)
57
- activestorage (6.1.5)
58
- actionpack (= 6.1.5)
59
- activejob (= 6.1.5)
60
- activerecord (= 6.1.5)
61
- activesupport (= 6.1.5)
58
+ activemodel (7.2.2)
59
+ activesupport (= 7.2.2)
60
+ activerecord (7.2.2)
61
+ activemodel (= 7.2.2)
62
+ activesupport (= 7.2.2)
63
+ timeout (>= 0.4.0)
64
+ activestorage (7.2.2)
65
+ actionpack (= 7.2.2)
66
+ activejob (= 7.2.2)
67
+ activerecord (= 7.2.2)
68
+ activesupport (= 7.2.2)
62
69
  marcel (~> 1.0)
63
- mini_mime (>= 1.1.0)
64
- activesupport (6.1.5)
65
- concurrent-ruby (~> 1.0, >= 1.0.2)
70
+ activesupport (7.2.2)
71
+ base64
72
+ benchmark (>= 0.3)
73
+ bigdecimal
74
+ concurrent-ruby (~> 1.0, >= 1.3.1)
75
+ connection_pool (>= 2.2.5)
76
+ drb
66
77
  i18n (>= 1.6, < 2)
78
+ logger (>= 1.4.2)
67
79
  minitest (>= 5.1)
68
- tzinfo (~> 2.0)
69
- zeitwerk (~> 2.3)
80
+ securerandom (>= 0.3)
81
+ tzinfo (~> 2.0, >= 2.0.5)
70
82
  ast (2.4.2)
71
- builder (3.2.4)
72
- concurrent-ruby (1.1.9)
83
+ base64 (0.2.0)
84
+ benchmark (0.3.0)
85
+ bigdecimal (3.1.8)
86
+ builder (3.3.0)
87
+ concurrent-ruby (1.3.4)
88
+ connection_pool (2.4.1)
73
89
  crass (1.0.6)
74
- erubi (1.10.0)
75
- ffi (1.15.5)
76
- globalid (1.0.0)
77
- activesupport (>= 5.0)
78
- i18n (1.10.0)
90
+ csv (3.3.0)
91
+ date (3.4.0)
92
+ drb (2.2.1)
93
+ erubi (1.13.0)
94
+ ffi (1.17.0)
95
+ fileutils (1.7.3)
96
+ globalid (1.2.1)
97
+ activesupport (>= 6.1)
98
+ i18n (1.14.6)
79
99
  concurrent-ruby (~> 1.0)
80
- language_server-protocol (3.16.0.3)
81
- listen (3.7.1)
100
+ io-console (0.7.2)
101
+ irb (1.14.1)
102
+ rdoc (>= 4.0.0)
103
+ reline (>= 0.4.2)
104
+ json (2.7.5)
105
+ language_server-protocol (3.17.0.3)
106
+ listen (3.9.0)
82
107
  rb-fsevent (~> 0.10, >= 0.10.3)
83
108
  rb-inotify (~> 0.9, >= 0.9.10)
84
- loofah (2.15.0)
109
+ logger (1.6.1)
110
+ loofah (2.23.1)
85
111
  crass (~> 1.0.2)
86
- nokogiri (>= 1.5.9)
87
- mail (2.7.1)
112
+ nokogiri (>= 1.12.0)
113
+ mail (2.8.1)
88
114
  mini_mime (>= 0.1.1)
89
- marcel (1.0.2)
90
- method_source (1.0.0)
91
- mini_mime (1.1.2)
92
- mini_portile2 (2.8.0)
93
- minitest (5.15.0)
94
- nio4r (2.5.8)
95
- nokogiri (1.13.3)
96
- mini_portile2 (~> 2.8.0)
115
+ net-imap
116
+ net-pop
117
+ net-smtp
118
+ marcel (1.0.4)
119
+ mini_mime (1.1.5)
120
+ mini_portile2 (2.8.7)
121
+ minitest (5.25.1)
122
+ net-imap (0.5.0)
123
+ date
124
+ net-protocol
125
+ net-pop (0.1.2)
126
+ net-protocol
127
+ net-protocol (0.2.2)
128
+ timeout
129
+ net-smtp (0.5.0)
130
+ net-protocol
131
+ nio4r (2.7.4)
132
+ nokogiri (1.16.7)
133
+ mini_portile2 (~> 2.8.2)
97
134
  racc (~> 1.4)
98
- parallel (1.21.0)
99
- parser (3.1.1.0)
135
+ parser (3.3.5.1)
100
136
  ast (~> 2.4.1)
101
- racc (1.6.0)
102
- rack (2.2.3)
103
- rack-test (1.1.0)
104
- rack (>= 1.0, < 3)
105
- rails (6.1.5)
106
- actioncable (= 6.1.5)
107
- actionmailbox (= 6.1.5)
108
- actionmailer (= 6.1.5)
109
- actionpack (= 6.1.5)
110
- actiontext (= 6.1.5)
111
- actionview (= 6.1.5)
112
- activejob (= 6.1.5)
113
- activemodel (= 6.1.5)
114
- activerecord (= 6.1.5)
115
- activestorage (= 6.1.5)
116
- activesupport (= 6.1.5)
137
+ racc
138
+ psych (5.1.2)
139
+ stringio
140
+ racc (1.8.1)
141
+ rack (3.1.8)
142
+ rack-session (2.0.0)
143
+ rack (>= 3.0.0)
144
+ rack-test (2.1.0)
145
+ rack (>= 1.3)
146
+ rackup (2.2.0)
147
+ rack (>= 3)
148
+ rails (7.2.2)
149
+ actioncable (= 7.2.2)
150
+ actionmailbox (= 7.2.2)
151
+ actionmailer (= 7.2.2)
152
+ actionpack (= 7.2.2)
153
+ actiontext (= 7.2.2)
154
+ actionview (= 7.2.2)
155
+ activejob (= 7.2.2)
156
+ activemodel (= 7.2.2)
157
+ activerecord (= 7.2.2)
158
+ activestorage (= 7.2.2)
159
+ activesupport (= 7.2.2)
117
160
  bundler (>= 1.15.0)
118
- railties (= 6.1.5)
119
- sprockets-rails (>= 2.0.0)
120
- rails-dom-testing (2.0.3)
121
- activesupport (>= 4.2.0)
161
+ railties (= 7.2.2)
162
+ rails-dom-testing (2.2.0)
163
+ activesupport (>= 5.0.0)
164
+ minitest
122
165
  nokogiri (>= 1.6)
123
- rails-html-sanitizer (1.4.2)
124
- loofah (~> 2.3)
125
- railties (6.1.5)
126
- actionpack (= 6.1.5)
127
- activesupport (= 6.1.5)
128
- method_source
166
+ rails-html-sanitizer (1.6.0)
167
+ loofah (~> 2.21)
168
+ nokogiri (~> 1.14)
169
+ railties (7.2.2)
170
+ actionpack (= 7.2.2)
171
+ activesupport (= 7.2.2)
172
+ irb (~> 1.13)
173
+ rackup (>= 1.0.0)
129
174
  rake (>= 12.2)
130
- thor (~> 1.0)
175
+ thor (~> 1.0, >= 1.2.2)
176
+ zeitwerk (~> 2.6)
131
177
  rainbow (3.1.1)
132
- rake (13.0.6)
133
- rb-fsevent (0.11.1)
134
- rb-inotify (0.10.1)
178
+ rake (13.2.1)
179
+ rb-fsevent (0.11.2)
180
+ rb-inotify (0.11.1)
135
181
  ffi (~> 1.0)
136
- rbs (2.2.2)
137
- sprockets (4.0.3)
138
- concurrent-ruby (~> 1.0)
139
- rack (> 1, < 3)
140
- sprockets-rails (3.4.2)
141
- actionpack (>= 5.2)
142
- activesupport (>= 5.2)
143
- sprockets (>= 3.0.0)
144
- steep (0.49.1)
182
+ rbs (3.6.1)
183
+ logger
184
+ rdoc (6.7.0)
185
+ psych (>= 4.0.0)
186
+ reline (0.5.10)
187
+ io-console (~> 0.5)
188
+ securerandom (0.3.1)
189
+ steep (1.8.3)
145
190
  activesupport (>= 5.1)
191
+ concurrent-ruby (>= 1.1.10)
192
+ csv (>= 3.0.9)
193
+ fileutils (>= 1.1.0)
194
+ json (>= 2.1.0)
146
195
  language_server-protocol (>= 3.15, < 4.0)
147
196
  listen (~> 3.0)
148
- parallel (>= 1.0.0)
149
- parser (>= 3.0)
197
+ logger (>= 1.3.0)
198
+ parser (>= 3.1)
150
199
  rainbow (>= 2.2.2, < 4.0)
151
- rbs (>= 2.2.0)
200
+ rbs (~> 3.6.0)
201
+ securerandom (>= 0.1)
202
+ strscan (>= 1.0.0)
152
203
  terminal-table (>= 2, < 4)
204
+ stringio (3.1.1)
205
+ strscan (3.1.0)
153
206
  terminal-table (3.0.2)
154
207
  unicode-display_width (>= 1.1.1, < 3)
155
- thor (1.2.1)
156
- tzinfo (2.0.4)
208
+ thor (1.3.2)
209
+ timeout (0.4.1)
210
+ tzinfo (2.0.6)
157
211
  concurrent-ruby (~> 1.0)
158
- unicode-display_width (2.1.0)
159
- websocket-driver (0.7.5)
212
+ unicode-display_width (2.6.0)
213
+ useragent (0.16.10)
214
+ websocket-driver (0.7.6)
160
215
  websocket-extensions (>= 0.1.0)
161
216
  websocket-extensions (0.1.5)
162
- zeitwerk (2.5.4)
217
+ zeitwerk (2.7.1)
163
218
 
164
219
  PLATFORMS
165
220
  ruby
166
- x86_64-linux
167
221
 
168
222
  DEPENDENCIES
169
223
  minitest
170
- rails (>= 6.0, < 7)
224
+ rails (>= 7.0)
171
225
  rake (~> 13.0)
172
- rbs (>= 2)
226
+ rbs (>= 3)
173
227
  rbs_rails!
174
- steep
228
+ steep (>= 1.4)
175
229
 
176
230
  BUNDLED WITH
177
- 2.3.9
231
+ 2.4.13
data/README.md CHANGED
@@ -41,6 +41,7 @@ You need to install `rails` gem's RBS files. I highly recommend using `rbs colle
41
41
  1. Then execute the following commands
42
42
  ```console
43
43
  $ bundle install
44
+ $ bundle exec rbs collection init
44
45
  $ bundle exec rbs collection install
45
46
  ```
46
47
 
data/Steepfile CHANGED
@@ -1,7 +1,12 @@
1
+ D = Steep::Diagnostic
1
2
  target :lib do
2
3
  signature "sig"
3
4
  signature 'assets/sig'
4
5
 
5
6
  check "lib" # Directory name
6
7
  repo_path ENV['RBS_REPO_DIR'] if ENV['RBS_REPO_DIR']
8
+
9
+ configure_code_diagnostics do |hash|
10
+ hash[D::Ruby::UnreachableBranch] = :information
11
+ end
7
12
  end
data/lib/generators/rbs_rails/install_generator.rb CHANGED
@@ -4,21 +4,25 @@ module RbsRails
4
4
  class InstallGenerator < Rails::Generators::Base
5
5
  def create_raketask
6
6
  create_file "lib/tasks/rbs.rake", <<~RUBY
7
- require 'rbs_rails/rake_task'
7
+ begin
8
+ require 'rbs_rails/rake_task'
8
9
 
9
- RbsRails::RakeTask.new do |task|
10
- # If you want to avoid generating RBS for some classes, comment in it.
11
- # default: nil
12
- #
13
- # task.ignore_model_if = -> (klass) { klass == MyClass }
10
+ RbsRails::RakeTask.new do |task|
11
+ # If you want to avoid generating RBS for some classes, comment in it.
12
+ # default: nil
13
+ #
14
+ # task.ignore_model_if = -> (klass) { klass == MyClass }
14
15
 
15
- # If you want to change the rake task namespace, comment in it.
16
- # default: :rbs_rails
17
- # task.name = :cool_rbs_rails
16
+ # If you want to change the rake task namespace, comment in it.
17
+ # default: :rbs_rails
18
+ # task.name = :cool_rbs_rails
18
19
 
19
- # If you want to change where RBS Rails writes RBSs into, comment in it.
20
- # default: Rails.root / 'sig/rbs_rails'
21
- # task.signature_root_dir = Rails.root / 'my_sig/rbs_rails'
20
+ # If you want to change where RBS Rails writes RBSs into, comment in it.
21
+ # default: Rails.root / 'sig/rbs_rails'
22
+ # task.signature_root_dir = Rails.root / 'my_sig/rbs_rails'
23
+ end
24
+ rescue LoadError
25
+ # failed to load rbs_rails. Skip to load rbs_rails tasks.
22
26
  end
23
27
  RUBY
24
28
  end