active_typed_store 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81b1efdd481c9034944b0b3ad6acb8972492128a13197a5054d291ee1b2e23ae
-  data.tar.gz: 8af315be7e55e6af5bba99f126b1abf26217f3634aef8aae708abf0887270c5c
+  metadata.gz: 8bbeb2d1b777327fdb95ee0864943128f702833b22bb67499e89d8508f2d99fd
+  data.tar.gz: e6c3263d53cad2ff342195ac01581039520cbe7ebb3622a47f3adaa6e2690110
 SHA512:
-  metadata.gz: 7dd04ad99513208826305d50e04b558778800b4ce3dbc6873193d995eb638b48a36c84c20b3a9c57dda18af7503751b48d9af291c6d720314ddf60a988f41b8c
-  data.tar.gz: eb4103cf2a62dc935a4cb283896083710f66a60146a5e4086c4fbcf57d215d52e88f5102f744aded09fa4291e1e62afca3375cadc05cf5c2dcbf6e72e9652995
+  metadata.gz: 17d199bc2b8421bc0efb370b145576d948236be298ea2ef80ef6e865a751130d8d5016bfb7e2f366202a55d062b80ba7b5e4494166086c15da3a65a9aec2c715
+  data.tar.gz: 6341dc95fdc95c2442eaf105297e153697ce9227b9d81993862b70c94f2d9e9449d5f1bb47a60ef39a2e5202e06e282168a95093cb18f9930c15a0c43b5b61ce

data/Gemfile

@@ -5,6 +5,7 @@ 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.2.0)
+    active_typed_store (1.3.0)
       activemodel
       activerecord
       activesupport
@@ -63,6 +63,11 @@ 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)
@@ -72,6 +77,7 @@ 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)
@@ -131,8 +137,6 @@ 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)
@@ -140,13 +144,11 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
-  arm64-darwin-21
-  arm64-darwin-23
-  x86_64-darwin-21
-  x86_64-linux
+  arm64-darwin-24
 
 DEPENDENCIES
   active_typed_store!
+  dry-struct
   dry-types
   priscilla!
   rake (~> 13.0)

data/lib/active_typed_store/attrs.rb

@@ -5,7 +5,7 @@ module ActiveTypedStore
     attr_reader :fields, :store_module, :store_attribute
 
     def initialize(store_attribute)
-      @store_attribute = store_attribute
+      @store_attribute = store_attribute.is_a?(Symbol) ? store_attribute.name : store_attribute
       @fields = []
       @store_module = Module.new
     end
@@ -41,27 +41,41 @@ 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?
+        return val if instance_variable_get(ivar_prev) == val.object_id && !val.nil?
 
-        cache_val =
+        is_default = false
+        casted_val =
           if val.nil? && !default.nil?
-            is_changed = attribute_changed?(store_attribute)
-            stored_value = self[store_attribute][field] = default.dup
-            clear_attribute_change(store_attribute) unless is_changed
-            stored_value
+            is_default = true
+            default.dup
           elsif type.respond_to?(:cast)
-            casted = type.cast(val)
-            casted.eql?(val) ? val : casted
+            type.cast(val)
           else
             type[val]
           end
 
-        instance_variable_set(ivar_prev, val)
-        instance_variable_set(ivar_cache, cache_val)
+        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
+          end
+
+        instance_variable_set(ivar_prev, return_val.object_id)
+        return_val
       end
     end
   end

data/lib/active_typed_store/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_typed_store
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ermolaev Andrey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2025-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -94,8 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Typed store for active records json/hstore columns
+summary: Typed store for active records json columns (postgresql, mysql, sqlite)
 test_files: []