paranoia 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32a4bc8e17adc564a3c87661d90c1457b44323bd
-  data.tar.gz: 94527885cf5fb887a88ee2a938472995623639dd
+  metadata.gz: e4840070148649d6ad07f0342b48a031fdf25827
+  data.tar.gz: 25ae25c52215d9cc78ab55756baa09f79255b283
 SHA512:
-  metadata.gz: 865a43181fa3699d92554cc800dff88a20070f2a00d839bc583c99b9e6ad2da78217711a0ca52cb5c358322a33865dbe378332c90c9182b7cf47971d2751f8a2
-  data.tar.gz: d55b46e33174f428e607557b60ba25b8adf6058acdac6dedd3aad00d5f010d7df4c9a5045b9d445c6d640ec1606399f75fbf0f383a6f8297569fd8b90c3d29f8
+  metadata.gz: ea4f3ab508171f21e047ded352fabb8b0f6f5821746054d00dcc5b733f3150f069086ccdbf892ad3c79aec071609839dba4676eaab73941f7b2b23b49639b46c
+  data.tar.gz: 732a2fe402b9d718cecf2968068adf2a83c7486cac87127684d92736b0d39b9352a433ae69e062c90665fd4b93a5cb4cbfe40d38d3f46a1efaf4b9374185bb2c

data/.travis.yml

@@ -1,13 +1,22 @@
 sudo: false
 language: ruby
+cache: bundler
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - 2.3.0
-  - jruby-19mode
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+  - jruby-9.1.0.0
 
 env:
-  - RAILS='~> 4.0.13'
-  - RAILS='~> 4.1.10'
-  - RAILS='~> 4.2.1'
+  matrix:
+    - RAILS='~> 4.1.15'
+    - RAILS='~> 4.2.6'
+    - RAILS='~> 5.0.0'
+
+matrix:
+  exclude:
+    - env: RAILS='~> 5.0.0'
+      rvm: 2.1.10
+  allow_failures:
+    - env: RAILS='~> 5.0.0'
+      rvm: jruby-9.1.0.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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)
 
 * Ruby 2.3 support

data/Gemfile

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'sqlite3', :platforms => [:ruby]
-gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+gem 'sqlite3', platforms: [:ruby]
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+end
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/README.md

@@ -1,6 +1,6 @@
 # Paranoia
 
-Paranoia is a re-implementation of [acts\_as\_paranoid](http://github.com/technoweenie/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.
 
@@ -20,18 +20,18 @@ For Rails 3, please use version 1 of Paranoia:
 gem "paranoia", "~> 1.0"
 ```
 
-For Rails 4, please use version 2 of Paranoia:
+For Rails 4 and 5, please use version 2 of Paranoia (2.2 or greater required for rails 5):
 
 ``` ruby
-gem "paranoia", "~> 2.0"
+gem "paranoia", "~> 2.2"
 ```
 
-Of course you can install this from GitHub as well:
+Of course you can install this from GitHub as well from one of these examples:
 
 ``` ruby
-gem "paranoia", :github => "radar/paranoia", :branch => "rails3"
-# or
-gem "paranoia", :github => "radar/paranoia", :branch => "rails4"
+gem "paranoia", github: "rubysherpas/paranoia", branch: "rails3"
+gem "paranoia", github: "rubysherpas/paranoia", branch: "rails4"
+gem "paranoia", github: "rubysherpas/paranoia", branch: "rails5"
 ```
 
 Then run:
@@ -47,7 +47,7 @@ Updating is as simple as `bundle update paranoia`.
 Run:
 
 ``` shell
-rails generate migration AddDeletedAtToClients deleted_at:datetime:index
+bin/rails generate migration AddDeletedAtToClients deleted_at:datetime:index
 ```
 
 and now you have a migration
@@ -104,6 +104,17 @@ class Client < ActiveRecord::Base
 end
 ```
 
+
+If you want to skip adding the default scope:
+
+``` ruby
+class Client < ActiveRecord::Base
+  acts_as_paranoid without_default_scope: true
+
+  ...
+end
+```
+
 If you want to access soft-deleted associations, override the getter method:
 
 ``` ruby
@@ -128,6 +139,12 @@ If you want to find all records, even those which are deleted:
 Client.with_deleted
 ```
 
+If you want to exclude deleted records, when not able to use the default_scope (e.g. when using without_default_scope):
+
+``` ruby
+Client.without_deleted
+```
+
 If you want to find only the deleted records:
 
 ``` ruby
@@ -187,7 +204,7 @@ Of course, this is not necessary for the indexes you always use in association w
 
 ##### Unique Indexes
 
-Becuse NULL != NULL in standard SQL, we can not simply create a unique index
+Because NULL != NULL in standard SQL, we can not simply create a unique index
 on the deleted_at column and expect it to enforce that there only be one record
 with a certain combination of values.
 
@@ -244,9 +261,9 @@ The `recover` method in `acts_as_paranoid` runs `update` callbacks.  Paranoia's
 
 ## Callbacks
 
-Paranoia provides few callbacks. It triggers `destroy` callback when the record is marked as deleted and `real_destroy` when the record is completely removed from database. It also calls `restore` callback when record is restored via paranoia
+Paranoia provides several callbacks. It triggers `destroy` callback when the record is marked as deleted and `real_destroy` when the record is completely removed from database. It also calls `restore` callback when the record is restored via paranoia
 
-For example if you want to index you records in some search engine you can do like this:
+For example if you want to index your records in some search engine you can go like this:
 
 ```ruby
 class Product < ActiveRecord::Base

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "2.1.5"
+  VERSION = "2.2.0"
 end

data/lib/paranoia.rb

@@ -3,7 +3,7 @@ require 'active_record' unless defined? ActiveRecord
 module Paranoia
   @@default_sentinel_value = nil
 
-  # Change default_sentinel_value in a rails initilizer
+  # Change default_sentinel_value in a rails initializer
   def self.default_sentinel_value=(val)
     @@default_sentinel_value = val
   end
@@ -38,7 +38,7 @@ module Paranoia
       quoted_paranoia_column = connection.quote_column_name(paranoia_column)
       with_deleted.where("#{quoted_paranoia_column} IS NULL OR #{quoted_paranoia_column} != ?", paranoia_sentinel_value)
     end
-    alias :deleted :only_deleted
+    alias_method :deleted, :only_deleted
 
     def restore(id_or_ids, opts = {})
       ids = Array(id_or_ids).flatten
@@ -207,9 +207,9 @@ end
 
 class ActiveRecord::Base
   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
     class_attribute :paranoia_column, :paranoia_sentinel_value
@@ -219,7 +219,11 @@ class ActiveRecord::Base
     def self.paranoia_scope
       where(paranoia_column => paranoia_sentinel_value)
     end
-    default_scope { paranoia_scope }
+    class << self; alias_method :without_deleted, :paranoia_scope end
+
+    unless options[:without_default_scope]
+      default_scope { paranoia_scope }
+    end
 
     before_restore {
       self.class.notify_observers(:before_restore, self) if self.class.respond_to?(:notify_observers)
@@ -258,14 +262,21 @@ require 'paranoia/rspec' if defined? RSpec
 
 module ActiveRecord
   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)
-        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
-      alias_method_chain :build_relation, :paranoia
+    end
+
+    class UniquenessValidator < ActiveModel::EachValidator
+      prepend UniquenessParanoiaValidator
     end
   end
 end

data/paranoia.gemspec

@@ -5,16 +5,26 @@ Gem::Specification.new do |s|
   s.name        = "paranoia"
   s.version     = Paranoia::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["radarlistener@gmail.com"]
-  s.email       = []
-  s.homepage    = "http://rubygems.org/gems/paranoia"
-  s.summary     = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much, much, much less code."
-  s.description = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much, much, much less code. You would use either plugin / gem if you wished that when you called destroy on an Active Record object that it didn't actually destroy it, but just \"hid\" the record. 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."
+  s.authors     = %w(radarlistener@gmail.com)
+  s.email       = %w(ben@benmorgan.io john.hawthorn@gmail.com)
+  s.homepage    = "https://github.com/rubysherpas/paranoia"
+  s.license     = 'MIT'
+  s.summary     = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5, using much, much, much less code."
+  s.description = <<-DSC
+    Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,
+    using much, much, much less code. You would use either plugin / gem if you
+    wished that when you called destroy on an Active Record object that it
+    didn't actually destroy it, but just "hid" the record. 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.
+  DSC
 
   s.required_rubygems_version = ">= 1.3.6"
-  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 "rake"

data/test/paranoia_test.rb

@@ -4,7 +4,6 @@ require 'minitest/autorun'
 require 'paranoia'
 
 test_framework = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
-ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::VERSION::STRING >= '4.2'
 
 def connect!
   ActiveRecord::Base.establish_connection :adapter => 'sqlite3', database: ':memory:'
@@ -40,7 +39,8 @@ def setup!
     'namespaced_paranoid_belongs_tos' => 'deleted_at DATETIME, paranoid_has_one_id INTEGER',
     'unparanoid_unique_models' => 'name VARCHAR(32), paranoid_with_unparanoids_id INTEGER',
     'active_column_models' => 'deleted_at DATETIME, active BOOLEAN',
-    'active_column_model_with_uniqueness_validations' => 'name VARCHAR(32), deleted_at DATETIME, active BOOLEAN'
+    'active_column_model_with_uniqueness_validations' => 'name VARCHAR(32), deleted_at DATETIME, active BOOLEAN',
+    'without_default_scope_models' => 'deleted_at DATETIME'
   }.each do |table_name, columns_as_sql_string|
     ActiveRecord::Base.connection.execute "CREATE TABLE #{table_name} (id INTEGER NOT NULL PRIMARY KEY, #{columns_as_sql_string})"
   end
@@ -56,8 +56,15 @@ setup!
 
 class ParanoiaTest < test_framework
   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
 
@@ -178,8 +185,10 @@ class ParanoiaTest < test_framework
     assert_equal 0, parent1.paranoid_models.count
     assert_equal 1, parent1.paranoid_models.only_deleted.count
     assert_equal 1, parent1.paranoid_models.deleted.count
+    assert_equal 0, parent1.paranoid_models.without_deleted.count
     p3 = ParanoidModel.create(:parent_model => parent1)
     assert_equal 2, parent1.paranoid_models.with_deleted.count
+    assert_equal 1, parent1.paranoid_models.without_deleted.count
     assert_equal [p1,p3], parent1.paranoid_models.with_deleted
   end
 
@@ -204,6 +213,14 @@ class ParanoiaTest < test_framework
     assert_equal nil, ParanoidModel.paranoia_sentinel_value
   end
 
+  def test_without_default_scope_option
+    model = WithoutDefaultScopeModel.create
+    model.destroy
+    assert_equal 1, model.class.count
+    assert_equal 1, model.class.only_deleted.count
+    assert_equal 0, model.class.where(deleted_at: nil).count
+  end
+
   def test_active_column_model
     model = ActiveColumnModel.new
     assert_equal 0, model.class.count
@@ -283,8 +300,7 @@ class ParanoiaTest < test_framework
   # Regression test for #24
   def test_chaining_for_paranoid_models
     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
 
   def test_only_destroyed_scope_for_paranoid_models
@@ -383,9 +399,9 @@ class ParanoiaTest < test_framework
     # Just to demonstrate the AR behaviour
     model = NonParanoidModel.new
     model.destroy!
-    assert model.really_destroyed?
+    assert model.destroyed?
     model.destroy!
-    assert model.really_destroyed?
+    assert model.destroyed?
 
     # Mirrors behaviour above
     model = ParanoidModel.new
@@ -762,7 +778,7 @@ class ParanoiaTest < test_framework
     parent1 = ParentModel.create
     pt1 = ParanoidModelWithTimestamp.create(:parent_model => parent1)
     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
     assert pt1.updated_at < 10.minutes.ago
     refute pt1.deleted_at.nil?
@@ -948,7 +964,13 @@ class FailCallbackModel < ActiveRecord::Base
   belongs_to :parent_model
   acts_as_paranoid
 
-  before_destroy { |_| false }
+  before_destroy { |_|
+    if ActiveRecord::VERSION::MAJOR < 5
+      false
+    else
+      throw :abort
+    end
+  }
 end
 
 class FeaturefulModel < ActiveRecord::Base
@@ -1042,6 +1064,10 @@ class CustomSentinelModel < ActiveRecord::Base
   acts_as_paranoid sentinel_value: DateTime.new(0)
 end
 
+class WithoutDefaultScopeModel < ActiveRecord::Base
+  acts_as_paranoid without_default_scope: true
+end
+
 class ActiveColumnModel < ActiveRecord::Base
   acts_as_paranoid column: :active, sentinel_value: true
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,13 +58,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using
-  much, much, much less code. You would use either plugin / gem if you wished that
-  when you called destroy on an Active Record object that it didn't actually destroy
-  it, but just "hid" the record. 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.
-email: []
+description: |2
+      Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,
+      using much, much, much less code. You would use either plugin / gem if you
+      wished that when you called destroy on an Active Record object that it
+      didn't actually destroy it, but just "hid" the record. 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.
+email:
+- ben@benmorgan.io
+- john.hawthorn@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -76,8 +86,9 @@ files:
 - lib/paranoia/version.rb
 - paranoia.gemspec
 - test/paranoia_test.rb
-homepage: http://rubygems.org/gems/paranoia
-licenses: []
+homepage: https://github.com/rubysherpas/paranoia
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -87,17 +98,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: paranoia
-rubygems_version: 2.4.5
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much,
-  much, much less code.
+summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,
+  using much, much, much less code.
 test_files: []