counter_culture 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/counter_culture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
-  s.date = "2013-03-27"
+  s.date = "2013-04-03"
   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 = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "spec/counter_culture_spec.rb",
     "spec/models/category.rb",
     "spec/models/company.rb",
+    "spec/models/has_string_id.rb",
     "spec/models/industry.rb",
     "spec/models/product.rb",
     "spec/models/review.rb",
@@ -90,7 +91,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bestvendor/counter_culture"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Turbo-charged counter caches for your Rails app."
 
   if s.respond_to? :specification_version then

data/lib/counter_culture.rb

@@ -113,7 +113,7 @@ module CounterCulture
                 }
                 # use update_all because it's faster and because a fixed counter-cache shouldn't
                 # update the timestamp
-                klass.update_all "#{column_name} = #{counts[model.id].to_i}", "id = #{model.id}"
+                klass.update_all "#{column_name} = #{counts[model.id].to_i}", "id = #{klass.connection.quote(model.id)}"
               end
             end
           end

data/spec/counter_culture_spec.rb

@@ -6,6 +6,7 @@ require 'models/product'
 require 'models/review'
 require 'models/user'
 require 'models/category'
+require 'models/has_string_id'
 
 describe "CounterCulture" do
   it "increments counter cache on create" do
@@ -886,6 +887,44 @@ describe "CounterCulture" do
     company.reload
     company.managers_count.should == 0
   end
+
+  it "should work correctly with string keys" do
+    puts HasStringId.all.inspect
+    string_id = HasStringId.create({:id => "1"}, :without_protection => true)
+    puts HasStringId.all.inspect
+    string_id2 = HasStringId.create({:id => "abc"}, :without_protection => true)
+    puts HasStringId.all.inspect
+
+    user = User.create :has_string_id_id => string_id.id
+
+    string_id.reload
+    string_id.users_count.should == 1
+
+    user2 = User.create :has_string_id_id => string_id.id
+
+    string_id.reload
+    string_id.users_count.should == 2
+
+    user2.has_string_id_id = string_id2.id
+    user2.save!
+
+    string_id.reload
+    string_id2.reload
+    string_id.users_count.should == 1
+    string_id2.users_count.should == 1
+
+    user2.destroy
+    string_id.reload
+    string_id2.reload
+    string_id.users_count.should == 1
+    string_id2.users_count.should == 0
+
+    user.destroy
+    string_id.reload
+    string_id2.reload
+    string_id.users_count.should == 0
+    string_id2.users_count.should == 0
+  end
   
   describe "#previous_model" do
     let(:user){User.create :name => "John Smith", :manages_company_id => 1}

data/spec/models/has_string_id.rb

@@ -0,0 +1,4 @@
+class HasStringId < ActiveRecord::Base
+  set_primary_key :id
+  has_many :users
+end

data/spec/models/user.rb

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

data/spec/schema.rb

@@ -51,6 +51,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.string   "has_string_id_id"
   end
 
   create_table "categories", :force => true do |t|
@@ -58,4 +59,11 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "products_count",       :default => 0, :null => false
   end
 
+  create_table "has_string_ids", :force => true, :id => false do |t|
+    t.string   "id", :default => '', :null => false
+    t.string   "something"
+    t.integer  "users_count",        :null => false, :default => 0
+  end
+  add_index "has_string_ids", :id, :unique => true
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,6 +149,7 @@ files:
 - spec/counter_culture_spec.rb
 - spec/models/category.rb
 - spec/models/company.rb
+- spec/models/has_string_id.rb
 - spec/models/industry.rb
 - spec/models/product.rb
 - spec/models/review.rb
@@ -218,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2320652416701814661
+      hash: -4392423569258865680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Turbo-charged counter caches for your Rails app.