counter_culture 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750074b917f0a0e9b7191aa948120ef09a1bc1496a949733aaf16d410656484d
-  data.tar.gz: 7d272b1c474a7a4201d1169e6116ad2b6946dcaba07abad814024a164d87e96c
+  metadata.gz: c7959919b657fa78f0411dfbab1d943126a56299845d675153cbc22b14dd379f
+  data.tar.gz: 478dd534275fa4b591c27dfee2430cd3ca0b51230ef1761ac65b29d9e457cb71
 SHA512:
-  metadata.gz: 0f65dbd3b05fd218642e18a229afcd1dfb4db538d896d9b866bfc083dceb5585d1bfcb9333738d9e854a1c9c4275445391962f891f642e0ed4d21a2091d65e90
-  data.tar.gz: af264d88858d62892cf4c601c1367cb57da56c82accbe51297398f296cd9c286c60f2861279df1cb32c569cbe46494033e320da21b3ae484c2468e00dd7a929b
+  metadata.gz: 82971d075ad62b51f70648e7fb00dc8b3be73bbe5243d7aea5bf341f0f4d9a33c2b34ec6e205c196069f6eb32d3e1dea85f9f7197278c9f769d426d095aa85dc
+  data.tar.gz: fec145c1cf38738c96c0a6e78bb67ca596813acb97fa16e7ee1e5265db3ddc567e6484ad812f35917f2d310e9a9f4a5bece98fd4f5fc4018e6e28d31a970ded7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.2 (December 7, 2018)
+
+Bugfixes:
+  - Properly handle `destroy` and `really_destroy` when using Paranoia (#239)
+
 ## 2.1.1 (November 7, 2018)
 
 Bugfixes:

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/counter_culture.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 2.1.1 ruby lib
+# stub: counter_culture 2.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture".freeze
-  s.version = "2.1.1"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Magnus von Koeller".freeze]
-  s.date = "2018-11-07"
+  s.date = "2018-12-07"
   s.description = "counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback.".freeze
   s.email = "magnus@vonkoeller.de".freeze
   s.extra_rdoc_files = [

data/lib/counter_culture/extensions.rb

@@ -30,6 +30,12 @@ module CounterCulture
             end
           end
 
+          if respond_to?(:before_real_destroy) &&
+              new.respond_to?(:paranoia_destroyed?)
+            before_real_destroy :_update_counts_after_destroy,
+              if: -> (model) { !model.paranoia_destroyed? }
+          end
+
           after_update :_update_counts_after_update
 
           if respond_to?(:before_restore)

data/spec/counter_culture_spec.rb

@@ -1869,6 +1869,35 @@ describe "CounterCulture" do
       sd.restore
       expect(company.reload.soft_delete_paranoia_count).to eq(1)
     end
+
+    describe "when calling paranoia really destroy" do
+      it "does not run destroy callback for paranoia destroyed records" do
+        skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+        company = Company.create!
+        sd = SoftDeleteParanoia.create!(company_id: company.id)
+
+        expect(company.reload.soft_delete_paranoia_count).to eq(1)
+
+        sd.destroy
+        expect(company.reload.soft_delete_paranoia_count).to eq(0)
+
+        sd.really_destroy!
+        expect(company.reload.soft_delete_paranoia_count).to eq(0)
+      end
+
+      it "runs really destroy callback for paranoia undestroyed records" do
+        skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+        company = Company.create!
+        expect(company.soft_delete_paranoia_count).to eq(0)
+        sd = SoftDeleteParanoia.create!(company_id: company.id)
+        expect(company.reload.soft_delete_paranoia_count).to eq(1)
+
+        sd.really_destroy!
+        expect{ sd.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        expect(company.reload.soft_delete_paranoia_count).to eq(0)
+      end
+    end
   end
 
   describe "with polymorphic_associations" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action