acts_as_paranoid 0.6.3 → 0.7.1

data/test/test_default_scopes.rb

@@ -1,13 +1,15 @@
-require 'test_helper'
+# frozen_string_literal: true
+
+require "test_helper"
 
 class MultipleDefaultScopesTest < ParanoidBaseTest
   def setup
     setup_db
 
-    ParanoidPolygon.create! :sides => 3
-    ParanoidPolygon.create! :sides => 3
-    ParanoidPolygon.create! :sides => 3
-    ParanoidPolygon.create! :sides => 8
+    ParanoidPolygon.create! sides: 3
+    ParanoidPolygon.create! sides: 3
+    ParanoidPolygon.create! sides: 3
+    ParanoidPolygon.create! sides: 8
 
     assert_equal 3, ParanoidPolygon.count
     assert_equal 4, ParanoidPolygon.unscoped.count

data/test/test_helper.rb

@@ -1,23 +1,41 @@
-require 'bundler'
+# frozen_string_literal: true
+
+require "bundler"
 begin
-  Bundler.require(:default, :development)
+  Bundler.load
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn "Run `bundle install` to install missing gems"
   exit e.status_code
 end
 
-require 'acts_as_paranoid'
-require 'minitest/autorun'
+if RUBY_ENGINE == "jruby"
+  # Workaround for issue in I18n/JRuby combo.
+  # See https://github.com/jruby/jruby/issues/6547 and
+  # https://github.com/ruby-i18n/i18n/issues/555
+  require "i18n/backend"
+  require "i18n/backend/simple"
+end
+
+require "simplecov"
+SimpleCov.start do
+  enable_coverage :branch
+end
+
+require "acts_as_paranoid"
+require "minitest/autorun"
+require "minitest/focus"
 
 # Silence deprecation halfway through the test
 I18n.enforce_available_locales = true
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
 ActiveRecord::Schema.verbose = false
 
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/MethodLength
 def setup_db
-  ActiveRecord::Schema.define(:version => 1) do
+  ActiveRecord::Schema.define(version: 1) do # rubocop:disable Metrics/BlockLength
     create_table :paranoid_times do |t|
       t.string    :name
       t.datetime  :deleted_at
@@ -32,6 +50,7 @@ def setup_db
       t.boolean   :is_deleted
       t.integer   :paranoid_time_id
       t.integer   :paranoid_with_counter_caches_count
+      t.integer   :paranoid_with_touch_and_counter_caches_count
       t.integer   :custom_counter_cache
       timestamps t
     end
@@ -112,14 +131,15 @@ def setup_db
 
     create_table :super_paranoids do |t|
       t.string :type
-      t.references :has_many_inherited_super_paranoidz, index: { name: 'index__sp_id_on_has_many_isp' }
+      t.references :has_many_inherited_super_paranoidz,
+                   index: { name: "index__sp_id_on_has_many_isp" }
       t.datetime :deleted_at
 
       timestamps t
     end
 
     create_table :has_many_inherited_super_paranoidzs do |t|
-      t.references :super_paranoidz, index: { name: 'index_has_many_isp_on_sp_id' }
+      t.references :super_paranoidz, index: { name: "index_has_many_isp_on_sp_id" }
       t.datetime :deleted_at
 
       timestamps t
@@ -166,7 +186,7 @@ def setup_db
     end
 
     create_table :paranoid_polygons do |t|
-      t.integer   :sides
+      t.integer :sides
       t.datetime :deleted_at
 
       timestamps t
@@ -185,7 +205,7 @@ def setup_db
 
     create_table :paranoid_boolean_not_nullables do |t|
       t.string :name
-      t.boolean :deleted, :boolean, :null => false, :default => false
+      t.boolean :deleted, :boolean, null: false, default: false
     end
 
     create_table :paranoid_belongs_to_polymorphics do |t|
@@ -223,19 +243,18 @@ def setup_db
     end
   end
 end
+# rubocop:enable Metrics/AbcSize
+# rubocop:enable Metrics/MethodLength
 
 def timestamps(table)
-  table.column  :created_at , :timestamp, :null => false
-  table.column  :updated_at , :timestamp, :null => false
+  table.column  :created_at, :timestamp, null: false
+  table.column  :updated_at, :timestamp, null: false
 end
 
 def teardown_db
-  tables = if ActiveRecord::VERSION::MAJOR < 5
-    ActiveRecord::Base.connection.tables
-  else
-    ActiveRecord::Base.connection.data_sources
+  ActiveRecord::Base.connection.data_sources.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
   end
-  tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
 end
 
 class ParanoidTime < ActiveRecord::Base
@@ -243,50 +262,58 @@ class ParanoidTime < ActiveRecord::Base
 
   validates_uniqueness_of :name
 
-  has_many :paranoid_has_many_dependants, :dependent => :destroy
-  has_many :paranoid_booleans, :dependent => :destroy
-  has_many :not_paranoids, :dependent => :delete_all
-  has_many :paranoid_sections, :dependent => :destroy
+  has_many :paranoid_has_many_dependants, dependent: :destroy
+  has_many :paranoid_booleans, dependent: :destroy
+  has_many :not_paranoids, dependent: :delete_all
+  has_many :paranoid_sections, dependent: :destroy
 
-  has_one :has_one_not_paranoid, :dependent => :destroy
+  has_one :has_one_not_paranoid, dependent: :destroy
 
-  belongs_to :not_paranoid, :dependent => :destroy
+  belongs_to :not_paranoid, dependent: :destroy
 end
 
 class ParanoidBoolean < ActiveRecord::Base
-  acts_as_paranoid :column_type => "boolean", :column => "is_deleted"
+  acts_as_paranoid column_type: "boolean", column: "is_deleted"
   validates_as_paranoid
   validates_uniqueness_of_without_deleted :name
 
   belongs_to :paranoid_time
-  has_one :paranoid_has_one_dependant, :dependent => :destroy
-  has_many :paranoid_with_counter_cache, :dependent => :destroy
-  has_many :paranoid_with_custom_counter_cache, :dependent => :destroy
+  has_one :paranoid_has_one_dependant, dependent: :destroy
+  has_many :paranoid_with_counter_cache, dependent: :destroy
+  has_many :paranoid_with_custom_counter_cache, dependent: :destroy
+  has_many :paranoid_with_touch_and_counter_cache, dependent: :destroy
+  has_many :paranoid_with_touch, dependent: :destroy
 end
 
 class ParanoidString < ActiveRecord::Base
-  acts_as_paranoid :column_type => "string", :column => "deleted", :deleted_value => "dead"
+  acts_as_paranoid column_type: "string", column: "deleted", deleted_value: "dead"
 end
 
 class NotParanoid < ActiveRecord::Base
 end
 
 class ParanoidNoDoubleTapDestroysFully < ActiveRecord::Base
-  acts_as_paranoid :double_tap_destroys_fully => false
+  acts_as_paranoid double_tap_destroys_fully: false
 end
 
 class HasOneNotParanoid < ActiveRecord::Base
-  belongs_to :paranoid_time, :with_deleted => true
+  belongs_to :paranoid_time, with_deleted: true
 end
 
 class DoubleHasOneNotParanoid < HasOneNotParanoid
-  belongs_to :paranoid_time, :with_deleted => true
-  belongs_to :paranoid_time, :with_deleted => true
+  belongs_to :paranoid_time, with_deleted: true
+  begin
+    verbose = $VERBOSE
+    $VERBOSE = false
+    belongs_to :paranoid_time, with_deleted: true
+  ensure
+    $VERBOSE = verbose
+  end
 end
 
 class ParanoidWithCounterCache < ActiveRecord::Base
   acts_as_paranoid
-  belongs_to :paranoid_boolean, :counter_cache => true
+  belongs_to :paranoid_boolean, counter_cache: true
 end
 
 class ParanoidWithCustomCounterCache < ActiveRecord::Base
@@ -307,15 +334,34 @@ class ParanoidWithCounterCacheOnOptionalBelognsTo < ActiveRecord::Base
   end
 end
 
+class ParanoidWithTouch < ActiveRecord::Base
+  self.table_name = "paranoid_with_counter_caches"
+  acts_as_paranoid
+  belongs_to :paranoid_boolean, touch: true
+end
+
+class ParanoidWithTouchAndCounterCache < ActiveRecord::Base
+  self.table_name = "paranoid_with_counter_caches"
+  acts_as_paranoid
+  belongs_to :paranoid_boolean, touch: true, counter_cache: true
+end
+
 class ParanoidHasManyDependant < ActiveRecord::Base
   acts_as_paranoid
   belongs_to :paranoid_time
-  belongs_to :paranoid_time_with_scope, -> { where(name: 'hello').includes(:not_paranoid) }, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id
-  belongs_to :paranoid_time_with_deleted, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id, :with_deleted => true
-  belongs_to :paranoid_time_with_scope_with_deleted, -> { where(name: 'hello').includes(:not_paranoid) }, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id, :with_deleted => true
-  belongs_to :paranoid_time_polymorphic_with_deleted, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id, :polymorphic => true, :with_deleted => true
+  belongs_to :paranoid_time_with_scope,
+             -> { where(name: "hello").includes(:not_paranoid) },
+             class_name: "ParanoidTime", foreign_key: :paranoid_time_id
+  belongs_to :paranoid_time_with_deleted, class_name: "ParanoidTime",
+                                          foreign_key: :paranoid_time_id, with_deleted: true
+  belongs_to :paranoid_time_with_scope_with_deleted,
+             -> { where(name: "hello").includes(:not_paranoid) },
+             class_name: "ParanoidTime", foreign_key: :paranoid_time_id, with_deleted: true
+  belongs_to :paranoid_time_polymorphic_with_deleted, class_name: "ParanoidTime",
+                                                      foreign_key: :paranoid_time_id,
+                                                      polymorphic: true, with_deleted: true
 
-  belongs_to :paranoid_belongs_dependant, :dependent => :destroy
+  belongs_to :paranoid_belongs_dependant, dependent: :destroy
 end
 
 class ParanoidBelongsDependant < ActiveRecord::Base
@@ -333,13 +379,14 @@ end
 class ParanoidWithCallback < ActiveRecord::Base
   acts_as_paranoid
 
-  attr_accessor :called_before_destroy, :called_after_destroy, :called_after_commit_on_destroy
-  attr_accessor :called_before_recover, :called_after_recover
+  attr_accessor :called_before_destroy, :called_after_destroy,
+                :called_after_commit_on_destroy, :called_before_recover,
+                :called_after_recover
 
   before_destroy :call_me_before_destroy
   after_destroy :call_me_after_destroy
 
-  after_commit :call_me_after_commit_on_destroy, :on => :destroy
+  after_commit :call_me_after_commit_on_destroy, on: :destroy
 
   before_recover :call_me_before_recover
   after_recover :call_me_after_recover
@@ -372,14 +419,14 @@ end
 
 class ParanoidDestroyCompany < ActiveRecord::Base
   acts_as_paranoid
-  validates :name, :presence => true
-  has_many :paranoid_products, :dependent => :destroy
+  validates :name, presence: true
+  has_many :paranoid_products, dependent: :destroy
 end
 
 class ParanoidDeleteCompany < ActiveRecord::Base
   acts_as_paranoid
-  validates :name, :presence => true
-  has_many :paranoid_products, :dependent => :delete_all
+  validates :name, presence: true
+  has_many :paranoid_products, dependent: :delete_all
 end
 
 class ParanoidProduct < ActiveRecord::Base
@@ -395,22 +442,21 @@ class SuperParanoid < ActiveRecord::Base
 end
 
 class HasManyInheritedSuperParanoidz < ActiveRecord::Base
-  has_many :super_paranoidz, :class_name => "InheritedParanoid", :dependent => :destroy
+  has_many :super_paranoidz, class_name: "InheritedParanoid", dependent: :destroy
 end
 
 class InheritedParanoid < SuperParanoid
   acts_as_paranoid
 end
 
-
 class ParanoidManyManyParentLeft < ActiveRecord::Base
   has_many :paranoid_many_many_children
-  has_many :paranoid_many_many_parent_rights, :through => :paranoid_many_many_children
+  has_many :paranoid_many_many_parent_rights, through: :paranoid_many_many_children
 end
 
 class ParanoidManyManyParentRight < ActiveRecord::Base
   has_many :paranoid_many_many_children
-  has_many :paranoid_many_many_parent_lefts, :through => :paranoid_many_many_children
+  has_many :paranoid_many_many_parent_lefts, through: :paranoid_many_many_children
 end
 
 class ParanoidManyManyChild < ActiveRecord::Base
@@ -421,21 +467,21 @@ end
 
 class ParanoidWithScopedValidation < ActiveRecord::Base
   acts_as_paranoid
-  validates_uniqueness_of :name, :scope => :category
+  validates_uniqueness_of :name, scope: :category
 end
 
 class ParanoidBelongsToPolymorphic < ActiveRecord::Base
   acts_as_paranoid
-  belongs_to :parent, :polymorphic => true, :with_deleted => true
+  belongs_to :parent, polymorphic: true, with_deleted: true
 end
 
 class NotParanoidHasManyAsParent < ActiveRecord::Base
-  has_many :paranoid_belongs_to_polymorphics, :as => :parent, :dependent => :destroy
+  has_many :paranoid_belongs_to_polymorphics, as: :parent, dependent: :destroy
 end
 
 class ParanoidHasManyAsParent < ActiveRecord::Base
   acts_as_paranoid
-  has_many :paranoid_belongs_to_polymorphics, :as => :parent, :dependent => :destroy
+  has_many :paranoid_belongs_to_polymorphics, as: :parent, dependent: :destroy
 end
 
 class ParanoidBaseTest < ActiveSupport::TestCase
@@ -443,13 +489,13 @@ class ParanoidBaseTest < ActiveSupport::TestCase
     setup_db
 
     ["paranoid", "really paranoid", "extremely paranoid"].each do |name|
-      ParanoidTime.create! :name => name
-      ParanoidBoolean.create! :name => name
+      ParanoidTime.create! name: name
+      ParanoidBoolean.create! name: name
     end
 
-    ParanoidString.create! :name => "strings can be paranoid"
-    NotParanoid.create! :name => "no paranoid goals"
-    ParanoidWithCallback.create! :name => "paranoid with callbacks"
+    ParanoidString.create! name: "strings can be paranoid"
+    NotParanoid.create! name: "no paranoid goals"
+    ParanoidWithCallback.create! name: "paranoid with callbacks"
   end
 
   def teardown
@@ -483,9 +529,9 @@ class ParanoidForest < ActiveRecord::Base
 
   ActiveRecord::Base.logger = Logger.new(StringIO.new)
 
-  scope :rainforest, lambda{ where(:rainforest => true) }
+  scope :rainforest, -> { where(rainforest: true) }
 
-  has_many :paranoid_trees, :dependent => :destroy
+  has_many :paranoid_trees, dependent: :destroy
 end
 
 class ParanoidTree < ActiveRecord::Base
@@ -496,7 +542,7 @@ end
 
 class ParanoidPolygon < ActiveRecord::Base
   acts_as_paranoid
-  default_scope { where('sides = ?', 3) }
+  default_scope { where("sides = ?", 3) }
 end
 
 class ParanoidAndroid < ActiveRecord::Base
@@ -506,11 +552,11 @@ end
 class ParanoidSection < ActiveRecord::Base
   acts_as_paranoid
   belongs_to :paranoid_time
-  belongs_to :paranoid_thing, :polymorphic => true, :dependent => :destroy
+  belongs_to :paranoid_thing, polymorphic: true, dependent: :destroy
 end
 
 class ParanoidBooleanNotNullable < ActiveRecord::Base
-  acts_as_paranoid column: 'deleted', column_type: 'boolean', allow_nulls: false
+  acts_as_paranoid column: "deleted", column_type: "boolean", allow_nulls: false
 end
 
 class ParanoidWithExplicitTableNameAfterMacro < ActiveRecord::Base

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,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
@@ -86,13 +88,15 @@ class RelationsTest < ParanoidBaseTest
     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)
@@ -100,14 +104,18 @@ class RelationsTest < ParanoidBaseTest
     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.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.count

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?
@@ -22,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])
 
@@ -32,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])