Support Rails 5.2

.travis.yml

@@ -15,16 +15,21 @@ gemfile:
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
 matrix:
   exclude:
     - rvm: ruby-2.0.0-p648
       gemfile: gemfiles/rails_5_0.gemfile
     - rvm: ruby-2.0.0-p648
       gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: ruby-2.0.0-p648
+      gemfile: gemfiles/rails_5_2.gemfile
     - rvm: ruby-2.1.10
       gemfile: gemfiles/rails_5_0.gemfile
     - rvm: ruby-2.1.10
       gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: ruby-2.1.10
+      gemfile: gemfiles/rails_5_2.gemfile
     - rvm: ruby-2.4.1
       gemfile: gemfiles/rails_4_0.gemfile
     - rvm: ruby-2.4.1

Appraisals

@@ -20,3 +20,7 @@ end
 appraise "rails-5-1" do
   gem "rails", "~> 5.1.0"
 end
+
+appraise "rails-5-2" do
+  gem "rails", "~> 5.2.0"
+end

gemfiles/rails_4_0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-byebug", platforms: :ruby
 gem "rails", "~> 4.0.0"
 gem "nokogiri", "~> 1.6.8"
 

gemfiles/rails_4_1.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-byebug", platforms: :ruby
 gem "rails", "~> 4.1.0"
 gem "nokogiri", "~> 1.6.8"
 

gemfiles/rails_4_2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-byebug", platforms: :ruby
 gem "rails", "~> 4.2.0"
 gem "nokogiri", "~> 1.6.8"
 

gemfiles/rails_5_0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-byebug", platforms: :ruby
 gem "rails", "~> 5.0.0"
 
 gemspec path: "../"

gemfiles/rails_5_1.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "pry-byebug", platforms: :ruby
 gem "rails", "~> 5.1.0"
 
 gemspec path: "../"

gemfiles/rails_5_2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry-byebug", platforms: :ruby
+gem "rails", "~> 5.2.0"
+
+gemspec path: "../"

lib/dynamoid/dirty.rb

@@ -5,7 +5,7 @@ module Dirty
 
     module ClassMethods
       def from_database(*)
-        super.tap { |d| d.changed_attributes.clear }
+        super.tap { |d| d.send(:clear_changes_information) }
       end
     end
 
@@ -28,7 +28,7 @@ def clear_changes
       (block_given? ? yield : true).tap do |result|
         unless result == false # failed validation; nil is OK.
           @previously_changed = previous
-          changed_attributes.clear
+          clear_changes_information
         end
       end
     end
@@ -43,5 +43,18 @@ def write_attribute(name, value)
     def attribute_method?(attr)
       super || self.class.attributes.has_key?(attr.to_sym)
     end
+
+    if ActiveModel::VERSION::STRING >= '5.2.0'
+      # The ActiveModel::Dirty API was changed
+      # https://github.com/rails/rails/commit/c3675f50d2e59b7fc173d7b332860c4b1a24a726#diff-aaddd42c7feb0834b1b5c66af69814d3
+      # So we just try to disable new functionality
+
+      def mutations_from_database
+        @mutations_from_database ||= ActiveModel::NullMutationTracker.instance
+      end
+
+      def forget_attribute_assignments
+      end
+    end
   end
 end