counter_culture 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de2e21ff4b35d41446f5baabcee7e79c667255d
-  data.tar.gz: 17e7fd7a5f09dcf4bcf883ab32bc4f85fa94fe5e
+  metadata.gz: f5c04260f58914bf559f6f7b94bee0af339daa44
+  data.tar.gz: fae72b4c05340ec945bad231311c214d2a9956d4
 SHA512:
-  metadata.gz: bef9637468d05f04302b73392d82ed397099e4041ea3c0eed966531ea87961170125b1226de687b51523164a1733ee9a4f5bdb84cbc740f7403e81ad7a701b35
-  data.tar.gz: 191d75d87fc71b208dc38ca853e4ab47455f3d98a7c65f203c9292c30730b1abe4a920dbe9850dc08d00e175674b075a6dbb1c333c6dec4f09cf64ad4ced922c
+  metadata.gz: 7ea0b1c02e7afd5f19f59226d7b4118399e7fadcaba9162d87969eb9ae3d1940110c522e9536a259588acd604289a95d5c0b8760b725348d1ec5141652e68094
+  data.tar.gz: dc746d48a2774df255c42300024e6c96b68c09d9e52ad9b5db0a959f8d7d24875faca48acd4836a98952688fbc566b6b22d3c94ec17188eb443683a59e222487

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.0"
+script: TRAVIS=true bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.20 (May 14, 2014)
+
+Bugfixes:
+  - counter_culture_fix counts now supports float values, where it forced integer values previously
+
 ## 0.1.19 (January 29, 2014)
 
 Bugfixes:

data/Gemfile

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

data/Gemfile.lock

@@ -138,6 +138,7 @@ DEPENDENCIES
   database_cleaner (>= 1.1.1)
   jeweler (~> 2.0.1)
   rails (>= 3.1.0)
+  rake
   rdoc (~> 3.12)
   rspec (~> 2.10.0)
   rspec-extra-formatters

data/README.md

@@ -1,4 +1,4 @@
-# counter_culture
+# counter_culture [![Build Status](https://travis-ci.org/magnusvk/counter_culture.png)](https://travis-ci.org/magnusvk/counter_culture)
 
 Turbo-charged counter caches for your Rails app. Huge improvements over the Rails standard counter caches:
 

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/counter_culture.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 0.1.19 ruby lib
+# stub: counter_culture 0.1.20 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
-  s.date = "2014-01-29"
+  s.date = "2014-05-15"
   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 = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     ".rspec",
     ".ruby-gemset",
     ".ruby-version",
+    ".travis.yml",
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
@@ -105,6 +106,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      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"])
       s.add_development_dependency(%q<after_commit_action>, [">= 0"])
@@ -114,6 +116,7 @@ Gem::Specification.new do |s|
       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"])
       s.add_dependency(%q<rspec>, ["~> 2.10.0"])
       s.add_dependency(%q<after_commit_action>, [">= 0"])
@@ -124,6 +127,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<after_commit_action>, ["~> 0.1.3"])
     end
   else
+    s.add_dependency(%q<rake>, [">= 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"])

data/lib/counter_culture.rb

@@ -111,11 +111,11 @@ module CounterCulture
             while (records = klass.reorder(full_primary_key(klass) + " ASC").offset(start).limit(batch_size)).any?
               # collect the counts for this batch in an id => count hash; this saves time relative
               # to running one query per record
-              counts = counts_query.reorder(full_primary_key(klass) + " ASC").offset(start).limit(batch_size).group(full_primary_key(klass)).inject({}){|memo, model| memo[model.id] = model.count.to_i; memo}
+              counts = counts_query.reorder(full_primary_key(klass) + " ASC").offset(start).limit(batch_size).group(full_primary_key(klass)).inject({}){|memo, model| memo[model.id] = model.count || 0; memo}
 
               # now iterate over all the models and see whether their counts are right
               records.each do |model|
-                if model.read_attribute(column_name) != counts[model.id].to_i
+                if model.read_attribute(column_name) != (counts[model.id] || 0)
                   # keep track of what we fixed, e.g. for a notification email
                   fixed<< {
                     :entity => klass.name,
@@ -126,7 +126,7 @@ module CounterCulture
                   }
                   # use update_all because it's faster and because a fixed counter-cache shouldn't
                   # update the timestamp
-                  klass.where(:id => model.id).update_all(column_name => counts[model.id].to_i)
+                  klass.where(:id => model.id).update_all(column_name => counts[model.id] || 0)
                 end
               end
 

data/spec/counter_culture_spec.rb

@@ -1083,7 +1083,7 @@ describe "CounterCulture" do
     SimpleMain.find_each { |main| main.simple_dependents_count.should == main.id % 4 }
   end
 
-  it "should correctly sum up flaot values" do
+  it "should correctly sum up float values" do
     user = User.create
 
     r1 = Review.create :user_id => user.id, :value => 3.4
@@ -1117,6 +1117,44 @@ describe "CounterCulture" do
     user.review_value_sum.round(1).should == 0
   end
 
+  it "should correctly fix float values that came out of sync" do
+    user = User.create
+
+    r1 = Review.create :user_id => user.id, :value => 3.4
+    r2 = Review.create :user_id => user.id, :value => 7.2
+    r3 = Review.create :user_id => user.id, :value => 5
+
+    user.update_column(:review_value_sum, 0)
+    Review.counter_culture_fix_counts skip_unsupported: true
+
+    user.reload
+    user.review_value_sum.round(1).should == 15.6
+
+    r2.destroy
+
+    user.update_column(:review_value_sum, 0)
+    Review.counter_culture_fix_counts skip_unsupported: true
+
+    user.reload
+    user.review_value_sum.round(1).should == 8.4
+
+    r3.destroy
+
+    user.update_column(:review_value_sum, 0)
+    Review.counter_culture_fix_counts skip_unsupported: true
+
+    user.reload
+    user.review_value_sum.round(1).should == 3.4
+
+    r1.destroy
+
+    user.update_column(:review_value_sum, 0)
+    Review.counter_culture_fix_counts skip_unsupported: true
+
+    user.reload
+    user.review_value_sum.round(1).should == 0
+  end
+
   it "should update the timestamp if touch: true is set" do
     user = User.create
     product = Product.create

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-05-15 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
@@ -137,6 +151,7 @@ files:
 - .rspec
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock