rbs_active_hash 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a40c37520928e6b4e5f6049311691c16966c1819008648702b9fdfa7abb0a156
-  data.tar.gz: c2d4212d760b5970ae09919641a88cdca6bd4469e12271a545d7226692281b99
+  metadata.gz: 5bd0859aca0abeafa29b299ee1a1aa61e35c047fd38b55f40221021a1d020f35
+  data.tar.gz: 4e4da104614dc73ebbcf0dd21dba228186794216e925dbe5d3bd024e2c2cfa4f
 SHA512:
-  metadata.gz: cf19e092d7dac5139dd6ba69bc136e692efc0b4dd6624f084e24de9a57327ec32bb4dcd777c7da6b25586925c4103738bf2796f962db200f5077ad7356f9ff59
-  data.tar.gz: c9a1fc5bcf3c671f2cc4954b0639ea13a461318583d55434e3bbe58f7036594b215d587b59eddedb89f5db6702cb5451c64ec0f45bcaa0cb262bf2b8b79e8941
+  metadata.gz: 9495fd300438b29d29667df2943a92dacc153deb347bd92f6e1d9c42b6f4420d972f068bcfdd155ad89015c82918a8fafe81ff0c396697be07fdc5fc03ef843a
+  data.tar.gz: fc05bb1f89e98266fba16a77c524265e67098ab5f341386f274d7be9c24c5d0ed9ba80ad869c04a3231b795e4dfec51c750f29e895b458c96f22bb5939b24326

data/.rubocop.yml

@@ -19,6 +19,9 @@ Metrics/BlockLength:
   Exclude:
     - spec/**/*_spec.rb
 
+Metrics/ClassLength:
+  Max: 200
+
 Metrics/MethodLength:
   Max: 20
 

data/.vscode/extensions.json

@@ -2,6 +2,7 @@
     "recommendations": [
         "shopify.ruby-lsp",
         "soutaro.steep-vscode",
-        "tk0miya.rspec-daemon"
+        "tk0miya.rspec-daemon",
+        "tk0miya.rbs-helper"
     ]
 }

data/.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "[ruby]": {
         "editor.defaultFormatter": "Shopify.ruby-lsp"
-    }
+    },
+    "rbs-helper.signature-directory": "sig"
 }

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 gem "rake", "~> 13.0"
 
-gem "rubocop", "~> 1.21"
+gem "rubocop", "~> 1.52"
 
 group :development do
   gem "rspec", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs_active_hash (1.0.0)
+    rbs_active_hash (1.0.2)
       active_hash
       rbs_rails
 
@@ -61,8 +61,9 @@ GEM
     nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.23.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -92,7 +93,7 @@ GEM
     rbs_rails (0.12.0)
       parser
       rbs (>= 1)
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -110,10 +111,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.52.0)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -159,7 +160,7 @@ DEPENDENCIES
   rbs_active_hash!
   rspec
   rspec-daemon
-  rubocop (~> 1.21)
+  rubocop (~> 1.52)
   steep
 
 BUNDLED WITH

data/lib/rbs_active_hash/active_hash.rb

@@ -15,8 +15,11 @@ module RbsActiveHash
     end
 
     class Generator
+      attr_reader :klass, :klass_name
+
       def initialize(klass)
         @klass = klass
+        @klass_name = RbsRails::Util.module_name(klass)
       end
 
       def generate
@@ -43,12 +46,23 @@ module RbsActiveHash
       end
 
       def header
-        module_defs = module_names.map { |module_name| "module #{module_name}" }
-
-        class_name = klass.name.split("::").last
-        class_def = "class #{class_name} < ::#{klass.superclass}"
-
-        (module_defs + [class_def]).join("\n")
+        namespace = +""
+        klass_name.split("::").map do |mod_name|
+          namespace += "::#{mod_name}"
+          mod_object = Object.const_get(namespace)
+          case mod_object
+          when Class
+            # @type var superclass: Class
+            superclass = _ = mod_object.superclass
+            superclass_name = RbsRails::Util.module_name(superclass)
+
+            "class #{mod_name} < ::#{superclass_name}"
+          when Module
+            "module #{mod_name}"
+          else
+            raise "unreachable"
+          end
+        end.join("\n")
       end
 
       def module_names
@@ -88,7 +102,7 @@ module RbsActiveHash
           method_type = stringify_type(method_types.fetch(method, "untyped"))
           <<~RBS
             def #{method}: () -> #{method_type}
-            def #{method}=: (#{method_type} value) -> void
+            def #{method}=: (#{method_type} value) -> #{method_type}
             def #{method}?: () -> bool
             def self.find_by_#{method}: (#{method_type} value) -> self?
             def self.find_all_by_#{method}: (#{method_type} value) -> Array[self]
@@ -139,8 +153,6 @@ module RbsActiveHash
           type.to_s
         end
       end
-
-      attr_reader :klass
     end
   end
 end

data/lib/rbs_active_hash/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbsActiveHash
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/sig/rbs_active_hash/active_hash.rbs

@@ -4,7 +4,8 @@ module RbsActiveHash
     def self.class_to_rbs: (Class klass) -> String
 
     class Generator
-      @klass: Class
+      attr_reader klass: Class
+      attr_reader klass_name: String
 
       def initialize: (Class class) -> void
       def generate: () -> String
@@ -22,8 +23,6 @@ module RbsActiveHash
       def footer: () -> String
 
       def stringify_type: (untyped type) -> String
-
-      attr_reader klass: Class
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_active_hash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash