rbs_active_hash 1.4.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50b3e286a30ef5111438bd8167f51f42b72a58af5fca5cd6351808c3e08a45ca
-  data.tar.gz: '009908add2d81dac55c52a572c3ceafcef090ef05778487985645062313ac40c'
+  metadata.gz: c72503e55cdd29dfb738e4cf1154b5673de210dabcb9c987770020f6421b37fb
+  data.tar.gz: 3f8b643bf0c6febc8d74b9139dc7db95a40feba1976c4213634ab4ba3e2c53cb
 SHA512:
-  metadata.gz: 96db691ce7b799010753a0bb711f952d0dac12c352842548c0a2f5b9a1ec41f2c263b00f5cec4849df261c8e19b2343afe922981d66abe0ee11b1acb3b019e6e
-  data.tar.gz: a383ca9ab7058d7fd2ab8beea9203f707e5ab91e74f713508f5912d7293b2289f84604410658e05c28822ff6c53a31a78c6386fe426fff3c861988357fbfe7b6
+  metadata.gz: 4ec043fdcc777e755c87b739a432e01769520f7eff3d9137dbe054c260c632def1bd5aa13b5cd81a29f95f960408caa6231f6db0ea77c430f92d63260ed90342
+  data.tar.gz: 6892cf7036260f002def3aeaf016529b40f401ec78e03e539ef5d61a7ad56a12d89c77901ba3b08f04e8cf33cb5c93fffbf7bddb248aaa2a5cfe891850ebe87f

data/.rubocop.yml

@@ -1,5 +1,10 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
+  NewCops: enable
+
+plugins:
+  - rubocop-rake
+  - rubocop-rspec
 
 Style/Documentation:
   Enabled: false
@@ -12,6 +17,9 @@ Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: double_quotes
 
+Layout/LeadingCommentSpace:
+  AllowRBSInlineAnnotation: true
+
 Layout/LineLength:
   Max: 120
 
@@ -33,3 +41,9 @@ Metrics/MethodLength:
 
 Metrics/PerceivedComplexity:
   Max: 10
+
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Max: 10

data/.vscode/settings.json

@@ -2,8 +2,22 @@
     "[ruby]": {
         "editor.defaultFormatter": "Shopify.ruby-lsp"
     },
-    "rbs-helper.signature-directory": "sig",
     "cSpell.words": [
-        "Cyclomatic"
-    ]
+        "activerecord",
+        "bindir",
+        "boolish",
+        "Colour",
+        "Cyclomatic",
+        "FCALL",
+        "klass",
+        "KOMIYA",
+        "raketask",
+        "rubocop",
+        "rubygems",
+        "Takeshi",
+        "tk0miya",
+        "VCALL"
+    ],
+    "rbs-helper.rbs-inline-signature-directory": "sig/",
+    "rbs-helper.rbs-inline-on-save": true
 }

data/Gemfile

@@ -5,9 +5,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in rbs_active_hash.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rake", "~> 13.3"
 
-gem "rubocop", "~> 1.57"
+gem "rubocop", "~> 1.81"
+gem "rubocop-rake"
+gem "rubocop-rspec"
 
 group :test do
   gem "activerecord"
@@ -17,6 +19,7 @@ group :development do
   gem "rspec", require: false
   gem "rspec-daemon", require: false
 
+  gem "rbs-inline", require: false
   gem "steep"
 end
 

data/Gemfile.lock

@@ -1,169 +1,227 @@
 PATH
   remote: .
   specs:
-    rbs_active_hash (1.4.1)
+    rbs_active_hash (1.6.0)
       active_hash
       rbs
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.7.2)
-      actionview (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-      rack (~> 2.0, >= 2.2.4)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.2)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.7.2)
-      activesupport (= 7.0.7.2)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_hash (3.2.1)
-      activesupport (>= 5.0.0)
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activerecord (7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activesupport (7.0.7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    active_hash (4.0.0)
+      activesupport (>= 6.1.0)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      timeout (>= 0.4.0)
+    activesupport (7.2.2.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    base64 (0.1.1)
-    builder (3.2.4)
-    coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    builder (3.3.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crass (1.0.6)
-    csv (3.2.7)
-    diff-lcs (1.5.0)
-    erubi (1.12.0)
-    ffi (1.15.5)
-    fileutils (1.7.1)
-    i18n (1.14.1)
+    csv (3.3.3)
+    date (3.4.1)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    erubi (1.13.0)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    fileutils (1.7.3)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
-    listen (3.8.0)
+    io-console (0.8.0)
+    irb (1.14.2)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.15.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.5.3)
-    loofah (2.21.3)
+    logger (1.7.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    method_source (1.0.0)
-    minitest (5.20.0)
-    nokogiri (1.15.4-x86_64-darwin)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
+    nokogiri (1.18.9-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.7.1)
-    rack (2.2.8)
+    prism (1.5.1)
+    psych (5.2.1)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.1.16)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-      method_source
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (3.1.3)
-    regexp_parser (2.8.2)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-daemon (0.1.5)
-      pry
+    rbs (3.9.5)
+      logger
+    rbs-inline (0.12.0)
+      prism (>= 0.29)
+      rbs (>= 3.8.0)
+    rdoc (6.9.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.11.3)
+    reline (0.5.12)
+      io-console (~> 0.5)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.4)
+      rspec-support (~> 3.13.0)
+    rspec-daemon (1.1.1)
       rspec
-    rspec-expectations (3.12.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.57.1)
-      base64 (~> 0.1.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    rubocop (1.81.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.7.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
-    securerandom (0.2.2)
-    steep (1.5.3)
+    securerandom (0.4.1)
+    steep (1.10.0)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
       json (>= 2.1.0)
-      language_server-protocol (>= 3.15, < 4.0)
+      language_server-protocol (>= 3.17.0.4, < 4.0)
       listen (~> 3.0)
       logger (>= 1.3.0)
+      mutex_m (>= 0.3.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 3.1.0)
+      rbs (~> 3.9)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
-      terminal-table (>= 2, < 4)
-    strscan (3.0.6)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.2)
+      terminal-table (>= 2, < 5)
+      uri (>= 0.12.0)
+    stringio (3.1.2)
+    strscan (3.1.2)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    thor (1.3.2)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    zeitwerk (2.6.11)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.3)
+    useragent (0.16.11)
+    zeitwerk (2.6.18)
 
 PLATFORMS
+  arm64-darwin-24
   x86_64-darwin-19
   x86_64-darwin-21
+  x86_64-darwin-23
+  x86_64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
   activerecord
   railties
-  rake (~> 13.0)
+  rake (~> 13.3)
+  rbs-inline
   rbs_active_hash!
   rspec
   rspec-daemon
-  rubocop (~> 1.57)
+  rubocop (~> 1.81)
+  rubocop-rake
+  rubocop-rspec
   steep
 
 BUNDLED WITH
-   2.4.4
+   2.3.27

data/Steepfile

@@ -8,4 +8,5 @@ target :lib do
   check "lib"
 
   configure_code_diagnostics(D::Ruby.lenient)
+  implicitly_returns_nil!
 end

data/lib/generators/rbs_active_hash/install_generator.rb

@@ -4,7 +4,7 @@ require "rails"
 
 module RbsActiveHash
   class InstallGenerator < Rails::Generators::Base
-    def create_raketask
+    def create_raketask #: void
       create_file "lib/tasks/rbs_active_hash.rake", <<~RUBY
         # frozen_string_literal: true
 

data/lib/rbs_active_hash/active_hash/parser.rb

@@ -12,6 +12,7 @@ module RbsActiveHash
       end
 
       class RB < RBS::Prototype::RB
+        # @rbs override
         def process(node, decls:, comments:, context:)
           case node.type
           when :FCALL, :VCALL
@@ -42,16 +43,21 @@ module RbsActiveHash
       end
 
       class Parser
-        attr_reader :has_many, :has_one, :belongs_to, :scopes
+        attr_reader :has_many #: Array[[Symbol, Hash[untyped, untyped]]]
+        attr_reader :has_one #: Array[[Symbol, Hash[untyped, untyped]]]
+        attr_reader :belongs_to #: Array[[Symbol, Hash[untyped, untyped]]]
+        attr_reader :scopes #: Array[[Symbol, Hash[untyped, untyped]]]
 
-        def initialize
+        def initialize #: void
           @has_many = []
           @has_one = []
           @belongs_to = []
           @scopes = []
         end
 
-        def parse(string, target)
+        # @rbs string: String
+        # @rbs target: Array[Symbol]
+        def parse(string, target) #: void
           parser = RB.new
           parser.parse(string)
           parser.decls.each do |decl|
@@ -59,7 +65,9 @@ module RbsActiveHash
           end
         end
 
-        def process(node, target)
+        # @rbs node: RBS::AST::Declarations::t | RBS::AST::Members::t
+        # @rbs target: Array[Symbol]
+        def process(node, target) #: void
           case node
           when RBS::AST::Declarations::Module, RBS::AST::Declarations::Class
             name = node.name.split
@@ -75,7 +83,8 @@ module RbsActiveHash
           end
         end
 
-        def process_association_definition(node)
+        # @rbs node: AssociationDefinition
+        def process_association_definition(node) #: void
           case node.name.name
           when :has_many
             association_id, args = node_to_literal(node.args)
@@ -89,21 +98,23 @@ module RbsActiveHash
           end
         end
 
-        def process_scope_definition(node)
+        # @rbs node: ScopeDefinition
+        def process_scope_definition(node) #: void
           scope_id, args = node_to_literal(node.args)
-          @scopes << [scope_id, args.to_h]
+          @scopes << [scope_id, args]
         end
 
-        def node_to_literal(node)
+        # @rbs node: untyped
+        def node_to_literal(node) #: untyped
           case node.type
           when :LIST
             node.children[...-1].map { |child| node_to_literal(child) }
-          when :LIT, :STR
+          when :LIT, :STR, :SYM
             node.children.first
           when :HASH
             Hash[*node_to_literal(node.children.first)]
           when :LAMBDA
-            {}  # Convert to empty hash because rbs_active_hash does not process lambda
+            node.children.first.children.first # Convert to the list of argument names
           else
             node
           end