counter_culture 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49818f60f158767b321543319b23233b8cd9de64
-  data.tar.gz: fa82dfc09339559393f83f7a426899bc92651083
+  metadata.gz: 6e9a0ab9e01e7417d2c32fb3b6d142018f2616be
+  data.tar.gz: 5ca2eb2a8cd0ccd2f7af333fae3685cbb9f7606c
 SHA512:
-  metadata.gz: ca9a78a08b38cb57ebc8a87f7e726546ceb569d0ed788fe9fef44ec1f5741d02636d632b2eb7f9e87b36eed0b70a0e6ba94d20d5b71dd4ea2b33b78c18030e8a
-  data.tar.gz: e6caf2341d843e143f2143853753ff6733ad493fc81cf461a14212893e5739eb9627a981b922cad28b38851ee11d4d2ca08e2e67a63ac7d5036d25a1f7c6c1c9
+  metadata.gz: 1a301eed807af138528e03fc33edb9c0e8317874d31584bee4a43166f965b1ea91b4cdf9c7edd75a92d0d294919e60c6f568554ee441d24631ab4ba0914e6ec0
+  data.tar.gz: 1ed11abdefe33c23b3af92212a7df337390e6ef412394dbfeb8e8db86ea314c756c20232ef34b21b167c7df3200d4a15c29247cbb63da89b633d224234bc0d43

data/.document

@@ -1,5 +1,5 @@
 lib/**/*.rb
 bin/*
-- 
+-
 features/**/*.feature
 LICENSE.txt

data/README.md

@@ -1,4 +1,4 @@
-# counter_culture [![Build Status](https://travis-ci.org/magnusvk/counter_culture.png)](https://travis-ci.org/magnusvk/counter_culture)
+# counter_culture [![Build Status](https://travis-ci.org/magnusvk/counter_culture.svg)](https://travis-ci.org/magnusvk/counter_culture)
 
 Turbo-charged counter caches for your Rails app. Huge improvements over the Rails standard counter caches:
 
@@ -13,7 +13,7 @@ Turbo-charged counter caches for your Rails app. Huge improvements over the Rail
 Add counter_culture to your Gemfile:
 
 ```ruby
-gem 'counter_culture', '~> 0.1.18'
+gem 'counter_culture', '~> 0.1.23'
 ```
 
 Then run ```bundle update ```

data/VERSION

@@ -1 +1 @@
-0.1.23
+0.1.24

data/counter_culture.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 0.1.23 ruby lib
+# stub: counter_culture 0.1.24 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.23"
+  s.version = "0.1.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
-  s.date = "2014-05-24"
+  s.date = "2014-06-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 = [
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "spec/models/conditional_main.rb",
     "spec/models/has_string_id.rb",
     "spec/models/industry.rb",
+    "spec/models/post.rb",
     "spec/models/product.rb",
     "spec/models/review.rb",
     "spec/models/simple_dependent.rb",

data/lib/counter_culture.rb

@@ -182,7 +182,7 @@ module CounterCulture
       def relation_foreign_key(relation)
         relation_reflect(relation).foreign_key
       end
-      
+
       # gets the foreign key name of the relation. will look at the first
       # level only -- i.e., if passed an array will consider only its
       # first element
@@ -193,7 +193,7 @@ module CounterCulture
         relation = relation.first if relation.is_a?(Enumerable)
         relation_reflect(relation).foreign_key
       end
-        
+
     end
 
     private
@@ -257,7 +257,7 @@ module CounterCulture
     #
     # options:
     #   :increment => true to increment, false to decrement
-    #   :relation => which relation to increment the count on, 
+    #   :relation => which relation to increment the count on,
     #   :counter_cache_name => the column name of the counter cache
     #   :counter_column => overrides :counter_cache_name
     #   :delta_column => override the default count delta (1) with the value of this column in the counted record
@@ -265,7 +265,7 @@ module CounterCulture
     #      first part of the relation
     def change_counter_cache(options)
       options[:counter_column] = counter_cache_name_for(self, options[:counter_cache_name]) unless options.has_key?(:counter_column)
-      
+
       # default to the current foreign key value
       id_to_change = foreign_key_value(options[:relation], options[:was])
       # allow overwriting of foreign key value by the caller
@@ -296,20 +296,21 @@ module CounterCulture
             end
           end
 
-          relation_klass(options[:relation]).where(self.class.primary_key => id_to_change).update_all updates.join(', ')
+          klass = relation_klass(options[:relation])
+          klass.where(klass.primary_key => id_to_change).update_all updates.join(', ')
         end
       end
     end
 
     # Gets the name of the counter cache for a specific object
-    # 
+    #
     # obj: object to calculate the counter cache name for
     # cache_name_finder: object used to calculate the cache name
     def counter_cache_name_for(obj, cache_name_finder)
       # figure out what the column name is
       if cache_name_finder.is_a? Proc
         # dynamic column name -- call the Proc
-        cache_name_finder.call(obj) 
+        cache_name_finder.call(obj)
       else
         # static column name
         cache_name_finder
@@ -319,11 +320,11 @@ module CounterCulture
     # Creates a copy of the current model with changes rolled back
     def previous_model
       prev = self.dup
-      
+
       self.changed_attributes.each_pair do |key, value|
         prev.send("#{key}=".to_sym, value)
       end
-      
+
       prev
     end
 
@@ -356,7 +357,7 @@ module CounterCulture
     def relation_reflect(relation)
       self.class.send :relation_reflect, relation
     end
-    
+
     def relation_foreign_key(relation)
       self.class.send :relation_foreign_key, relation
     end

data/lib/generators/counter_culture_generator.rb

@@ -4,7 +4,7 @@ class CounterCultureGenerator < ActiveRecord::Generators::Base
 
   desc "Create a migration that adds counter-cache columns to a model"
 
-  argument :counter_cache_columns, :required => true, :type => :array, 
+  argument :counter_cache_columns, :required => true, :type => :array,
     :desc => "The names of the counter cache columns to add",
     :banner => "counter_cache_one counter_cache_two counter_cache_three ..."
 

data/spec/counter_culture_spec.rb

@@ -12,6 +12,7 @@ require 'models/simple_main'
 require 'models/simple_dependent'
 require 'models/conditional_main'
 require 'models/conditional_dependent'
+require 'models/post'
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :deletion
@@ -30,7 +31,7 @@ describe "CounterCulture" do
     user.review_approvals_count.should == 0
 
     user.reviews.create :user_id => user.id, :product_id => product.id, :approvals => 13
-    
+
     user.reload
     product.reload
 
@@ -48,7 +49,7 @@ describe "CounterCulture" do
     user.review_approvals_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 69
-    
+
     user.reload
     product.reload
 
@@ -78,7 +79,7 @@ describe "CounterCulture" do
     user2.review_approvals_count.should == 0
 
     review = Review.create :user_id => user1.id, :product_id => product.id, :approvals => 42
-    
+
     user1.reload
     user2.reload
     product.reload
@@ -135,7 +136,7 @@ describe "CounterCulture" do
     company.review_approvals_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 314
-    
+
     company.reload
     user.reload
     product.reload
@@ -157,7 +158,7 @@ describe "CounterCulture" do
     company.review_approvals_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 314
-    
+
     user.reload
     product.reload
     company.reload
@@ -195,7 +196,7 @@ describe "CounterCulture" do
     company2.review_approvals_count.should == 0
 
     review = Review.create :user_id => user1.id, :product_id => product.id, :approvals => 69
-    
+
     user1.reload
     user2.reload
     company1.reload
@@ -238,7 +239,7 @@ describe "CounterCulture" do
     product.rexiews_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id
-    
+
     product.reload
 
     product.rexiews_count.should == 1
@@ -251,7 +252,7 @@ describe "CounterCulture" do
     product.rexiews_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id
-    
+
     product.reload
 
     product.rexiews_count.should == 1
@@ -272,7 +273,7 @@ describe "CounterCulture" do
     product2.rexiews_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product1.id
-    
+
     product1.reload
     product2.reload
 
@@ -297,7 +298,7 @@ describe "CounterCulture" do
     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
@@ -312,7 +313,7 @@ describe "CounterCulture" do
     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
@@ -337,7 +338,7 @@ describe "CounterCulture" do
     user2.tried_count.should == 0
 
     review = Review.create :user_id => user1.id, :product_id => product.id, :review_type => nil
-    
+
     user1.reload
     user2.reload
 
@@ -357,64 +358,64 @@ describe "CounterCulture" do
     user2.using_count.should == 0
     user2.tried_count.should == 0
   end
-  
+
   describe "conditional counts on update" do
     let(:product) {Product.create!}
     let(:user) {User.create!}
-    
+
     it "should increment and decrement if changing column name" do
       user.using_count.should == 0
       user.tried_count.should == 0
-      
+
       review = Review.create :user_id => user.id, :product_id => product.id, :review_type => "using"
       user.reload
-      
+
       user.using_count.should == 1
       user.tried_count.should == 0
-      
+
       review.review_type = "tried"
       review.save!
-      
+
       user.reload
-      
+
       user.using_count.should == 0
       user.tried_count.should == 1
     end
-    
+
     it "should increment if changing from a nil column name" do
       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
-      
+
       review.review_type = "tried"
       review.save!
-      
+
       user.reload
-      
+
       user.using_count.should == 0
       user.tried_count.should == 1
     end
-    
+
     it "should decrement if changing column name to nil" do
       user.using_count.should == 0
       user.tried_count.should == 0
-      
+
       review = Review.create :user_id => user.id, :product_id => product.id, :review_type => "using"
       user.reload
-      
+
       user.using_count.should == 1
       user.tried_count.should == 0
-      
+
       review.review_type = nil
       review.save!
-      
+
       user.reload
-      
+
       user.using_count.should == 0
       user.tried_count.should == 0
     end
@@ -433,7 +434,7 @@ describe "CounterCulture" do
     product.reviews_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 42
-    
+
     industry.reload
     company.reload
     user.reload
@@ -459,7 +460,7 @@ describe "CounterCulture" do
     product.reviews_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 42
-    
+
     industry.reload
     company.reload
     user.reload
@@ -504,7 +505,7 @@ describe "CounterCulture" do
     industry2.review_approvals_count.should == 0
 
     review = Review.create :user_id => user1.id, :product_id => product.id, :approvals => 42
-    
+
     industry1.reload
     industry2.reload
     company1.reload
@@ -553,7 +554,7 @@ describe "CounterCulture" do
     industry.rexiews_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id
-    
+
     industry.reload
 
     industry.rexiews_count.should == 1
@@ -568,7 +569,7 @@ describe "CounterCulture" do
     industry.rexiews_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id
-    
+
     industry.reload
     industry.rexiews_count.should == 1
 
@@ -591,7 +592,7 @@ describe "CounterCulture" do
     industry2.rexiews_count.should == 0
 
     review = Review.create :user_id => user1.id, :product_id => product.id
-    
+
     industry1.reload
     industry1.rexiews_count.should == 1
     industry2.reload
@@ -609,7 +610,7 @@ describe "CounterCulture" do
   it "increments dynamic counter cache on create" do
     user = User.create
     product = Product.create
-    
+
     user.using_count.should == 0
     user.tried_count.should == 0
 
@@ -631,7 +632,7 @@ describe "CounterCulture" do
   it "decrements dynamic counter cache on destroy" do
     user = User.create
     product = Product.create
-    
+
     user.using_count.should == 0
     user.tried_count.should == 0
 
@@ -674,14 +675,14 @@ describe "CounterCulture" do
     industry.tried_count.should == 0
 
     review_using = Review.create :user_id => user.id, :product_id => product.id, :review_type => 'using'
-    
+
     industry.reload
 
     industry.using_count.should == 1
     industry.tried_count.should == 0
 
     review_tried = Review.create :user_id => user.id, :product_id => product.id, :review_type => 'tried'
-    
+
     industry.reload
 
     industry.using_count.should == 1
@@ -698,14 +699,14 @@ describe "CounterCulture" do
     industry.tried_count.should == 0
 
     review_using = Review.create :user_id => user.id, :product_id => product.id, :review_type => 'using'
-    
+
     industry.reload
 
     industry.using_count.should == 1
     industry.tried_count.should == 0
 
     review_tried = Review.create :user_id => user.id, :product_id => product.id, :review_type => 'tried'
-    
+
     industry.reload
 
     industry.using_count.should == 1
@@ -741,7 +742,7 @@ describe "CounterCulture" do
     industry2.tried_count.should == 0
 
     review_using = Review.create :user_id => user1.id, :product_id => product.id, :review_type => 'using'
-    
+
     industry1.reload
     industry2.reload
 
@@ -751,7 +752,7 @@ describe "CounterCulture" do
     industry2.tried_count.should == 0
 
     review_tried = Review.create :user_id => user1.id, :product_id => product.id, :review_type => 'tried'
-    
+
     industry1.reload
     industry2.reload
 
@@ -786,7 +787,7 @@ describe "CounterCulture" do
   it "should overwrite foreign-key values on create" do
     3.times { Category.create }
     Category.all {|category| category.products_count.should == 0 }
-    
+
     product = Product.create :category_id => Category.first.id
     Category.all {|category| category.products_count.should == 1 }
   end
@@ -794,7 +795,7 @@ describe "CounterCulture" do
   it "should overwrite foreign-key values on destroy" do
     3.times { Category.create }
     Category.all {|category| category.products_count.should == 0 }
-    
+
     product = Product.create :category_id => Category.first.id
     Category.all {|category| category.products_count.should == 1 }
 
@@ -805,7 +806,7 @@ describe "CounterCulture" do
   it "should overwrite foreign-key values on destroy" do
     3.times { Category.create }
     Category.all {|category| category.products_count.should == 0 }
-    
+
     product = Product.create :category_id => Category.first.id
     Category.all {|category| category.products_count.should == 1 }
 
@@ -824,7 +825,7 @@ describe "CounterCulture" do
     user.review_approvals_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 69
-    
+
     user.reload
     product.reload
 
@@ -873,7 +874,7 @@ describe "CounterCulture" do
     product = Product.create
 
     product.twitter_reviews_count.should == 0
-    
+
     review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 42
     twitter_review = TwitterReview.create :user_id => user.id, :product_id => product.id, :approvals => 32
 
@@ -904,7 +905,7 @@ describe "CounterCulture" do
     company.review_approvals_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 42
-    
+
     company.reload
     user.reload
     product.reload
@@ -940,7 +941,7 @@ describe "CounterCulture" do
     product.rexiews_count.should == 0
 
     review = Review.create :user_id => user.id, :product_id => product.id
-    
+
     product.reload
 
     product.rexiews_count.should == 1
@@ -957,7 +958,7 @@ describe "CounterCulture" do
   it "should fix a dynamic counter cache correctly" do
     user = User.create
     product = Product.create
-    
+
     user.using_count.should == 0
     user.tried_count.should == 0
 
@@ -1007,7 +1008,7 @@ describe "CounterCulture" do
     string_id.users_count.should == 123
 
     User.counter_culture_fix_counts
-    
+
     string_id.reload
     string_id.users_count.should == 2
   end
@@ -1080,7 +1081,7 @@ describe "CounterCulture" do
     # first, clean up
     SimpleDependent.delete_all
     SimpleMain.delete_all
-    
+
     1000.times do |i|
       main = SimpleMain.create
       3.times { main.simple_dependents.create }
@@ -1215,18 +1216,31 @@ describe "CounterCulture" do
     user.created_at.to_i.should == user.updated_at.to_i
     product.created_at.to_i.should < product.updated_at.to_i
   end
-  
+
+  it "should update counts correctly when creating using nested attributes" do
+    user = User.create(:reviews_attributes => [{:some_text => 'abc'}, {:some_text => 'xyz'}])
+    user.reload
+    user.reviews_count.should == 2
+  end
+
+  it "should use relation primary_key correctly", :focus => true do
+    category = Category.create!
+    post = Post.create!(:category_id => category.id)
+    category.reload
+    category.posts_count.should == 1
+  end
+
   describe "#previous_model" do
     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.manages_company_id = 2
       prev = user.send(:previous_model)
-      
+
       prev.name.should == "John Smith"
       prev.manages_company_id.should == 1
-      
+
       user.name.should =="Joe Smith"
       user.manages_company_id.should == 2
     end

data/spec/models/post.rb

@@ -0,0 +1,6 @@
+class Post < ActiveRecord::Base
+  self.primary_key = :post_id
+
+  belongs_to :category
+  counter_culture :category, :column_name => :posts_count
+end

data/spec/models/user.rb

@@ -7,4 +7,5 @@ class User < ActiveRecord::Base
   counter_culture :has_string_id
 
   has_many :reviews
+  accepts_nested_attributes_for :reviews, :allow_destroy => true
 end

data/spec/schema.rb

@@ -75,6 +75,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
   create_table "categories", :force => true do |t|
     t.string   "name"
     t.integer  "products_count",       :default => 0, :null => false
+    t.integer  "posts_count",       :default => 0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -93,7 +94,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  
+
   create_table "simple_dependents", :force => true do |t|
     t.integer "simple_main_id"
     t.datetime "created_at"
@@ -113,4 +114,10 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime "updated_at"
   end
 
+  create_table "posts", :primary_key => "post_id", :force => true do |t|
+    t.string   "title"
+    t.integer  "category_id", :default => nil
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,6 +171,7 @@ files:
 - spec/models/conditional_main.rb
 - spec/models/has_string_id.rb
 - spec/models/industry.rb
+- spec/models/post.rb
 - spec/models/product.rb
 - spec/models/review.rb
 - spec/models/simple_dependent.rb