subroutine 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a85a75ee28c2c27b1d144059b1af01681aee27987ca2fdad9a0736b2270c824
-  data.tar.gz: 73bf392120764aa30da22c18b756ea8483f35b34e14e473fae6f7d495a4cbc9f
+  metadata.gz: c3571693a24dd9d341127e6de4d29cd242d2afc31e5e569728d4dc9101dcd11d
+  data.tar.gz: 72efb048aa00d5ba7be9c8a5c48fa6dd84c69ca71a6e1544373c96e85b3b0869
 SHA512:
-  metadata.gz: ea38c80c4bbf80eb1763f1052b5f0a906268b1eb6416bcd6e4f2f39a678af16395555ddc02b56867671413076680fb65343d7462974e594f112e8cdb2136f52b
-  data.tar.gz: b5590640ea893a227ef850fb052fb04cac6d46ccc0af2cb33b7b86972518c1b5b7988114fab0faa6472b215f8f927825c9699a08266fd6713ed8c84a88846065
+  metadata.gz: 97c717c09a9b7a2e8fcc76240c0cb1a928bb9a3407e5442e126a3cf0aa147f03d747c43ed44da1efa8258b0ade53242c3bf064141d51fe612769fe446b87ec5d
+  data.tar.gz: ee2f52b5c450828495d2e5d5f11458edec8243487768570b6dcd09e5606a40637290222187c79344284353baaee206cf4833022d8983c5b5eb909809f037b1b3

data/lib/subroutine/type_caster.rb

@@ -65,9 +65,11 @@ end
 
 ::Subroutine::TypeCaster.register :foreign_key do |value, options = {}|
   next nil if value.blank?
-
-  next ::Subroutine::TypeCaster.cast(value, type: options[:foreign_key_type].call) if options[:foreign_key_type].respond_to?(:call)
-  next ::Subroutine::TypeCaster.cast(value, type: options[:foreign_key_type]) if options[:foreign_key_type]
+  
+  calculated_type = options[:foreign_key_type].respond_to?(:call)
+  calculated_value = calculated_type ? options[:foreign_key_type].call : options[:foreign_key_type]
+  
+  next ::Subroutine::TypeCaster.cast(value, type: calculated_value) if calculated_value
   next ::Subroutine::TypeCaster.cast(value, type: :integer) if options[:name] && options[:name].to_s.end_with?("_id")
 
   value

data/lib/subroutine/version.rb

@@ -4,7 +4,7 @@ module Subroutine
 
   MAJOR = 2
   MINOR = 3
-  PATCH = 1
+  PATCH = 2
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

data/test/subroutine/association_test.rb

@@ -231,6 +231,11 @@ module Subroutine
       assert_equal true, op.field_provided?(:admin_id)
       assert_equal true, op.field_provided?(:admin_type)
 
+      op = PolymorphicAssociationOp.new admin_type: doug.class.name, admin_id: doug.id.to_s
+      assert_equal true, op.field_provided?(:admin)
+      assert_equal true, op.field_provided?(:admin_id)
+      assert_equal true, op.field_provided?(:admin_type)
+
       op = PolymorphicAssociationOp.new admin_id: doug.id
       assert_equal false, op.field_provided?(:admin)
       assert_equal true, op.field_provided?(:admin_id)
@@ -293,6 +298,18 @@ module Subroutine
       assert_equal({ "admin_id" => 1, "admin_type" => "User" }, op.params)
     end
 
+    def test_params_id_type_as_integer_for_polymorphic_associations
+      user = ::User.new(id: 1)
+
+      op = PolymorphicAssociationOp.new(admin_id: user.id)
+      op.admin
+      assert_equal({ "admin_id" => 1 }, op.params)
+
+      op = PolymorphicAssociationOp.new(admin_id: user.id.to_s)
+      op.admin
+      assert_equal({ "admin_id" => 1 }, op.params)
+    end
+
     def test_params_can_be_accessed_with_associations_loaded
       user = User.new(id: 1)
       op = SimpleAssociationOp.new(user: user)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel