store_model 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61353c039b8274db76c67d73081ce718a5446e392df4bd5987f4dde023d5b244
-  data.tar.gz: 40f5011957af3787650b1f3565468fc0b59a4c1a2e090735e8cbf9926e8b622e
+  metadata.gz: a3b12509ebafeb20d7a2bcb2ae1094dcd756f1b86f31dd8066b0abd61d8f998a
+  data.tar.gz: d3a06944b46ebf4094de55736e892f15ae27514e0604047260e74a033bbc7cda
 SHA512:
-  metadata.gz: 5e3065c9503681ac881fe2e2b2194bfc9f9c959c66e4a6430b47160ff4487cc1bdc6f4408dfc72e216f94eae729ce8462e09ae12364e3e37ef5341769588a796
-  data.tar.gz: 427cb2dab39fd79ef74fb3b1a1e48f89003fbb2e00ca25488cea257cc9f87c9aad5eedb4c469252a605e5932420ad6e257898e85ab7622c904c7cec99c75af73
+  metadata.gz: 7d8ec95caf59aea39e3cedc20a471db9289f4c1eda9d083a1b2fd321f732e7d056b67ac58a7f4f437cb04e932c1f14f18e56dfb9b04c884e5d64025cc7d7989b
+  data.tar.gz: e526dbc89d1c4186b1fe94581acb2b1d80e207bcf08d69809dffc393d43e3d8d2cd08c905d3d3d4f842c9bf7db9ad1581611368fabe8206eb0445c16a2c615eb

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/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.1"
 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.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-29 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: