acts_as_paranoid 0.6.2 → 0.7.3

data/test/test_inheritance.rb

@@ -1,4 +1,6 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class InheritanceTest < ParanoidBaseTest
   def test_destroy_dependents_with_inheritance

data/test/test_relations.rb

@@ -1,24 +1,84 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
+
+class RelationsTest < ActiveSupport::TestCase
+  class ParanoidForest < ActiveRecord::Base
+    acts_as_paranoid
+
+    scope :rainforest, -> { where(rainforest: true) }
+
+    has_many :paranoid_trees, dependent: :destroy
+  end
+
+  class ParanoidTree < ActiveRecord::Base
+    acts_as_paranoid
+    belongs_to :paranoid_forest
+    validates_presence_of :name
+  end
+
+  class NotParanoidBowl < ActiveRecord::Base
+    has_many :paranoid_chocolates, dependent: :destroy
+  end
+
+  class ParanoidChocolate < ActiveRecord::Base
+    acts_as_paranoid
+    belongs_to :not_paranoid_bowl
+    validates_presence_of :name
+  end
 
-class RelationsTest < ParanoidBaseTest
   def setup
-    setup_db
+    ActiveRecord::Schema.define(version: 1) do
+      create_table :paranoid_forests do |t|
+        t.string   :name
+        t.boolean  :rainforest
+        t.datetime :deleted_at
+
+        timestamps t
+      end
+
+      create_table :paranoid_trees do |t|
+        t.integer  :paranoid_forest_id
+        t.string   :name
+        t.datetime :deleted_at
+
+        timestamps t
+      end
+
+      create_table :not_paranoid_bowls do |t|
+        t.string   :name
+
+        timestamps t
+      end
 
-    @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
+      create_table :paranoid_chocolates do |t|
+        t.integer  :not_paranoid_bowl_id
+        t.string   :name
+        t.datetime :deleted_at
+
+        timestamps t
+      end
+    end
+
+    @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
 
+  def teardown
+    teardown_db
+  end
+
   def test_filtering_with_scopes
     assert_equal 2, ParanoidForest.rainforest.with_deleted.count
     assert_equal 2, ParanoidForest.with_deleted.rainforest.count
@@ -81,35 +141,57 @@ class RelationsTest < ParanoidBaseTest
     assert_equal 1, ParanoidForest.rainforest.only_deleted.count
 
     # destroy_all: through a relation
-    @paranoid_forest_2.paranoid_trees.order(:id).destroy_all
+    @paranoid_forest_2.paranoid_trees.destroy_all
     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_fake_removal_through_has_many_relation_of_non_paranoid_model
+    not_paranoid = NotParanoidBowl.create! name: "NotParanoid #1"
+    not_paranoid.paranoid_chocolates.create! name: "ParanoidChocolate #1"
+    not_paranoid.paranoid_chocolates.create! name: "ParanoidChocolate #2"
+
+    not_paranoid.paranoid_chocolates.destroy_all
+    assert_equal 0, not_paranoid.paranoid_chocolates.count
+    assert_equal 2, not_paranoid.paranoid_chocolates.with_deleted.count
+  end
+
+  def test_real_removal_through_relation_with_destroy_fully
+    ParanoidForest.rainforest.destroy_fully!(@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_real_removal_through_relation_with_deprecated_destroy!
     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.destroy(paranoid_tree.id)
     @paranoid_forest_1.paranoid_trees.only_deleted.destroy(paranoid_tree.id)
     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.destroy_all
     @paranoid_forest_1.paranoid_trees.only_deleted.destroy_all
     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!
+    @paranoid_forest_2.paranoid_trees.delete_all!
     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

data/test/test_table_namespace.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class TableNamespaceTest < ActiveSupport::TestCase
+  module Paranoid
+    class Blob < ActiveRecord::Base
+      acts_as_paranoid
+
+      validates_presence_of :name
+
+      def self.table_name_prefix
+        "paranoid_"
+      end
+    end
+  end
+
+  def setup
+    ActiveRecord::Schema.define(version: 1) do
+      create_table :paranoid_blobs do |t|
+        t.string   :name
+        t.datetime :deleted_at
+
+        timestamps t
+      end
+    end
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_correct_table_name
+    assert_equal "paranoid_blobs", Paranoid::Blob.table_name
+
+    b = Paranoid::Blob.new(name: "hello!")
+    b.save!
+    assert_equal b, Paranoid::Blob.first
+  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,7 @@ 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?
@@ -21,9 +23,27 @@ class ValidatesUniquenessTest < ParanoidBaseTest
     end
   end
 
+  def test_validate_serialized_attribute_without_deleted
+    ParanoidWithSerializedColumn.create!(name: "ParanoidWithSerializedColumn #1",
+                                         colors: %w[Cyan Maroon])
+    record = ParanoidWithSerializedColumn.new(name: "ParanoidWithSerializedColumn #2")
+    record.colors = %w[Cyan Maroon]
+    refute record.valid?
+
+    record.colors = %w[Beige Turquoise]
+    assert record.valid?
+  end
+
+  def test_updated_serialized_attribute_validated_without_deleted
+    record = ParanoidWithSerializedColumn.create!(name: "ParanoidWithSerializedColumn #1",
+                                                  colors: %w[Cyan Maroon])
+    record.update!(colors: %w[Beige Turquoise])
+    assert record.valid?
+  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])
 
@@ -32,8 +52,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,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Zachary Scott
 - Goncalo Silva
 - Rick Olson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -73,7 +73,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.14'
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,39 +129,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<="
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
 description: Check the home page for more in-depth information.
 email:
 - e@zzak.io
@@ -142,28 +184,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CONTRIBUTING.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
 - test/test_associations.rb
 - test/test_core.rb
 - test/test_default_scopes.rb
+- test/test_dependent_recovery.rb
+- test/test_deprecated_behavior.rb
 - test/test_helper.rb
 - test/test_inheritance.rb
-- test/test_preloader_association.rb
 - test/test_relations.rb
+- test/test_table_namespace.rb
 - test/test_validations.rb
 homepage: https://github.com/ActsAsParanoid/acts_as_paranoid
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,24 +215,26 @@ 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: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+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_validations.rb
-- test/test_relations.rb
-- test/test_inheritance.rb
-- test/test_default_scopes.rb
 - test/test_associations.rb
-- test/test_helper.rb
 - test/test_core.rb
-- test/test_preloader_association.rb
+- test/test_default_scopes.rb
+- test/test_dependent_recovery.rb
+- test/test_deprecated_behavior.rb
+- test/test_helper.rb
+- test/test_inheritance.rb
+- test/test_relations.rb
+- test/test_table_namespace.rb
+- test/test_validations.rb