orthoses-rails 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7b416eba2452375317a5c028aeae285d135ee8c8ef4129f28170f46d0090d9
-  data.tar.gz: 71148b9456d3038c6960611ac78e764590f8becd9376e1d136fb06549e80a378
+  metadata.gz: 5819282d03a6e3fe410434be4dac07eed3fff60677d013c37ce268c7a259e9fa
+  data.tar.gz: c8a9a445d6e629057b1db47ad08b5472cb4456bc8454071c9ef711e0d10ef100
 SHA512:
-  metadata.gz: 6abe5dd4e76632c6039a20da11e44e63851713a4793e31661e246ce00d1de36ced9c0ecfe182efe2108df2e59c54e00cadf4d857eb1e7c447dd36d289de068b5
-  data.tar.gz: 6e1df2008c803ffa594d2fc96312ef9d97bda0570339604a40b47e8ff35c94118dd7ed2ca1cf77f7316cf3464ba7cbdc9ec438d182a4099983c0625ece69024c
+  metadata.gz: dd864af949021445b9780e5d95282447e391b0099b90121ece4d58278944ab06264dfeaa25134801386f6e1c7629053d32c6b346d3acde0e1946a004bd3b0c6d
+  data.tar.gz: 72bcdf7904a00596006d405edadbd2fd9d4fe8d1f3c7d6bb8c2929600fff6f1b996ed574a69f1666de504fb27393af0afa2dbd98a055f4dc984d2d8c66024283

data/lib/generators/orthoses/rails/templates/rails.rake

@@ -22,7 +22,7 @@ namespace :orthoses do
       # By using this middleware, you can add the capability
       # to generate type information from YARD documentation.
       # use Orthoses::YARD,
-      #   parse: ['{app/lib}/**/*.rb']
+      #   parse: ['{app,lib}/**/*.rb']
 
       # You can load hand written RBS.
       # use Orthoses::LoadRBS,

data/lib/orthoses/action_mailer/base.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module ActionMailer
+    class Base
+      def initialize(loader)
+        @loader = loader
+      end
+
+      def call
+        @loader.call.tap do |store|
+          ::ActionMailer::Base.descendants.each do |mailer_class|
+            base_name = Utils.module_name(mailer_class) or next
+            content = store[base_name]
+            mailer_class.action_methods.each do |action_method|
+              method_object = mailer_class.instance_method(action_method)
+              parameters = method_parameters_to_rbs_method_type(method_object).to_s.gsub(' -> untyped', '')
+              content << "def self.#{action_method}: #{parameters} -> ::ActionMailer::MessageDelivery"
+            end
+          end
+        end
+      end
+
+      private
+
+      def method_parameters_to_rbs_method_type(method_object)
+        required_positionals = []
+        optional_positionals = []
+        rest_positionals = nil
+        trailing_positionals = []
+        required_keywords = {}
+        optional_keywords = {}
+        rest_keywords = nil
+        requireds = required_positionals
+        block = nil
+        untyped = RBS::Types::Bases::Any.new(location: nil)
+
+        method_object.parameters.each do |kind, name|
+          case kind
+          when :req
+            requireds << ::RBS::Types::Function::Param.new(name: name, type: untyped)
+          when :opt
+            requireds = trailing_positionals
+            optional_positionals << ::RBS::Types::Function::Param.new(name: name, type: untyped)
+          when :rest
+            requireds = trailing_positionals
+            name = nil if name == :*
+            rest_positionals = ::RBS::Types::Function::Param.new(name: name, type: untyped)
+          when :keyreq
+            required_keywords[name] = ::RBS::Types::Function::Param.new(name: nil, type: untyped)
+          when :key
+            optional_keywords[name] = ::RBS::Types::Function::Param.new(name: nil, type: untyped)
+          when :keyrest
+            rest_keywords = ::RBS::Types::Function::Param.new(name: name, type: untyped)
+          when :block
+            block = RBS::Types::Block.new(
+              type: RBS::Types::Function.empty(untyped).update(rest_positionals: RBS::Types::Function::Param.new(name: nil, type: untyped)),
+              required: true,
+              self_type: nil
+            )
+          else
+            raise "bug"
+          end
+        end
+
+        function = ::RBS::Types::Function.new(
+          required_positionals: required_positionals,
+          optional_positionals: optional_positionals,
+          rest_positionals: rest_positionals,
+          trailing_positionals: trailing_positionals,
+          required_keywords: required_keywords,
+          optional_keywords: optional_keywords,
+          rest_keywords: rest_keywords,
+          return_type: untyped,
+        )
+        ::RBS::MethodType.new(
+          location: nil,
+          type_params: [],
+          type: function,
+          block: block
+        )
+      end
+    end
+  end
+end

data/lib/orthoses/action_mailer.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'action_mailer/base'

data/lib/orthoses/active_model/attributes.rb

@@ -33,7 +33,16 @@ module Orthoses
         attribute.captures.each do |capture|
           receiver_name = Utils.module_name(capture.method.receiver) or next
           name = capture.argument[:name]
-          cast_type = capture.argument[:cast_type] || capture.argument[:type]
+          active_model_version = Gem::Version.new(::ActiveModel::VERSION::STRING)
+          cast_type =
+            if active_model_version >= Gem::Version.new('7.1')
+              # https://github.com/rails/rails/commit/608cbfae36b125d7962b7ed9083c9e9e6ce70b88
+              capture.argument[:*].first
+            elsif active_model_version >= Gem::Version.new('7.0')
+              capture.argument[:cast_type]
+            else
+              capture.argument[:type]
+            end
 
           return_type = DEFAULT_TYPES[cast_type] || 'untyped'
 

data/lib/orthoses/active_record/generated_attribute_methods.rb

@@ -4,8 +4,6 @@ module Orthoses
   module ActiveRecord
     class GeneratedAttributeMethods
       TARGET_TYPE_MAP = {
-        "attribute" => "() -> %<type>s",
-        "attribute=" => "(%<type>s) -> %<type>s",
         "attribute?" => "() -> bool",
         "attribute_before_last_save" => "() -> %<opt>s",
         "attribute_before_type_cast" => "() -> %<type>s",
@@ -50,13 +48,14 @@ module Orthoses
               opt = "#{req}?"
               type = col.null ? opt : req
 
-              ::ActiveRecord::Base.attribute_method_matchers.each do |matcher|
-                tmpl = TARGET_TYPE_MAP[matcher.target]
+              lines << "attr_accessor #{name}: #{type}"
+              attribute_method_patterns(::ActiveRecord::Base).each do |matcher|
+                tmpl = TARGET_TYPE_MAP[matcher.proxy_target] or next
                 lines << "def #{matcher.method_name(name)}: #{tmpl % {type: type, opt: opt}}"
               end
             end
             klass.attribute_aliases.each do |alias_name, column_name|
-              ::ActiveRecord::Base.attribute_method_matchers.each do |matcher|
+              attribute_method_patterns(::ActiveRecord::Base).each do |matcher|
                 lines << "alias #{matcher.method_name(alias_name)} #{matcher.method_name(column_name)}"
               end
             end
@@ -69,6 +68,20 @@ module Orthoses
           end
         end
       end
+
+      private
+
+      def attribute_method_patterns(const)
+        if const.respond_to?(:attribute_method_patterns)
+          const.attribute_method_patterns
+        else
+          const.attribute_method_matchers.each do |matcher|
+            def matcher.proxy_target
+              target
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/orthoses/active_record/scope.rb

@@ -20,7 +20,7 @@ module Orthoses
           name = capture.argument[:name]
           body = capture.argument[:body]
 
-          definition = "#{name}: #{parameters_to_type(body.parameters)} -> #{base_name}::ActiveRecord_Relation"
+          definition = "#{name}: #{parameters_to_type(parameters(body))} -> #{base_name}::ActiveRecord_Relation"
           store[base_name] << "def self.#{definition}"
           store["#{base_name}::GeneratedRelationMethods"].header = "module #{base_name}::GeneratedRelationMethods"
           store["#{base_name}::GeneratedRelationMethods"] << "def #{definition}"
@@ -47,9 +47,9 @@ module Orthoses
           when :key
             res << "?#{name}: untyped"
           when :rest
-            res << "*untyped #{name}"
+            res << "*untyped"
           when :keyrest
-            res << "**untyped #{name}"
+            res << "**untyped"
           when :block
             block = " { (*untyped) -> untyped }"
           else
@@ -58,6 +58,14 @@ module Orthoses
         end
         "(#{res.join(", ")})#{block}"
       end
+
+      def parameters(body)
+        if body.respond_to?(:to_proc)
+          body.to_proc.parameters
+        else
+          body.method(:call).parameters
+        end
+      end
     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 = runtime.to_type_name(mod_name)
+        type_name = TypeName(mod_name)
         [].tap do |members|
           runtime.generate_methods(mod, type_name, members)
         end

data/lib/orthoses/active_support/time_with_zone.rb

@@ -28,12 +28,26 @@ module Orthoses
         -
       ])
 
