counter_culture 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/counter_culture.gemspec

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

data/lib/counter_culture.rb

@@ -212,20 +212,21 @@ module CounterCulture
       id_to_change = foreign_key_value(hash[:relation], was)
       # allow overwriting of foreign key value by the caller
       id_to_change = hash[:foreign_key_values].call(id_to_change) if hash[:foreign_key_values]
-      if id_to_change
+
+      # figure out what the column name is
+      if hash[:counter_cache_name].is_a? Proc
+        # dynamic column name -- call the Proc
+        counter_cache_name = hash[:counter_cache_name].call(self) 
+      else
+        # static column name
+        counter_cache_name = hash[:counter_cache_name]
+      end
+
+      if id_to_change && counter_cache_name
         execute_after_commit do
           # increment or decrement?
           method = increment ? :increment_counter : :decrement_counter
 
-          # figure out what the column name is
-          if hash[:counter_cache_name].is_a? Proc
-            # dynamic column name -- call the Proc
-            counter_cache_name = hash[:counter_cache_name].call(self) 
-          else
-            # static column name
-            counter_cache_name = hash[:counter_cache_name]
-          end
-
           # do it!
           relation_klass(hash[:relation]).send(method, counter_cache_name, id_to_change)
         end

data/spec/counter_culture_spec.rb

@@ -230,6 +230,75 @@ describe "CounterCulture" do
     product2.rexiews_count.should == 1
   end
 
+  it "handles nil column name in custom counter cache on create" do
+    user = User.create
+    product = Product.create
+
+    user.using_count.should == 0
+    user.tried_count.should == 0
+
+    review = Review.create :user_id => user.id, :product_id => product.id, :review_type => nil
+    
+    user.reload
+
+    user.using_count.should == 0
+    user.tried_count.should == 0
+  end
+
+  it "handles nil column name in custom counter cache on destroy" do
+    user = User.create
+    product = Product.create
+
+    user.using_count.should == 0
+    user.tried_count.should == 0
+
+    review = Review.create :user_id => user.id, :product_id => product.id, :review_type => nil
+    
+    product.reload
+
+    user.using_count.should == 0
+    user.tried_count.should == 0
+
+    review.destroy
+
+    product.reload
+
+    user.using_count.should == 0
+    user.tried_count.should == 0
+  end
+
+  it "handles nil column name in custom counter cache on update" do
+    product = Product.create
+    user1 = User.create
+    user2 = User.create
+
+    user1.using_count.should == 0
+    user1.tried_count.should == 0
+    user2.using_count.should == 0
+    user2.tried_count.should == 0
+
+    review = Review.create :user_id => user1.id, :product_id => product.id, :review_type => nil
+    
+    user1.reload
+    user2.reload
+
+    user1.using_count.should == 0
+    user1.tried_count.should == 0
+    user2.using_count.should == 0
+    user2.tried_count.should == 0
+
+    review.user = user2
+    review.save!
+
+    user1.reload
+    user2.reload
+
+    user1.using_count.should == 0
+    user1.tried_count.should == 0
+    user2.using_count.should == 0
+    user2.tried_count.should == 0
+  end
+
   it "increments third-level counter cache on create" do
     industry = Industry.create
     company = Company.create :industry_id => industry.id

data/spec/models/review.rb

@@ -5,7 +5,7 @@ class Review < ActiveRecord::Base
   counter_culture :product
   counter_culture :product, :column_name => 'rexiews_count'
   counter_culture :user
-  counter_culture :user, :column_name => Proc.new { |model| "#{model.review_type}_count" }, :column_names => {"reviews.review_type = 'using'" => 'using_count', "reviews.review_type = 'tried'" => 'tried_count'}
+  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'

data/spec/schema.rb

@@ -37,7 +37,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
   end
 
   create_table "reviews", :force => true do |t|
-    t.string   "review_type",                :default => "using", :null => false
+    t.string   "review_type",                :default => "using"
     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.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1900291701591297555
+      hash: -2752242088378468016
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: