rbs_activemodel 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade04cb067767d6453e1eca795b184333487ea6a95a1da803e3728d9383942d7
-  data.tar.gz: 5f4311680e25d88fee12db6dfdda91e970bdfd1cccf78a66425090f79a2be589
+  metadata.gz: 565656a54eb217c822781ebc48e9eca1e40f5eb26e81aab55f6a08d5012e02b2
+  data.tar.gz: 6927a2e5adee0e5ab0c9eeceea67f04345b079aeea9d814e4715ca6dee0bb47f
 SHA512:
-  metadata.gz: 277ba332f36746bee77ca64194efe2de9d72247e114d13e1d5f64e2acf130393156ee25c487eeac988253e26a0a8d338364b970827bbbb1edbb43e2febc8786b
-  data.tar.gz: af377a42d1a5cc85c070d1da916bb9bbd2a68cb2f1879063d4c18adc2dfbc3413b22c1d61981c274275a00fa4b7d54b09a2c95003cbbd821dec3bc24a3b6d073
+  metadata.gz: d7eeaf0d2a270734b1e68c31dd79dfba7c8ef68f4a92a9ca6f0e6060c561fce51531572c4f657d9fbd3ebffd14a278176c27bce02ea09af261cbdda622d7a382
+  data.tar.gz: d4dc4f96279447b913335927697ee0072fc5c725179b9064386c653e891502ee69c4d96f820df32ada677de98411e8b4bd084b4e963e96275e70c7fc722c0b5d

data/.rubocop.yml

@@ -3,8 +3,12 @@ AllCops:
 
 Metrics/BlockLength:
   Exclude:
+    - 'rbs_activemodel.gemspec'
     - 'spec/**/*.rb'
 
+Metrics/CyclomaticComplexity:
+  Max: 10
+
 Metrics/MethodLength:
   Max: 20
 

data/lib/rbs_activemodel/active_model.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_model"
+require "active_record"
 require "bigdecimal"
 require "date"
 require "rbs"
@@ -26,7 +27,7 @@ module RbsActivemodel
         binary: String,
         boolean: :bool,
         date: Date,
-        datetime: DateTime,
+        datetime: "DateTime | ActiveSupport::TimeWithZone",
         decimal: BigDecimal,
         float: Float,
         immutable_string: String,
@@ -41,7 +42,7 @@ module RbsActivemodel
       end
 
       def generate
-        return if mixins.empty?
+        return if mixins.empty? && attributes.empty?
 
         format <<~RBS
           #{header}
@@ -85,7 +86,9 @@ module RbsActivemodel
       end
 
       def mixins
-        MIXINS.each_with_object([]) do |mod, mixins|
+        return "" if klass < ActiveRecord::Base
+
+        @mixins ||= MIXINS.each_with_object([]) do |mod, mixins|
           if klass < mod
             mixins << "include ::#{mod.name}"
             mixins << "extend  ::#{mod.name}::ClassMethods" if mod.const_defined?(:ClassMethods)
@@ -98,9 +101,16 @@ module RbsActivemodel
 
         # @type var model: untyped
         model = klass
-        model.attribute_types.map do |name, type|
+        @attributes ||= model.attribute_types.map do |name, type|
           type = TYPES.fetch(type.type, :untyped)
-          type_name = type.is_a?(Class) ? type.name : type.to_s
+          type_name = case type
+                      when Class
+                        type.name
+                      when String
+                        "(#{type})"
+                      else
+                        type.to_s
+                      end
           suffix = "?" unless required_attribute?(name)
           <<~RBS
             def #{name}: () -> #{type_name}#{suffix}

data/lib/rbs_activemodel/version.rb

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

data/rbs_collection.lock.yaml

@@ -25,6 +25,14 @@ gems:
     revision: 3ff00fb82aa9e9fc72eb60a8172f664f25e7cbad
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: activerecord
+  version: '7.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 27212b1cd6c4d58b6a0d57f0b462b3bd8242636b
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: activesupport
   version: '7.0'
   source:

data/sig/rbs_activemodel/active_model.rbs

@@ -5,7 +5,10 @@ module RbsActivemodel
 
     class Generator
       MIXINS: Array[Module]
-      TYPES: Hash[Symbol, untyped]
+      TYPES: Hash[Symbol, Class | String | Symbol]
+
+      @mixins: String
+      @attributes: String
 
       def initialize: (Class klass) -> void
       def generate: () -> String?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_activemodel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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: railties
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A RBS files generator for activemodel gem
 email:
 - i.tkomiya@gmail.com