delta_changes 2.0.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f722d8be9e14ffadad47521a4db8ddab44a35300
-  data.tar.gz: 7eae375050f5af8f4090ce310a0205b114e292a7
+SHA256:
+  metadata.gz: 3b91b06537bf1a3a6ee19ade9f63e6105c81354d835639a6a4d294356aaabbb7
+  data.tar.gz: 5b8a6af25b886ea80f741f877b65d88fbf7f274b6e9f980e10e97a444edd477b
 SHA512:
-  metadata.gz: 299ca74a9af437f53bb81c32a2d227add2c587e0dc282c5af18bc471d2fea7d9538185805af6d926749bea120cc3961b48bb48111b09ba08e8e5269ca082d859
-  data.tar.gz: d9cbf8b6ba85d2bb8bd7b6c35d96d3ca0c8182eb8adbb6ee4e2def43392a561b46826bb28263b4725aec0fa273dc677e3ceedca8150a21f3ccb0209512db0e95
+  metadata.gz: 9b711cd683ac5889d92c659802c4f5fa3a31b94025d1392d40a4e64fa3a7cb0ac7b97686f8375a09d6999ccfdac7314ac67c36db65571493958d04cfef46896b
+  data.tar.gz: d7301799a39a9f1e14c7b5ace35810a1bb5f0fb77c1f7276ac39b47be257d1cc94f3cb4f28544ce2d6fb06bcf2555b45b237c7c63929e3f7e52347424777f636

data/lib/delta_changes.rb

@@ -6,8 +6,11 @@ module DeltaChanges
       base.extend(ClassMethods)
       base.cattr_accessor :delta_changes_options
       base.attribute_method_suffix '_delta_changed?', '_delta_change', '_delta_was', '_delta_will_change!'
-      base.send(:alias_method, :write_attribute_without_delta_changes, :write_attribute)
-      base.send(:alias_method, :write_attribute, :write_attribute_with_delta_changes)
+      if ::ActiveRecord.version < Gem::Version.new('5.2')
+        base.send(:prepend, InstanceMethodsLegacy)
+      else
+        base.send(:prepend, InstanceMethods)
+      end
     end
 
     module ClassMethods
@@ -34,14 +37,58 @@ module DeltaChanges
               attribute_delta_was(tracked_attribute)
             end
 
-            define_method("#{tracked_attribute}_delta_will_change!") do
-              attribute_delta_will_change!(tracked_attribute)
+            define_method("#{tracked_attribute}_delta_will_change!") do |*args|
+              attribute_delta_will_change!(tracked_attribute, *args)
             end
           end
         end
       end
     end
 
+    # Rails < 5.2
+    module InstanceMethodsLegacy
+      # Wrap write_attribute to remember original attribute value.
+      def write_attribute(attr, value)
+        attr = attr.to_s
+
+        unless self.class.delta_changes_options[:columns].include?(attr)
+          return super(attr, value)
+        end
+
+        # The attribute already has an unsaved change.
+        if delta_changed_attributes.include?(attr)
+          old = delta_changed_attributes[attr]
+          super(attr, value)
+          delta_changed_attributes.delete(attr) unless delta_changes_field_changed?(attr, old, value)
+        else
+          old = respond_to?(:clone_attribute_value) ? clone_attribute_value(:read_attribute, attr) : read_attribute(attr).dup
+          super(attr, value)
+          delta_changed_attributes[attr] = old if delta_changes_field_changed?(attr, old, value)
+        end
+      end
+    end
+
+    module InstanceMethods
+      def _write_attribute(attr, value)
+         attr = attr.to_s
+
+        unless self.class.delta_changes_options[:columns].include?(attr)
+          return super(attr, value)
+        end
+
+        # The attribute already has an unsaved change.
+        if delta_changed_attributes.include?(attr)
+          old = delta_changed_attributes[attr]
+          super(attr, value)
+          delta_changed_attributes.delete(attr) unless delta_changes_field_changed?(attr, old, value)
+        else
+          old = read_attribute(attr).dup
+          super(attr, value)
+          delta_changed_attributes[attr] = old if delta_changes_field_changed?(attr, old, value)
+        end
+      end
+    end
+
     def delta_changes
       delta_changed_attributes.keys.inject({}) { |h, attr| h[attr] = attribute_delta_change(attr); h }
     end
@@ -84,39 +131,20 @@ module DeltaChanges
         value = send(attr)
         value.duplicable? ? value.clone : value
       else
-        options[:from] || clone_attribute_value(:read_attribute, attr)
+        options[:from] || (respond_to?(:clone_attribute_value) ? clone_attribute_value(:read_attribute, attr) : read_attribute(attr).dup)
       end
       delta_changed_attributes[attr] = attribute_value
     end
 
-    # Wrap write_attribute to remember original attribute value.
-    def write_attribute_with_delta_changes(attr, value)
-      attr = attr.to_s
-
-      unless self.class.delta_changes_options[:columns].include?(attr)
-        return write_attribute_without_delta_changes(attr, value)
-      end
-
-      # The attribute already has an unsaved change.
-      if delta_changed_attributes.include?(attr)
-        old = delta_changed_attributes[attr]
-        write_attribute_without_delta_changes(attr, value)
-        delta_changed_attributes.delete(attr) unless delta_changes_field_changed?(attr, old, value)
-      else
-        old = clone_attribute_value(:read_attribute, attr)
-        write_attribute_without_delta_changes(attr, value)
-        delta_changed_attributes[attr] = old if delta_changes_field_changed?(attr, old, value)
-      end
-    end
-
     def delta_changes_field_changed?(attr, old, value)
-      return true if old.nil? && !value.nil?
+      return true if !old.present? && value.present?
+
       if ActiveRecord::VERSION::STRING < '4.2.0'
         _field_changed?(attr, old, value)
       elsif ActiveRecord::VERSION::MAJOR < 5
         _field_changed?(attr, old)
       else
-        changes_include?(attr)
+        self[attr] != old
       end
     end
   end

data/lib/delta_changes/version.rb

@@ -1,3 +1,3 @@
 module DeltaChanges
-  VERSION = "2.0.0"
+  VERSION = "2.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delta_changes
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.22
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.2.22
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +62,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: matching_bundle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,7 +114,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: michael@grosser.it
 executables: []
 extensions: []
@@ -122,11 +122,11 @@ extra_rdoc_files: []
 files:
 - lib/delta_changes.rb
 - lib/delta_changes/version.rb
-homepage: http://github.com/grosser/delta_changes
+homepage: http://github.com/zendesk/delta_changes
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Additional real/virtual attribute change tracking independent of ActiveRecords
 test_files: []