store_model 1.6.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4731608dcbfcf457b9e0cce52d04766ccbc7ea38fc061a6af61ef3b6edc2a3c
-  data.tar.gz: d5a84b08a03420aece94ea78a0c620d3e486ac4046173d6b6091974f94f4c507
+  metadata.gz: c15370c45ee576c10a8dacbf1ac740e0fb11e51fad7cb65dd7040e103bff70f0
+  data.tar.gz: 26aef12aa50c51dca2f9341986910a7bf88827491f41f393b73e1063c1fe0c4d
 SHA512:
-  metadata.gz: 9e78d0f1f95f9982ed599f5701e06d48936f2be349189764b5fa7df6fc7a0c9ee71a17d1ae50a74c1a70bcbb037feb8e33db43131de1e880efb74c9a2c0e9c9d
-  data.tar.gz: 7d5d82c70fe870f3abc767faae918a2a8f11bc6a9d645a8d36d12800da19951b9a8f018cdc336e5c35979a5e21847a034d1d9b76196a87c6bd1a1d0389062a80
+  metadata.gz: 509d1ea5ae2f710e4e04a89c1b7a52676e389edd6953fddc2dccab3a015c6f18d03e6e0c64639e2499fde389a0dc3e311a20c65afebbf4e2d6f01ae9d860b3a1
+  data.tar.gz: e8aa0b70959e32431d4352124cfa9834fc614c67417c53d90d935daec4ce6eb1f91606610260a46f1338cdbe9244cf5ee08348102d4e552210463f326f002fef

data/lib/store_model/model.rb

@@ -167,6 +167,17 @@ 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)

data/lib/store_model/types/one.rb

@@ -46,13 +46,36 @@ module StoreModel
       # @return [String] serialized value
       def serialize(value)
         case value
-        when Hash, @model_klass
-          ActiveSupport::JSON.encode(value, serialize_unknown_attributes: true)
+        when @model_klass
+          ActiveSupport::JSON.encode(value.values_for_database)
+        when Hash
+          ActiveSupport::JSON.encode(value)
         else
           super
         end
       end
 
+      # Converts a value from database input to the appropriate ruby type.
+      #
+      # @param value [String] value to deserialize
+      #
+      # @return [Object] deserialized value
+
+      # rubocop:disable Style/RescueModifier
+      def deserialize(value)
+        case value
+        when String
+          payload = ActiveSupport::JSON.decode(value) rescue nil
+          model_instance(deserialize_by_types(payload))
+        when Hash
+          model_instance(deserialize_by_types(value))
+        when nil
+          nil
+        else raise_cast_error(value)
+        end
+      end
+      # rubocop:enable Style/RescueModifier
+
       private
 
       def raise_cast_error(value)
@@ -63,6 +86,14 @@ module StoreModel
 
       def model_instance(value)
         @model_klass.new(value)
+      rescue ActiveModel::UnknownAttributeError => e
+        handle_unknown_attribute(value, e)
+      end
+
+      def deserialize_by_types(hash)
+        @model_klass.attribute_types.each.with_object(hash.dup) do |(key, type), value|
+          value[key] = type.deserialize(hash[key])
+        end
       end
     end
   end

data/lib/store_model/version.rb

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

metadata

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