store_attribute 0.8.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d0060f9544a3e9e005c149cc189dd6647c0c83493bbb577bb67893e2b5a5fd
-  data.tar.gz: 0f9105dc411953cf7b3342117538e068c9ea7897220d573126bf0d4c01640726
+  metadata.gz: adaa8107d5917cf34ec29623a75a16fd14b7c5231ee57c7b6c0d3fdac1632b42
+  data.tar.gz: 8b7a96bc6da2779a1c7812d453374b312a52c77068511796c0199617f875d2e7
 SHA512:
-  metadata.gz: 0521c55632478bc52bfcb03eab0fb9709ec2e63cc59c9eafa1dc3795742c88d7f2caf7019bb3eac3f3232006f49e0c9dc0cec4bcf619154b7f1873ccd7915201
-  data.tar.gz: e6644235407bd7481499dbb4bfc3fb9214ec0805ebf85be79914ddf8179f7b2f9837db1f33760c8af50236608820e0dc976fad74b3f9046e70f5996c86ec251c
+  metadata.gz: 9fb0f5ae8ac985d43c909df92930e8a60dcf8910d967a563b23524021ab8acc014fa6e83cbcca6687855c2372c48450a65b5ebb801475f1dd0a7100a9a7a8a6c
+  data.tar.gz: 54703853d6172fd22bd54bec3460045dd298aeb12984bd6763b45a8a48943f6ff20329cef4b744bfd36732bb5e1a3ff0bac97f82fb15cf06b170b1592025d577

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## master
 
+## 0.9.2 (2021-10-13)
+
+- Fix bug with store mutation during changes calculation. ([@palkan][])
+
+## 0.9.1
+
+- Fix bug with dirty nullable stores. ([@palkan][])
+
+## 0.9.0 (2021-08-17) 📉
+
+- Default values no longer marked as dirty. ([@markedmondson][])
+
+## 0.8.1 (2020-12-03)
+
+- Fix adding dirty tracking methods for `store_attribute`. ([@palkan][])
+
 ## 0.8.0
 
 - Add Rails 6.1 compatibility. ([@palkan][])
@@ -32,4 +48,5 @@
 [@dreikanter]: https://github.com/dreikanter
 [@SumLare]: https://github.com/SumLare
 [@glaszig]: https://github.com/glaszig
-[@ioki-klaus]: https://github.com/ioki-klaus
+[@ioki-klaus]: https://github.com/ioki-klaus
+[@markedmondson]: https://github.com/markedmondson

data/README.md

