active_typed_store 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bbeb2d1b777327fdb95ee0864943128f702833b22bb67499e89d8508f2d99fd
-  data.tar.gz: e6c3263d53cad2ff342195ac01581039520cbe7ebb3622a47f3adaa6e2690110
+  metadata.gz: 284ddabdbf758d07bc56e984971ef1cf058633a663e9a6f50072f3d795fe76cf
+  data.tar.gz: 52cb762351e5e2132d1f3f7c16b034449474f63cb0641ddc6d7c67cb5b9778fa
 SHA512:
-  metadata.gz: 17d199bc2b8421bc0efb370b145576d948236be298ea2ef80ef6e865a751130d8d5016bfb7e2f366202a55d062b80ba7b5e4494166086c15da3a65a9aec2c715
-  data.tar.gz: 6341dc95fdc95c2442eaf105297e153697ce9227b9d81993862b70c94f2d9e9449d5f1bb47a60ef39a2e5202e06e282168a95093cb18f9930c15a0c43b5b61ce
+  metadata.gz: 0ff0bf66c6037e2124e2bf5513070b6dc5035afb3770457db1e729b755486828ae9cb447ce62828f94707480a08e18d164437d5961b0a0589c94e353e3396082
+  data.tar.gz: 59b389d92a4582c6824444e874c6c20279461d467e7454e6a59ad8c5e3f705c15069f0c5d1613d593ea283614d26d261ba20c971634c81169f0840e2a0e8896d

data/Gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gemspec
 
 gem "dry-types"
-gem "dry-struct"
 gem "priscilla", github: "corp-gp/priscilla"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.9"

data/Gemfile.lock

@@ -22,7 +22,7 @@ GIT
 PATH
   remote: .
   specs:
-    active_typed_store (1.3.0)
+    active_typed_store (2.1.0)
       activemodel
       activerecord
       activesupport
@@ -63,11 +63,6 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-struct (1.6.0)
-      dry-core (~> 1.0, < 2)
-      dry-types (>= 1.7, < 2)
-      ice_nine (~> 0.11)
-      zeitwerk (~> 2.6)
     dry-types (1.7.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
@@ -77,7 +72,6 @@ GEM
       zeitwerk (~> 2.6)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     logger (1.6.1)
@@ -137,6 +131,8 @@ GEM
     rumoji (0.5.0)
     securerandom (0.3.1)
     sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86_64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -144,11 +140,14 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
+  arm64-darwin-21
+  arm64-darwin-23
   arm64-darwin-24
+  x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   active_typed_store!
-  dry-struct
   dry-types
   priscilla!
   rake (~> 13.0)

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
 
@@ -42,40 +43,28 @@ module ActiveTypedStore
 
     private def reader(store_attribute, field, type, default)
       ivar_prev = :"@__ts_prev_#{field}"
+
       store_module.define_method(field) do
         val = read_store_attribute(store_attribute, field)
-        return val if instance_variable_get(ivar_prev) == val.object_id && !val.nil?
 
-        is_default = false
         casted_val =
           if val.nil? && !default.nil?
-            is_default = true
-            default.dup
+            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)
-            type.cast(val)
+            casted = type.cast(val)
+            casted.eql?(val) ? val : (self[store_attribute][field] = casted)
           else
-            type[val]
-          end
-
-        return_val =
-          if casted_val.eql?(val)
-            val
-          else
-            is_changed = attribute_changed?(store_attribute)
-
-            # write cast val
-            self[store_attribute][field] = casted_val
-
-            # discard changes
-            if !is_changed && (val == casted_val || is_default)
-              @attributes.write_from_database(store_attribute, self[store_attribute].to_json).value[field]
-            else
-              casted_val
-            end
+            self[store_attribute][field] = type[val]
           end
 
-        instance_variable_set(ivar_prev, return_val.object_id)
-        return_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 = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_typed_store
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ermolaev Andrey