subroutine 0.10.0.beta6 → 0.10.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22ca4172e9f569b15bbccae7c59dc7df49dfca43f367bd1cfcf1d771d77e6ab
-  data.tar.gz: 84cf68b11db90711abbf87b480a36f852673e2ed7c975404b1ffc085bd3269df
+  metadata.gz: 27287a4d05110ba46ae806e8e3b38f4598c0bb8f69fbdb97f41a53eea025e955
+  data.tar.gz: 22da96f1411d3887a41f42a2a7ca493587ed404aa5760da45447c7ba443dd6ef
 SHA512:
-  metadata.gz: 780e4d568a18e6e6d19a2f92bfbd3e12cb3433e0e11a1a3986a9af7552efdcf69f546d5d95639704a4e4dbcbe8e7dfb5567ee5741d6bc8c811e35058420e3d21
-  data.tar.gz: 3191b5dbe495a426db558b14f5ff22ce3b2bfddd87b5fa60d9606f2b107fb57f5f1830a235982aa2d1be471308b8cde278160c5747d54a266ea90f2fe7de9123
+  metadata.gz: 8cef15bcb25e9792eee2a0073f9d428784cda0370aa40c49881db5e124821b9c0036e83cdfc173233f4a4a76ea8be1ce842a0b309bdd02023f7e1333219f19a6
+  data.tar.gz: e0797ab6a5153718d02ef4bb9d7dbeed5f793a8ef574d504627c2c109ff8147a8ed290cc555c08a5dd62cb5f226998d40faec1d8a6f14a10163d93b6974d1892

data/lib/subroutine/association_fields.rb

@@ -18,6 +18,11 @@ module Subroutine
 
       end
 
+      attr_reader :association_cache
+
+      alias_method :setup_fields_without_association, :setup_fields
+      alias_method :setup_fields, :setup_fields_with_association
+
       alias_method :set_field_without_association, :set_field
       alias_method :set_field, :set_field_with_association
 
@@ -83,33 +88,40 @@ module Subroutine
 
     end
 
+    def setup_fields_with_association(*args)
+      @association_cache = {}
+      setup_fields_without_association(*args)
+    end
+
     def set_field_with_association(field_name, value, opts = {})
       config = get_field_config(field_name)
 
       if config&.behavior == :association
-        maybe_raise_on_type_mismatch!(config, value)
+        maybe_raise_on_association_type_mismatch!(config, value)
         set_field(config.foreign_type_method, value&.class&.name, opts) if config.polymorphic?
         set_field(config.foreign_key_method, value&.id, opts)
-      elsif config&.behavior == :association_component
-        clear_field_without_association(config.association_name)
-      end
+        association_cache[config.field_name] = value
+      else
+        if config&.behavior == :association_component
+          clear_field_without_association(config.association_name)
+        end
 
-      set_field_without_association(field_name, value, opts)
+        set_field_without_association(field_name, value, opts)
+      end
     end
 
     def get_field_with_association(field_name)
       config = get_field_config(field_name)
 
       if config&.behavior == :association
-        stored_result = get_field_without_association(field_name)
+        stored_result = association_cache[config.field_name]
         return stored_result unless stored_result.nil?
 
         fk = send(config.foreign_key_method)
         type = send(config.foreign_type_method)
 
         result = fetch_association_instance(type, fk, config.unscoped?)
-        set_field_without_association(field_name, result, track_provided: false) unless result.nil?
-        result
+        association_cache[config.field_name] = result
       else
         get_field_without_association(field_name)
       end
@@ -121,9 +133,10 @@ module Subroutine
       if config&.behavior == :association
         clear_field(config.foreign_type_method) if config.polymorphic?
         clear_field(config.foreign_key_method)
+        association_cache.delete(config.field_name)
+      else
+        clear_field_without_association(field_name)
       end
-
-      clear_field_without_association(field_name)
     end
 
     def field_provided_with_association?(field_name)
@@ -156,7 +169,7 @@ module Subroutine
       scope.find(_fk)
     end
 
-    def maybe_raise_on_type_mismatch!(config, record)
+    def maybe_raise_on_association_type_mismatch!(config, record)
       return if config.polymorphic?
       return if record.nil?
 

data/lib/subroutine/version.rb

@@ -5,7 +5,7 @@ module Subroutine
   MAJOR = 0
   MINOR = 10
   PATCH = 0
-  PRE   = "beta6"
+  PRE   = "beta7"
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
 

data/test/subroutine/association_test.rb

@@ -187,5 +187,16 @@ module Subroutine
       assert_equal account, op.user
     end
 
+    def test_params_only_contain_the_id_and_type_of_associations
+      user = ::User.new(id: 1)
+      op = SimpleAssociationOp.new(user: user)
+      op.user
+      assert_equal({ "user_id" => 1 }, op.params)
+
+      op = PolymorphicAssociationOp.new(admin: user)
+      op.admin
+      assert_equal({ "admin_id" => 1, "admin_type" => "User" }, op.params)
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta6
+  version: 0.10.0.beta7
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel