Add support for ActiveModel::Dirty 5.2.x API

Pieces taken from
#1310
samvera/rubydora#110

active-fedora.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rsolr', '>= 1.1.2', '< 3'
   s.add_dependency 'solrizer', '>= 3.4', '< 5'
   s.add_dependency "activesupport", '>= 4.2.4', '< 6'
-  s.add_dependency "activemodel", '>= 4.2', '< 6'
+  s.add_dependency "activemodel", '>= 4.2.10', '< 6'
   s.add_dependency "active-triples", '>= 0.11.0', '< 2.0.0'
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.7.0'

lib/active_fedora/aggregation/list_source.rb

@@ -15,7 +15,7 @@ def save(*args)
       # Overriding so that we don't track previously_changed, which was
       # rather expensive.
       def clear_changed_attributes
-        @changed_attributes.clear
+        clear_changes_information
       end
 
       def changed?

lib/active_fedora/attribute_methods.rb

@@ -136,7 +136,7 @@ def has_attribute?(attr_name)
     #   person.attribute_names
     #   # => ["id", "created_at", "updated_at", "name", "age"]
     def attribute_names
-      @attributes.keys
+      @local_attributes.keys
     end
 
     # Returns a hash of all the attributes with their names as keys and the values of the attributes as values.

lib/active_fedora/attribute_methods/read.rb

@@ -36,7 +36,7 @@ def read_attribute(attr_name, &block)
       end
 
       def _read_attribute(attr_name) # :nodoc:
-        @attributes.fetch(attr_name.to_s) { |n| yield n if block_given? }
+        attributes.fetch(attr_name.to_s) { |n| yield n if block_given? }
       end
 
       alias attribute _read_attribute

lib/active_fedora/attribute_methods/write.rb

@@ -28,7 +28,7 @@ def __temp__#{safe_name}=(value)
 
       def write_attribute(attribute_name, value)
         if self.class.properties.key?(attribute_name)
-          @attributes[attribute_name] = value
+          attributes[attribute_name] = value
         else
           raise ActiveModel::MissingAttributeError, "can't write unknown attribute `#{attribute_name}'"
         end

lib/active_fedora/attributes.rb

@@ -12,7 +12,7 @@ module Attributes
       after_save :clear_changed_attributes
       def clear_changed_attributes
         @previously_changed = changes
-        @changed_attributes.clear
+        clear_attribute_changes(changes.keys)
       end
     end
 

lib/active_fedora/file.rb

@@ -43,7 +43,7 @@ def initialize(identifier = nil, &_block)
           raise "The first argument to #{self} must be a Hash, String or RDF::URI. You provided a #{identifier.class}"
         end
 
-        @attributes = {}.with_indifferent_access
+        @local_attributes = {}.with_indifferent_access
         @readonly = false
         yield self if block_given?
       end
@@ -86,20 +86,20 @@ def refresh
       @content = nil
       @metadata = nil
       @ds_content = nil
-      changed_attributes.clear
+      clear_attribute_changes(changes.keys)
     end
 
     def check_fixity
       FixityService.new(@ldp_source.subject).check
     end
 
     def datastream_will_change!
-      attribute_will_change! :profile
+      attribute_will_change! :ldp_source
     end
 
     def attribute_will_change!(attr)
       return super unless attr == 'content'
-      changed_attributes['content'] = true
+      attributes_changed_by_setter[:content] = true
     end
 
     def remote_content

lib/active_fedora/inheritable_accessors.rb

@@ -1,5 +1,6 @@
 # Similar to ActiveSupport.class_attribute but with a setter that doesn't use the #{name}= syntax
 # This preserves backward compatibility with the API in ActiveTriples
+require "active_support/core_ext/module/remove_method"
 
 module ActiveFedora
   module InheritableAccessors

lib/active_fedora/with_metadata/metadata_node.rb

@@ -15,6 +15,7 @@ def initialize(file)
         @file = file
         super(file.uri, ldp_source.graph)
         return unless self.class.type && !type.include?(self.class.type)
+        attributes_changed_by_setter[:type] = true if type.present?
         # Workaround for https://github.com/ActiveTriples/ActiveTriples/issues/123
         get_values(:type) << self.class.type
       end
@@ -54,7 +55,7 @@ def save
 
       def changed_attributes
         super.tap do |changed|
-          changed['type'] = true if type.present? && new_record?
+          changed.merge('type' => true) if type.present? && new_record?
         end
       end
 

spec/integration/file_spec.rb

@@ -74,7 +74,7 @@ def content
 
     describe "changed attributes are set" do
       it "marks profile as changed" do
-        expect_any_instance_of(SampleResource).to receive(:attribute_will_change!).with(:profile)
+        expect_any_instance_of(SampleResource).to receive(:attribute_will_change!).with(:ldp_source)
         test_object
       end
     end

spec/support/an_active_model.rb

@@ -11,6 +11,10 @@ def assert_equal(the_other, one)
     expect(one).to eq the_other
   end
 
+  def assert_respond_to(obj, meth, _msg = nil)
+    expect(obj).to respond_to meth
+  end
+
   include ActiveModel::Lint::Tests
 
   ActiveModel::Lint::Tests.public_instance_methods.map(&:to_s).grep(/^test/).each do |m|