counter_culture 0.1.9 → 0.1.10

data/README.md

@@ -185,6 +185,10 @@ end
 
 Manually populating counter caches with dynamicall over-written foreign keys (```:foreign_key_values``` option) is not supported. You will have to write code to handle this case yourself.
 
+#### Polymorphic associations
+
+counter_culture currently does *not* support polymorphic associations. Check [this issue](https://github.com/bestvendor/counter_culture/issues/4) for progress and alternatives.
+
 ## Contributing to counter_culture
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/counter_culture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
-  s.date = "2013-01-08"
+  s.date = "2013-03-27"
   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."
   s.email = "magnus@vonkoeller.de"
   s.extra_rdoc_files = [

data/lib/counter_culture.rb

@@ -172,35 +172,55 @@ module CounterCulture
     end
 
     private
+    # need to make sure counter_culture is only activated once
+    # per commit; otherwise, if we do an update in an after_create,
+    # we would be triggered twice within the same transaction -- once
+    # for the create, once for the update
+    def _wrap_in_counter_culture_active(&block)
+      if @_counter_culture_active
+        # don't do anything; we are already active for this transaction
+      else
+        @_counter_culture_active = true
+        block.call
+        execute_after_commit { @_counter_culture_active = false}
+      end
+    end
+
     # called by after_create callback
     def _update_counts_after_create
-      self.class.after_commit_counter_cache.each do |hash|
-        # increment counter cache
-        change_counter_cache(hash.merge(:increment => true))
+      _wrap_in_counter_culture_active do
+        self.class.after_commit_counter_cache.each do |hash|
+          # increment counter cache
+          change_counter_cache(hash.merge(:increment => true))
+        end
       end
     end
 
     # called by after_destroy callback
     def _update_counts_after_destroy
-      self.class.after_commit_counter_cache.each do |hash|
-        # decrement counter cache
-        change_counter_cache(hash.merge(:increment => false))
+      _wrap_in_counter_culture_active do
+        self.class.after_commit_counter_cache.each do |hash|
+          # decrement counter cache
+          change_counter_cache(hash.merge(:increment => false))
+        end
       end
     end
 
     # called by after_update callback
     def _update_counts_after_update
-      self.class.after_commit_counter_cache.each do |hash|
-        # figure out whether the applicable counter cache changed (this can happen
-        # with dynamic column names)
-        counter_cache_name_was = counter_cache_name_for(previous_model, hash[:counter_cache_name])
-        counter_cache_name = counter_cache_name_for(self, hash[:counter_cache_name])
-
-        if send("#{first_level_relation_foreign_key(hash[:relation])}_changed?") || counter_cache_name != counter_cache_name_was
-          # increment the counter cache of the new value
-          change_counter_cache(hash.merge(:increment => true, :counter_column => counter_cache_name))
-          # decrement the counter cache of the old value
-          change_counter_cache(hash.merge(:increment => false, :was => true, :counter_column => counter_cache_name_was))
+      _wrap_in_counter_culture_active do
+        self.class.after_commit_counter_cache.each do |hash|
+          # figure out whether the applicable counter cache changed (this can happen
+          # with dynamic column names)
+          counter_cache_name_was = counter_cache_name_for(previous_model, hash[:counter_cache_name])
+          counter_cache_name = counter_cache_name_for(self, hash[:counter_cache_name])
+
+          if send("#{first_level_relation_foreign_key(hash[:relation])}_changed?") || counter_cache_name != counter_cache_name_was
+            # increment the counter cache of the new value
+            change_counter_cache(hash.merge(:increment => true, :counter_column => counter_cache_name))
+            # decrement the counter cache of the old value
+            change_counter_cache(hash.merge(:increment => false, :was => true, :counter_column => counter_cache_name_was))
+          end
         end
       end
     end

data/spec/counter_culture_spec.rb

@@ -81,7 +81,7 @@ describe "CounterCulture" do
 
   it "increments second-level counter cache on create" do
     company = Company.create
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     company.reviews_count.should == 0
@@ -101,7 +101,7 @@ describe "CounterCulture" do
 
   it "decrements second-level counter cache on destroy" do
     company = Company.create
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     company.reviews_count.should == 0
@@ -132,8 +132,8 @@ describe "CounterCulture" do
   it "updates second-level counter cache on update" do
     company1 = Company.create
     company2 = Company.create
-    user1 = User.create :company_id => company1.id
-    user2 = User.create :company_id => company2.id
+    user1 = User.create :manages_company_id => company1.id
+    user2 = User.create :manages_company_id => company2.id
     product = Product.create
 
     user1.reviews_count.should == 0
@@ -364,7 +364,7 @@ describe "CounterCulture" do
   it "increments third-level counter cache on create" do
     industry = Industry.create
     company = Company.create :industry_id => industry.id
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     industry.reviews_count.should == 0
@@ -388,7 +388,7 @@ describe "CounterCulture" do
   it "decrements third-level counter cache on destroy" do
     industry = Industry.create
     company = Company.create :industry_id => industry.id
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     industry.reviews_count.should == 0
@@ -426,8 +426,8 @@ describe "CounterCulture" do
     industry2 = Industry.create
     company1 = Company.create :industry_id => industry1.id
     company2 = Company.create :industry_id => industry2.id
-    user1 = User.create :company_id => company1.id
-    user2 = User.create :company_id => company2.id
+    user1 = User.create :manages_company_id => company1.id
+    user2 = User.create :manages_company_id => company2.id
     product = Product.create
 
     industry1.reviews_count.should == 0
@@ -474,7 +474,7 @@ describe "CounterCulture" do
   it "increments third-level custom counter cache on create" do
     industry = Industry.create
     company = Company.create :industry_id => industry.id
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     industry.rexiews_count.should == 0
@@ -489,7 +489,7 @@ describe "CounterCulture" do
   it "decrements third-level custom counter cache on destroy" do
     industry = Industry.create
     company = Company.create :industry_id => industry.id
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     industry.rexiews_count.should == 0
@@ -510,8 +510,8 @@ describe "CounterCulture" do
     industry2 = Industry.create
     company1 = Company.create :industry_id => industry1.id
     company2 = Company.create :industry_id => industry2.id
-    user1 = User.create :company_id => company1.id
-    user2 = User.create :company_id => company2.id
+    user1 = User.create :manages_company_id => company1.id
+    user2 = User.create :manages_company_id => company2.id
     product = Product.create
 
     industry1.rexiews_count.should == 0
@@ -594,7 +594,7 @@ describe "CounterCulture" do
   it "increments third-level dynamic counter cache on create" do
     industry = Industry.create
     company = Company.create :industry_id => industry.id
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     industry.using_count.should == 0
@@ -618,7 +618,7 @@ describe "CounterCulture" do
   it "decrements third-level custom counter cache on destroy" do
     industry = Industry.create
     company = Company.create :industry_id => industry.id
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     industry.using_count.should == 0
@@ -658,8 +658,8 @@ describe "CounterCulture" do
     industry2 = Industry.create
     company1 = Company.create :industry_id => industry1.id
     company2 = Company.create :industry_id => industry2.id
-    user1 = User.create :company_id => company1.id
-    user2 = User.create :company_id => company2.id
+    user1 = User.create :manages_company_id => company1.id
+    user2 = User.create :manages_company_id => company2.id
     product = Product.create
 
     industry1.using_count.should == 0
@@ -774,7 +774,7 @@ describe "CounterCulture" do
 
   it "should fix a second-level counter cache correctly" do
     company = Company.create
-    user = User.create :company_id => company.id
+    user = User.create :manages_company_id => company.id
     product = Product.create
 
     company.reviews_count.should == 0
@@ -888,18 +888,18 @@ describe "CounterCulture" do
   end
   
   describe "#previous_model" do
-    let(:user){User.create :name => "John Smith", :company_id => 1}
+    let(:user){User.create :name => "John Smith", :manages_company_id => 1}
     
     it "should return a copy of the original model" do
       user.name = "Joe Smith"
-      user.company_id = 2
+      user.manages_company_id = 2
       prev = user.send(:previous_model)
       
       prev.name.should == "John Smith"
-      prev.company_id.should == 1
+      prev.manages_company_id.should == 1
       
       user.name.should =="Joe Smith"
-      user.company_id.should == 2
+      user.manages_company_id.should == 2
     end
   end
 

data/spec/models/review.rb

@@ -6,8 +6,14 @@ class Review < ActiveRecord::Base
   counter_culture :product, :column_name => 'rexiews_count'
   counter_culture :user
   counter_culture :user, :column_name => Proc.new { |model| model.review_type ? "#{model.review_type}_count" : nil }, :column_names => {"reviews.review_type = 'using'" => 'using_count', "reviews.review_type = 'tried'" => 'tried_count'}
-  counter_culture [:user, :company]
-  counter_culture [:user, :company, :industry]
-  counter_culture [:user, :company, :industry], :column_name => 'rexiews_count'
-  counter_culture [:user, :company, :industry], :column_name => Proc.new { |model| model.review_type ? "#{model.review_type}_count" : nil }
+  counter_culture [:user, :manages_company]
+  counter_culture [:user, :manages_company, :industry]
+  counter_culture [:user, :manages_company, :industry], :column_name => 'rexiews_count'
+  counter_culture [:user, :manages_company, :industry], :column_name => Proc.new { |model| model.review_type ? "#{model.review_type}_count" : nil }
+
+  after_create :update_some_text
+
+  def update_some_text
+    update_attribute(:some_text, rand(36**12).to_s(36))
+  end
 end

data/spec/schema.rb

@@ -39,6 +39,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
 
   create_table "reviews", :force => true do |t|
     t.string   "review_type",                :default => "using"
+    t.string   "some_text"
     t.integer  "user_id"
     t.integer  "product_id"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1797196708173178324
+      hash: 2320652416701814661
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: