counter_culture 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc13eaf1a8b41c9d062ec7606dde7418321cb6b5
-  data.tar.gz: 948845a96cec14ec05ad067f56a0c460ab86ba21
+  metadata.gz: e50039fb9bcff88c135a812d83e6ac9779fe740a
+  data.tar.gz: 683b72e7070a3746d8a15d86774ac5f94ca4cd0d
 SHA512:
-  metadata.gz: b515bdc8f3032a0da0594f622f5b0176f68a9a99c2ef4eda7d846085388ef0919cc7abe49e031e8c8dafa52d949cd49feffa71cb9ed3d73fc00c248cf83bbff9
-  data.tar.gz: 0cd98b49e84f374bbb25ac631316f882beff7a78c7689caeceff70a5083da41924deaf5da317afe70328995ee6be59d82ae2b59eceddd8430c6080fac0c301f8
+  metadata.gz: 5452993949dfa0558e374dd9f463ec3323a595de7112efba085b834fe1c778a6af1044cbd8c74949f33d7c8eedae122f18b56e62a239b579f50fa661819e09a4
+  data.tar.gz: 354e8bb001d985e03be663ad4ac0fb1053b91c607695e1188954439a7e967976f4ef60edafe37061bbe9da25af0a71ef0bf2ec02a54b4479ab48c1832bd842dc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.30 (February 10, 2014)
+
+Bugfixes:
+  - Correctly use custom relation primary keys (fixes #93)
+
 ## 0.1.29 (December 25, 2014)
 
 Bugfixes:

data/Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "after_commit_action", "~> 0.1.3"
+gem "activerecord", ">= 3.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -130,6 +130,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 3.0.0)
   after_commit_action (~> 0.1.3)
   awesome_print
   bundler (>= 1.2.0)

data/VERSION

@@ -1 +1 @@
-0.1.29
+0.1.30

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 0.1.29 ruby lib
+# stub: counter_culture 0.1.30 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.29"
+  s.version = "0.1.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Magnus von Koeller"]
-  s.date = "2014-12-25"
+  s.date = "2015-02-10"
   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 = [
@@ -37,6 +37,8 @@ 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/another_post.rb",
+    "spec/models/another_post_comment.rb",
     "spec/models/categ.rb",
     "spec/models/category.rb",
     "spec/models/company.rb",
@@ -114,6 +116,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<after_commit_action>, ["~> 0.1.3"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 3.1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
@@ -123,6 +126,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
     else
       s.add_dependency(%q<after_commit_action>, ["~> 0.1.3"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.10.0"])
@@ -133,6 +137,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<after_commit_action>, ["~> 0.1.3"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.10.0"])

data/lib/counter_culture.rb

@@ -104,7 +104,7 @@ module CounterCulture
               join_table_name = reflect.active_record.table_name
             end
             # join with alias to avoid ambiguous table name with self-referential models:
-            joins_query = "LEFT JOIN #{reflect.active_record.table_name} AS #{join_table_name} ON #{reflect.table_name}.#{reflect.klass.primary_key} = #{join_table_name}.#{reflect.foreign_key}"
+            joins_query = "LEFT JOIN #{reflect.active_record.table_name} AS #{join_table_name} ON #{reflect.table_name}.#{reflect.association_primary_key} = #{join_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 reflect.active_record.column_names.include?('type') and not(self.descends_from_active_record?)
             joins_query
@@ -112,8 +112,8 @@ 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}.#{klass.primary_key}, #{count_select} AS count, #{klass.table_name}.#{column_name}")
+            # select join column and count (from above) as well as cache column ('column_name') for later comparison
+            counts_query = query.select("#{klass.table_name}.#{klass.primary_key}, #{klass.table_name}.#{relation_reflect(hash[:relation]).association_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
@@ -195,6 +195,14 @@ module CounterCulture
         relation_reflect(relation).foreign_key
       end
 
+      # gets the primary key name of the given relation
+      #
+      # relation: a symbol or array of symbols; specifies the relation
+      #   that has the counter cache column
+      def relation_primary_key(relation)
+        relation_reflect(relation).association_primary_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
@@ -309,7 +317,7 @@ module CounterCulture
           end
 
           klass = relation_klass(options[:relation])
-          klass.where(klass.primary_key => id_to_change).update_all updates.join(', ')
+          klass.where(relation_primary_key(options[:relation]) => id_to_change).update_all updates.join(', ')
         end
       end
     end
@@ -349,17 +357,18 @@ module CounterCulture
     #   current value
     def foreign_key_value(relation, was = false)
       relation = relation.is_a?(Enumerable) ? relation.dup : [relation]
+      first_relation = relation.first
       if was
         first = relation.shift
         foreign_key_value = send("#{relation_foreign_key(first)}_was")
-        value = relation_klass(first).find(foreign_key_value) if foreign_key_value
+        value = relation_klass(first).find_by(relation_primary_key(first) => foreign_key_value) if foreign_key_value
       else
         value = self
       end
       while !value.nil? && relation.size > 0
         value = value.send(relation.shift)
       end
-      return value.try(:id)
+      return value.try(relation_primary_key(first_relation).to_sym)
     end
 
     def relation_klass(relation)
@@ -374,6 +383,10 @@ module CounterCulture
       self.class.send :relation_foreign_key, relation
     end
 
+    def relation_primary_key(relation)
+      self.class.send :relation_primary_key, relation
+    end
+
     def first_level_relation_foreign_key(relation)
       self.class.send :first_level_relation_foreign_key, relation
     end

data/spec/counter_culture_spec.rb

@@ -16,6 +16,8 @@ require 'models/post'
 require 'models/post_comment'
 require 'models/categ'
 require 'models/subcateg'
+require 'models/another_post'
+require 'models/another_post_comment'
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :deletion
@@ -25,6 +27,35 @@ describe "CounterCulture" do
     DatabaseCleaner.clean
   end
 
+
+  it "should use relation foreign_key correctly", :focus => true do
+    post = AnotherPost.new
+    comment = post.comments.build
+    comment.comment = 'Comment'
+    post.save!
+    post.reload
+    post.another_post_comments_count.should == 1
+  end
+
+  it "should fix counts using relation foreign_key correctly", :focus => true do
+    post = AnotherPost.new
+    comment = post.comments.build
+    comment.comment = 'Comment'
+    post.save!
+    post.reload
+    post.another_post_comments_count.should == 1
+    post.comments.size.should == 1
+
+    post.another_post_comments_count = 2
+    post.save!
+
+    fixed = AnotherPostComment.counter_culture_fix_counts
+    fixed.length.should == 1
+
+    post.reload
+    post.another_post_comments_count.should == 1
+  end
+
   it "increments counter cache on create" do
     user = User.create
     product = Product.create

data/spec/models/another_post.rb

@@ -0,0 +1,13 @@
+class AnotherPost < ActiveRecord::Base
+  has_many :comments, class_name: 'AnotherPostComment', foreign_key: 'another_post_id', primary_key: 'another_id'
+
+  before_save :assign_another_id, :if => :new_record?
+
+  private
+  def assign_another_id
+    loop do
+      self.another_id = Random.rand(65535)
+      break unless self.class.where(another_id: another_id).exists?
+    end
+  end
+end

data/spec/models/another_post_comment.rb

@@ -0,0 +1,4 @@
+class AnotherPostComment < ActiveRecord::Base
+  belongs_to :post, class_name: 'AnotherPost', foreign_key: 'another_post_id', primary_key: 'another_id'
+  counter_culture :post
+end

data/spec/schema.rb

@@ -143,4 +143,21 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
+
+  create_table "another_posts", :force => true do |t|
+    t.string   "title"
+    t.integer  "another_id", :null => false
+    t.integer  "another_post_comments_count", :null => false, :default => 0
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+  add_index "another_posts", :another_id, :unique => true
+
+  create_table "another_post_comments", :force => true do |t|
+    t.integer "another_post_id"
+    t.string   "comment"
+    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.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +165,8 @@ files:
 - lib/generators/counter_culture_generator.rb
 - lib/generators/templates/counter_culture_migration.rb.erb
 - spec/counter_culture_spec.rb
+- spec/models/another_post.rb
+- spec/models/another_post_comment.rb
 - spec/models/categ.rb
 - spec/models/category.rb
 - spec/models/company.rb