counter_culture 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6b6af5c5d06c1ac2acc64ece67762e7283d716
-  data.tar.gz: 26ef80810b4e221925ede5a498af6f97d025b6ec
+  metadata.gz: 46f513670a73b530008f4051a11a67e46def6f0c
+  data.tar.gz: 3f004c832368bcff24aa5f1fd6b0121d89d38fe6
 SHA512:
-  metadata.gz: 41c7a9851b9d974303bd5b9704c8c2a29a385b8b06c5f0673063a6bc1442bf1c5ab5b4533cf0fac268146125cec9a7adb0dd9071077182f35916b92fa245e1a2
-  data.tar.gz: 3e60ee5f8ca8dd35163b63ee98a76244b9f4de30b124d03758e10c4d11486173ac47897feb12a56bfd05a554d7c9fe41aa758fb8185c6a6a20809e972d6c9335
+  metadata.gz: 149514535d47feb3fac3d3ea389945c7bd66dd2c578e321b35cb3bd33b242b3130fb3c9824dfd665a0b21c6611327f23d7244f3d841cf3b05ac6d9a428704922
+  data.tar.gz: c4621358a00d034452b0b56f43e56664480c7a6b7058bbf956cda52409a9789ce8803da216001e70cb07ff1250ad2044b8477ba787756e709784e348dea8b4d0

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.0.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.26 (November 12, 2014)
+
+Bugfixes:
+  - makes fix_counts work correctly with self-referential tables
+
 ## 0.1.25 (July 30, 2014)
 
 Bugfixes:

data/Gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      mail (~> 2.5.4)
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
+    actionmailer (4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.7)
+      actionview (= 4.1.7)
+      activesupport (= 4.1.7)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
+    actionview (4.1.7)
+      activesupport (= 4.1.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+    activemodel (4.1.7)
+      activesupport (= 4.1.7)
       builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
+    activerecord (4.1.7)
+      activemodel (= 4.1.7)
+      activesupport (= 4.1.7)
       arel (~> 5.0.0)
-    activesupport (4.1.1)
+    activesupport (4.1.7)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -33,26 +33,26 @@ GEM
     arel (5.0.1.20140414130214)
     awesome_print (1.2.0)
     builder (3.2.2)
-    database_cleaner (1.2.0)
+    database_cleaner (1.3.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    git (1.2.6)
-    github_api (0.11.3)
+    git (1.2.8)
+    github_api (0.12.2)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    hashie (2.1.1)
+    hashie (3.3.1)
     highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -63,45 +63,42 @@ GEM
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.13)
-      multi_json (>= 1.5)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mini_portile (0.6.0)
-    minitest (5.3.3)
-    multi_json (1.10.0)
+    jwt (1.0.0)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    oauth2 (0.9.3)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.1)
-      actionmailer (= 4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      activemodel (= 4.1.1)
-      activerecord (= 4.1.1)
-      activesupport (= 4.1.1)
+    rails (4.1.7)
+      actionmailer (= 4.1.7)
+      actionpack (= 4.1.7)
+      actionview (= 4.1.7)
+      activemodel (= 4.1.7)
+      activerecord (= 4.1.7)
+      activesupport (= 4.1.7)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.1)
+      railties (= 4.1.7)
       sprockets-rails (~> 2.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
+    railties (4.1.7)
+      actionpack (= 4.1.7)
+      activesupport (= 4.1.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.10.0)
@@ -113,23 +110,20 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-extra-formatters (1.0.0)
     rspec-mocks (2.10.1)
-    sprockets (2.12.1)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/Rakefile

@@ -21,8 +21,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{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.}
   gem.email = "magnus@vonkoeller.de"
   gem.authors = ["Magnus von Koeller"]
-
-  gem.add_dependency 'after_commit_action', '~> 0.1.3' 
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.1.25
+0.1.26

data/counter_culture.gemspec

@@ -2,15 +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.25 ruby lib
+# stub: counter_culture 0.1.26 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.25"
+  s.version = "0.1.26"
 
   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-07-30"
+  s.date = "2014-11-13"
   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 = [
@@ -105,8 +106,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bestvendor/counter_culture"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.2.2"
   s.summary = "Turbo-charged counter caches for your Rails app."
 
   if s.respond_to? :specification_version then
@@ -121,7 +121,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_runtime_dependency(%q<after_commit_action>, ["~> 0.1.3"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.1.0"])
@@ -131,7 +130,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.2.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<after_commit_action>, ["~> 0.1.3"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
@@ -142,7 +140,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.2.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<after_commit_action>, ["~> 0.1.3"])
   end
 end
 

data/lib/counter_culture.rb

@@ -76,8 +76,14 @@ module CounterCulture
           klass = relation_klass(hash[:relation])
           query = klass
 
+          if klass.table_name == self.table_name
+            self_table_name = "#{self.table_name}_#{self.table_name}"
+          else
+            self_table_name = self.table_name
+          end
+
           # 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}.#{self.primary_key})"
+          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 +98,13 @@ 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}.#{reflect.klass.primary_key} = #{reflect.active_record.table_name}.#{reflect.foreign_key}"
+            if klass.table_name == reflect.active_record.table_name
+              join_table_name = "#{klass.table_name}_#{klass.table_name}"
+            else
+              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}"
             # 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

data/spec/counter_culture_spec.rb

@@ -1302,4 +1302,38 @@ describe "CounterCulture" do
     end
   end
 
+  describe "self referential counter cache" do
+    it "increments counter cache on create" do
+      company = Company.create!
+      company.children << Company.create!
+
+      company.reload
+      company.children_count.should == 1
+    end
+
+    it "decrements counter cache on destroy" do
+      company = Company.create!
+      company.children << Company.create!
+
+      company.reload
+      company.children_count.should == 1
+
+      company.children.first.destroy
+
+      company.reload
+      company.children_count.should == 0
+    end
+
+    it "fixes counter cache" do
+      company = Company.create!
+      company.children << Company.create!
+
+      company.children_count = -1
+      company.save!
+
+      fixed = Company.counter_culture_fix_counts
+      fixed.length.should == 1
+      company.reload.children_count.should == 1
+    end
+  end
 end

data/spec/models/company.rb

@@ -1,4 +1,11 @@
 class Company < ActiveRecord::Base
   belongs_to :industry
   has_many :managers, :foreign_key => :manages_company_id
+
+
+  belongs_to :parent, :class_name => 'Company', :foreign_key => 'parent_id'
+  has_many :children, :class_name => 'Company', :foreign_key => 'parent_id'
+
+  counter_culture :parent, :column_name => :children_count
+
 end

data/spec/schema.rb

@@ -21,6 +21,8 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "tried_count",         :default => 0, :null => false
     t.integer  "managers_count",      :default => 0, :null => false
     t.integer  "review_approvals_count",      :default => 0, :null => false
+    t.integer  "parent_id"
+    t.integer  "children_count",      :default => 0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end

metadata

@@ -1,141 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: after_commit_action
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: after_commit_action
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 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
@@ -147,11 +133,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".document"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -241,17 +227,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.