counter_culture 0.1.8 → 0.1.9

data/Gemfile

@@ -6,7 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development, :test do
-  gem "rails"
+  gem "rails", '>= 3.1.0'
   gem "rspec", "~> 2.10.0"
   gem "after_commit_action"
 end

data/Gemfile.lock

@@ -1,79 +1,79 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.10)
+      actionpack (= 3.2.10)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+    activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     after_commit_action (0.1.3)
       activerecord (>= 3.0.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
     hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.8.3)
+    i18n (0.6.1)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    journey (1.0.3)
-    json (1.7.3)
+    journey (1.0.4)
+    json (1.7.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.3.5)
+    mime-types (1.19)
+    multi_json (1.5.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.10)
+      actionmailer (= 3.2.10)
+      actionpack (= 3.2.10)
+      activerecord (= 3.2.10)
+      activeresource (= 3.2.10)
+      activesupport (= 3.2.10)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.10)
+    railties (3.2.10)
+      actionpack (= 3.2.10)
+      activesupport (= 3.2.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.10.0)
@@ -83,19 +83,20 @@ GEM
     rspec-core (2.10.1)
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-extra-formatters (0.4)
+    rspec-extra-formatters (1.0.0)
     rspec-mocks (2.10.1)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -104,7 +105,7 @@ DEPENDENCIES
   after_commit_action
   bundler (~> 1.2.0.pre)
   jeweler (~> 1.8.3)
-  rails
+  rails (>= 3.1.0)
   rdoc (~> 3.12)
   rspec (~> 2.10.0)
   rspec-extra-formatters

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/counter_culture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
-  s.date = "2012-12-13"
+  s.date = "2013-01-08"
   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 = [
@@ -97,7 +97,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rails>, [">= 0"])
+      s.add_development_dependency(%q<rails>, [">= 3.1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_development_dependency(%q<after_commit_action>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -105,7 +105,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_runtime_dependency(%q<after_commit_action>, ["~> 0.1.3"])
     else
-      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_dependency(%q<after_commit_action>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -114,7 +114,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<after_commit_action>, ["~> 0.1.3"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.10.0"])
     s.add_dependency(%q<after_commit_action>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

data/spec/counter_culture_spec.rb

@@ -861,6 +861,31 @@ describe "CounterCulture" do
     user.using_count.should == 1
     user.tried_count.should == 1
   end
+
+  it "should work correctly for relationships with custom names" do
+    company = Company.create
+    user1 = User.create :manages_company_id => company.id
+
+    company.reload
+    company.managers_count.should == 1
+
+    user2 = User.create :manages_company_id => company.id
+
+    company.reload
+    company.managers_count.should == 2
+
+    user2.destroy
+
+    company.reload
+    company.managers_count.should == 1
+
+    company2 = Company.create
+    user1.manages_company_id = company2.id
+    user1.save!
+
+    company.reload
+    company.managers_count.should == 0
+  end
   
   describe "#previous_model" do
     let(:user){User.create :name => "John Smith", :company_id => 1}

data/spec/models/company.rb

@@ -1,3 +1,4 @@
 class Company < ActiveRecord::Base
   belongs_to :industry
+  has_many :managers, :foreign_key => :manages_company_id
 end

data/spec/models/user.rb

@@ -1,3 +1,6 @@
 class User < ActiveRecord::Base
-  belongs_to :company
+  belongs_to :employer
+
+  belongs_to :manages_company, :class_name => "Company"
+  counter_culture :manages_company, :column_name => "managers_count"
 end

data/spec/schema.rb

@@ -19,6 +19,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "reviews_count",       :default => 0, :null => false
     t.integer  "using_count",         :default => 0, :null => false
     t.integer  "tried_count",         :default => 0, :null => false
+    t.integer  "managers_count",      :default => 0, :null => false
   end
 
   create_table "industries", :force => true do |t|
@@ -45,6 +46,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
   create_table "users", :force => true do |t|
     t.string   "name"
     t.integer  "company_id"
+    t.integer  "manages_company_id"
     t.integer  "reviews_count",       :default => 0, :null => false
     t.integer  "using_count",         :default => 0, :null => false
     t.integer  "tried_count",         :default => 0, :null => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1683110651855926153
+      hash: 1797196708173178324
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: