subroutine 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16421773a13ee6b6c415cd21a1d4c5e43e5e161af42e70260343945b56e660de
-  data.tar.gz: 6a8dcec6f523acef96919bc558c07a11689edde60c3f895ae00bb2c8dbaf2c12
+  metadata.gz: 6bd9cb93ba6c09a520b8db4d79b6aa2e5eefee2046b5b8d768976864dd4a7c89
+  data.tar.gz: d5d0be02650acb97a25b3663f2722ace66f38ad2cb5457208da7ad1e3a2a9e0d
 SHA512:
-  metadata.gz: '03255082c51014d08e1125e733ba03e5d57e0ee65b1582969fde737f51c7381cdc084eafe86469cf44728dca516dea841ba92516ca72737b110e63fcbaa0d7cd'
-  data.tar.gz: 73107c7a4a609b4bfeed24540ecf9fc04a5b423eed16a4ec31c695c9c650cbcd82178d3fc723b2cfed08027b0bd89df82030e70b90049424d95b50e6af548514
+  metadata.gz: f4eaa685e8fff642d134ba9f97b0050c1eee01639b4429ebe2d4a522ff88de544f58a4080372af3f91f210f656efbf9c37c8a6fbdea1f36468067408e5615913
+  data.tar.gz: e6b4c7fbadbaf6a1b8b8d765d962aed0acb7ba8c8f661b5b5c70da6b20d49458013d0f31ab34e0c4a7519452a568f8f9e51ee85f18be0a119ba62af1e24b1d94

data/lib/subroutine/association_fields.rb

@@ -105,8 +105,10 @@ module Subroutine
       end
 
       out = params.except(*excepts)
-      association_fields.each_pair do |field_name, _config|
-        out[field_name] = get_field(field_name) if field_provided?(field_name)
+      association_fields.each_pair do |field_name, config|
+        next unless field_provided?(field_name)
+
+        out[field_name] = config.field_reader? ? send(field_name) : get_field(field_name)
       end
 
       out
@@ -136,8 +138,8 @@ module Subroutine
         stored_result = association_cache[config.field_name]
         return stored_result unless stored_result.nil?
 
-        fk = get_field(config.foreign_key_method)
-        type = config.polymorphic? ? get_field(config.foreign_type_method) : send(config.foreign_type_method)
+        fk = config.field_reader? ? send(config.foreign_key_method) : get_field(config.foreign_id_method)
+        type = config.field_reader? || !config.polymorphic? ? send(config.foreign_type_method) : get_field(config.foreign_type_method)
 
         result = fetch_association_instance(type, fk, config.unscoped?)
         association_cache[config.field_name] = result

data/lib/subroutine/version.rb

@@ -5,7 +5,7 @@ module Subroutine
   MAJOR = 1
   MINOR = 0
   PATCH = 0
-  PRE   = "rc3"
+  PRE   = "rc4"
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel