store_model 1.6.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb71e398694ddaf5061f4088a8172ec4c6df21e42934dc160d393948ed59882
-  data.tar.gz: efe5e68f750c0bb31ef030de7a7a01f761f7c03b95875dd78dba95256fe7e0fa
+  metadata.gz: 5678f8d809e7ed7745c5bd21b10bb455ecef32fac89cbc0fe9d5928c99dcf7c8
+  data.tar.gz: 13fd4acba36ff7b96d8111043de74e94442f63a02d718571fdda3682521e0dab
 SHA512:
-  metadata.gz: 83f3624df6d013c1927eedcea35ef8c4abc1cfc95c4312a72af8d83d1e5e88f910527ca0ebdab99fce8db004e621dfc38f6b61e02abd3e684aea2c6d5615c334
-  data.tar.gz: 6811e01828fb9c9464513793e369bb436c48cb9adb23d2a4b01ef59d21e7a97e8353f9b4493f64e8a711e8388c3cc59f6e6bcf376b1d133d81b9dbd440dd6034
+  metadata.gz: e57e9ebc4b7e6547c75c8b0375742194eafa6104d2abfd2b55e9e657c64e2af935e99505bb712e8e1ef3d38123f4852d89603f10bfacfa620ec2cb38751995b6
+  data.tar.gz: a2c9e761568bc100697c7240762ed27aac4d8ccde2429f4e037357121351f120a1b9a17909f6670f0215691f909032131979ebbe0001d67bba1d2cadeebaadeb

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]) if hash.key?(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.2"
+  VERSION = "2.0.1"
 end

metadata

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