subroutine 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e75f941dcb1020be24cefa722acc6a2fa5689479eac294e50cdfab09a8ea97
-  data.tar.gz: c7bbe661699afcbfd8ffe6b3da0ca06dd21ea6dd9c29e80265ad507361754483
+  metadata.gz: 16421773a13ee6b6c415cd21a1d4c5e43e5e161af42e70260343945b56e660de
+  data.tar.gz: 6a8dcec6f523acef96919bc558c07a11689edde60c3f895ae00bb2c8dbaf2c12
 SHA512:
-  metadata.gz: 26f93744cee2306723ca1d4949b0cc1d85570cd761ac6254edc50b58ed26d884b81e3a53e478818072077177861d74b5f806527d03ca6716c9e6eba3575b1d8f
-  data.tar.gz: 157b2503fba1c1866a4bda9e13b04311acf2dd87caf163010025f6495f08305bf63859bbb3d810c3a789bfbb753c0f9bc03f21518805158d79c5490bc66a8ad6
+  metadata.gz: '03255082c51014d08e1125e733ba03e5d57e0ee65b1582969fde737f51c7381cdc084eafe86469cf44728dca516dea841ba92516ca72737b110e63fcbaa0d7cd'
+  data.tar.gz: 73107c7a4a609b4bfeed24540ecf9fc04a5b423eed16a4ec31c695c9c650cbcd82178d3fc723b2cfed08027b0bd89df82030e70b90049424d95b50e6af548514

data/lib/subroutine/association_fields/configuration.rb

@@ -48,11 +48,11 @@ module Subroutine
       end
 
       def build_foreign_key_field
-        build_child_field(foreign_key_method)
+        build_child_field(foreign_key_method, type: :integer)
       end
 
       def build_foreign_type_field
-        build_child_field(foreign_type_method)
+        build_child_field(foreign_type_method, type: :string)
       end
 
       def unscoped?
@@ -65,8 +65,8 @@ module Subroutine
 
       protected
 
-      def build_child_field(name)
-        ComponentConfiguration.new(name, inheritable_options.merge(association_name: as))
+      def build_child_field(name, opts = {})
+        ComponentConfiguration.new(name, inheritable_options.merge(opts).merge(association_name: as))
       end
 
     end

data/lib/subroutine/association_fields.rb

@@ -69,16 +69,17 @@ module Subroutine
           config = ::Subroutine::AssociationFields::Configuration.new(field_name, options)
 
           if config.polymorphic?
-            string config.foreign_type_method, config.build_foreign_type_field
+            field config.foreign_type_method, config.build_foreign_type_field
           else
             class_eval <<-EV, __FILE__, __LINE__ + 1
+              try(:silence_redefinition_of_method, :#{config.foreign_type_method})
               def #{config.foreign_type_method}
                 #{config.inferred_class_name.inspect}
               end
             EV
           end
 
-          integer config.foreign_key_method, config.build_foreign_key_field
+          field config.foreign_key_method, config.build_foreign_key_field
 
           field_without_association(config.as, config)
         else

data/lib/subroutine/fields.rb

@@ -119,16 +119,18 @@ module Subroutine
       end
 
       def ensure_field_accessors(config)
-        if config.field_writer? && !instance_methods.include?(:"#{config.field_name}=")
+        if config.field_writer?
           class_eval <<-EV, __FILE__, __LINE__ + 1
+            try(:silence_redefinition_of_method, :#{config.field_name}=)
             def #{config.field_name}=(v)
               set_field(:#{config.field_name}, v)
             end
           EV
         end
 
-        if config.field_reader? && !instance_methods.include?(:"#{config.field_name}")
+        if config.field_reader?
           class_eval <<-EV, __FILE__, __LINE__ + 1
+            try(:silence_redefinition_of_method, :#{config.field_name})
             def #{config.field_name}
               get_field(:#{config.field_name})
             end

data/lib/subroutine/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Mike Nelson