active_typed_store 1.3.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00294f06d7b42ef340d56715c9e86525be7ce1c1aea054fed1faf11b7d6d7bf
-  data.tar.gz: 271d28763908598806ff221a292f9a88d4b773909da217cdec13199d8d7a0a20
+  metadata.gz: 284ddabdbf758d07bc56e984971ef1cf058633a663e9a6f50072f3d795fe76cf
+  data.tar.gz: 52cb762351e5e2132d1f3f7c16b034449474f63cb0641ddc6d7c67cb5b9778fa
 SHA512:
-  metadata.gz: 2d26d57a57f40f3b02007a3033990a1102183043e184e8a25406ef7afbf7b3e884f3a3c7b529be25b05c253042ddfb4503b9ef1279a12ac99914577167c96a9a
-  data.tar.gz: 11a1002a926fd01f00bc6b922aff49cde6847f66f38260275c0f45127f75484a67280be86716b0873de70b29cf7894b5b2bd3d44334e95d7a8a9e341a575cbe9
+  metadata.gz: 0ff0bf66c6037e2124e2bf5513070b6dc5035afb3770457db1e729b755486828ae9cb447ce62828f94707480a08e18d164437d5961b0a0589c94e353e3396082
+  data.tar.gz: 59b389d92a4582c6824444e874c6c20279461d467e7454e6a59ad8c5e3f705c15069f0c5d1613d593ea283614d26d261ba20c971634c81169f0840e2a0e8896d

data/Gemfile.lock

@@ -22,7 +22,7 @@ GIT
 PATH
   remote: .
   specs:
-    active_typed_store (1.2.0)
+    active_typed_store (2.1.0)
       activemodel
       activerecord
       activesupport

data/lib/active_typed_store/attrs.rb

@@ -28,7 +28,8 @@ module ActiveTypedStore
         # dry_type[nil] для optional типов возвращает не default-значение, а nil
         reader(attr_name, field, type, (type.value if type.default?))
       else
-        raise "type <#{type}> for field '#{field}' not supported"
+        writer(attr_name, field, type)
+        reader(attr_name, field, type, default)
       end
     end
 
@@ -41,32 +42,29 @@ module ActiveTypedStore
     end
 
     private def reader(store_attribute, field, type, default)
-      ivar_prev  = :"@__ts_prev_#{field}"
-      ivar_cache = :"@__ts_cache_#{field}"
+      ivar_prev = :"@__ts_prev_#{field}"
+
       store_module.define_method(field) do
         val = read_store_attribute(store_attribute, field)
-        return instance_variable_get(ivar_cache) if instance_variable_get(ivar_prev) == val && !val.nil?
 
-        cache_val =
+        casted_val =
           if val.nil? && !default.nil?
-            is_changed = attribute_changed?(store_attribute)
-            self[store_attribute][field] = default.dup
-
-            if is_changed
-              self[store_attribute][field]
-            else
-              # for discard changes
-              @attributes.write_from_database(store_attribute, self[store_attribute]).value[field]
-            end
+            v = default.dup
+            self[store_attribute][field] = v
+            clear_attribute_change(store_attribute)
+            self[store_attribute][field] = v
+          elsif val.nil?
+            return nil
+          elsif instance_variable_get(ivar_prev).eql?(val)
+            return val
           elsif type.respond_to?(:cast)
             casted = type.cast(val)
-            casted.eql?(val) ? val : casted
+            casted.eql?(val) ? val : (self[store_attribute][field] = casted)
           else
-            type[val]
+            self[store_attribute][field] = type[val]
           end
 
-        instance_variable_set(ivar_prev, val)
-        instance_variable_set(ivar_cache, cache_val)
+        instance_variable_set(ivar_prev, casted_val)
       end
     end
   end

data/lib/active_typed_store/store.rb

@@ -2,10 +2,22 @@
 
 module ActiveTypedStore
   module Store
+    class CustomJson < ActiveRecord::Type::Json
+      def changed_in_place?(raw_old_value, new_value)
+        deserialize(raw_old_value) != new_value.as_json
+      end
+    end
+
     def typed_store(store_attribute, &)
       attrs = Attrs.new(store_attribute)
       attrs.instance_eval(&)
 
+      # for redefined self._default_attributes
+      def self.type_for_column(connection, column) # rubocop:disable Lint/NestedMethodDefinition
+        return ActiveTypedStore::Store::CustomJson.new if column.name == "params"
+
+        super
+      end
       store_accessor store_attribute, attrs.fields
 
       if ActiveTypedStore.config.hash_safety == :disallow_symbol_keys

data/lib/active_typed_store/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveTypedStore
-  VERSION = "1.3.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_typed_store
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ermolaev Andrey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel