counter_culture 0.1.11 → 0.1.12

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/counter_culture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
-  s.date = "2013-04-03"
+  s.date = "2013-05-24"
   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 = [

data/lib/counter_culture.rb

@@ -49,6 +49,8 @@ module CounterCulture
       #     :right => the newly fixed, correct count }
       #
       def counter_culture_fix_counts(options = {})
+        raise "No counter cache defined on #{self.name}" unless @after_commit_counter_cache
+
         options[:exclude] = [options[:exclude]] if options[:exclude] && !options[:exclude].is_a?(Enumerable)
         options[:exclude] = options[:exclude].try(:map) {|x| x.is_a?(Enumerable) ? x : [x] }
         options[:only] = [options[:only]] if options[:only] && !options[:only].is_a?(Enumerable)
@@ -113,7 +115,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 = #{klass.connection.quote(model.id)}"
+                klass.where(:id => model.id).update_all(column_name => counts[model.id])
               end
             end
           end

data/spec/counter_culture_spec.rb

@@ -863,6 +863,31 @@ describe "CounterCulture" do
     user.tried_count.should == 1
   end
 
+  it "should fix a string counter cache correctly" do
+    string_id = HasStringId.create({:id => "bbb"}, :without_protection => true)
+
+    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
+
+    string_id.users_count = 123
+    string_id.save!
+
+    string_id.reload
+    string_id.users_count.should == 123
+
+    User.counter_culture_fix_counts
+    
+    string_id.reload
+    string_id.users_count.should == 2
+  end
+
   it "should work correctly for relationships with custom names" do
     company = Company.create
     user1 = User.create :manages_company_id => company.id
@@ -889,11 +914,8 @@ describe "CounterCulture" do
   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
 
@@ -925,6 +947,10 @@ describe "CounterCulture" do
     string_id.users_count.should == 0
     string_id2.users_count.should == 0
   end
+
+  it "should raise a good error message when calling fix_counts with no caches defined" do
+    expect { Category.counter_culture_fix_counts }.to raise_error "No counter cache defined on Category"
+  end
   
   describe "#previous_model" do
     let(:user){User.create :name => "John Smith", :manages_company_id => 1}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -219,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4392423569258865680
+      hash: 209272298773152950
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: