counter_culture 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9a0ab9e01e7417d2c32fb3b6d142018f2616be
-  data.tar.gz: 5ca2eb2a8cd0ccd2f7af333fae3685cbb9f7606c
+  metadata.gz: 0e6b6af5c5d06c1ac2acc64ece67762e7283d716
+  data.tar.gz: 26ef80810b4e221925ede5a498af6f97d025b6ec
 SHA512:
-  metadata.gz: 1a301eed807af138528e03fc33edb9c0e8317874d31584bee4a43166f965b1ea91b4cdf9c7edd75a92d0d294919e60c6f568554ee441d24631ab4ba0914e6ec0
-  data.tar.gz: 1ed11abdefe33c23b3af92212a7df337390e6ef412394dbfeb8e8db86ea314c756c20232ef34b21b167c7df3200d4a15c29247cbb63da89b633d224234bc0d43
+  metadata.gz: 41c7a9851b9d974303bd5b9704c8c2a29a385b8b06c5f0673063a6bc1442bf1c5ab5b4533cf0fac268146125cec9a7adb0dd9071077182f35916b92fa245e1a2
+  data.tar.gz: 3e60ee5f8ca8dd35163b63ee98a76244b9f4de30b124d03758e10c4d11486173ac47897feb12a56bfd05a554d7c9fe41aa758fb8185c6a6a20809e972d6c9335

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-## 0.1.33 (May 24, 2014)
+## 0.1.25 (July 30, 2014)
+
+Bugfixes:
+  - makes fix_counts work correctly with custom primary keys
+
+## 0.1.24 (June 27, 2014)
+
+Bugfixes:
+  - correctly uses custom primary keys when incrementing / decrementing counts
+
+## 0.1.23 (May 24, 2014)
 
 Bugfixes:
   - fixes problems fixing conditional counter caches with batching

data/VERSION

@@ -1 +1 @@
-0.1.24
+0.1.25

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.24 ruby lib
+# stub: counter_culture 0.1.25 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.24"
+  s.version = "0.1.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
-  s.date = "2014-06-27"
+  s.date = "2014-07-30"
   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 = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/generators/counter_culture_generator.rb",
     "lib/generators/templates/counter_culture_migration.rb.erb",
     "spec/counter_culture_spec.rb",
+    "spec/models/categ.rb",
     "spec/models/category.rb",
     "spec/models/company.rb",
     "spec/models/conditional_dependent.rb",
@@ -43,10 +44,12 @@ Gem::Specification.new do |s|
     "spec/models/has_string_id.rb",
     "spec/models/industry.rb",
     "spec/models/post.rb",
+    "spec/models/post_comment.rb",
     "spec/models/product.rb",
     "spec/models/review.rb",
     "spec/models/simple_dependent.rb",
     "spec/models/simple_main.rb",
+    "spec/models/subcateg.rb",
     "spec/models/twitter_review.rb",
     "spec/models/user.rb",
     "spec/rails_app/.gitignore",

data/lib/counter_culture.rb

@@ -77,7 +77,7 @@ module CounterCulture
           query = klass
 
           # if a delta column is provided use SUM, otherwise use COUNT
-          count_select = hash[:delta_column] ? "SUM(COALESCE(#{self.table_name}.#{hash[:delta_column]},0))" : "COUNT(#{self.table_name}.id)"
+          count_select = hash[:delta_column] ? "SUM(COALESCE(#{self.table_name}.#{hash[:delta_column]},0))" : "COUNT(#{self.table_name}.#{self.primary_key})"
 
           # respect the deleted_at column if it exists
           query = query.where("#{self.table_name}.deleted_at IS NULL") if self.column_names.include?('deleted_at')
@@ -92,7 +92,7 @@ module CounterCulture
           # store joins in an array so that we can later apply column-specific conditions
           joins = reverse_relation.map do |cur_relation|
             reflect = relation_reflect(cur_relation)
-            joins_query = "LEFT JOIN #{reflect.active_record.table_name} ON #{reflect.table_name}.id = #{reflect.active_record.table_name}.#{reflect.foreign_key}"
+            joins_query = "LEFT JOIN #{reflect.active_record.table_name} ON #{reflect.table_name}.#{reflect.klass.primary_key} = #{reflect.active_record.table_name}.#{reflect.foreign_key}"
             # adds 'type' condition to JOIN clause if the current model is a child in a Single Table Inheritance
             joins_query = "#{joins_query} AND #{reflect.active_record.table_name}.type IN ('#{self.name}')" if self.column_names.include?('type') and not(self.descends_from_active_record?)
             joins_query
@@ -101,7 +101,7 @@ module CounterCulture
           # iterate over all the possible counter cache column names
           column_names.each do |where, column_name|
             # select id and count (from above) as well as cache column ('column_name') for later comparison
-            counts_query = query.select("#{klass.table_name}.id, #{count_select} AS count, #{klass.table_name}.#{column_name}")
+            counts_query = query.select("#{klass.table_name}.#{klass.primary_key}, #{count_select} AS count, #{klass.table_name}.#{column_name}")
 
             # 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
@@ -123,14 +123,14 @@ module CounterCulture
                   # keep track of what we fixed, e.g. for a notification email
                   fixed<< {
                     :entity => klass.name,
-                    :id => model.id,
+                    klass.primary_key.to_sym => model.send(klass.primary_key),
                     :what => column_name,
                     :wrong => model.send(column_name),
                     :right => count
                   }
                   # use update_all because it's faster and because a fixed counter-cache shouldn't
                   # update the timestamp
-                  klass.where(:id => model.id).update_all(column_name => count)
+                  klass.where(klass.primary_key => model.send(klass.primary_key)).update_all(column_name => count)
                 end
               end
 
@@ -371,3 +371,4 @@ module CounterCulture
   # extend ActiveRecord with our own code here
   ::ActiveRecord::Base.send :include, ActiveRecord
 end
+

data/spec/counter_culture_spec.rb

@@ -13,6 +13,9 @@ require 'models/simple_dependent'
 require 'models/conditional_main'
 require 'models/conditional_dependent'
 require 'models/post'
+require 'models/post_comment'
+require 'models/categ'
+require 'models/subcateg'
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :deletion
@@ -1224,10 +1227,63 @@ describe "CounterCulture" do
   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
+    subcateg = Subcateg.create :subcat_id => Subcateg::SUBCAT_1
+    post = Post.new
+    post.subcateg = subcateg
+    post.save!
+    subcateg.reload
+    subcateg.posts_count.should == 1
+  end
+
+  it "should use relation primary key on counter destination table correctly when fixing counts" do
+    subcateg = Subcateg.create :subcat_id => Subcateg::SUBCAT_1
+    post = Post.new
+    post.subcateg = subcateg
+    post.save!
+
+    subcateg.posts_count = -1
+    subcateg.save!
+
+    fixed = Post.counter_culture_fix_counts :only => :subcateg
+
+    fixed.length.should == 1
+    subcateg.reload.posts_count.should == 1
+  end
+
+  it "should use primary key on counted records table correctly when fixing counts" do
+    subcateg = Subcateg.create :subcat_id => Subcateg::SUBCAT_1
+    post = Post.new
+    post.subcateg = subcateg
+    post.save!
+
+    post_comment = PostComment.create!(:post_id => post.id)
+
+    post.comments_count = -1
+    post.save!
+
+    fixed = PostComment.counter_culture_fix_counts
+    fixed.length.should == 1
+    post.reload.comments_count.should == 1
+  end
+
+
+  it "should use multi-level relation primary key on counter destination table correctly when fixing counts" do
+    categ = Categ.create :cat_id => Categ::CAT_1
+    subcateg = Subcateg.new :subcat_id => Subcateg::SUBCAT_1
+    subcateg.categ = categ
+    subcateg.save!
+
+    post = Post.new
+    post.subcateg = subcateg
+    post.save!
+
+    categ.posts_count = -1
+    categ.save!
+
+    fixed = Post.counter_culture_fix_counts :only => [[:subcateg, :categ]]
+
+    fixed.length.should == 1
+    categ.reload.posts_count.should == 1
   end
 
   describe "#previous_model" do

data/spec/models/categ.rb

@@ -0,0 +1,8 @@
+class Categ < ActiveRecord::Base
+  CAT_1 = 0
+  CAT_2 = 1
+
+  self.primary_key = :cat_id
+
+  has_many :subcategs, :foreign_key => :fk_subcat_id
+end

data/spec/models/post.rb

@@ -1,6 +1,10 @@
 class Post < ActiveRecord::Base
   self.primary_key = :post_id
 
-  belongs_to :category
-  counter_culture :category, :column_name => :posts_count
+  belongs_to :subcateg, :foreign_key => :fk_subcat_id
+
+  has_many :post_comments
+  counter_culture :subcateg, :column_name => :posts_count
+
+  counter_culture [:subcateg, :categ]
 end

data/spec/models/post_comment.rb

@@ -0,0 +1,6 @@
+class PostComment < ActiveRecord::Base
+  self.primary_key = :post_id
+
+  belongs_to :post, :foreign_key => 'post_id'
+  counter_culture :post, :column_name => :comments_count
+end

data/spec/models/subcateg.rb

@@ -0,0 +1,9 @@
+class Subcateg < ActiveRecord::Base
+  SUBCAT_1 = 0
+  SUBCAT_2 = 1
+
+  self.primary_key = :subcat_id
+
+  has_many :posts
+  belongs_to :categ, :foreign_key => :fk_cat_id
+end

data/spec/schema.rb

@@ -114,9 +114,29 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime "updated_at"
   end
 
+  create_table "categs", :primary_key => "cat_id", :force => true do |t|
+    t.integer  "posts_count",       :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "subcategs", :primary_key => "subcat_id", :force => true do |t|
+    t.integer  "fk_cat_id"
+    t.integer  "posts_count",       :default => 0, :null => false
+    t.datetime "created_at"
+    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.integer  "fk_subcat_id", :default => nil
+    t.integer  "comments_count", :null => false, :default => 0
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "post_comments", :primary_key => "post_id", :force => true do |t|
+    t.string   "comment"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,6 +165,7 @@ files:
 - lib/generators/counter_culture_generator.rb
 - lib/generators/templates/counter_culture_migration.rb.erb
 - spec/counter_culture_spec.rb
+- spec/models/categ.rb
 - spec/models/category.rb
 - spec/models/company.rb
 - spec/models/conditional_dependent.rb
@@ -172,10 +173,12 @@ files:
 - spec/models/has_string_id.rb
 - spec/models/industry.rb
 - spec/models/post.rb
+- spec/models/post_comment.rb
 - spec/models/product.rb
 - spec/models/review.rb
 - spec/models/simple_dependent.rb
 - spec/models/simple_main.rb
+- spec/models/subcateg.rb
 - spec/models/twitter_review.rb
 - spec/models/user.rb
 - spec/rails_app/.gitignore