acts_as_paranoid 0.5.0 → 0.7.0

data/test/test_inheritance.rb

@@ -1,14 +1,16 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class InheritanceTest < ParanoidBaseTest
   def test_destroy_dependents_with_inheritance
     has_many_inherited_super_paranoidz = HasManyInheritedSuperParanoidz.new
     has_many_inherited_super_paranoidz.save
     has_many_inherited_super_paranoidz.super_paranoidz.create
-    assert_nothing_raised(NoMethodError) { has_many_inherited_super_paranoidz.destroy }
+    assert_nothing_raised { has_many_inherited_super_paranoidz.destroy }
   end
 
   def test_class_instance_variables_are_inherited
-    assert_nothing_raised(ActiveRecord::StatementInvalid) { InheritedParanoid.paranoid_column }
+    assert_nothing_raised { InheritedParanoid.paranoid_column }
   end
 end

data/test/test_relations.rb

@@ -1,20 +1,22 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class RelationsTest < ParanoidBaseTest
   def setup
     setup_db
 
-    @paranoid_forest_1 = ParanoidForest.create! :name => "ParanoidForest #1"
-    @paranoid_forest_2 = ParanoidForest.create! :name => "ParanoidForest #2", :rainforest => true
-    @paranoid_forest_3 = ParanoidForest.create! :name => "ParanoidForest #3", :rainforest => true
+    @paranoid_forest_1 = ParanoidForest.create! name: "ParanoidForest #1"
+    @paranoid_forest_2 = ParanoidForest.create! name: "ParanoidForest #2", rainforest: true
+    @paranoid_forest_3 = ParanoidForest.create! name: "ParanoidForest #3", rainforest: true
 
     assert_equal 3, ParanoidForest.count
     assert_equal 2, ParanoidForest.rainforest.count
 
-    @paranoid_forest_1.paranoid_trees.create! :name => 'ParanoidTree #1'
-    @paranoid_forest_1.paranoid_trees.create! :name => 'ParanoidTree #2'
-    @paranoid_forest_2.paranoid_trees.create! :name => 'ParanoidTree #3'
-    @paranoid_forest_2.paranoid_trees.create! :name => 'ParanoidTree #4'
+    @paranoid_forest_1.paranoid_trees.create! name: "ParanoidTree #1"
+    @paranoid_forest_1.paranoid_trees.create! name: "ParanoidTree #2"
+    @paranoid_forest_2.paranoid_trees.create! name: "ParanoidTree #3"
+    @paranoid_forest_2.paranoid_trees.create! name: "ParanoidTree #4"
 
     assert_equal 4, ParanoidTree.count
   end
@@ -82,36 +84,42 @@ class RelationsTest < ParanoidBaseTest
 
     # destroy_all: through a relation
     @paranoid_forest_2.paranoid_trees.order(:id).destroy_all
-    assert_equal 0, @paranoid_forest_2.paranoid_trees(true).count
-    assert_equal 2, @paranoid_forest_2.paranoid_trees(true).with_deleted.count
+    assert_equal 0, @paranoid_forest_2.paranoid_trees.count
+    assert_equal 2, @paranoid_forest_2.paranoid_trees.with_deleted.count
   end
 
-  def test_real_removal_through_relation
-    # destroy!: aliased to delete
+  def test_real_removal_through_relation_with_destroy_bang
+    # Relation.destroy!: aliased to delete
     ParanoidForest.rainforest.destroy!(@paranoid_forest_3)
     assert_equal 1, ParanoidForest.rainforest.count
     assert_equal 1, ParanoidForest.rainforest.with_deleted.count
     assert_equal 0, ParanoidForest.rainforest.only_deleted.count
+  end
 
+  def test_two_step_real_removal_through_relation_with_destroy
     # destroy: two-step through a relation
     paranoid_tree = @paranoid_forest_1.paranoid_trees.first
     @paranoid_forest_1.paranoid_trees.order(:id).destroy(paranoid_tree.id)
     @paranoid_forest_1.paranoid_trees.only_deleted.destroy(paranoid_tree.id)
-    assert_equal 1, @paranoid_forest_1.paranoid_trees(true).count
-    assert_equal 1, @paranoid_forest_1.paranoid_trees(true).with_deleted.count
-    assert_equal 0, @paranoid_forest_1.paranoid_trees(true).only_deleted.count
+    assert_equal 1, @paranoid_forest_1.paranoid_trees.count
+    assert_equal 1, @paranoid_forest_1.paranoid_trees.with_deleted.count
+    assert_equal 0, @paranoid_forest_1.paranoid_trees.only_deleted.count
+  end
 
+  def test_two_step_real_removal_through_relation_with_destroy_all
     # destroy_all: two-step through a relation
     @paranoid_forest_1.paranoid_trees.order(:id).destroy_all
     @paranoid_forest_1.paranoid_trees.only_deleted.destroy_all
-    assert_equal 0, @paranoid_forest_1.paranoid_trees(true).count
-    assert_equal 0, @paranoid_forest_1.paranoid_trees(true).with_deleted.count
-    assert_equal 0, @paranoid_forest_1.paranoid_trees(true).only_deleted.count
+    assert_equal 0, @paranoid_forest_1.paranoid_trees.count
+    assert_equal 0, @paranoid_forest_1.paranoid_trees.with_deleted.count
+    assert_equal 0, @paranoid_forest_1.paranoid_trees.only_deleted.count
+  end
 
+  def test_real_removal_through_relation_with_delete_all_bang
     # delete_all!: through a relation
     @paranoid_forest_2.paranoid_trees.order(:id).delete_all!
-    assert_equal 0, @paranoid_forest_2.paranoid_trees(true).count
-    assert_equal 0, @paranoid_forest_2.paranoid_trees(true).with_deleted.count
-    assert_equal 0, @paranoid_forest_2.paranoid_trees(true).only_deleted.count
+    assert_equal 0, @paranoid_forest_2.paranoid_trees.count
+    assert_equal 0, @paranoid_forest_2.paranoid_trees.with_deleted.count
+    assert_equal 0, @paranoid_forest_2.paranoid_trees.only_deleted.count
   end
 end

data/test/test_validations.rb

@@ -1,8 +1,10 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class ValidatesUniquenessTest < ParanoidBaseTest
   def test_should_include_deleted_by_default
-    ParanoidTime.new(:name => 'paranoid').tap do |record|
+    ParanoidTime.new(name: "paranoid").tap do |record|
       assert !record.valid?
       ParanoidTime.first.destroy
       assert !record.valid?
@@ -12,7 +14,8 @@ class ValidatesUniquenessTest < ParanoidBaseTest
   end
 
   def test_should_validate_without_deleted
-    ParanoidBoolean.new(:name => 'paranoid').tap do |record|
+    ParanoidBoolean.new(name: "paranoid").tap do |record|
+      refute record.valid?
       ParanoidBoolean.first.destroy
       assert record.valid?
       ParanoidBoolean.only_deleted.first.destroy!
@@ -21,8 +24,8 @@ class ValidatesUniquenessTest < ParanoidBaseTest
   end
 
   def test_models_with_scoped_validations_can_be_multiply_deleted
-    model_a = ParanoidWithScopedValidation.create(:name => "Model A", :category => "Category A")
-    model_b = ParanoidWithScopedValidation.create(:name => "Model B", :category => "Category B")
+    model_a = ParanoidWithScopedValidation.create(name: "Model A", category: "Category A")
+    model_b = ParanoidWithScopedValidation.create(name: "Model B", category: "Category B")
 
     ParanoidWithScopedValidation.delete([model_a.id, model_b.id])
 
@@ -31,8 +34,8 @@ class ValidatesUniquenessTest < ParanoidBaseTest
   end
 
   def test_models_with_scoped_validations_can_be_multiply_destroyed
-    model_a = ParanoidWithScopedValidation.create(:name => "Model A", :category => "Category A")
-    model_b = ParanoidWithScopedValidation.create(:name => "Model B", :category => "Category B")
+    model_a = ParanoidWithScopedValidation.create(name: "Model A", category: "Category A")
+    model_b = ParanoidWithScopedValidation.create(name: "Model B", category: "Category B")
 
     ParanoidWithScopedValidation.destroy([model_a.id, model_b.id])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,54 +18,94 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,25 +135,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.89.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.89.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<="
+        version: 0.18.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<="
+        version: 0.18.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.20.0
 description: Check the home page for more in-depth information.
 email:
 - e@zzak.io
@@ -121,12 +175,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/acts_as_paranoid.rb
 - lib/acts_as_paranoid/associations.rb
 - lib/acts_as_paranoid/core.rb
-- lib/acts_as_paranoid/preloader_association.rb
 - lib/acts_as_paranoid/relation.rb
 - lib/acts_as_paranoid/validations.rb
 - lib/acts_as_paranoid/version.rb
@@ -135,7 +189,6 @@ files:
 - test/test_default_scopes.rb
 - test/test_helper.rb
 - test/test_inheritance.rb
-- test/test_preloader_association.rb
 - test/test_relations.rb
 - test/test_validations.rb
 homepage: https://github.com/ActsAsParanoid/acts_as_paranoid
@@ -150,26 +203,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without
   actually deleting them.
 test_files:
-- test/test_inheritance.rb
-- test/test_preloader_association.rb
 - test/test_relations.rb
+- test/test_inheritance.rb
 - test/test_core.rb
+- test/test_default_scopes.rb
+- test/test_helper.rb
 - test/test_validations.rb
 - test/test_associations.rb
-- test/test_helper.rb
-- test/test_default_scopes.rb
-has_rdoc: 

data/lib/acts_as_paranoid/preloader_association.rb

@@ -1,15 +0,0 @@
-module ActsAsParanoid
-  module PreloaderAssociation
-    def self.included(base)
-      base.class_eval do
-        def build_scope_with_deleted
-          scope = build_scope_without_deleted
-          scope = scope.with_deleted if options[:with_deleted] && klass.respond_to?(:with_deleted)
-          scope
-        end
-
-        alias_method_chain :build_scope, :deleted
-      end
-    end
-  end
-end

data/test/test_preloader_association.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-class PreloaderAssociationTest < ParanoidBaseTest
-  def test_includes_with_deleted
-    paranoid_time = ParanoidTime.first
-    paranoid_has_many_dependant = paranoid_time.paranoid_has_many_dependants.create(:name => 'dependant!')
-
-    paranoid_time.destroy
-
-    ParanoidHasManyDependant.with_deleted.includes(:paranoid_time_with_deleted).each do |hasmany|
-      assert_not_nil hasmany.paranoid_time_with_deleted
-    end
-  end
-
-  def test_includes_with_deleted_with_polymorphic_parent
-    not_paranoid_parent = NotParanoidHasManyAsParent.create(name: 'not paranoid parent')
-    paranoid_parent = ParanoidHasManyAsParent.create(name: 'paranoid parent')
-    ParanoidBelongsToPolymorphic.create(:name => 'belongs_to', :parent => not_paranoid_parent)
-    ParanoidBelongsToPolymorphic.create(:name => 'belongs_to', :parent => paranoid_parent)
-
-    paranoid_parent.destroy
-
-    ParanoidBelongsToPolymorphic.with_deleted.includes(:parent).each do |hasmany|
-      assert_not_nil hasmany.parent
-    end
-  end
-end