store_model 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61353c039b8274db76c67d73081ce718a5446e392df4bd5987f4dde023d5b244
-  data.tar.gz: 40f5011957af3787650b1f3565468fc0b59a4c1a2e090735e8cbf9926e8b622e
+  metadata.gz: db36f4fa51b9f71a34198ba18b921565d46a450c62e4892628dfee8e067bf4ff
+  data.tar.gz: 4e72e8f0fc7051105a09843040a4cfc61f248884ac2dcc8def0f6a95f9b8390f
 SHA512:
-  metadata.gz: 5e3065c9503681ac881fe2e2b2194bfc9f9c959c66e4a6430b47160ff4487cc1bdc6f4408dfc72e216f94eae729ce8462e09ae12364e3e37ef5341769588a796
-  data.tar.gz: 427cb2dab39fd79ef74fb3b1a1e48f89003fbb2e00ca25488cea257cc9f87c9aad5eedb4c469252a605e5932420ad6e257898e85ab7622c904c7cec99c75af73
+  metadata.gz: 5c5073d90550cd90049cb0cc2555bfab36c4b036857319ac5bf0f0eeadaea70deabcf71e549c7e1348127f719ba9f03bda444fb700153b8bdbbb5ffdc3e36c0f
+  data.tar.gz: f5a3eed707850087dfc95c908725624352da067410b3fa69762764545fd83c243a99bfbf8a4b4ae53086fdff9094377769be720cf7497b0d82ae1d7ad736e411

data/lib/store_model/model.rb

@@ -7,7 +7,7 @@ require "store_model/nested_attributes"
 
 module StoreModel
   # When included into class configures it to handle JSON column
-  module Model
+  module Model # rubocop:disable Metrics/ModuleLength
     def self.included(base) # :nodoc:
       base.include ActiveModel::Model
       base.include ActiveModel::Attributes
@@ -44,7 +44,10 @@ module StoreModel
                                         StoreModel.config.serialize_enums_using_as_json
                                       end
 
-      result = attributes.with_indifferent_access
+      result = @attributes.keys.each_with_object({}) do |key, values|
+        values[key] = serialized_attribute(key)
+      end.with_indifferent_access
+
       result.merge!(unknown_attributes) if serialize_unknown_attributes
       result.as_json(options).tap do |json|
         serialize_enums!(json) if serialize_enums_using_as_json
@@ -175,17 +178,6 @@ module StoreModel
       @unknown_attributes ||= {}
     end
 
-    # Serialized values for storing in db
-    #
-    # @return [Hash]
-    def values_for_database
-      result = @attributes.keys.each_with_object({}) do |key, values|
-        values[key] = @attributes.fetch(key).value_for_database
-      end
-      result.merge!(unknown_attributes)
-      result
-    end
-
     private
 
     def attribute?(attribute)
@@ -207,5 +199,16 @@ module StoreModel
         json[name] = public_send(name).as_json unless json[name].nil?
       end
     end
+
+    def serialized_attribute(attr_name)
+      attr = @attributes.fetch(attr_name)
+      if attr.value.is_a? StoreModel::Model
+        Types::RawJSONEncoder.new(attr.value_for_database)
+      elsif attr.value.is_a? Array
+        attr.value.as_json
+      else
+        attr.value_for_database
+      end
+    end
   end
 end

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/types/one.rb

@@ -46,9 +46,7 @@ module StoreModel
       # @return [String] serialized value
       def serialize(value)
         case value
-        when @model_klass
-          ActiveSupport::JSON.encode(value.values_for_database)
-        when Hash
+        when @model_klass, Hash
           ActiveSupport::JSON.encode(value)
         else
           super

data/lib/store_model/types/raw_json.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module StoreModel
+  module Types
+    # Implements #encode_json and #as_json methods.
+    # By wrapping serialized objects in this type, it prevents duplicate
+    # JSON serialization passes on nested object. It is named as Encoder
+    # as it will not work to inflate typed attributes and is intended
+    # to be used internally.
+    class RawJSONEncoder < String
+      def encode_json(_encoder)
+        self
+      end
+
+      def as_json(_options = nil)
+        JSON.parse(self)
+      end
+    end
+  end
+end

data/lib/store_model/types.rb

@@ -14,6 +14,8 @@ require "store_model/types/enum_type"
 
 require "store_model/types/one_of"
 
+require "store_model/types/raw_json"
+
 module StoreModel
   # Contains all custom types.
   module Types

data/lib/store_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoreModel # :nodoc:
-  VERSION = "2.1.0"
+  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.0
+  version: 2.1.2
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,6 +115,7 @@ files:
 - lib/store_model/types/one_of.rb
 - lib/store_model/types/one_polymorphic.rb
 - lib/store_model/types/polymorphic_helper.rb
+- lib/store_model/types/raw_json.rb
 - lib/store_model/version.rb
 homepage: https://github.com/DmitryTsepelev/store_model
 licenses: