Add Rails 6 Support

.gitignore

@@ -4,3 +4,4 @@ pkg
 Gemfile.lock
 gemfiles/*.lock
 .idea/
+.ruby-version

.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
-
 script: "bundle exec rake test"
+cache:
+  - bundler
+  - directories:
+    - vendor/bundle
 rvm:
   - 2.2.10
   - 2.3.8
   - 2.4.5
   - 2.5.3
-  - 2.6.0
+  - 2.6.3
   - ruby-head
   - jruby
   - jruby-9.1.8.0
@@ -16,6 +19,12 @@ gemfile:
   - gemfiles/active_record_50.gemfile
   - gemfiles/active_record_51.gemfile
   - gemfiles/active_record_52.gemfile
+  - gemfiles/active_record_60.gemfile
+before_install:
+  - gem install bundler --version 1.11.2
+  - export BUNDLE_PATH="${TRAVIS_BUILD_DIR}/vendor/bundle"
+before_cache:
+  - rm -f ${BUNDLE_PATH}/**/extensions/**/{gem_make.out,mkmf.log}
 matrix:
   allow_failures:
     - rvm: ruby-head
@@ -27,9 +36,15 @@ matrix:
     - gemfile: gemfiles/active_record_edge.gemfile
       rvm: 2.5.3
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.6.0
+      rvm: 2.6.3
+  exclude:
+    - rvm: 2.2.10
+      gemfile: gemfiles/active_record_60.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/active_record_60.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/active_record_60.gemfile
   fast_finish: true
-
 branches:
   only:
-    - master
+    - master

README.md

@@ -9,12 +9,12 @@ recoverable later.
 
 ## Support
 
-**This branch targets Rails 4.2, 5.0 and 5.1, with experimental support for 5.2**
+**This branch targets Rails 4.2, 5.0 and 5.1, with experimental support for 5.2+**
 
-If you're working with another version, switch to the corresponding branch, or
+If you're working with Rails 4.1-, switch to the corresponding branch, or
 require an older version of the `acts_as_paranoid` gem.
 
-### Known issues with Rails 5.2
+### Known issues with Rails 5.2+
 
 * Using acts_as_paranoid and ActiveStorage on the same model
   [leads to a SystemStackError](https://github.com/ActsAsParanoid/acts_as_paranoid/issues/103).
@@ -287,5 +287,6 @@ Watch out for these caveats:
 * To [Jean Boussier](https://github.com/byroot) for initial Rails 4.0.0 support
 * To [Matijs van Zuijlen](https://github.com/mvz) for Rails 4.1 and 4.2 support
 * To [Andrey Ponomarenko](https://github.com/sjke) for Rails 5 support
+* To [Daniel Rice](https://github.com/danielricecodes), [Josh Bryant](https://github.com/jbryant92), and [Romain Alexandre](https://github.com/RomainAlexandre) for Rails 6.0 support.
 
 See `LICENSE`.

Rakefile

@@ -9,7 +9,7 @@ desc 'Default: run unit tests.'
 task :default => "test:all"
 
 namespace :test do
-  versions = %w(active_record_42 active_record_50 active_record_51 active_record_52 active_record_edge)
+  versions = Dir["gemfiles/*.gemfile"].map {|gemfile_path| gemfile_path.split(/\/|\./)[1]}
 
   versions.each do |version|
     desc "Test acts_as_paranoid against #{version}"

acts_as_paranoid.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir["test/*.rb"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.2", "< 6.0"
-  spec.add_dependency "activesupport", ">= 4.2", "< 6.0"
+  spec.add_dependency "activerecord", ">= 4.2", "< 7.0"
+  spec.add_dependency "activesupport", ">= 4.2", "< 7.0"
 
   spec.add_development_dependency "bundler", ">= 1.5", "< 3.0"
   spec.add_development_dependency "rake"

gemfiles/active_record_42.gemfile

@@ -1,9 +1,7 @@
 source 'https://rubygems.org'
 
-github 'rails/rails', branch: '4-2-stable' do
-  gem 'activerecord', require: 'active_record'
-  gem 'activesupport', require: 'active_support'
-end
+gem 'activerecord', '~> 4.2.0', require: 'active_record'
+gem 'activesupport', '~> 4.2.0', require: 'active_support'
 
 # Development dependencies
 group :development do

gemfiles/active_record_50.gemfile

@@ -1,9 +1,7 @@
 source 'https://rubygems.org'
 
-github 'rails/rails', branch: '5-0-stable' do
-  gem 'activerecord', require: 'active_record'
-  gem 'activesupport', require: 'active_support'
-end
+gem 'activerecord', '~> 5.0.0', require: 'active_record'
+gem 'activesupport', '~> 5.0.0', require: 'active_support'
 
 # Development dependencies
 group :development do

gemfiles/active_record_51.gemfile

@@ -1,9 +1,7 @@
 source 'https://rubygems.org'
 
-github 'rails/rails', branch: '5-1-stable' do
-  gem 'activerecord', require: 'active_record'
-  gem 'activesupport', require: 'active_support'
-end
+gem 'activerecord', '~> 5.1.0', require: 'active_record'
+gem 'activesupport', '~> 5.1.0', require: 'active_support'
 
 # Development dependencies
 group :development do

gemfiles/active_record_52.gemfile

@@ -1,9 +1,7 @@
 source 'https://rubygems.org'
 
-github 'rails/rails', branch: '5-2-stable' do
-  gem 'activerecord', require: 'active_record'
-  gem 'activesupport', require: 'active_support'
-end
+gem 'activerecord', '~> 5.2.0', require: 'active_record'
+gem 'activesupport', '~> 5.2.0', require: 'active_support'
 
 # Development dependencies
 group :development do

gemfiles/active_record_60.gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0', require: 'active_record'
+gem 'activesupport', '~> 6.0.0', require: 'active_support'
+
+# Development dependencies
+group :development do
+  gem "sqlite3", :platforms => [:ruby]
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+end
+
+gemspec :path => '../'

lib/acts_as_paranoid/associations.rb

@@ -31,7 +31,7 @@ def #{target}_with_unscoped(*args)
                 association = association(:#{target})
                 return nil if association.options[:polymorphic] && association.klass.nil?
                 return #{target}_without_unscoped(*args) unless association.klass.paranoid?
-                association.klass.with_deleted.scoping { #{target}_without_unscoped(*args) }
+                association.klass.with_deleted.scoping { association.klass.unscoped { #{target}_without_unscoped(*args) } }
               end
               alias_method :#{target}_without_unscoped, :#{target}
               alias_method :#{target}, :#{target}_with_unscoped

lib/acts_as_paranoid/core.rb

@@ -184,7 +184,11 @@ def recover_dependent_associations(window, options)
         scope = klass.only_deleted
 
         # Merge in the association's scope
-        scope = scope.merge(association(reflection.name).association_scope)
+        scope = if ActiveRecord::VERSION::MAJOR >= 6
+          scope.merge(ActiveRecord::Associations::AssociationScope.scope(association(reflection.name)))
+        else
+          scope.merge(association(reflection.name).association_scope)
+        end
 
         # We can only recover by window if both parent and dependant have a
         # paranoid column type of :time.
@@ -205,7 +209,11 @@ def destroy_dependent_associations!
         scope = klass.only_deleted
 
         # Merge in the association's scope
-        scope = scope.merge(association(reflection.name).association_scope)
+        scope = if ActiveRecord::VERSION::MAJOR >= 6
+          scope.merge(ActiveRecord::Associations::AssociationScope.scope(association(reflection.name)))
+        else
+          scope.merge(association(reflection.name).association_scope)
+        end
 
         scope.each do |object|
           object.destroy!

lib/acts_as_paranoid/validations.rb

@@ -8,10 +8,9 @@ def self.included(base)
 
     class UniquenessWithoutDeletedValidator
       def self.[](version)
-        version = version.to_s
-        name = "V#{version.tr('.', '_')}"
+        name = "V#{version.to_s.tr('.', '_')}"
         unless constants.include? name.to_sym
-          raise "Unknown validator version #{version.inspect}; expected one of #{constants.sort.join(', ')}"
+          raise "Unknown validator version #{name.inspect}; expected one of #{constants.sort.join(', ')}"
         end
         const_get name
       end
@@ -38,8 +37,11 @@ def validate_each(record, attribute, value)
         protected
 
         def build_relation(klass, attribute, value)
-          return super(klass, klass.arel_table, attribute, value) if ActiveRecord::VERSION::MINOR == 0
-          super
+          if ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::MAJOR == 5
+            return super(klass, klass.arel_table, attribute, value)
+          else
+            super
+          end
         end
       end
 
@@ -75,6 +77,9 @@ def validate_each(record, attribute, value)
           end
         end
       end
+
+      class V6 < V5
+      end
     end
 
     module ClassMethods

test/test_associations.rb

@@ -228,7 +228,7 @@ def test_double_belongs_to_with_deleted
   end
 
   def test_mass_assignment_of_paranoid_column_enabled
-    if ActiveRecord::VERSION::MAJOR > 4 && ActiveRecord::VERSION::MINOR > 1
+    if Gem.loaded_specs['activerecord'].version >= Gem::Version.new('5.2.0')
       skip 'Creation as deleted is not supported with Rails >= 5.2'
     end
     now = Time.now