rbs_active_hash 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bd0859aca0abeafa29b299ee1a1aa61e35c047fd38b55f40221021a1d020f35
-  data.tar.gz: 4e4da104614dc73ebbcf0dd21dba228186794216e925dbe5d3bd024e2c2cfa4f
+  metadata.gz: 29417b6830a461114cf3825a04a76747c16e936a6b3bc6a1e7385393dd26333c
+  data.tar.gz: 8382e0a1f22ff0d6e653bfe2d095d437551768d379e82680ddc142ca4c8d6554
 SHA512:
-  metadata.gz: 9495fd300438b29d29667df2943a92dacc153deb347bd92f6e1d9c42b6f4420d972f068bcfdd155ad89015c82918a8fafe81ff0c396697be07fdc5fc03ef843a
-  data.tar.gz: fc05bb1f89e98266fba16a77c524265e67098ab5f341386f274d7be9c24c5d0ed9ba80ad869c04a3231b795e4dfec51c750f29e895b458c96f22bb5939b24326
+  metadata.gz: aa87db3f4f6c2cf132f9be5697ad69feeb7fbc2a380eb864ed6f32a3748eaef7803433e00e4abccbd0ca4499caf09b07c29e90b70760a98d8117a36b6648ce7c
+  data.tar.gz: 9d2a71a1429971f679160fab88f61aa2ec38a2553c397163448c60c6685955c5dff77da19f7acb10866b5f22ee097f93c9bfd51a77e4d714e947a20271e8ab57

data/Gemfile

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

data/Gemfile.lock

@@ -1,34 +1,35 @@
 PATH
   remote: .
   specs:
-    rbs_active_hash (1.0.2)
+    rbs_active_hash (1.1.0)
       active_hash
+      rbs
       rbs_rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.5)
-      actionview (= 7.0.5)
-      activesupport (= 7.0.5)
+    actionpack (7.0.6)
+      actionview (= 7.0.6)
+      activesupport (= 7.0.6)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.5)
-      activesupport (= 7.0.5)
+    actionview (7.0.6)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_hash (3.2.0)
       activesupport (>= 5.0.0)
-    activemodel (7.0.5)
-      activesupport (= 7.0.5)
-    activerecord (7.0.5)
-      activemodel (= 7.0.5)
-      activesupport (= 7.0.5)
-    activesupport (7.0.5)
+    activemodel (7.0.6)
+      activesupport (= 7.0.6)
+    activerecord (7.0.6)
+      activemodel (= 7.0.6)
+      activesupport (= 7.0.6)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -38,12 +39,12 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
-    csv (3.2.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.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
@@ -55,7 +56,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     method_source (1.0.0)
-    minitest (5.18.0)
+    minitest (5.18.1)
     nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.2-x86_64-linux)
@@ -67,19 +68,20 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.0)
+    racc (1.7.1)
     rack (2.2.7)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.5)
