subroutine 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8695d158b7e6ab0464d8e7b4a6c9a641b5dde81f422ff139c29eab8bc8512e75
-  data.tar.gz: 61a393835d542a613f91335581c114fbd44764809ed78c2f4bd14f463b3c604d
+  metadata.gz: 0a85a75ee28c2c27b1d144059b1af01681aee27987ca2fdad9a0736b2270c824
+  data.tar.gz: 73bf392120764aa30da22c18b756ea8483f35b34e14e473fae6f7d495a4cbc9f
 SHA512:
-  metadata.gz: '011484de567ba987afdc22abcd3aa198ae1cf62ecca93c42412cacab2ef14832d5eb343d64150cbed7f8fc06526709a05918a4a5e0cd8f655e4c6d903cc9c40f'
-  data.tar.gz: 40bda69b27c0ec4fd2ca152136918809da4a5b1793b9732bc8e0910714213a4696230a21fc3872e76294d75b6550ba106c52ec0a262d334b2b2da4c8b06bc132
+  metadata.gz: ea38c80c4bbf80eb1763f1052b5f0a906268b1eb6416bcd6e4f2f39a678af16395555ddc02b56867671413076680fb65343d7462974e594f112e8cdb2136f52b
+  data.tar.gz: b5590640ea893a227ef850fb052fb04cac6d46ccc0af2cb33b7b86972518c1b5b7988114fab0faa6472b215f8f927825c9699a08266fd6713ed8c84a88846065

data/lib/subroutine/association_fields/configuration.rb

@@ -60,7 +60,7 @@ module Subroutine
       end
 
       def build_foreign_key_field
-        build_child_field(foreign_key_method, type: :foreign_key, foreign_key_type: config[:foreign_key_type])
+        build_child_field(foreign_key_method, type: :foreign_key, foreign_key_type: -> { determine_foreign_key_type })
       end
 
       def build_foreign_type_field
@@ -84,6 +84,25 @@ module Subroutine
         ComponentConfiguration.new(name, child_opts)
       end
 
+      def determine_foreign_key_type
+        return config[:foreign_key_type] if config[:foreign_key_type]
+
+        # TODO: Make this logic work for polymorphic associations.
+        return if polymorphic?
+
+        @determined_foreign_type ||= begin
+          klass = inferred_foreign_type&.constantize
+          if klass && klass.respond_to?(:type_for_attribute)
+            case klass.type_for_attribute(find_by)&.type&.to_sym
+            when :string
+              :string
+            else
+              :integer
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/subroutine/type_caster.rb

@@ -66,6 +66,7 @@ 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]
   next ::Subroutine::TypeCaster.cast(value, type: :integer) if options[:name] && options[:name].to_s.end_with?("_id")
 

data/lib/subroutine/version.rb

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

data/test/subroutine/association_test.rb

@@ -13,6 +13,10 @@ module Subroutine
       @fred ||= ::User.new(id: 2, email_address: "fred@example.com")
     end
 
+    def murphy
+      @murphy ||= ::StringIdUser.new(id: "ABACABADABACABA", email_address: "murphy@example.com")
+    end
+
     def account
       @account ||= ::Account.new(id: 1)
     end
@@ -43,6 +47,16 @@ module Subroutine
       assert_equal doug, op.user
     end
 
+    def test_it_looks_up_an_association_with_string_ids
+      all_mock = mock
+
+      ::StringIdUser.expects(:all).returns(all_mock)
+      all_mock.expects(:find_by!).with(id: "ABACABADABACABA").returns(murphy)
+
+      op = ::SimpleAssociationWithStringIdOp.new(string_id_user_id: murphy.id)
+      assert_equal murphy, op.string_id_user
+    end
+
     def test_it_sanitizes_types
       all_mock = mock
 
@@ -122,6 +136,16 @@ module Subroutine
       assert_equal "email_address", op.field_configurations[:user][:find_by]
     end
 
+    def test_it_allows_a_find_by_to_be_set_with_implicit_string
+      all_mock = mock
+      ::User.expects(:all).returns(all_mock)
+      all_mock.expects(:find_by!).with(email_address: doug.email_address).returns(doug)
+
+      op = ::AssociationWithImplicitStringFindByOp.new(user_id: doug.email_address)
+      assert_equal doug, op.user
+      assert_equal "email_address", op.field_configurations[:user][:find_by]
+    end
+
     def test_values_are_correct_for_find_by_usage
       op = ::AssociationWithFindByKeyOp.new(user: doug)
       assert_equal doug, op.user

data/test/support/ops.rb

@@ -31,6 +31,23 @@ class User
     find_by(params) || raise
   end
 
+  def self.type_for_attribute(attribute)
+    case attribute
+    when :id
+      Struct.new(:type).new(:integer)
+    else
+      Struct.new(:type).new(:string)
+    end
+  end
+
+end
+
+class StringIdUser < ::User
+
+  def self.type_for_attribute(attribute)
+    Struct.new(:type).new(:string)
+  end
+
 end
 
 class AdminUser < ::User
@@ -325,6 +342,12 @@ class SimpleAssociationOp < ::OpWithAssociation
 
 end
 
+class SimpleAssociationWithStringIdOp < ::OpWithAssociation
+
+  association :string_id_user
+
+end
+
 class UnscopedSimpleAssociationOp < ::OpWithAssociation
 
   association :user, unscoped: true, allow_overwrite: true
@@ -355,6 +378,12 @@ class AssociationWithFindByKeyOp < ::OpWithAssociation
 
 end
 
+class AssociationWithImplicitStringFindByOp < ::OpWithAssociation
+
+  association :user, find_by: "email_address"
+
+end
+
 class AssociationWithFindByAndForeignKeyOp < ::OpWithAssociation
 
   association :user, foreign_key: "email_address", find_by: "email_address"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Mike Nelson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -205,7 +205,7 @@ homepage: https://github.com/mnelson/subroutine
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -220,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.3.23
+signing_key: 
 specification_version: 4
 summary: Feature-driven operation objects.
 test_files: