store_attribute 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e666327899587f17df5c5196abd1f6094388d08c4ca4c020b9a67f182fa0660
-  data.tar.gz: 6a23e7d6122483843caaa7ae6d2da59e33e0c250c96306839bbb4cac8242ea87
+  metadata.gz: 5de07480a22b55413fe34512b0d36a6572da92390c998dcc1ad7838866667e5c
+  data.tar.gz: 78d3d38f95d1f614f6d9233f0a0bfa52b67a65853f741fedbb8ff510e38e6988
 SHA512:
-  metadata.gz: b61d2f76d32c9ddbe3c993896a1826662b8afc881e7b72674ab21d8954e70dbae25630996ab920eeeb752436e433949bec36914d3b6a3278909ca85fce889de5
-  data.tar.gz: 07bb42459a9925b247b6cea363df401c4c9a92787bf6aca1de2bf795575e5895f331a0d4cd983e9b82ee1d27d0a35b47cd6a791314a756fcf78b438e8a25aea0
+  metadata.gz: 3831baa1c5de7d7dee01dfe5ee0be5a1478b95a2e110c37e1c9ebd405c1246e300cc4eadbbf0b3e83742c8ea258db7399ddd0dc3df10c8797e7b911428bbd3e9
+  data.tar.gz: 774eb359b1ba5e02022f7e931089990f0d169116cbd8f9c725bc7f8bfa8189dce9c649ca3b7b3face0eccbca13b73dbb2a1028ab6f282dfe797b65adffab627c

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 0.9.1
+
+- Fix bug with dirty nullable stores. ([@palkan][])
+
 ## 0.9.0 (2021-08-17) 📉
 
 - Default values no longer marked as dirty. ([@markedmondson][])

data/lib/store_attribute/active_record/store.rb

@@ -6,7 +6,7 @@ require "store_attribute/active_record/type/typed_store"
 module ActiveRecord
   module Store
     module ClassMethods # :nodoc:
-      alias _orig_store store
+      alias_method :_orig_store, :store
       # Defines store on this model.
       #
       # +store_name+ The name of the store.
@@ -63,25 +63,6 @@ module ActiveRecord
 
         _prepare_local_stored_attributes(store_name, *keys)
 
-        _store_accessors_module.module_eval do
-          define_method("changes") do
-            return @changes if defined?(@changes)
-            changes = super()
-            self.class.local_stored_attributes.each do |accessor, attributes|
-              next unless attribute_changed?(accessor)
-
-              prev_store, new_store = changes[accessor]
-              prev_store.each do |key, value|
-                if new_store[key] == value
-                  changes[accessor][0].except!(key)
-                  changes[accessor][1].except!(key)
-                end
-              end
-            end
-            @changes = changes
-          end
-        end
-
         _define_dirty_tracking_methods(store_name, keys + typed_keys.keys, prefix: accessor_prefix, suffix: accessor_suffix)
 
         typed_keys.each do |key, type|
@@ -204,6 +185,24 @@ module ActiveRecord
 
       def _define_dirty_tracking_methods(store_attribute, keys, prefix: nil, suffix: nil)
         _store_accessors_module.module_eval do
+          define_method("changes") do
+            return @changes if defined?(@changes)
+            changes = super()
+            self.class.local_stored_attributes.each do |accessor, attributes|
+              next unless attribute_changed?(accessor)
+
+              prev_store, new_store = changes[accessor]
+
+              prev_store&.each do |key, value|
+                if new_store[key] == value
+                  prev_store.except!(key)
+                  new_store&.except!(key)
+                end
+              end
+            end
+            @changes = changes
+          end
+
           keys.flatten.each do |key|
             key = key.to_s
             accessor_key = "#{prefix}#{key}#{suffix}"

data/lib/store_attribute/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoreAttribute # :nodoc:
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_attribute
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - palkan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-md
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: ActiveRecord extension which adds typecasting to store accessors