counter_culture 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffba219862c747eb8b00e3b89d29f6306e32c2c2
-  data.tar.gz: 80783eda6b30c56e2d5b203c9ffcd2e92a44056c
+  metadata.gz: 40d222184acc3b81f1abf7dfd2dbede253eacb7a
+  data.tar.gz: bdf081ac5294d1a5a8b693c3639ccf82b0642e0b
 SHA512:
-  metadata.gz: 89b88c26c5646a04a828d59eefdd872c6da43e54242e6db119303809331f8a04095c99c699a3636056277e725b9f83c7f55a1d32c93358e5bc92bd8908e8e0cb
-  data.tar.gz: 1bdba2475e7d09b878b89d5fae4de51f7116aa1326d3ea7eaa3fc3fc9a399683f606b5adf5998ac8f0da7fcc9ae2310299300482d9145c5d2b8cb2cb0349a0e0
+  metadata.gz: e81781257cff2487c108d441dfe92ea65bd5f8b42a90c61752d68fe7233d8aa30ebc90c8625c487626b7e461edfb36eaadde30aa539760dcb277a1a2fdd4f0bb
+  data.tar.gz: f0c9a1687eff220ccd4d703e901e49f7ad0193207f5fbdcb3a00b5dbb6aea8fd6e288c1f77ad037c9125bee0ce07873ca8f0fb2c5ecddfdc40fc2698532d9d04

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.0 (April 24, 2017)
+
+Improvements:
+  - Keeps counts updated correctly when using the paranoia gem and restoring soft-deleted records
+
 ## 1.5.1 (April 17, 2017)
 
 Bugfixes:

data/Gemfile

@@ -25,6 +25,9 @@ group :development, :test do
   gem "rspec", "~> 3.0"
   gem "awesome_print"
   gem "timecop"
+
+  # to test the integration
+  gem "paranoia"
 end
 
 group :development do

data/README.md

@@ -293,6 +293,22 @@ end
 
 Manually populating counter caches with dynamically over-written foreign keys (```:foreign_key_values``` option) is not supported. You will have to write code to handle this case yourself.
 
+### Soft-deletes / `paranoia` gem
+
+This gem will keep counters correctly updated when using the `paranoia` gem for
+soft-delete support. However, to ensure that counts are incremented after a
+restore you have to make sure that the call to `acts_as_paranoid` comes before
+the call to `counter_culture` in your model:
+
+```ruby
+class SoftDelete < ActiveRecord::Base
+  acts_as_paranoid
+
+  belongs_to :company
+  counter_culture :company
+end
+```
+
 #### Polymorphic associations
 
 counter_culture now supports polymorphic associations of one level only.

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0

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 1.5.1 ruby lib
+# stub: counter_culture 1.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture".freeze
-  s.version = "1.5.1"
+  s.version = "1.6.0"
 
   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 = "2017-04-17"
+  s.date = "2017-04-24"
   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 = [
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
     "spec/models/simple_dependent.rb",
     "spec/models/simple_main.rb",
     "spec/models/simple_review.rb",
+    "spec/models/soft_delete.rb",
     "spec/models/subcateg.rb",
     "spec/models/transaction.rb",
     "spec/models/twitter_review.rb",
@@ -131,6 +132,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
       s.add_development_dependency(%q<awesome_print>.freeze, [">= 0"])
       s.add_development_dependency(%q<timecop>.freeze, [">= 0"])
+      s.add_development_dependency(%q<paranoia>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 1.2.0"])
       s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1"])
@@ -143,6 +145,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
       s.add_dependency(%q<awesome_print>.freeze, [">= 0"])
       s.add_dependency(%q<timecop>.freeze, [">= 0"])
+      s.add_dependency(%q<paranoia>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
       s.add_dependency(%q<bundler>.freeze, [">= 1.2.0"])
       s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
@@ -156,6 +159,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
     s.add_dependency(%q<awesome_print>.freeze, [">= 0"])
     s.add_dependency(%q<timecop>.freeze, [">= 0"])
+    s.add_dependency(%q<paranoia>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_dependency(%q<bundler>.freeze, [">= 1.2.0"])
     s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])

data/lib/counter_culture/extensions.rb

@@ -21,6 +21,9 @@ module CounterCulture
           after_create :_update_counts_after_create
           after_destroy :_update_counts_after_destroy
           after_update :_update_counts_after_update
+          if respond_to?(:after_restore)
+            after_restore :_update_counts_after_create
+          end
 
           # we keep a list of all counter caches we must maintain
           @after_commit_counter_cache = []

data/lib/counter_culture/reconciler.rb

@@ -52,7 +52,6 @@ module CounterCulture
       counter.relation_klass(counter.relation)
     end
 
-
     class Reconciliation
       attr_reader :counter, :options, :relation_class
 
@@ -72,9 +71,6 @@ module CounterCulture
 
         scope = relation_class
 
-        # respect the deleted_at column if it exists
-        scope = scope.where("#{model.table_name}.deleted_at IS NULL") if model.column_names.include?('deleted_at')
-
         counter_column_names = column_names || {nil => counter_cache_name}
 
         # iterate over all the possible counter cache column names
@@ -91,8 +87,14 @@ module CounterCulture
           # we need to join together tables until we get back to the table this class itself lives in
           # conditions must also be applied to the join on which we are counting
           join_clauses.each_with_index do |join, index|
-            if index == join_clauses.size - 1 && where
-              join += " AND (#{model.send(:sanitize_sql_for_conditions, where)})"
+            if index == join_clauses.size - 1
+              if where
+                join += " AND (#{model.send(:sanitize_sql_for_conditions, where)})"
+              end
+              # respect the deleted_at column if it exists
+              if model.column_names.include?('deleted_at')
+                join += " AND #{model.table_name}.deleted_at IS NULL"
+              end
             end
             counts_query = counts_query.joins(join)
           end

data/spec/counter_culture_spec.rb

@@ -21,6 +21,7 @@ require 'models/another_post'
 require 'models/another_post_comment'
 require 'models/person'
 require 'models/transaction'
+require 'models/soft_delete'
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :deletion
@@ -1586,6 +1587,28 @@ describe "CounterCulture" do
     end
   end
 
+  describe "when using acts_as_paranoia" do
+    it "works" do
+      company = Company.create!
+      expect(company.soft_deletes_count).to eq(0)
+      sd = SoftDelete.create!(company_id: company.id)
+      expect(company.reload.soft_deletes_count).to eq(1)
+
+      sd.destroy
+      sd.reload
+      expect(sd.deleted_at).to be_truthy
+      expect(company.reload.soft_deletes_count).to eq(0)
+
+      company.update_attributes(soft_deletes_count: 100)
+      expect(company.reload.soft_deletes_count).to eq(100)
+      SoftDelete.counter_culture_fix_counts
+      expect(company.reload.soft_deletes_count).to eq(0)
+
+      sd.restore
+      expect(company.reload.soft_deletes_count).to eq(1)
+    end
+  end
+
   describe "with polymorphic_associations" do
     before(:all) do
       require 'models/poly_image'

data/spec/models/soft_delete.rb

@@ -0,0 +1,6 @@
+class SoftDelete < ActiveRecord::Base
+  acts_as_paranoid
+
+  belongs_to :company
+  counter_culture :company
+end

data/spec/schema.rb

@@ -24,6 +24,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "review_approvals_count",      :default => 0, :null => false
     t.integer  "parent_id"
     t.integer  "children_count",      :default => 0, :null => false
+    t.integer  "soft_deletes_count",  :default => 0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -175,18 +176,25 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer "monetary_value", :null => false
   end
 
+  create_table "soft_deletes", :force => true do |t|
+    t.integer "company_id", :null => false
+    t.timestamp "deleted_at"
+  end
+
   #polymorphic
   create_table "poly_images", :force => true do |t|
     t.integer "imageable_id", :null => true
     t.string "imageable_type", :null => true
     t.string "url"
   end
+
   create_table "poly_employees", :force => true do |t|
     t.string "name"
     t.integer  "poly_images_count", :default => 0, :null => false
     t.integer  "poly_images_count_dup", :default => 0, :null => false
     t.integer  "special_poly_images_count", :default => 0, :null => false
   end
+
   create_table "poly_products", :primary_key => 'pp_pk_id', :force => true do |t|
     t.string "brand_name"
     t.integer  "poly_images_count", :default => 0, :null => false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: paranoia
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +228,7 @@ files:
 - spec/models/simple_dependent.rb
 - spec/models/simple_main.rb
 - spec/models/simple_review.rb
+- spec/models/soft_delete.rb
 - spec/models/subcateg.rb
 - spec/models/transaction.rb
 - spec/models/twitter_review.rb