acts_as_paranoid 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06cfbf17cb1f8fe737c00e223cc6b02f8ea1159d751c3e6c1bfba1fd077ca6ac
-  data.tar.gz: b887b92760729053b6286412ee861e9677c7d418bcf28bdfdc996c4e9474ed30
+  metadata.gz: 6bcd9a9f5f44fbc3890442360530b48ed39f94bd8cbe4f49d245a2c27510f7fd
+  data.tar.gz: 47c9aceb7415a3704b69b3bcaf7c8db64d402ecc9d1ef41352a70d0a386a819c
 SHA512:
-  metadata.gz: 699e32ad650195f1d4b34ef89e266a379ef35f450d6434d753227788fe214c3af9ebe410397799117b8b6527a240d769e768cc1a60b49f8abd663d8e1ab81ff9
-  data.tar.gz: a5e7745201cfe1fb5689726ca93cff4fb24a594373a10c2fb7777541f9ca7dcb2681a20ddd91692eff6dae3149b80e6a962b56dc4fecd86d10b87e77f9be1221
+  metadata.gz: 78c376b394c50800f5f22db6a30a4dd607196a277266af7e24e04b209326e176471f916da360a1eb6e7e2c6573c506b211eccac42961a9a3ed686def7c105987
+  data.tar.gz: b0025f38c28cfc80fb852673f4913edf25273912ca83a768e000a15a745edfa9069d6fda490e31cc8ffe39975651d339d7ce82ac07f1065936ef6832f6b5eef1

data/CHANGELOG.md

@@ -2,10 +2,19 @@
 
 Notable changes to this project will be documented in this file.
 
+## 0.6.2
+
+* Prevent recovery of non-deleted records
+  ([#133], by [Mary Beliveau][marycodes2] and [Valerie Woolard][valeriecodes])
+* Allow model to set `table_name` after `acts_as_paranoid` macro
+  ([#131], by [Alex Wheeler][AlexWheeler]).
+* Make counter cache work with a custom column name and with optional
+  associations ([#123], by [Ned Campion][nedcampion]).
+
 ## 0.6.1
 
-* Add support for Rails 6 ([#124], by [Daniel Rice](danielricecodes),
-  [Josh Bryant](jbryant92), and [Romain Alexandre](RomainAlexandre))
+* Add support for Rails 6 ([#124], by [Daniel Rice][danielricecodes],
+  [Josh Bryant][jbryant92], and [Romain Alexandre][RomainAlexandre])
 * Add support for incrementing and decrementing counter cache columns on
   associated objects ([#119], by [Dimitar Lukanov][shadydealer])
 * Add `:double_tap_destroys_fully` option, with default `true` ([#116],
@@ -23,10 +32,18 @@ Notable changes to this project will be documented in this file.
 [shadydealer]: https://github.com/shadydealer
 [danielricecodes]: https://github.com/danielricecodes
 [jbryant92]: https://github.com/jbryant92
+[nedcampion]: https://github.com/nedcampion
 [RomainAlexandre]: https://github.com/RomainAlexandre
+[AlexWheeler]: https://github.com/AlexWheeler
+[marycodes2]: https://github.com/marycodes2
+[valeriecodes]: https://github.com/valeriecodes
 
 <!-- issues & pull requests -->
 
+[#133]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/133
+[#131]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/131
+[#124]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/124
+[#123]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/123
 [#119]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/119
 [#116]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/116
 [#114]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/114

data/lib/acts_as_paranoid.rb

@@ -17,7 +17,7 @@ module ActsAsParanoid
   def acts_as_paranoid(options = {})
     raise ArgumentError, "Hash expected, got #{options.class.name}" if not options.is_a?(Hash) and not options.empty?
 
-    class_attribute :paranoid_configuration, :paranoid_column_reference
+    class_attribute :paranoid_configuration
 
     self.paranoid_configuration = { :column => "deleted_at", :column_type => "time", :recover_dependent_associations => true, :dependent_recovery_window => 2.minutes, :recovery_value => nil, double_tap_destroys_fully: true }
     self.paranoid_configuration.merge!({ :deleted_value => "deleted" }) if options[:column_type] == "string"
@@ -26,7 +26,9 @@ module ActsAsParanoid
 
     raise ArgumentError, "'time', 'boolean' or 'string' expected for :column_type option, got #{paranoid_configuration[:column_type]}" unless ['time', 'boolean', 'string'].include? paranoid_configuration[:column_type]
 
-    self.paranoid_column_reference = "#{self.table_name}.#{paranoid_configuration[:column]}"
+    def self.paranoid_column_reference
+      "#{self.table_name}.#{paranoid_configuration[:column]}"
+    end
 
     return if paranoid?
 

data/lib/acts_as_paranoid/core.rb

@@ -158,6 +158,7 @@ module ActsAsParanoid
     alias_method :destroy, :destroy!
 
     def recover(options={})
+      return if !self.deleted?
       options = {
         :recursive => self.class.paranoid_configuration[:recover_dependent_associations],
         :recovery_window => self.class.paranoid_configuration[:dependent_recovery_window]
@@ -248,15 +249,16 @@ module ActsAsParanoid
       return unless [:decrement_counter, :increment_counter].include? method_sym
 
       each_counter_cached_association_reflection do |assoc_reflection|
-        associated_object = send(assoc_reflection.name)
-        counter_cache_column = assoc_reflection.counter_cache_column
-        associated_object.class.send(method_sym, counter_cache_column, associated_object.id)
+        if associated_object = send(assoc_reflection.name)
+          counter_cache_column = assoc_reflection.counter_cache_column
+          associated_object.class.send(method_sym, counter_cache_column, associated_object.id)
+        end
       end
     end
 
     def each_counter_cached_association_reflection
       _reflections.each do |name, reflection|
-        yield reflection if reflection.belongs_to? && reflection.counter_cache_column == "#{self.class.name.underscore.pluralize}_count"
+        yield reflection if reflection.belongs_to? && reflection.counter_cache_column
       end
     end
 

data/lib/acts_as_paranoid/version.rb

@@ -1,3 +1,3 @@
 module ActsAsParanoid
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/test_core.rb

@@ -312,6 +312,14 @@ class ParanoidTest < ParanoidBaseTest
     assert @paranoid_with_callback.called_after_recover
   end
 
+  def test_recovery_callbacks_without_destroy
+    @paranoid_with_callback = ParanoidWithCallback.first
+    @paranoid_with_callback.recover
+
+    assert_nil @paranoid_with_callback.called_before_recover
+    assert_nil @paranoid_with_callback.called_after_recover
+  end
+
   def test_delete_by_multiple_id_is_paranoid
     model_a = ParanoidBelongsDependant.create
     model_b = ParanoidBelongsDependant.create
@@ -455,6 +463,23 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 0, paranoid_boolean.reload.paranoid_with_counter_caches_count
   end
 
+  def test_decrement_custom_counters
+    paranoid_boolean = ParanoidBoolean.create!()
+    paranoid_with_custom_counter_cache = ParanoidWithCustomCounterCache.create!(paranoid_boolean: paranoid_boolean)
+
+    assert_equal 1, paranoid_boolean.custom_counter_cache
+
+    paranoid_with_custom_counter_cache.destroy
+
+    assert_equal 0, paranoid_boolean.reload.custom_counter_cache
+  end
+
+  def test_destroy_with_optional_belongs_to_and_counter_cache
+    ps = ParanoidWithCounterCacheOnOptionalBelognsTo.create!()
+    ps.destroy
+    assert_equal 1, ParanoidWithCounterCacheOnOptionalBelognsTo.only_deleted.where(:id => ps).count
+  end
+
   def test_hard_destroy_decrement_counters
     paranoid_boolean = ParanoidBoolean.create!()
     paranoid_with_counter_cache = ParanoidWithCounterCache.create!(paranoid_boolean: paranoid_boolean)
@@ -466,6 +491,17 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 0, paranoid_boolean.reload.paranoid_with_counter_caches_count
   end
 
+  def test_hard_destroy_decrement_custom_counters
+    paranoid_boolean = ParanoidBoolean.create!()
+    paranoid_with_custom_counter_cache = ParanoidWithCustomCounterCache.create!(paranoid_boolean: paranoid_boolean)
+
+    assert_equal 1, paranoid_boolean.custom_counter_cache
+
+    paranoid_with_custom_counter_cache.destroy_fully!
+
+    assert_equal 0, paranoid_boolean.reload.custom_counter_cache
+  end
+
   def test_increment_counters
     paranoid_boolean = ParanoidBoolean.create!()
     paranoid_with_counter_cache = ParanoidWithCounterCache.create!(paranoid_boolean: paranoid_boolean)
@@ -480,4 +516,23 @@ class ParanoidTest < ParanoidBaseTest
 
     assert_equal 1, paranoid_boolean.reload.paranoid_with_counter_caches_count
   end
+
+  def test_increment_custom_counters
+    paranoid_boolean = ParanoidBoolean.create!()
+    paranoid_with_custom_counter_cache = ParanoidWithCustomCounterCache.create!(paranoid_boolean: paranoid_boolean)
+
+    assert_equal 1, paranoid_boolean.custom_counter_cache
+
+    paranoid_with_custom_counter_cache.destroy
+
+    assert_equal 0, paranoid_boolean.reload.custom_counter_cache
+
+    paranoid_with_custom_counter_cache.recover
+
+    assert_equal 1, paranoid_boolean.reload.custom_counter_cache
+  end
+
+  def test_explicitly_setting_table_name_after_acts_as_paranoid_macro
+    assert_equal "explicit_table.deleted_at", ParanoidWithExplicitTableNameAfterMacro.paranoid_column_reference
+  end
 end

data/test/test_helper.rb

@@ -32,6 +32,7 @@ def setup_db
       t.boolean   :is_deleted
       t.integer   :paranoid_time_id
       t.integer   :paranoid_with_counter_caches_count
+      t.integer   :custom_counter_cache
       timestamps t
     end
 
@@ -260,6 +261,7 @@ class ParanoidBoolean < ActiveRecord::Base
   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
 end
 
 class ParanoidString < ActiveRecord::Base
@@ -287,6 +289,24 @@ class ParanoidWithCounterCache < ActiveRecord::Base
   belongs_to :paranoid_boolean, :counter_cache => true
 end
 
+class ParanoidWithCustomCounterCache < ActiveRecord::Base
+  self.table_name = "paranoid_with_counter_caches"
+
+  acts_as_paranoid
+  belongs_to :paranoid_boolean, counter_cache: :custom_counter_cache
+end
+
+class ParanoidWithCounterCacheOnOptionalBelognsTo < ActiveRecord::Base
+  self.table_name = "paranoid_with_counter_caches"
+
+  acts_as_paranoid
+  if ActiveRecord::VERSION::MAJOR < 5
+    belongs_to :paranoid_boolean, counter_cache: true, required: false
+  else
+    belongs_to :paranoid_boolean, counter_cache: true, optional: true
+  end
+end
+
 class ParanoidHasManyDependant < ActiveRecord::Base
   acts_as_paranoid
   belongs_to :paranoid_time
@@ -493,3 +513,7 @@ class ParanoidBooleanNotNullable < ActiveRecord::Base
   acts_as_paranoid column: 'deleted', column_type: 'boolean', allow_nulls: false
 end
 
+class ParanoidWithExplicitTableNameAfterMacro < ActiveRecord::Base
+  acts_as_paranoid
+  self.table_name = "explicit_table"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord