rbs_rails 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb7076ac91a406f491cf3e6c4d8499525f860660061ff23809635d000d1aba3
-  data.tar.gz: a863d9e16999e7491cef930b8fb79515c538ad7d83b919abad762a5c1290e370
+  metadata.gz: 4daa0714f5e127bc21e33e9737983999459a2dbb690202c6dc86408a68ef82b0
+  data.tar.gz: 54f9a8c04ca0f22c1a391a4d5a47c0294c54f50741843226655ae9e8175b0a51
 SHA512:
-  metadata.gz: 10dccf3356c898258d6c13aaed04d61a5f137787f9ea696fe0d7005e2063c2fd130d9fdda59c4c7b4fa58d1cde84a3ca0cf750dac28f1ac9ffbfe94ead90da57
-  data.tar.gz: b8f5c227bf58bdb16044867cd4abd883f21782817eda8fa6d85d1956418c763829748d5d0ee0e81e1005ffd18e022d6da6e83b64aa97cf4f77fe6942bacec48b
+  metadata.gz: f85bdbf2f59f5accdd54a062f5d5412f432b9d91b62b6f4ced371fbcc0d565ad661a1015d9193e4ee9add64ef69cf7243dd5603dc22b05182b59f3a122ecad2e
+  data.tar.gz: f75cc735df8961b0714af8bf4f38771f01542ed4162e69fb8adc677dcbfec0885fe15296bc84006b955d9370004dfcd6070fbd761c0b220f02d16f062fadcbba

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, '3.0', head]
+        ruby: [2.6, 2.7, '3.0', 3.1, head]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

data/Gemfile

@@ -7,6 +7,6 @@ gemspec
 
 gem "rake", "~> 13.0"
 gem 'rails', '< 6.1', '>= 6.0'
-gem 'rbs', '>= 1.6'
-gem 'steep', github: 'soutaro/steep'
+gem 'rbs', '>= 2'
+gem 'steep'
 gem 'minitest'

data/Gemfile.lock

@@ -1,77 +1,63 @@
-GIT
-  remote: https://github.com/soutaro/steep
-  revision: 0673d88395fb0ea380463fef1aed568dfb077a60
-  specs:
-    steep (0.46.0)
-      activesupport (>= 5.1)
-      language_server-protocol (>= 3.15, < 4.0)
-      listen (~> 3.0)
-      parallel (>= 1.0.0)
-      parser (>= 3.0)
-      rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 1.6.0)
-      terminal-table (>= 2, < 4)
-
 PATH
   remote: .
   specs:
-    rbs_rails (0.9.0)
+    rbs_rails (0.10.0)
       parser
       rbs (>= 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.4.1)
