Merge pull request #303 from jhawthorn/rails5

Rails 5 Support, Require ruby 2.0

.travis.yml

@@ -2,12 +2,24 @@ sudo: false
 language: ruby
 language: ruby
 rvm:
 rvm:
   - 2.0.0
   - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - 2.1.8
+  - 2.2.4
   - 2.3.0
   - 2.3.0
-  - jruby-19mode
+  - jruby-9.0.5.0
 
 
 env:
 env:
-  - RAILS='~> 4.0.13'
-  - RAILS='~> 4.1.10'
-  - RAILS='~> 4.2.1'
+  matrix:
+    - RAILS='~> 4.0.13'
+    - RAILS='~> 4.1.10'
+    - RAILS='~> 4.2.1'
+    - RAILS='~> 5.0.0.beta1'
+
+matrix:
+  exclude:
+    - env: RAILS='~> 5.0.0.beta1'
+      rvm: 2.0.0
+    - env: RAILS='~> 5.0.0.beta1'
+      rvm: 2.1.8
+  allow_failures:
+    - env: RAILS='~> 5.0.0.beta1'
+      rvm: jruby-9.0.5.0

CHANGELOG.md

 # paranoia Changelog
 # paranoia Changelog
 
 
+## 2.2.0 (unreleased)
+
+* Ruby 2.0 or greater is required
+* Rails 5.0.0.beta1.1 support [@pigeonworks](https://github.com/pigeonworks) [@halostatue](https://github.com/halostatue) and [@gagalago](https://github.com/gagalago)
+* Previously `#really_destroyed?` may have been defined on non-paranoid models, it is now only available on paranoid models, use regular `#destroyed?` instead.
+
 ## 2.1.5 (2016-01-06)
 ## 2.1.5 (2016-01-06)
 
 
 * Ruby 2.3 support
 * Ruby 2.3 support

README.md

 # Paranoia
 # Paranoia
 
 
-Paranoia is a re-implementation of [acts\_as\_paranoid](http://github.com/ActsAsParanoid/acts_as_paranoid) for Rails 3 and Rails 4, using much, much, much less code.
+Paranoia is a re-implementation of [acts\_as\_paranoid](http://github.com/ActsAsParanoid/acts_as_paranoid) for Rails 3/4/5, using much, much, much less code.
 
 
 When your app is using Paranoia, calling `destroy` on an ActiveRecord object doesn't actually destroy the database record, but just *hides* it. Paranoia does this by setting a `deleted_at` field to the current time when you `destroy` a record, and hides it by scoping all queries on your model to only include records which do not have a `deleted_at` field.
 When your app is using Paranoia, calling `destroy` on an ActiveRecord object doesn't actually destroy the database record, but just *hides* it. Paranoia does this by setting a `deleted_at` field to the current time when you `destroy` a record, and hides it by scoping all queries on your model to only include records which do not have a `deleted_at` field.
 
 
@@ -20,7 +20,7 @@ For Rails 3, please use version 1 of Paranoia:
 gem "paranoia", "~> 1.0"
 gem "paranoia", "~> 1.0"
 ```
 ```
 
 
-For Rails 4, please use version 2 of Paranoia:
+For Rails 4 or 5, please use version 2 of Paranoia:
 
 
 ``` ruby
 ``` ruby
 gem "paranoia", "~> 2.0"
 gem "paranoia", "~> 2.0"

lib/paranoia.rb

@@ -38,7 +38,7 @@ module Paranoia
       quoted_paranoia_column = connection.quote_column_name(paranoia_column)
       quoted_paranoia_column = connection.quote_column_name(paranoia_column)
       with_deleted.where("#{quoted_paranoia_column} IS NULL OR #{quoted_paranoia_column} != ?", paranoia_sentinel_value)
       with_deleted.where("#{quoted_paranoia_column} IS NULL OR #{quoted_paranoia_column} != ?", paranoia_sentinel_value)
     end
     end
-    alias :deleted :only_deleted
+    alias_method :deleted, :only_deleted
 
 
     def restore(id_or_ids, opts = {})
     def restore(id_or_ids, opts = {})
       ids = Array(id_or_ids).flatten
       ids = Array(id_or_ids).flatten
@@ -207,9 +207,9 @@ end
 
 
 class ActiveRecord::Base
 class ActiveRecord::Base
   def self.acts_as_paranoid(options={})
   def self.acts_as_paranoid(options={})
-    alias :really_destroyed? :destroyed?
-    alias :really_delete :delete
-    alias :destroy_without_paranoia :destroy
+    alias_method :really_destroyed?, :destroyed?
+    alias_method :really_delete, :delete
+    alias_method :destroy_without_paranoia, :destroy
 
 
     include Paranoia
     include Paranoia
     class_attribute :paranoia_column, :paranoia_sentinel_value
     class_attribute :paranoia_column, :paranoia_sentinel_value
@@ -261,14 +261,21 @@ require 'paranoia/rspec' if defined? RSpec
 
 
 module ActiveRecord
 module ActiveRecord
   module Validations
   module Validations
-    class UniquenessValidator < ActiveModel::EachValidator
-      protected
-      def build_relation_with_paranoia(klass, table, attribute, value)
-        relation = build_relation_without_paranoia(klass, table, attribute, value)
+    module UniquenessParanoiaValidator
+      def build_relation(klass, table, attribute, value)
+        relation = super(klass, table, attribute, value)
         return relation unless klass.respond_to?(:paranoia_column)
         return relation unless klass.respond_to?(:paranoia_column)
-        relation.and(klass.arel_table[klass.paranoia_column].eq(klass.paranoia_sentinel_value))
+        arel_paranoia_scope = klass.arel_table[klass.paranoia_column].eq(klass.paranoia_sentinel_value)
+        if ActiveRecord::VERSION::STRING >= "5.0"
+          relation.where(arel_paranoia_scope)
+        else
+          relation.and(arel_paranoia_scope)
+        end
       end
       end
-      alias_method_chain :build_relation, :paranoia
+    end
+
+    class UniquenessValidator < ActiveModel::EachValidator
+      prepend UniquenessParanoiaValidator
     end
     end
   end
   end
 end
 end

lib/paranoia/version.rb

 module Paranoia
 module Paranoia
-  VERSION = "2.1.5"
+  VERSION = "2.2.0.alpha"
 end
 end

paranoia.gemspec

@@ -14,7 +14,9 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "paranoia"
   s.rubyforge_project         = "paranoia"
 
 
-  s.add_dependency "activerecord", "~> 4.0"
+  s.required_ruby_version = '>= 2.0'
+
+  s.add_dependency 'activerecord', '>= 4.0', '< 5.1'
 
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rake"

test/paranoia_test.rb

@@ -57,8 +57,15 @@ setup!
 
 
 class ParanoiaTest < test_framework
 class ParanoiaTest < test_framework
   def setup
   def setup
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.execute "DELETE FROM #{table}"
+    connection = ActiveRecord::Base.connection
+    cleaner = ->(source) {
+      ActiveRecord::Base.connection.execute "DELETE FROM #{source}"
+    }
+
+    if ActiveRecord::VERSION::MAJOR < 5
+      connection.tables.each(&cleaner)
+    else
+      connection.data_sources.each(&cleaner)
     end
     end
   end
   end
 
 
@@ -292,8 +299,7 @@ class ParanoiaTest < test_framework
   # Regression test for #24
   # Regression test for #24
   def test_chaining_for_paranoid_models
   def test_chaining_for_paranoid_models
     scope = FeaturefulModel.where(:name => "foo").only_deleted
     scope = FeaturefulModel.where(:name => "foo").only_deleted
-    assert_equal "foo", scope.where_values_hash['name']
-    assert_equal 2, scope.where_values.count
+    assert_equal({'name' => "foo"}, scope.where_values_hash)
   end
   end
 
 
   def test_only_destroyed_scope_for_paranoid_models
   def test_only_destroyed_scope_for_paranoid_models
@@ -392,9 +398,9 @@ class ParanoiaTest < test_framework
     # Just to demonstrate the AR behaviour
     # Just to demonstrate the AR behaviour
     model = NonParanoidModel.new
     model = NonParanoidModel.new
     model.destroy!
     model.destroy!
-    assert model.really_destroyed?
+    assert model.destroyed?
     model.destroy!
     model.destroy!
-    assert model.really_destroyed?
+    assert model.destroyed?
 
 
     # Mirrors behaviour above
     # Mirrors behaviour above
     model = ParanoidModel.new
     model = ParanoidModel.new
@@ -771,7 +777,7 @@ class ParanoiaTest < test_framework
     parent1 = ParentModel.create
     parent1 = ParentModel.create
     pt1 = ParanoidModelWithTimestamp.create(:parent_model => parent1)
     pt1 = ParanoidModelWithTimestamp.create(:parent_model => parent1)
     ParanoidModelWithTimestamp.record_timestamps = false
     ParanoidModelWithTimestamp.record_timestamps = false
-    pt1.update_columns(created_at: 20.years.ago, updated_at: 10.years.ago, deleted_at: 10.years.ago) 
+    pt1.update_columns(created_at: 20.years.ago, updated_at: 10.years.ago, deleted_at: 10.years.ago)
     ParanoidModelWithTimestamp.record_timestamps = true
     ParanoidModelWithTimestamp.record_timestamps = true
     assert pt1.updated_at < 10.minutes.ago
     assert pt1.updated_at < 10.minutes.ago
     refute pt1.deleted_at.nil?
     refute pt1.deleted_at.nil?
@@ -957,7 +963,13 @@ class FailCallbackModel < ActiveRecord::Base
   belongs_to :parent_model
   belongs_to :parent_model
   acts_as_paranoid
   acts_as_paranoid
 
 
-  before_destroy { |_| false }
+  before_destroy { |_|
+    if ActiveRecord::VERSION::MAJOR < 5
+      false
+    else
+      throw :abort
+    end
+  }
 end
 end
 
 
 class FeaturefulModel < ActiveRecord::Base
 class FeaturefulModel < ActiveRecord::Base