subroutine 2.0.0.beta → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ade77ec5abb9601e1dce7bc53e34baac35c978a41aef3268b57ee5b9def6e5
-  data.tar.gz: c450947886efc34b26b202b52202909f44735a2d5f26a3c1af51fdf93be509c6
+  metadata.gz: bc8eb530552fea8e2bacd033372826e11c57734d9695973ebca956c76aa2ed93
+  data.tar.gz: 908764a3fc127881b4c719c2c5523ae280771683e765ea8f47ddda52bed76a33
 SHA512:
-  metadata.gz: c171a9bb82076ed4f5e407375d19e423a5e6bba0211192109d300e3b7372d537a0bac3d67ef5c480ef9af34ddd2a849a07fef79459f5597ea97e195cad239fe7
-  data.tar.gz: 52502e8dd504de2d59faa4665ab7c755c9ff6ba8b951e79acaa264c4d257f09a20da58977f1565e8d121023d6a2f5291cd4528eca143d697252b2f6a27d4197b
+  metadata.gz: 4de2ad64fede40a510afe5b0af073eb6fae1800a61e2f9387337c1d46475ec439c1c35cb393ecececb3a5954b7c9e1b32be10e6be963dc7ce3fb840d40a3b368
+  data.tar.gz: 9ec24f1a6ce47edb502bded197096dec4d1ff444c4d3b0fda64291111aa7a29e67e7bd4f8e01a018c72795117c40e16fa3c68131b64db346e3c1073611c8134e

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.7

data/CHANGELOG.MD

@@ -81,7 +81,7 @@ class AccountUpdateOp < ::Op
 end
 ```
 
-ActionController::Parameters from Rails 5+ are now transformed to as hash in `Subroutine::Fields` by default. This means strong parameters are essentially unused when passing `Subroutine::Fields`.
+ActionController::Parameters from Rails 5+ are now transformed to a hash in `Subroutine::Fields` by default. This means strong parameters are essentially unused when passing `Subroutine::Fields`.
 
 Read more about field management and access in https://github.com/guideline-tech/subroutine/wiki/Param-Usage
 

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)
+        build_child_field(foreign_key_method, type: :foreign_key, foreign_key_type: config[:foreign_key_type])
       end
 
       def build_foreign_type_field
@@ -78,7 +78,10 @@ module Subroutine
       protected
 
       def build_child_field(name, opts = {})
-        ComponentConfiguration.new(name, inheritable_options.merge(opts).merge(association_name: as))
+        child_opts = inheritable_options
+        child_opts.merge!(opts)
+        child_opts[:association_name] = as
+        ComponentConfiguration.new(name, child_opts)
       end
 
     end

data/lib/subroutine/fields/configuration.rb

@@ -101,6 +101,7 @@ module Subroutine
         opts[:groups] = Array(groups).map(&:to_sym).presence
         opts.delete(:group)
         opts[:aka] = opts[:aka].to_sym if opts[:aka]
+        opts[:name] = field_name
         opts
       end
 

data/lib/subroutine/type_caster.rb

@@ -63,6 +63,15 @@ end
   String(value)
 end
 
+::Subroutine::TypeCaster.register :foreign_key do |value, options = {}|
+  next nil if value.blank?
+
+  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")
+
+  value
+end
+
 ::Subroutine::TypeCaster.register :boolean, :bool do |value, _options = {}|
   !!(String(value) =~ /^(yes|true|1|ok)$/)
 end

data/lib/subroutine/version.rb

@@ -5,7 +5,7 @@ module Subroutine
   MAJOR = 2
   MINOR = 0
   PATCH = 0
-  PRE   = "beta"
+  PRE   = "beta2"
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
 

data/test/subroutine/association_test.rb

@@ -83,20 +83,32 @@ module Subroutine
     def test_it_allows_foreign_key_to_be_set
       all_mock = mock
       ::User.expects(:all).returns(all_mock)
-      all_mock.expects(:find_by!).with(id: "foobarbaz").returns(doug)
+      all_mock.expects(:find_by!).with(id: 10).returns(doug)
 
-      op = ::AssociationWithForeignKeyOp.new(user_identifier: "foobarbaz")
+      op = ::AssociationWithForeignKeyOp.new(owner_id: 10)
       assert_equal doug, op.user
-      assert_equal "user_identifier", op.field_configurations[:user][:foreign_key]
+      assert_equal "owner_id", op.field_configurations[:user][:foreign_key]
+    end
+
+    def test_the_foreign_key_is_cast
+      all_mock = mock
+      ::User.expects(:all).returns(all_mock)
+      all_mock.expects(:find_by!).with(id: 10).returns(doug)
+
+      op = ::AssociationWithForeignKeyOp.new(owner_id: "10")
+      assert_equal doug, op.user
+      assert_equal 10, op.owner_id
+      assert_equal "owner_id", op.field_configurations[:user][:foreign_key]
     end
 
     def test_it_allows_a_foreign_key_and_find_by_to_be_set
       all_mock = mock
       ::User.expects(:all).returns(all_mock)
-      all_mock.expects(:find_by!).with(email_address: doug.email_address).returns(doug)
+      all_mock.expects(:find_by!).with(email_address: "foo@bar.com").returns(doug)
 
-      op = ::AssociationWithFindByAndForeignKeyOp.new(email_address: doug.email_address)
+      op = ::AssociationWithFindByAndForeignKeyOp.new(email_address: "foo@bar.com")
       assert_equal doug, op.user
+      assert_equal "foo@bar.com", op.email_address
       assert_equal "email_address", op.field_configurations[:user][:find_by]
     end
 
@@ -119,7 +131,7 @@ module Subroutine
     def test_values_are_correct_for_foreign_key_usage
       op = ::AssociationWithForeignKeyOp.new(user: doug)
       assert_equal doug, op.user
-      assert_equal doug.id, op.user_identifier
+      assert_equal doug.id, op.owner_id
     end
 
     def test_values_are_correct_for_both_foreign_key_and_find_by_usage

data/test/subroutine/type_caster_test.rb

@@ -261,5 +261,28 @@ module Subroutine
         op.date_input = "2015-13-01"
       end
     end
+
+    def test_foreign_key_inputs
+      op.fk_input_owner_id = nil
+      assert_nil op.fk_input_owner_id
+
+      op.fk_input_owner_id = ""
+      assert_nil op.fk_input_owner_id
+
+      op.fk_input_owner_id = "19402"
+      assert_equal 19402, op.fk_input_owner_id
+
+      op.fk_input_owner_id = "19402.0"
+      assert_equal 19402, op.fk_input_owner_id
+
+      op.fk_input_email_address = nil
+      assert_nil op.fk_input_email_address
+
+      op.fk_input_email_address = ""
+      assert_nil op.fk_input_email_address
+
+      op.fk_input_email_address = "foo@bar.com"
+      assert_equal "foo@bar.com", op.fk_input_email_address
+    end
   end
 end

data/test/support/ops.rb

@@ -166,6 +166,8 @@ class TypeCastOp < ::Subroutine::Op
   array :array_input, default: "foo"
   array :type_array_input, of: :integer
   file :file_input
+  foreign_key :fk_input_owner_id
+  foreign_key :fk_input_email_address, foreign_key_type: :string
 
 end
 
@@ -314,13 +316,13 @@ end
 
 class AssociationWithForeignKeyOp < ::OpWithAssociation
 
-  association :user, foreign_key: "user_identifier"
+  association :user, foreign_key: "owner_id"
 
 end
 
 class AssociationWithFindByKeyOp < ::OpWithAssociation
 
-  association :user, find_by: "email_address"
+  association :user, find_by: "email_address", foreign_key_type: :string
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Feature-driven operation objects.