-      actionpack (= 6.0.4.1)
+    actioncable (6.0.4.7)
+      actionpack (= 6.0.4.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionmailbox (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       mail (>= 2.7.1)
-    actionmailer (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
+    actionmailer (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      actionview (= 6.0.4.7)
+      activejob (= 6.0.4.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.1)
-      actionview (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionpack (6.0.4.7)
+      actionview (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actiontext (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionview (6.0.4.7)
+      activesupport (= 6.0.4.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    activejob (6.0.4.7)
+      activesupport (= 6.0.4.7)
       globalid (>= 0.3.6)
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activerecord (6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activestorage (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
+    activemodel (6.0.4.7)
+      activesupport (= 6.0.4.7)
+    activerecord (6.0.4.7)
+      activemodel (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
+    activestorage (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
       marcel (~> 1.0.0)
-    activesupport (6.0.4.1)
+    activesupport (6.0.4.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -82,86 +68,95 @@ GEM
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     erubi (1.10.0)
-    ffi (1.15.4)
-    globalid (0.5.2)
+    ffi (1.15.5)
+    globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.16.0.3)
-    listen (3.7.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.12.0)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     nio4r (2.5.8)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.21.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.4.1)
-      actioncable (= 6.0.4.1)
-      actionmailbox (= 6.0.4.1)
-      actionmailer (= 6.0.4.1)
-      actionpack (= 6.0.4.1)
-      actiontext (= 6.0.4.1)
-      actionview (= 6.0.4.1)
-      activejob (= 6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activerecord (= 6.0.4.1)
-      activestorage (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    rails (6.0.4.7)
+      actioncable (= 6.0.4.7)
+      actionmailbox (= 6.0.4.7)
+      actionmailer (= 6.0.4.7)
+      actionpack (= 6.0.4.7)
+      actiontext (= 6.0.4.7)
+      actionview (= 6.0.4.7)
+      activejob (= 6.0.4.7)
+      activemodel (= 6.0.4.7)
+      activerecord (= 6.0.4.7)
+      activestorage (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       bundler (>= 1.3.0)
-      railties (= 6.0.4.1)
+      railties (= 6.0.4.7)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    railties (6.0.4.7)
+      actionpack (= 6.0.4.7)
+      activesupport (= 6.0.4.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.6.2)
-    sprockets (4.0.2)
+    rbs (2.2.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    terminal-table (3.0.1)
+    steep (0.49.1)
+      activesupport (>= 5.1)
+      language_server-protocol (>= 3.15, < 4.0)
+      listen (~> 3.0)
+      parallel (>= 1.0.0)
+      parser (>= 3.0)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (>= 2.2.0)
+      terminal-table (>= 2, < 4)
+    terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -171,9 +166,9 @@ DEPENDENCIES
   minitest
   rails (>= 6.0, < 6.1)
   rake (~> 13.0)
-  rbs (>= 1.6)
+  rbs (>= 2)
   rbs_rails!
-  steep!
+  steep
 
 BUNDLED WITH
    2.2.27

data/lib/rbs_rails/active_record.rb

@@ -32,6 +32,8 @@ module RbsRails
 
           #{columns}
           #{associations}
+          #{generated_association_methods}
+          #{has_secure_password}
           #{delegated_type_instance}
           #{delegated_type_scope(singleton: true)}
           #{enum_instance_methods}
@@ -68,7 +70,7 @@ module RbsRails
 
       private def relation_decl
         <<~RBS
-          class #{relation_class_name} < ActiveRecord::Relation
+          class #{relation_class_name} < ::ActiveRecord::Relation
             include GeneratedRelationMethods
             include _ActiveRecord_Relation[#{klass_name}, #{pk_type}]
             include Enumerable[#{klass_name}]
@@ -78,7 +80,7 @@ module RbsRails
 
       private def collection_proxy_decl
         <<~RBS
-          class ActiveRecord_Associations_CollectionProxy < ActiveRecord::Associations::CollectionProxy
+          class ActiveRecord_Associations_CollectionProxy < ::ActiveRecord::Associations::CollectionProxy
             include GeneratedRelationMethods
             include _ActiveRecord_Relation[#{klass_name}, #{pk_type}]
           end
@@ -97,7 +99,7 @@ module RbsRails
             superclass_name = Util.module_name(superclass)
             @dependencies << superclass_name
 
-            "class #{mod_name} < #{superclass_name}"
+            "class #{mod_name} < ::#{superclass_name}"
           when Module
             "module #{mod_name}"
           else
@@ -165,6 +167,41 @@ module RbsRails
         end.join("\n")
       end
 
+      private def generated_association_methods
+        # @type var sigs: Array[String]
+        sigs = []
+
+        # Needs to require "active_storage/engine"
+        if klass.respond_to?(:attachment_reflections)
+          sigs << "module GeneratedAssociationMethods"
+          sigs << klass.attachment_reflections.map do |name, reflection|
+            case reflection.macro
+            when :has_one_attached
+              <<~EOS
+                def #{name}: () -> ActiveStorage::Attached::One
+                def #{name}=: (ActionDispatch::Http::UploadedFile) -> ActionDispatch::Http::UploadedFile
+                            | (Rack::Test::UploadedFile) -> Rack::Test::UploadedFile
+                            | (ActiveStorage::Blob) -> ActiveStorage::Blob
+                            | (String) -> String
+                            | ({ io: IO, filename: String, content_type: String? }) -> { io: IO, filename: String, content_type: String? }
+                            | (nil) -> nil
+              EOS
+            when :has_many_attached
+              <<~EOS
+                def #{name}: () -> ActiveStorage::Attached::Many
+                def #{name}=: (untyped) -> untyped
+              EOS
+            else
+              raise
+            end
+          end.join("\n")
+          sigs << "end"
+          sigs << "include GeneratedAssociationMethods"
+        end
+
+        sigs.join("\n")
+      end
+
       private def delegated_type_scope(singleton:)
         definitions = delegated_type_definitions
         return "" unless definitions
@@ -236,12 +273,42 @@ module RbsRails
         end.compact
       end
 
+      private def has_secure_password
+        ast = parse_model_file
+        return unless ast
+
+        traverse(ast).map do |node|
+          # @type block: String?
+          next unless node.type == :send
+          next unless node.children[0].nil?
+          next unless node.children[1] == :has_secure_password
+
+          attribute_node = node.children[2]
+          attribute = if attribute_node && attribute_node.type == :sym
+                        attribute_node.children[0]
+                      else
+                        :password
+                      end
+
+          <<~EOS
+            module ActiveModel_SecurePassword_InstanceMethodsOnActivation_#{attribute}
+              attr_reader #{attribute}: String?
+              def #{attribute}=: (String) -> String
+              def #{attribute}_confirmation=: (String) -> String
+              def authenticate_#{attribute}: (String) -> (#{klass_name} | false)
+              #{attribute == :password ? "alias authenticate authenticate_password" : ""}
+            end
+            include ActiveModel_SecurePassword_InstanceMethodsOnActivation_#{attribute}
+          EOS
+        end.compact.join("\n")
+      end
+
       private def enum_instance_methods
         # @type var methods: Array[String]
         methods = []
         enum_definitions.each do |hash|
           hash.each do |name, values|
-            next if name == :_prefix || name == :_suffix
+            next if name == :_prefix || name == :_suffix || name == :_default
 
             values.each do |label, value|
               value_method_name = enum_method_name(hash, name, label)
@@ -259,7 +326,7 @@ module RbsRails
         methods = []
         enum_definitions.each do |hash|
           hash.each do |name, values|
-            next if name == :_prefix || name == :_suffix
+            next if name == :_prefix || name == :_suffix || name == :_default
 
             values.each do |label, value|
               value_method_name = enum_method_name(hash, name, label)
@@ -320,7 +387,9 @@ module RbsRails
         ast = parse_model_file
         return '' unless ast
 
-        traverse(ast).map do |node|
+        prefix = singleton ? 'self.' : ''
+
+        sigs = traverse(ast).map do |node|
           # @type block: nil | String
           next unless node.type == :send
           next unless node.children[0].nil?
@@ -336,8 +405,16 @@ module RbsRails
           next unless body_node.type == :block
 
           args = args_to_type(body_node.children[1])
-          "def #{singleton ? 'self.' : ''}#{name}: #{args} -> #{relation_class_name}"
-        end.compact.join("\n")
+          "def #{prefix}#{name}: #{args} -> #{relation_class_name}"
+        end.compact
+
+        if klass.respond_to?(:attachment_reflections)
+          klass.attachment_reflections.each do |name, _reflection|
+            sigs << "def #{prefix}with_attached_#{name}: () -> #{relation_class_name}"
+          end
+        end
+
+        sigs.join("\n")
       end
 
       private def args_to_type(args_node)
@@ -396,7 +473,8 @@ module RbsRails
       end
 
       private def columns
-        klass.columns.map do |col|
+        mod_sig = +"module GeneratedAttributeMethods\n"
+        mod_sig << klass.columns.map do |col|
           class_name = if enum_definitions.any? { |hash| hash.key?(col.name) || hash.key?(col.name.to_sym) }
                          'String'
                        else
@@ -405,7 +483,9 @@ module RbsRails
           class_name_opt = optional(class_name)
           column_type = col.null ? class_name_opt : class_name
           sig = <<~EOS
-            attr_accessor #{col.name} (): #{column_type}
+            def #{col.name}: () -> #{column_type}
+            def #{col.name}=: (#{column_type}) -> #{column_type}
+            def #{col.name}?: () -> bool
             def #{col.name}_changed?: () -> bool
             def #{col.name}_change: () -> [#{class_name_opt}, #{class_name_opt}]
             def #{col.name}_will_change!: () -> void
@@ -422,9 +502,12 @@ module RbsRails
             def restore_#{col.name}!: () -> void
             def clear_#{col.name}_change: () -> void
           EOS
-          sig << "attr_accessor #{col.name}? (): #{class_name}\n" if col.type == :boolean
+          sig << "\n"
           sig
         end.join("\n")
+        mod_sig << "\nend\n"
+        mod_sig << "include GeneratedAttributeMethods"
+        mod_sig
       end
 
       private def optional(class_name)

data/lib/rbs_rails/version.rb

@@ -2,5 +2,5 @@ module RbsRails
   # Because of copy_signatures is defined by lib/rbs_rails.rb
   # @dynamic self.copy_signatures
 
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/rbs_collection.lock.yaml

@@ -6,59 +6,31 @@ sources:
   repo_dir: gems
 path: ".gem_rbs_collection"
 gems:
-- name: pathname
-  version: '0'
-  source:
-    type: stdlib
 - name: logger
   version: '0'
   source:
     type: stdlib
-- name: mutex_m
-  version: '0'
-  source:
-    type: stdlib
-- name: date
-  version: '0'
-  source:
-    type: stdlib
-- name: monitor
-  version: '0'
-  source:
-    type: stdlib
-- name: singleton
-  version: '0'
-  source:
-    type: stdlib
-- name: tsort
+- name: set
   version: '0'
   source:
     type: stdlib
-- name: time
+- name: pathname
   version: '0'
   source:
     type: stdlib
-- name: set
+- name: json
   version: '0'
   source:
     type: stdlib
-- name: rack
-  version: 2.2.2
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: json
+- name: optparse
   version: '0'
   source:
     type: stdlib
-- name: strscan
+- name: rubygems
   version: '0'
   source:
     type: stdlib
-- name: optparse
+- name: tsort
   version: '0'
   source:
     type: stdlib
@@ -67,7 +39,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: actionview
@@ -75,7 +47,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activejob
@@ -83,7 +55,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activemodel
@@ -91,7 +63,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activerecord
@@ -99,7 +71,15 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: activestorage
+  version: '6.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activesupport
@@ -107,7 +87,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: parallel
@@ -115,7 +95,15 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rack
+  version: 2.2.2
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: railties
@@ -123,10 +111,34 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 51880bed87fbc3dc8076fedb5cf798be05148220
+    revision: 6320a194c85afbf4ff332c3eb75fcae2a6518c92
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 1.6.2
+  version: 2.2.2
   source:
     type: rubygems
+- name: monitor
+  version: '0'
+  source:
+    type: stdlib
+- name: tempfile
+  version: '0'
+  source:
+    type: stdlib
+- name: date
+  version: '0'
+  source:
+    type: stdlib
+- name: singleton
+  version: '0'
+  source:
+    type: stdlib
+- name: mutex_m
+  version: '0'
+  source:
+    type: stdlib
+- name: time
+  version: '0'
+  source:
+    type: stdlib

data/rbs_collection.yaml

@@ -9,25 +9,6 @@ sources:
 path: .gem_rbs_collection
 
 gems:
-  # stdlibs
-  - name: 'pathname'
-  - name: 'logger'
-  - name: 'mutex_m'
-  - name: 'date'
-  - name: 'monitor'
-  - name: 'singleton'
-  - name: 'tsort'
-  - name: 'time'
-  - name: 'set'
-
-  # gems
-  - name: 'rack'
-
-  # RBS gem dependencies
-  - name: 'json'
-  - name: 'strscan'
-  - name: 'optparse'
-
   # Ignores - Gemfile.lock contains them but their RBSs are unnecessary
   - name: steep
     ignore: true
@@ -43,3 +24,13 @@ gems:
   # ignore RBS Rails itself
   - name: rbs_rails
     ignore: true
+
+  # They'are necessary to load RBS gem.
+  # See https://github.com/ruby/rbs/pull/921
+  - name: logger
+  - name: set
+  - name: pathname
+  - name: json
+  - name: optparse
+  - name: rubygems
+  - name: tsort

data/sig/rbs_rails/active_record.rbs

@@ -32,12 +32,16 @@ class RbsRails::ActiveRecord::Generator
 
   def belongs_to: () -> String
 
+  def generated_association_methods: () -> String
+
   def delegated_type_scope: (singleton: bool) -> String
 
   def delegated_type_instance: () -> String
 
   def delegated_type_definitions: () -> Array[{ role: Symbol, types: Array[String] }]?
 
+  def has_secure_password: () -> String?
+
   def enum_instance_methods: () -> String
 
   def enum_scope_methods: (singleton: untyped `singleton`) -> String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: A RBS files generator for Rails application