store_model 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738610a630b9d60da6e855965f5f2ecfee4bb1acd68d89b8f012645f62930591
-  data.tar.gz: 512a83d32803641b177f9bd385f7c543595492851e96f296f7257fcc6ac8275e
+  metadata.gz: 79f3b084f46c6eaf4add97a2c0cf23356524f4e5c08c8387535561231453cb4c
+  data.tar.gz: 9471a0a8db98416257030134e1bebadb661a6bf8d2d1495c5232c09029884daf
 SHA512:
-  metadata.gz: 4ef1e9fab0a057edc2322593fb17595e4517c1c10c87b726c02f84deb1aabbd73a37949c885987cf9f342892d2df17675b4e18839a82f0d6153c57797930acb8
-  data.tar.gz: 150c9d6dc291512309046c9049316c3ad9f2784e0989751ae406dcc6924a43973b88c2c606a8645c6a25d9243816d7f0dc7470ffbe02512837db4862f783b988
+  metadata.gz: 48c10f69a844c7adc77346b3cad3f27d15c53fd9281a7953213f7c7c92c0baad25b62c1a6f469fab7056ace9c7856688818d997d9a684b147935580d7e2972a5
+  data.tar.gz: 60c00607715329c2e34bf101eba4c014a6cd29f564323d38bcd74921349996b441048c590d48c023eb6d2a4f254e1015526034bab7a10b5eb11a6524876284aa

data/lib/store_model/configuration.rb

@@ -27,6 +27,7 @@ module StoreModel
     def initialize
       @serialize_unknown_attributes = true
       @enable_parent_assignment = true
+      @serialize_enums_using_as_json = true
     end
   end
 end

data/lib/store_model/model.rb

@@ -22,6 +22,7 @@ module StoreModel
     end
 
     attr_accessor :parent
+    attr_writer :serialize_unknown_attributes, :serialize_enums_using_as_json
 
     delegate :each_value, to: :attributes
 
@@ -45,7 +46,9 @@ module StoreModel
                                       end
 
       result = @attributes.keys.each_with_object({}) do |key, values|
-        values[key] = serialized_attribute(key)
+        attr = @attributes.fetch(key)
+        assign_serialization_options(attr, serialize_unknown_attributes, serialize_enums_using_as_json)
+        values[key] = serialized_attribute(attr)
       end.with_indifferent_access
 
       result.merge!(unknown_attributes) if serialize_unknown_attributes
@@ -178,6 +181,38 @@ module StoreModel
       @unknown_attributes ||= {}
     end
 
+    # Returns the value of the `@serialize_unknown_attributes` instance
+    # variable. In the current specification, unknown attributes must be
+    # persisted in the database regardless of the globally configured
+    # `serialize_unknown_attributes` option. Therefore, it returns the
+    # default value `true` if the instance variable is `nil`.
+    #
+    # This method is used to ensure that the `serialize_unknown_attributes`
+    # option is correctly applied to nested StoreModel::Model objects when
+    # the `as_json` method is called.
+    #
+    # @return [Boolean]
+    def serialize_unknown_attributes?
+      @serialize_unknown_attributes.nil? ? true : @serialize_unknown_attributes
+    end
+
+    # Returns the value of the `@serialize_enums_using_as_json` instance
+    # variable. The default value is the value of the globally configured
+    # `serialize_enums_using_as_json` option.
+    #
+    # This method is used to determine whether enums should be serialized
+    # when the `as_json` method is called in nested StoreModel::Model
+    # objects.
+    #
+    # @return [Boolean]
+    def serialize_enums_using_as_json?
+      if @serialize_enums_using_as_json.nil?
+        StoreModel.config.serialize_enums_using_as_json || false
+      else
+        @serialize_enums_using_as_json
+      end
+    end
+
     private
 
     def attribute?(attribute)
@@ -200,15 +235,32 @@ module StoreModel
       end
     end
 
-    def serialized_attribute(attr_name)
-      attr = @attributes.fetch(attr_name)
+    def serialized_attribute(attr)
       if attr.value.is_a? StoreModel::Model
         Types::RawJSONEncoder.new(attr.value_for_database)
       elsif attr.value.is_a? Array
-        attr.value.as_json
+        serialize_array_attribute(attr.value)
       else
         attr.value_for_database
       end
     end
+
+    def serialize_array_attribute(array)
+      return array.as_json unless array.all? { |value| value.is_a?(StoreModel::Model) }
+
+      array.as_json(
+        serialize_unknown_attributes: array.first.serialize_unknown_attributes?,
+        serialize_enums_using_as_json: array.first.serialize_enums_using_as_json?
+      )
+    end
+
+    def assign_serialization_options(attr, serialize_unknown_attributes, serialize_enums_using_as_json)
+      return unless Array(attr.value).all? { |value| value.is_a?(StoreModel::Model) }
+
+      Array(attr.value).each do |value|
+        value.serialize_unknown_attributes = serialize_unknown_attributes
+        value.serialize_enums_using_as_json = serialize_enums_using_as_json
+      end
+    end
   end
 end

data/lib/store_model/types/many_base.rb

@@ -40,7 +40,11 @@ module StoreModel
       def serialize(value)
         case value
         when Array
-          ActiveSupport::JSON.encode(value, serialize_unknown_attributes: true)
+          return ActiveSupport::JSON.encode(value) unless value.all? { |v| v.is_a?(StoreModel::Model) }
+
+          ActiveSupport::JSON.encode(value,
+                                     serialize_unknown_attributes: value.first.serialize_unknown_attributes?,
+                                     serialize_enums_using_as_json: value.first.serialize_enums_using_as_json?)
         else
           super
         end

data/lib/store_model/types/one.rb

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

data/lib/store_model/types/one_polymorphic.rb

@@ -52,7 +52,15 @@ module StoreModel
       def serialize(value)
         return super unless value.is_a?(Hash) || implements_model?(value.class)
 
-        ActiveSupport::JSON.encode(value, serialize_unknown_attributes: true)
+        if value.is_a?(StoreModel::Model)
+          ActiveSupport::JSON.encode(
+            value,
+            serialize_unknown_attributes: value.serialize_unknown_attributes?,
+            serialize_enums_using_as_json: value.serialize_enums_using_as_json?
+          )
+        else
+          ActiveSupport::JSON.encode(value)
+        end
       end
 
       protected

data/lib/store_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord