orthoses-rails 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9d1d7f1892b862cf30852db780a75b61d1ff5a47d27f2be74ac1b65ee3b320
-  data.tar.gz: 7a7165512a1d9926a14d6a0fb871463cf8ea14bd8b8cfe2f7801c1397d2c48b1
+  metadata.gz: 1b4970c303a0f5df274a367939d30c03d7e7734d58845325423aae75e53827bf
+  data.tar.gz: ca40d8c7996291b6dbcf0db78ae817ec7ef1eb8f5a6eef8a4ab0b9cb07b14ddb
 SHA512:
-  metadata.gz: cc87995c26444744860c7feb523d08d13511c301ca1dbdcfa889b265f51031c1e3cbfc3629c63f8752f7d82b759d113342ec535f604330286e674542e5ace36d
-  data.tar.gz: 66892e6e434cb9a80cefd3128852a4d66ab5e2401b1dda6fcedd6fa1183b2ea6f4c97a70c716609fc5b178af829878518c61efe5af91169fe0e5276ce799f77c
+  metadata.gz: 04fa7b44b4dd3f3649e19859cc03ece90758517631dae4f054adcd81bc7935414b0551311a9c6b906e6ab9db1deaca1014f760d858b0c4e58e8f410197ff5b89
+  data.tar.gz: 715ad56b1ff3c8699c4cb0abbd789483087afc50f5c1585b8ecc3a06691e79e7566c2d87ee26d5c145524cb99fdc7f54e58757117f47caa3fea5bf3b648e2ea9

data/lib/orthoses/active_record/belongs_to.rb

@@ -23,7 +23,7 @@ module Orthoses
               opt = "#{type}?"
 
               [
-                "def #{ref.name}: () -> #{opt}",
+                "%a{implicitly-returns-nil} def #{ref.name}: () -> #{type}",
                 "def #{ref.name}=: (#{opt}) -> #{opt}",
                 "def reload_#{ref.name}: () -> #{opt}",
               ].tap do |ary|

data/lib/orthoses/active_record/enum.rb

@@ -7,8 +7,9 @@ module Orthoses
     # >= 7.0
     #   def enum(name = nil, values = nil, **options)
     class Enum
-      def initialize(loader)
+      def initialize(loader, strict_limit: 8)
         @loader = loader
+        @strict_limit = strict_limit
       end
 
       def call
@@ -84,18 +85,23 @@ module Orthoses
         end
 
         # Expressing type casting.
-        store[base_name] << "def #{name}: () -> (#{pairs.keys.map { |k| "\"#{k}\"" }.join(" | ")})"
-        symbol_pattern = if pairs.keys.any? { |key| key.match?(/[^a-zA-Z_]/) }
-          "(Symbol) -> void"
+        overloads = [] #: Array[String]
+        if pairs.length <= @strict_limit
+          if pairs.keys.any? { |key| key.match?(/[^a-zA-Z_]/) }
+            overloads << "(Symbol) -> void"
+          else
+            overloads << "(#{pairs.keys.map{|key|key.to_sym.inspect}.join(" | ")}) -> void"
+          end
+          overloads << "(#{pairs.keys.map{|key|key.to_s.inspect}.join(" | ")}) -> void"
+          overloads << "(#{pairs.values.map(&:inspect).join(" | ")}) -> void"
+          store[base_name] << "def #{name}: () -> (#{pairs.keys.map { |k| "\"#{k}\"" }.join(" | ")})"
+          store[base_name] << "def #{name}=: #{overloads.join(" | ")}"
         else
-          "(#{pairs.keys.map{|key|key.to_sym.inspect}.join(" | ")}) -> void"
+          overloads << "(Symbol | String) -> void"
+          overloads << "(#{pairs.values.map { |v| Orthoses::Utils.object_to_rbs(v) }.uniq.join(" | ")}) -> void"
+          store[base_name] << "def #{name}: () -> String"
+          store[base_name] << "def #{name}=: #{overloads.join(" | ")}"
         end
-        overloads = [
-          symbol_pattern,
-          "(#{pairs.keys.map{|key|key.to_s.inspect}.join(" | ")}) -> void",
-          "(#{pairs.values.map(&:inspect).join(" | ")}) -> void",
-        ]
-        store[base_name] << "def #{name}=: #{overloads.join(" | ")}"
       end
     end
   end

data/lib/orthoses/active_record/relation.rb

@@ -3,8 +3,9 @@
 module Orthoses
   module ActiveRecord
     class Relation
-      def initialize(loader)
+      def initialize(loader, strict: false)
         @loader = loader
+        @strict = strict
       end
 
       def call
@@ -24,10 +25,12 @@ module Orthoses
               klass.singleton_methods(false).each do |singleton_method|
                 c << "def #{singleton_method}: (*untyped, **untyped) -> untyped"
               end
-              (klass.singleton_class.included_modules - ::ActiveRecord::Relation.included_modules).each do |mod|
-                mname = Utils.module_name(mod) or next
-                store[mname].header = "module #{mname}"
-                c << "include #{mname}"
+              if @strict
+                (klass.singleton_class.included_modules - ::ActiveRecord::Relation.included_modules).each do |mod|
+                  mname = Utils.module_name(mod) or next
+                  store[mname].header = "module #{mname}"
+                  c << "include #{mname}"
+                end
               end
             end
 

data/lib/orthoses/active_support/concern.rb

@@ -36,7 +36,7 @@ module Orthoses
       def members_prototype_of(mod_name)
         mod = Object.const_get(mod_name)
         runtime = ::RBS::Prototype::Runtime.new(patterns: nil, env: nil, merge: false)
-        type_name = TypeName(mod_name)
+        type_name = ::RBS::TypeName.parse(mod_name)
         [].tap do |members|
           runtime.generate_methods(mod, type_name, members)
         end

data/lib/orthoses/active_support/delegation.rb

@@ -80,7 +80,7 @@ module Orthoses
         end
 
         def find(mod_name, name, kind, argument)
-          typename = TypeName(mod_name).absolute!
+          typename = ::RBS::TypeName.parse(mod_name).absolute!
 
           if definition_method = build_definition(typename, kind)&.methods&.[](name)
             # found in env

data/lib/orthoses/active_support/time_with_zone.rb

@@ -29,10 +29,10 @@ module Orthoses
       ])
 
       TIME_MODULES = Set.new([
-        TypeName("::Time"),
-        TypeName("::DateAndTime::Zones"),
-        TypeName("::DateAndTime::Calculations"),
-        TypeName("::DateAndTime::Compatibility")
+        ::RBS::TypeName.parse("::Time"),
+        ::RBS::TypeName.parse("::DateAndTime::Zones"),
+        ::RBS::TypeName.parse("::DateAndTime::Calculations"),
+        ::RBS::TypeName.parse("::DateAndTime::Compatibility")
       ])
 
       NONEED_METHODS = Set.new(%i[
@@ -65,8 +65,8 @@ module Orthoses
       end
 
       def each_line_from_core_time_definition(store)
-        type_name_time = TypeName("::Time")
-        type_name_time_with_zone = TypeName("::ActiveSupport::TimeWithZone")
+        type_name_time = ::RBS::TypeName.parse("::Time")
+        type_name_time_with_zone = ::RBS::TypeName.parse("::ActiveSupport::TimeWithZone")
         env = Utils.rbs_environment(collection: true, cache: false)
 
         add_signature(env, store["Time"])

data/lib/orthoses/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Orthoses
   module Rails
-    VERSION = "1.7.0"
+    VERSION = "1.8.0"
   end
 end

data/lib/orthoses/rails.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'orthoses'
+require_relative 'shims'
 
 require_relative 'action_mailer'
 require_relative 'active_model'

data/lib/orthoses/shims.rb

@@ -0,0 +1,18 @@
+# RBS 3.8
+unless RBS::TypeName.singleton_class.method_defined?(:parse)
+  module RBS
+    class TypeName
+      def self.parse(string)
+        absolute = string.start_with?("::")
+
+        *path, name = string.delete_prefix("::").split("::").map(&:to_sym)
+        raise unless name
+
+        TypeName.new(
+          name: name,
+          namespace: RBS::Namespace.new(path: path, absolute: absolute)
+        )
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - ksss
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orthoses
@@ -69,6 +68,7 @@ files:
 - lib/orthoses/rails/version.rb
 - lib/orthoses/railties.rb
 - lib/orthoses/railties/mixin.rb
+- lib/orthoses/shims.rb
 - sig/orthoses/rails.rbs
 homepage: https://github.com/ksss/orthoses-rails
 licenses:
@@ -77,7 +77,6 @@ metadata:
   homepage_uri: https://github.com/ksss/orthoses-rails
   source_code_uri: https://github.com/ksss/orthoses-rails
   changelog_uri: https://github.com/ksss/orthoses-rails
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,8 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Orthoses middleware collection for Ruby on Rails
 test_files: []