@@ -1,5 +1,6 @@
 [![Cult Of Martians](http://cultofmartians.com/assets/badges/badge.svg)](https://cultofmartians.com/tasks/store-attribute-defaults.html#task)
-[![Gem Version](https://badge.fury.io/rb/store_attribute.svg)](https://rubygems.org/gems/store_attribute) [![Build Status](https://travis-ci.org/palkan/store_attribute.svg?branch=master)](https://travis-ci.org/palkan/store_attribute)
+[![Gem Version](https://badge.fury.io/rb/store_attribute.svg)](https://rubygems.org/gems/store_attribute)
+![Build](https://github.com/palkan/store_attribute/workflows/Build/badge.svg)
 
 ## Store Attribute
 
@@ -15,7 +16,7 @@ In your Gemfile:
 
 ```ruby
 # for Rails 5+ (6 is supported)
-gem "store_attribute", "~> 0.5.0"
+gem "store_attribute", "~> 0.8.0"
 
 # for Rails 4.2
 gem "store_attribute", "~> 0.4.0"
@@ -48,6 +49,7 @@ class MegaUser < User
   store_attribute :settings, :login_at, :datetime
   store_attribute :settings, :active, :boolean
   store_attribute :settings, :color, :string, default: "red"
+  store_attribute :settings, :colors, :json, default: ["red", "blue"]
   store_attribute :settings, :data, :datetime, default: -> { Time.now }
 end
 
@@ -59,6 +61,8 @@ u.ratio # => 63
 u.active # => false
 # Default value is set
 u.color # => red
+# Default array is set
+u.colors # => ["red", "blue"]
 # A dynamic default can also be provided
 u.data # => Current time
 # And we also have a predicate method

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.
@@ -61,10 +61,10 @@ module ActiveRecord
 
         _define_accessors_methods(store_name, *keys, prefix: accessor_prefix, suffix: accessor_suffix)
 
-        _define_dirty_tracking_methods(store_name, keys + typed_keys.keys, prefix: accessor_prefix, suffix: accessor_suffix)
-
         _prepare_local_stored_attributes(store_name, *keys)
 
+        _define_dirty_tracking_methods(store_name, keys + typed_keys.keys, prefix: accessor_prefix, suffix: accessor_suffix)
+
         typed_keys.each do |key, type|
           store_attribute(store_name, key, type, prefix: prefix, suffix: suffix)
         end
@@ -128,11 +128,15 @@ module ActiveRecord
         _define_predicate_method(name, prefix: prefix, suffix: suffix) if type == :boolean
 
         # Rails >6.0
-        if method(:decorate_attribute_type).parameters.count { |type, _| type == :req } == 1
+        if !respond_to?(:decorate_attribute_type) || method(:decorate_attribute_type).parameters.count { |type, _| type == :req } == 1
           attr_name = store_name.to_s
           was_type = attributes_to_define_after_schema_loads[attr_name]&.first
           attribute(attr_name) do |subtype|
-            Type::TypedStore.create_from_type(_lookup_cast_type(attr_name, was_type, {}), name, type, **options)
+            if defined?(_lookup_cast_type)
+              Type::TypedStore.create_from_type(_lookup_cast_type(attr_name, was_type, {}), name, type, **options)
+            else
+              Type::TypedStore.create_from_type(subtype, name, type, **options)
+            end
           end
         else
           decorate_attribute_type(store_name, "typed_accessor_for_#{name}") do |subtype|
@@ -141,6 +145,8 @@ module ActiveRecord
         end
 
         _prepare_local_stored_attributes(store_name, name)
+
+        _define_dirty_tracking_methods(store_name, [name], prefix: prefix, suffix: suffix)
       end
 
       def _prepare_local_stored_attributes(store_name, *keys) # :nodoc:
@@ -179,6 +185,25 @@ module ActiveRecord
 
       def _define_dirty_tracking_methods(store_attribute, keys, prefix: nil, suffix: nil)
         _store_accessors_module.module_eval do
+          define_method("changes") do
+            changes = super()
+            self.class.local_stored_attributes.each do |accessor, attributes|
+              next unless attribute_changed?(accessor)
+
+              prev_store, new_store = changes[accessor].map(&:dup)
+
+              prev_store&.each do |key, value|
+                if new_store[key] == value
+                  prev_store.except!(key)
+                  new_store&.except!(key)
+                end
+              end
+
+              changes[accessor] = prev_store, new_store
+            end
+            changes
+          end
+
           keys.flatten.each do |key|
             key = key.to_s
             accessor_key = "#{prefix}#{key}#{suffix}"

data/lib/store_attribute/active_record/type/typed_store.rb

@@ -43,6 +43,10 @@ module ActiveRecord
         hash
       end
 
+      def changed_in_place?(raw_old_value, new_value)
+        raw_old_value != serialize(new_value)
+      end
+
       def serialize(value)
         return super(value) unless value.is_a?(Hash)
         typed_casted = {}

data/lib/store_attribute/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_attribute
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.2
 platform: ruby
 authors:
 - palkan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2021-10-13 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
@@ -118,7 +90,7 @@ metadata:
   documentation_uri: http://github.com/palkan/store_attribute
   homepage_uri: http://github.com/palkan/store_attribute
   source_code_uri: http://github.com/palkan/store_attribute
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,15 +98,15 @@ 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.0.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: ActiveRecord extension which adds typecasting to store accessors
 test_files: []