delta_changes 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5098ae34ad5c3463ae089a94bf3736e15b47ae4f8c9d185a4208841ebec00f69
-  data.tar.gz: 540276c58ac91875d021e4fa86a59d983f542059d5ad1828b2c76e55fdd017f0
+  metadata.gz: da863383cd4382362669bc42a36e7e0a361ac634d1bbad7448fb44b64468dcdc
+  data.tar.gz: d9d49ffcc2118d0bfe02fa47a2346486f28e938addc3d88f891e976be99f6e1f
 SHA512:
-  metadata.gz: d46bf7b19b2678cd0c44318d234e42a6dd11a0bb16427f645ad60e28127badebcbeb0db3738d80f903c65b03fd0b0bf0dcb5d592337fdd5353ebe6792e1455bb
-  data.tar.gz: 78c00a7637ef11280224edad95d55e3823c4ef5ae591f925dfb0e7ea9e417b479c10dc3b118e1c258f3505e9ec759a612b854b38f945f7e51dd5e22fd9c10864
+  metadata.gz: 7d1df5f621ad803e4d58da4f7ee2c7066d613ea71187706fe7b72861f490622f3b3234feb7c9c93c2d8cd919093dbc487deb16d5c7fb2a5c0ab86b555853e034
+  data.tar.gz: 928d3e1e59233443aa028903ed653f8143b690251108587a739a55d566d21f940c7b93ce009d852ac967b9584d52511494ae63074fa6ffb2eb54aaab2b0c332b

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
@@ -42,6 +45,50 @@ module DeltaChanges
       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
@@ -89,26 +136,6 @@ module DeltaChanges
       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 = respond_to?(:clone_attribute_value) ? clone_attribute_value(:read_attribute, attr) : read_attribute(attr).dup
-        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.present? && value.present?
 

data/lib/delta_changes/version.rb

@@ -1,3 +1,3 @@
 module DeltaChanges
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delta_changes
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-23 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.2'
+        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.2'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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:
     - - ">="