-      actionpack (= 7.0.5)
-      activesupport (= 7.0.5)
+    railties (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -89,7 +91,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (3.1.0)
+    rbs (3.1.1)
     rbs_rails (0.12.0)
       parser
       rbs (>= 1)
@@ -111,8 +113,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.52.1)
+    rubocop (1.54.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
@@ -125,9 +128,9 @@ GEM
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     securerandom (0.2.2)
-    steep (1.4.0)
+    steep (1.5.1)
       activesupport (>= 5.1)
-      concurrent-ruby (>= 1.2.2)
+      concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
       json (>= 2.1.0)
@@ -136,7 +139,7 @@ GEM
       logger (>= 1.3.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.8.0)
+      rbs (>= 3.1.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -160,7 +163,7 @@ DEPENDENCIES
   rbs_active_hash!
   rspec
   rspec-daemon
-  rubocop (~> 1.52)
+  rubocop (~> 1.54)
   steep
 
 BUNDLED WITH

data/Steepfile

@@ -5,8 +5,7 @@ D = Steep::Diagnostic
 target :lib do
   signature "sig"
 
-  check "lib"                       # Directory name
-  check "Gemfile"                   # File name
+  check "lib"
 
-  configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
+  configure_code_diagnostics(D::Ruby.lenient)
 end

data/lib/rbs_active_hash/active_hash.rb

@@ -121,7 +121,7 @@ module RbsActiveHash
         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
+            method_types[key] << identify_class(value)
           end
         end
         method_types.transform_values(&:uniq)
@@ -135,13 +135,27 @@ module RbsActiveHash
         "end\n" * klass.module_parents.size
       end
 
+      def identify_class(obj)
+        case obj
+        when Array
+          args = obj.map(&:class)
+          "#{obj.class}[#{stringify_type(args)}]"
+        when Hash
+          keys = obj.keys.map(&:class)
+          values = obj.values.map(&:class)
+          "#{obj.class}[#{stringify_type(keys)}, #{stringify_type(values)}]"
+        else
+          obj.class
+        end
+      end
+
       def stringify_type(type)
         if [TrueClass, FalseClass].include?(type)
           "bool"
         elsif type == NilClass
           "nil"
         elsif type.is_a? Class
-          type.name
+          type.name.to_s
         elsif type.is_a? Array
           types = type.map { |t| stringify_type(t) }.uniq.sort
           if types.delete("nil")

data/lib/rbs_active_hash/rake_task.rb

@@ -7,7 +7,7 @@ require "rbs_active_hash"
 
 module RbsActiveHash
   class RakeTask < Rake::TaskLib
-    attr_accessor  :name, :signature_root_dir
+    attr_accessor :name, :signature_root_dir
 
     def initialize(name = :"rbs:active_hash", &block)
       super()

data/lib/rbs_active_hash/version.rb

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

data/rbs_active_hash.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "active_hash"
+  spec.add_dependency "rbs"
   spec.add_dependency "rbs_rails"
 
   # For more information and examples about making a new gem, check out our

data/rbs_collection.lock.yaml

@@ -2,7 +2,7 @@
 sources:
 - type: git
   name: ruby/gem_rbs_collection
-  revision: 280d44d7671abfa909f2966fbef94bca5be082de
+  revision: aeede7258d020bfd509541e0c8075ce833292409
   remote: https://github.com/ruby/gem_rbs_collection.git
   repo_dir: gems
 path: ".gem_rbs_collection"
@@ -168,7 +168,7 @@ gems:
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.1.0
+  version: 3.1.1
   source:
     type: rubygems
 - name: rbs_rails

data/rbs_collection.yaml

@@ -14,8 +14,5 @@ sources:
 path: .gem_rbs_collection
 
 gems:
-  # Skip loading rbs gem's RBS.
-  # It's unnecessary if you don't use rbs as a library.
-  - name: rbs
   - name: steep
     ignore: true

data/sig/generators/rbs_active_hash/install_generator.rbs

@@ -0,0 +1,5 @@
+module RbsActiveHash
+  class InstallGenerator < Rails::Generators::Base
+    def create_raketask: () -> void
+  end
+end

data/sig/rbs_active_hash/active_hash.rbs

@@ -1,13 +1,13 @@
 module RbsActiveHash
   module ActiveHash
-    def self.user_defined_model?: (Class klass) -> bool
-    def self.class_to_rbs: (Class klass) -> String
+    def self.user_defined_model?: (singleton(ActiveHash::Base) klass) -> bool
+    def self.class_to_rbs: (singleton(ActiveHash::Base) klass) -> String
 
     class Generator
-      attr_reader klass: Class
+      attr_reader klass: singleton(ActiveHash::Base)
       attr_reader klass_name: String
 
-      def initialize: (Class class) -> void
+      def initialize: (singleton(ActiveHash::Base) klass) -> void
       def generate: () -> String
 
       private
@@ -22,6 +22,7 @@ module RbsActiveHash
       def valid_field_name?: (String) -> boolish
       def footer: () -> String
 
+      def identify_class: (untyped value) -> (String | singleton(Class))
       def stringify_type: (untyped type) -> String
     end
   end

data/sig/rbs_active_hash/rake_task.rbs

@@ -1,6 +1,18 @@
 module RbsActiveHash
-  module RakeTask
+  class RakeTask < Rake::TaskLib
+    attr_accessor name: Symbol
+    attr_accessor signature_root_dir: Pathname
+
     @name: Symbol
     @signature_root_dir: Pathname
+
+    def initialize: (Symbol name) { (RakeTask) -> void } -> void
+    def define_setup_task: () -> void
+    def define_clean_task: () -> void
+    def define_generate_task: () -> void
+
+    private
+
+    def setup_signature_root_dir!: () -> void
   end
 end

data/sig/rbs_active_hash.rbs

@@ -1,4 +1,6 @@
 module RbsActiveHash
+  class Error < StandardError
+  end
+
   VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
 end

data/sig/shims/rake.rbs

@@ -0,0 +1,19 @@
+module Rake
+  class TaskLib
+    include Rake::DSL
+  end
+
+  module DSL
+    private
+
+    def desc: (String description) -> void
+    def file: (*untyped args) ?{ () -> void } -> void
+    def import: (*String fns) -> void
+    def multitask: (*untyped args) ?{ () -> void } -> void
+    def namespace: (?String? name) ?{ () -> void } -> void
+    def rule: (*untyped args) ?{ () -> void } -> void
+    def task: (*untyped args) ?{ () -> void } -> void
+    def sh: (*String cmd) ?{ (bool, Process::Status) -> void } -> void
+  end
+end
+

data/sig/shims/thor.rbs

@@ -0,0 +1,5 @@
+class Thor
+  module Actions
+    def create_file: (String destination, *String? args, ?config: bool) ?{ () -> void } -> untyped
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_active_hash
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rbs_rails
   requirement: !ruby/object:Gem::Requirement
@@ -63,9 +77,12 @@ files:
 - rbs_active_hash.gemspec
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
+- sig/generators/rbs_active_hash/install_generator.rbs
 - sig/rbs_active_hash.rbs
 - sig/rbs_active_hash/active_hash.rbs
 - sig/rbs_active_hash/rake_task.rbs
+- sig/shims/rake.rbs
+- sig/shims/thor.rbs
 homepage: https://github.com/tk0miya/rbs_active_hash
 licenses:
 - MIT