counter_culture 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e6e595dc3bfd04dc2c43689a2e92551a0d1e62
-  data.tar.gz: 0eaa6cb18bd4f31a0c93a75b65dd87e3f88c864d
+  metadata.gz: 19dc37789d383bb90f0f02f4c23c60b05db6a5db
+  data.tar.gz: f7514a2a2d9bfd9c525dbec1fbfa88b5c03ae11c
 SHA512:
-  metadata.gz: 327ffa770c20fb19cb62997fbb7b5e731edda014e892ec1eed971f8cc9488e430d64e922036e018603f766705f057cd2732545d5a947a2c802e5a2534ac79b70
-  data.tar.gz: cf7382c2e12317c8c6b358db94bfdf254b3f8e5af12a7d26437644376d31125902441988fcb445260994d5f719061b9db6fd05d828d0297701a0850c7d98b1a3
+  metadata.gz: 377e5dce3e1cdcb30992e3f3361e9aa330a3333d5e527d2d9ebf02f2f37b1ddb78e61e38aae3c5dc951ede2f5fefb7fb50fbe8e0355da366c2d665f51cb0fbd6
+  data.tar.gz: dfa309282057df45419d50f62bcf6f951e8195f3ed3f60c36116da51ff8a6b66780e0c038c752178507d56085a052e81a3f8214f017c2a526353dcd29700c3f7

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.1.22 (May 24, 2014)
+
+Bugfixes:
+  - support for single-table inheritance in counter_culture_fix_counts
+
+## 0.1.21 (May 24, 2014)
+
+Bugfixes:
+  - makes the migration generator compatible with Rails 4.1
+
 ## 0.1.20 (May 14, 2014)
 
 Bugfixes:

data/VERSION

@@ -1 +1 @@
-0.1.21
+0.1.22

data/counter_culture.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 0.1.21 ruby lib
+# stub: counter_culture 0.1.22 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.21"
+  s.version = "0.1.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
     "spec/models/review.rb",
     "spec/models/simple_dependent.rb",
     "spec/models/simple_main.rb",
+    "spec/models/twitter_review.rb",
     "spec/models/user.rb",
     "spec/rails_app/.gitignore",
     "spec/rails_app/Gemfile",

data/lib/counter_culture.rb

@@ -101,7 +101,10 @@ module CounterCulture
             # lives in
             reverse_relation.each do |cur_relation|
               reflect = relation_reflect(cur_relation)
-              counts_query = counts_query.joins("LEFT JOIN #{reflect.active_record.table_name} ON #{reflect.table_name}.id = #{reflect.active_record.table_name}.#{reflect.foreign_key}")
+              joins_query = "LEFT JOIN #{reflect.active_record.table_name} ON #{reflect.table_name}.id = #{reflect.active_record.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?)
+              counts_query = counts_query.joins(joins_query)
             end
 
             # iterate in batches; otherwise we might run out of memory when there's a lot of

data/spec/counter_culture_spec.rb

@@ -4,6 +4,7 @@ require 'models/company'
 require 'models/industry'
 require 'models/product'
 require 'models/review'
+require 'models/twitter_review'
 require 'models/user'
 require 'models/category'
 require 'models/has_string_id'
@@ -864,6 +865,32 @@ describe "CounterCulture" do
 
   end
 
+  it "should fix a STI counter cache correctly" do
+    company = Company.create
+    user = User.create :manages_company_id => company.id
+    product = Product.create
+
+    product.twitter_reviews_count.should == 0
+    
+    review = Review.create :user_id => user.id, :product_id => product.id, :approvals => 42
+    twitter_review = TwitterReview.create :user_id => user.id, :product_id => product.id, :approvals => 32
+
+    company.reload
+    user.reload
+    product.reload
+
+    product.twitter_reviews_count.should == 1
+
+    product.twitter_reviews_count = 2
+    product.save!
+
+    TwitterReview.counter_culture_fix_counts
+
+    product.reload
+
+    product.twitter_reviews_count.should == 1
+  end
+
   it "should fix a second-level counter cache correctly" do
     company = Company.create
     user = User.create :manages_company_id => company.id

data/spec/models/twitter_review.rb

@@ -0,0 +1,3 @@
+class TwitterReview < Review
+  counter_culture :product, column_name: 'twitter_reviews_count'
+end

data/spec/schema.rb

@@ -40,6 +40,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.string   "name"
     t.integer  "reviews_count",       :default => 0, :null => false
     t.integer  "rexiews_count",       :default => 0, :null => false
+    t.integer  "twitter_reviews_count",       :default => 0, :null => false
     t.integer  "category_id"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -52,6 +53,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "product_id"
     t.integer  "approvals"
     t.float    "value"
+    t.string   "type"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Magnus von Koeller
@@ -173,6 +173,7 @@ files:
 - spec/models/review.rb
 - spec/models/simple_dependent.rb
 - spec/models/simple_main.rb
+- spec/models/twitter_review.rb
 - spec/models/user.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Gemfile