rbs_active_hash 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39351f6d9217ba00e6fb1d8787f3740bd81b9f883efd4992708506cfc1b423c2
-  data.tar.gz: e74571aeba7af6cde5396a1e595cd2bc3190fa6d34ce8d5e10b569128201fce9
+  metadata.gz: 49a4b12af2d15a13a338e2924494f4da8d3167301f3fa9bc66277bdf0185d326
+  data.tar.gz: 94eef0c6aafc8d0162541e51871ace002bdcd5b6f38f0203ef30eecfb19d666a
 SHA512:
-  metadata.gz: 19351b7829c68607011084f0bb253ea8282282045dd66a7fbd4e60e6c55997a3087c591629b8dea60702dff31211d55bde4a574475feda85ddb5fd83e7efef3d
-  data.tar.gz: 4a30401c88437f1b534e182a49d54190cb820111093d99ec50934ba5f9429a102e9cae8f2cb1fdc6805580dbe2b749a0caca4239af417df59317272b463855de
+  metadata.gz: 2fc036b3bd3ce01452800e183f683e6dc7a6c720d07484414c5c6cc393f9b7b8d15cef8d3819ef1ef38173b449b9cfdd892db3764e0f5468e76461f35ef557c0
+  data.tar.gz: 437b7dec163d2a770d2f916727aac06e3b1c6d2d69cae56cc1c63d756fa87b4abb12025f1b9ee9d833ccca00677bca70e062321ce8cd911fbb2f37a5ddfcca67

data/Gemfile.lock

@@ -1,35 +1,34 @@
 PATH
   remote: .
   specs:
-    rbs_active_hash (1.3.0)
+    rbs_active_hash (1.3.1)
       active_hash
       rbs
-      rbs_rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.7)
-      actionview (= 7.0.7)
-      activesupport (= 7.0.7)
+    actionpack (7.0.7.2)
+      actionview (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       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.7)
-      activesupport (= 7.0.7)
+    actionview (7.0.7.2)
+      activesupport (= 7.0.7.2)
       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.7)
-      activesupport (= 7.0.7)
-    activerecord (7.0.7)
-      activemodel (= 7.0.7)
-      activesupport (= 7.0.7)
-    activesupport (7.0.7)
+    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)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -80,9 +79,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.7)
-      actionpack (= 7.0.7)
-      activesupport (= 7.0.7)
+    railties (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -93,9 +92,6 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (3.1.3)
-    rbs_rails (0.12.0)
-      parser
-      rbs (>= 1)
     regexp_parser (2.8.1)
     rexml (3.2.6)
     rspec (3.12.0)

data/lib/generators/rbs_active_hash/install_generator.rb

@@ -6,8 +6,10 @@ module RbsActiveHash
   class InstallGenerator < Rails::Generators::Base
     def create_raketask
       create_file "lib/tasks/rbs_active_hash.rake", <<~RUBY
+        # frozen_string_literal: true
+
         begin
-          require 'rbs_active_hash/rake_task'
+          require "rbs_active_hash/rake_task"
 
           RbsActiveHash::RakeTask.new
         rescue LoadError

data/lib/rbs_active_hash/active_hash.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rbs"
-require "rbs_rails/util"
 require "active_hash"
 
 module RbsActiveHash
@@ -19,7 +18,7 @@ module RbsActiveHash
 
       def initialize(klass)
         @klass = klass
-        @klass_name = RbsRails::Util.module_name(klass)
+        @klass_name = klass.name || ""
         @parser = ActiveHash::Parser::Parser.new
 
         path, = Object.const_source_location(klass_name)
@@ -29,7 +28,7 @@ module RbsActiveHash
       end
 
       def generate
-        if klass.ancestors.include? ::ActiveFile::Base
+        if klass < ::ActiveFile::Base
           begin
             klass.reload
           rescue StandardError
@@ -37,11 +36,18 @@ module RbsActiveHash
           end
         end
 
-        RbsRails::Util.format_rbs klass_decl
+        format(klass_decl)
       end
 
       private
 
+      def format(rbs)
+        parsed = RBS::Parser.parse_signature(rbs)
+        StringIO.new.tap do |out|
+          RBS::Writer.new(out: out).write(parsed[1] + parsed[2])
+        end.string
+      end
+
       def klass_decl
         <<~RBS
           #{header}
@@ -62,7 +68,7 @@ module RbsActiveHash
           when Class
             # @type var superclass: Class
             superclass = _ = mod_object.superclass
-            superclass_name = RbsRails::Util.module_name(superclass)
+            superclass_name = superclass.name || "Object"
 
             "class #{mod_name} < ::#{superclass_name}"
           when Module

data/lib/rbs_active_hash/version.rb

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

data/rbs_active_hash.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
 
   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
   # guide at: https://bundler.io/guides/creating_gem.html

data/rbs_collection.lock.yaml

@@ -2,7 +2,7 @@
 sources:
 - type: git
   name: ruby/gem_rbs_collection
-  revision: 306d1aec19defeb177e217d8aad9812a52bcd5eb
+  revision: 5666e737d2b27a8425b4e3855c1a38cae54989f7
   remote: https://github.com/ruby/gem_rbs_collection.git
   repo_dir: gems
 path: ".gem_rbs_collection"
@@ -175,10 +175,6 @@ gems:
   version: 3.1.3
   source:
     type: rubygems
-- name: rbs_rails
-  version: 0.12.0
-  source:
-    type: rubygems
 - name: rdoc
   version: '0'
   source:

data/sig/rbs_active_hash/active_hash/parser.rbs

@@ -20,7 +20,7 @@ module RbsActiveHash
         def parse: (String string, Array[Symbol] target) -> void
         def process: (RBS::AST::Declarations::t | RBS::AST::Members::t node, Array[Symbol] target) -> void
         def process_association_definition: (AssociationDefinition node) -> void
-        def process_scope_definition: (AssociationDefinition node) -> void
+        def process_scope_definition: (ScopeDefinition node) -> void
         def node_to_literal: (untyped node) -> untyped
       end
     end

data/sig/rbs_active_hash/active_hash.rbs

@@ -13,6 +13,7 @@ module RbsActiveHash
 
       private
 
+      def format: (String) -> String
       def klass_decl: () -> String
       def header: () -> String
       def enum_decls: () -> String?
@@ -25,7 +26,7 @@ module RbsActiveHash
       def method_decls: () -> String
       def method_names: () -> Array[Symbol]
       def method_types: () -> Hash[Symbol, untyped]
-      def valid_field_name?: (String) -> boolish
+      def valid_field_name?: (String | Symbol) -> boolish
       def footer: () -> String
 
       def identify_class: (untyped value) -> (String | singleton(Class))

data/sig/rbs_active_hash/rake_task.rbs

@@ -6,7 +6,7 @@ module RbsActiveHash
     @name: Symbol
     @signature_root_dir: Pathname
 
-    def initialize: (Symbol name) { (RakeTask) -> void } -> void
+    def initialize: (?Symbol name) { (RakeTask) -> void } -> void
     def define_setup_task: () -> void
     def define_clean_task: () -> void
     def define_generate_task: () -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs_active_hash
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Takeshi KOMIYA
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rbs_rails
-  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'
 description: A RBS files generator for ActiveHash models
 email:
 - i.tkomiya@gmail.com