store_attribute 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a5221f6ede53f448653e54b3aa7432134c56e06369162a5370470e954fd1a1
-  data.tar.gz: 8df0761793ef5c39cda9c97039ca501fa8f9393fcb3ecc8abf85367414e3533c
+  metadata.gz: 8e666327899587f17df5c5196abd1f6094388d08c4ca4c020b9a67f182fa0660
+  data.tar.gz: 6a23e7d6122483843caaa7ae6d2da59e33e0c250c96306839bbb4cac8242ea87
 SHA512:
-  metadata.gz: 2b4cedb5566a137159e863a59dc38797dcf7ddc590f779a957a6b6f6ac73e2c8f05f82876649304143f5160eefcbfc001773e9219d6d1d044fe9f483bad9c426
-  data.tar.gz: f95f478824a19e55243ca1b1cda44c284db8429b9afcad333fb7933ebca2c2ef54f0fbe98095523f1564a15e31f3a236e1b5546a249023c0c196635d8ec175c7
+  metadata.gz: b61d2f76d32c9ddbe3c993896a1826662b8afc881e7b72674ab21d8954e70dbae25630996ab920eeeb752436e433949bec36914d3b6a3278909ca85fce889de5
+  data.tar.gz: 07bb42459a9925b247b6cea363df401c4c9a92787bf6aca1de2bf795575e5895f331a0d4cd983e9b82ee1d27d0a35b47cd6a791314a756fcf78b438e8a25aea0

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 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][])
@@ -36,4 +40,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

@@ -61,10 +61,29 @@ 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)
 
+        _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|
           store_attribute(store_name, key, type, prefix: prefix, suffix: suffix)
         end
@@ -128,11 +147,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|
@@ -140,9 +163,9 @@ module ActiveRecord
           end
         end
 
-        _define_dirty_tracking_methods(store_name, [name], prefix: prefix, suffix: suffix)
-
         _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:

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.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_attribute
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - palkan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -118,7 +118,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
@@ -133,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: ActiveRecord extension which adds typecasting to store accessors
 test_files: []