counter_culture 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7959919b657fa78f0411dfbab1d943126a56299845d675153cbc22b14dd379f
-  data.tar.gz: 478dd534275fa4b591c27dfee2430cd3ca0b51230ef1761ac65b29d9e457cb71
+  metadata.gz: 0beff678fd83c3d1dd16c6f9d2b3104bc5b7fd4e3f53fe916071df4c3a7fd0d5
+  data.tar.gz: df317d7031cc176137898bf0cc7fe9e8b74d469752b4497b404f9e799a5efae7
 SHA512:
-  metadata.gz: 82971d075ad62b51f70648e7fb00dc8b3be73bbe5243d7aea5bf341f0f4d9a33c2b34ec6e205c196069f6eb32d3e1dea85f9f7197278c9f769d426d095aa85dc
-  data.tar.gz: fec145c1cf38738c96c0a6e78bb67ca596813acb97fa16e7ee1e5265db3ddc567e6484ad812f35917f2d310e9a9f4a5bece98fd4f5fc4018e6e28d31a970ded7
+  metadata.gz: ae81d2fa63abcac9f46af293eb22be9b618345a3a9c8c4be337fab683f15506573c4b392d2c32258b58217684e5f7efad6c1562b484c23ae8fbd76b10282d2fc
+  data.tar.gz: 7e916af1fef3cdb9a445332e6f172d421d5a104a4e086c848375109fb3303e55916a02068f2501ae2feb3a657f3335561a5273b87b3ce159031c14ad34cd5d26

data/.travis.yml

@@ -32,6 +32,9 @@ matrix:
     env: 'RAILS_VERSION="~> 4.0.0"'
   - rvm: "2.5.1"
     env: 'RAILS_VERSION="~> 4.1.0"'
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 install:
   - bundle update
 script: TRAVIS=true bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.3 (January 19, 2019)
+
+Bugfixes:
+  - Don't update running total on soft-deleted records (#244)
+
 ## 2.1.2 (December 7, 2018)
 
 Bugfixes:

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.1.3

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.2 ruby lib
+# stub: counter_culture 2.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture".freeze
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   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-12-07"
+  s.date = "2019-01-19"
   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

@@ -20,15 +20,7 @@ module CounterCulture
           # initialize callbacks only once
           after_create :_update_counts_after_create
 
-          before_destroy :_update_counts_after_destroy, if: -> (model) do
-            if model.respond_to?(:paranoia_destroyed?)
-              !model.paranoia_destroyed?
-            elsif defined?(Discard::Model) && model.class.include?(Discard::Model)
-              !model.discarded?
-            else
-              true
-            end
-          end
+          before_destroy :_update_counts_after_destroy, unless: :destroyed_for_counter_culture?
 
           if respond_to?(:before_real_destroy) &&
               new.respond_to?(:paranoia_destroyed?)
@@ -36,7 +28,7 @@ module CounterCulture
               if: -> (model) { !model.paranoia_destroyed? }
           end
 
-          after_update :_update_counts_after_update
+          after_update :_update_counts_after_update, unless: :destroyed_for_counter_culture?
 
           if respond_to?(:before_restore)
             before_restore :_update_counts_after_create,
@@ -133,5 +125,16 @@ module CounterCulture
       end
     end
 
+    # check if record is soft-deleted
+    def destroyed_for_counter_culture?
+      if respond_to?(:paranoia_destroyed?)
+        paranoia_destroyed?
+      elsif defined?(Discard::Model) && self.class.include?(Discard::Model)
+        discarded?
+      else
+        false
+      end
+    end
+
   end
 end

data/spec/counter_culture_spec.rb

@@ -1813,6 +1813,39 @@ describe "CounterCulture" do
         expect(company.reload.soft_delete_discards_count).to eq(0)
       end
     end
+
+    describe "dynamic column names with totaling instead of counting" do
+      describe 'when updating discarded records' do
+        it 'does not update sum' do
+          skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+          company = Company.create!
+          sd = SoftDeleteDiscard.create!(company_id: company.id, value: 5)
+
+          expect(company.reload.soft_delete_discard_values_sum).to eq(5)
+
+          sd.discard
+          expect(company.reload.soft_delete_discard_values_sum).to eq(0)
+
+          sd.update value: 10
+          expect(company.reload.soft_delete_discard_values_sum).to eq(0)
+        end
+      end
+
+      describe 'when updating undiscarded records' do
+        it 'updates sum' do
+          skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+          company = Company.create!
+          sd = SoftDeleteDiscard.create!(company_id: company.id, value: 5)
+
+          expect(company.reload.soft_delete_discard_values_sum).to eq(5)
+
+          sd.update value: 10
+          expect(company.reload.soft_delete_discard_values_sum).to eq(10)
+        end
+      end
+    end
   end
 
   describe "when using paranoia for soft deletes" do
@@ -1898,6 +1931,39 @@ describe "CounterCulture" do
         expect(company.reload.soft_delete_paranoia_count).to eq(0)
       end
     end
+
+    describe "dynamic column names with totaling instead of counting" do
+      describe 'when updating soft deleted records' do
+        it 'does not update sum' do
+          skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+          company = Company.create!
+          sd = SoftDeleteParanoia.create!(company_id: company.id, value: 5)
+
+          expect(company.reload.soft_delete_paranoia_values_sum).to eq(5)
+
+          sd.destroy
+          expect(company.reload.soft_delete_paranoia_values_sum).to eq(0)
+
+          sd.update value: 10
+          expect(company.reload.soft_delete_paranoia_values_sum).to eq(0)
+        end
+      end
+
+      describe 'when updating undestroyed records' do
+        it 'updates sum' do
+          skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+          company = Company.create!
+          sd = SoftDeleteParanoia.create!(company_id: company.id, value: 5)
+
+          expect(company.reload.soft_delete_paranoia_values_sum).to eq(5)
+
+          sd.update value: 10
+          expect(company.reload.soft_delete_paranoia_values_sum).to eq(10)
+        end
+      end
+    end
   end
 
   describe "with polymorphic_associations" do

data/spec/models/soft_delete_discard.rb

@@ -3,4 +3,5 @@ class SoftDeleteDiscard < ActiveRecord::Base
 
   belongs_to :company
   counter_culture :company
+  counter_culture :company, column_name: 'soft_delete_discard_values_sum', delta_column: 'value'
 end

data/spec/models/soft_delete_paranoia.rb

@@ -3,4 +3,5 @@ class SoftDeleteParanoia < ActiveRecord::Base
 
   belongs_to :company
   counter_culture :company
+  counter_culture :company, column_name: 'soft_delete_paranoia_values_sum', delta_column: 'value'
 end

data/spec/schema.rb

@@ -25,7 +25,9 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "parent_id"
     t.integer  "children_count",      :default => 0, :null => false
     t.integer  "soft_delete_paranoia_count",  :default => 0, :null => false
+    t.integer  "soft_delete_paranoia_values_sum", :default => 0, :null => false
     t.integer  "soft_delete_discards_count",  :default => 0, :null => false
+    t.integer  "soft_delete_discard_values_sum", :default => 0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -179,11 +181,13 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
 
   create_table "soft_delete_paranoia", :force => true do |t|
     t.integer "company_id", :null => false
+    t.integer "value", :default => 0
     t.timestamp "deleted_at"
   end
 
   create_table "soft_delete_discards", :force => true do |t|
     t.integer "company_id", :null => false
+    t.integer "value", :default => 0
     t.timestamp "discarded_at"
   end
 

metadata

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