rbs_active_hash 0.1.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c6d368bbd5d2a88c358679a5fe2d4e0e6330602cad2a593d38d0b66174356f'
-  data.tar.gz: e18518e269dcad30a34795519bb745206eee48083d6bc3d7d3c35326d7946f76
+  metadata.gz: 57044cf3bbe008c0523f22f062fb7936a43ddce6a03e17f04e02daef661c092d
+  data.tar.gz: b6533e6014fcef654e87d2187e381dced145f2f4828567e0e226b241d7258233
 SHA512:
-  metadata.gz: c380fd3d043cadebb606d6e2acfe47399c49d663392bba6fcd2f2c1b58277363039f7449fa848deb299bfca35b104a62ab4318b7114e863810e38518ed6bdef5
-  data.tar.gz: 722aabe39f2f61c67562476aa6dd4af2a3acb908797ab1a8edc1913b6f8234761aaa23475c1a77e7395c7f03b01256a592892200a6c8c994c0bc895ddee71113
+  metadata.gz: ba76fab12f70ac6cb4bae32d6861657f4932f5e7509a2b33e273d6bd7ed954eab626af709fcc91780c6f68caad7de36c05796f4aa2cb17befd7708200a99ef79
+  data.tar.gz: ac00937fc78c4fd2e098ab1154aedf79a1626ab48e810ee543143087a4d83424b5547708c7b9edf7fcf5431f5d9e8e2eea54a17562e01a961fab0e1a5196908e

data/.rubocop.yml

@@ -18,3 +18,12 @@ Layout/LineLength:
 Metrics/BlockLength:
   Exclude:
     - spec/**/*_spec.rb
+
+Metrics/ClassLength:
+  Max: 200
+
+Metrics/MethodLength:
+  Max: 20
+
+Metrics/PerceivedComplexity:
+  Max: 10

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 (0.1.1)
+    rbs_active_hash (1.0.1)
       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
@@ -85,12 +99,13 @@ module RbsActiveHash
 
       def method_decls
         method_names.map do |method|
+          method_type = stringify_type(method_types.fetch(method, "untyped"))
           <<~RBS
-            def #{method}: () -> untyped
-            def #{method}=: (untyped value) -> void
+            def #{method}: () -> #{method_type}
+            def #{method}=: (#{method_type} value) -> void
             def #{method}?: () -> bool
-            def self.find_by_#{method}: (untyped value) -> self?
-            def self.find_all_by_#{method}: (untyped value) -> Array[self]
+            def self.find_by_#{method}: (#{method_type} value) -> self?
+            def self.find_all_by_#{method}: (#{method_type} value) -> Array[self]
           RBS
         end.join("\n")
       end
@@ -102,6 +117,16 @@ module RbsActiveHash
         method_names.uniq.select { |k| k != :id && valid_field_name?(k) }
       end
 
+      def method_types
+        method_types = Hash.new { |hash, key| hash[key] = [] }
+        (klass.data || []).each do |record|
+          record.symbolize_keys.each do |key, value|
+            method_types[key] << value.class
+          end
+        end
+        method_types.transform_values(&:uniq)
+      end
+
       def valid_field_name?(name)
         name.to_s =~ /^[a-zA-Z_][a-zA-Z0-9_]*$/
       end
@@ -110,7 +135,24 @@ module RbsActiveHash
         "end\n" * klass.module_parents.size
       end
 
-      attr_reader :klass
+      def stringify_type(type)
+        if [TrueClass, FalseClass].include?(type)
+          "bool"
+        elsif type == NilClass
+          "nil"
+        elsif type.is_a? Class
+          type.name
+        elsif type.is_a? Array
+          types = type.map { |t| stringify_type(t) }.uniq.sort
+          if types.delete("nil")
+            "(#{types.join(" | ")})?"
+          else
+            "(#{types.join(" | ")})"
+          end
+        else
+          type.to_s
+        end
+      end
     end
   end
 end

data/lib/rbs_active_hash/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbsActiveHash
-  VERSION = "0.1.1"
+  VERSION = "1.0.1"
 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
@@ -16,11 +17,12 @@ module RbsActiveHash
       def enum_decls: () -> String?
       def constants: () -> Array[String]
       def method_decls: () -> String
-      def method_names: () -> Array[String]
+      def method_names: () -> Array[Symbol]
+      def method_types: () -> Hash[Symbol, untyped]
       def valid_field_name?: (String) -> boolish
       def footer: () -> String
 
-      attr_reader klass: Class
+      def stringify_type: (untyped type) -> String
     end
   end
 end

metadata

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