store_model 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b12509ebafeb20d7a2bcb2ae1094dcd756f1b86f31dd8066b0abd61d8f998a
-  data.tar.gz: d3a06944b46ebf4094de55736e892f15ae27514e0604047260e74a033bbc7cda
+  metadata.gz: db36f4fa51b9f71a34198ba18b921565d46a450c62e4892628dfee8e067bf4ff
+  data.tar.gz: 4e72e8f0fc7051105a09843040a4cfc61f248884ac2dcc8def0f6a95f9b8390f
 SHA512:
-  metadata.gz: 7d8ec95caf59aea39e3cedc20a471db9289f4c1eda9d083a1b2fd321f732e7d056b67ac58a7f4f437cb04e932c1f14f18e56dfb9b04c884e5d64025cc7d7989b
-  data.tar.gz: e526dbc89d1c4186b1fe94581acb2b1d80e207bcf08d69809dffc393d43e3d8d2cd08c905d3d3d4f842c9bf7db9ad1581611368fabe8206eb0445c16a2c615eb
+  metadata.gz: 5c5073d90550cd90049cb0cc2555bfab36c4b036857319ac5bf0f0eeadaea70deabcf71e549c7e1348127f719ba9f03bda444fb700153b8bdbbb5ffdc3e36c0f
+  data.tar.gz: f5a3eed707850087dfc95c908725624352da067410b3fa69762764545fd83c243a99bfbf8a4b4ae53086fdff9094377769be720cf7497b0d82ae1d7ad736e411

data/lib/store_model/nested_attributes.rb

@@ -35,25 +35,45 @@ module StoreModel
       #
       #   See https://api.rubyonrails.org/classes/ActiveRecord/NestedAttributes/ClassMethods.html#method-i-accepts_nested_attributes_for
       def accepts_nested_attributes_for(*attributes)
-        global_options = attributes.extract_options!
+        options = attributes.extract_options!
 
-        attributes.each do |attribute, options|
-          case attribute_types[attribute.to_s]
+        attributes.each do |attribute|
+          case nested_attribute_type(attribute)
           when Types::OneBase, Types::ManyBase
-            define_store_model_attr_accessors(attribute, options || global_options)
+            options.reverse_merge!(allow_destroy: false, update_only: false)
+            define_store_model_attr_accessors(attribute, options)
           else
-            super(attribute, options || global_options)
+            super(*attribute, options)
           end
         end
       end
 
       private
 
+      # If attribute defined in ActiveRecord model but you dont yet have database created
+      # you cannot access attribute types.
+      # To handle this case, we can use ActiveRecord::Attributes 'attributes_to_define_after_schema_loads'
+      # which stores information about custom defined attributes.
+      # See ActiveRecord::Attributes#atribute
+      # If #accepts_nested_attributes_for is used inside active model instance
+      # schema is not required to determine attribute type so we can still use attribute_types
+      # If schema loaded the attribute_types already populated and we can safely use it
+      # See ActiveRecord::ModelSchema#load_schema!
+      def nested_attribute_type(attribute)
+        if self < ActiveRecord::Base && !schema_loaded?
+          attributes_to_define_after_schema_loads[attribute.to_s]&.first
+        else
+          attribute_types[attribute.to_s]
+        end
+      end
+
       def define_store_model_attr_accessors(attribute, options)
-        case attribute_types[attribute.to_s]
+        case nested_attribute_type(attribute)
         when Types::OneBase
           define_association_setter_for_single(attribute, options)
-          alias_method "#{attribute}_attributes=", "#{attribute}="
+          define_method "#{attribute}_attributes=" do |*args, **kwargs|
+            send("#{attribute}=", *args, **kwargs)
+          end
         when Types::ManyBase
           define_association_setter_for_many(attribute, options)
         end
@@ -88,7 +108,10 @@ module StoreModel
       end
     end
 
-    def assign_nested_attributes_for_collection_association(association, attributes, options)
+    # Base
+    def assign_nested_attributes_for_collection_association(association, attributes, options = nil)
+      return super(association, attributes) unless options
+
       attributes = attributes.values if attributes.is_a?(Hash)
 
       if options&.dig(:allow_destroy)

data/lib/store_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoreModel # :nodoc:
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord