active_resource-dirty 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51d30b16b1e5e297a36297b8daacb87eb1108fa7d2918a10487ebc9b941a53f
-  data.tar.gz: fcbe57e27e4aa072497a7c743e8dac7652ed5f5f3e87391f238eadd6d3cd528a
+  metadata.gz: bb6d6388350cebd5d10bcebf4d0a60a52852a79842a55f7cda3b705ef5249a73
+  data.tar.gz: f12d3d19080dedc5edcde658930e065d2b708dc3e80a679244d8f96bba8db7a4
 SHA512:
-  metadata.gz: 3aec6044946af537c061c66b964e8ac4285f4d8e71af39a7d9b76902bcb259f11e1dfbc75255816f8307b884e33efd32e2521a09fc2d9b3b2c0504a11eb38367
-  data.tar.gz: 0b9fe3bd20e6305fd1b0c43cb3cce5ff2d45417f98d600f3e0f9d105480e214437e258fed983ad0615109f8c92d4f2497974b6062d206f65d05dd822c711dc9a
+  metadata.gz: fb222b6ce9e24d115624a5df083222b815b3d0ff1de6798a94aca36775e2f908a05fc38766cd60b7b63552edb414286c69e5701566e67c2c1b510950f9a32c11
+  data.tar.gz: b31f252377dd572d4778bc1cd5a6bb08b14bbc45c9488acd72c037fada22f034f2ce3e5df6fe7a94419d902251621fc4909554fdbb2f374f0d747631b191a206

data/lib/active_resource/dirty.rb

@@ -38,12 +38,20 @@ module ActiveResource
 
     # Monkey patch
     def changes_applied
-      @previously_changed = changes
-      @attributes_changed_by_setter = ActiveSupport::HashWithIndifferentAccess.new
+      if new_active_model_version?
+        super
+      else
+        @previously_changed = changes
+        @attributes_changed_by_setter = ActiveSupport::HashWithIndifferentAccess.new
+      end
     end
 
     private
 
+    def new_active_model_version?
+      ActiveModel::VERSION::MAJOR == 6
+    end
+
     def method_missing(method_symbol, *arguments) #:nodoc:
       method_name = method_symbol.to_s
       if method_name =~ /(=)$/ && attributes.key?($`)
@@ -62,7 +70,11 @@ module ActiveResource
 
     # Monkey patch
     def mutations_from_database
-      @mutations_from_database ||= ActiveModel::NullMutationTracker.instance
+      @mutations_from_database ||= if new_active_model_version?
+                                     ActiveModel::ForcedMutationTracker.new(self)
+                                   else
+                                     ActiveModel::NullMutationTracker.instance
+                                   end
     end
 
     # Monkey patch

data/lib/active_resource/dirty/version.rb

@@ -1,5 +1,5 @@
 module ActiveResource
   module Dirty
-    VERSION = '1.0.5'.freeze
+    VERSION = '1.0.6'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_resource-dirty
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Francisco Caiceo