-      TIME_MODULES = [
+      TIME_MODULES = Set.new([
         TypeName("::Time"),
         TypeName("::DateAndTime::Zones"),
         TypeName("::DateAndTime::Calculations"),
         TypeName("::DateAndTime::Compatibility")
-      ]
+      ])
+
+      NONEED_METHODS = Set.new(%i[
+        freeze
+        hash
+        eql?
+        method_missing
+        respond_to?
+        respond_to_missing?
+        is_a?
+        marshal_dump
+        marshal_load
+        to_json
+        < > <= >=
+      ])
 
       def filter_decl(time_with_zone_store)
         writer = RBS::Writer.new(out: StringIO.new)
@@ -68,7 +82,7 @@ module Orthoses
         builder = RBS::DefinitionBuilder.new(env: env.resolve_type_names)
         twz_methods = builder.build_instance(type_name_time_with_zone).methods
         builder.build_instance(type_name_time).methods.each do |sym, definition_method|
-          next if twz_methods.has_key?(sym) && !TYPE_MERGE_METHODS.include?(sym)
+          next if NONEED_METHODS.include?(sym)
           next if !definition_method.public?
 
           # delegate to ::Time method

data/lib/orthoses/rails/application.rb

@@ -17,6 +17,8 @@ module Orthoses
       def call
         loader = @loader
         Orthoses::Builder.new do
+          use Orthoses::ActionMailer::Base
+
           use Orthoses::ActiveModel::Attributes
           use Orthoses::ActiveModel::HasSecurePassword
 

data/lib/orthoses/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Orthoses
   module Rails
-    VERSION = "1.3.0"
+    VERSION = "1.5.0"
   end
 end

data/lib/orthoses/rails.rb

@@ -2,6 +2,7 @@
 
 require 'orthoses'
 
+require_relative 'action_mailer'
 require_relative 'active_model'
 require_relative 'active_record'
 require_relative 'active_storage'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orthoses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 description: Orthoses middleware collection for Ruby on Rails
 email:
 - co000ri@gmail.com
@@ -37,6 +37,8 @@ files:
 - lib/generators/orthoses/rails/install_generator.rb
 - lib/generators/orthoses/rails/templates/rails.rake
 - lib/orthoses-rails.rb
+- lib/orthoses/action_mailer.rb
+- lib/orthoses/action_mailer/base.rb
 - lib/orthoses/active_model.rb
 - lib/orthoses/active_model/attributes.rb
 - lib/orthoses/active_model/has_secure_password.rb
@@ -89,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Orthoses middleware collection for Ruby on Rails