counter_culture 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e50039fb9bcff88c135a812d83e6ac9779fe740a
-  data.tar.gz: 683b72e7070a3746d8a15d86774ac5f94ca4cd0d
+  metadata.gz: 5768633c82c0cda2df6b2f4b213eef15e6f57a2a
+  data.tar.gz: b4e1cfdf54ebe4bdcbb224968f9f4cb80c93138a
 SHA512:
-  metadata.gz: 5452993949dfa0558e374dd9f463ec3323a595de7112efba085b834fe1c778a6af1044cbd8c74949f33d7c8eedae122f18b56e62a239b579f50fa661819e09a4
-  data.tar.gz: 354e8bb001d985e03be663ad4ac0fb1053b91c607695e1188954439a7e967976f4ef60edafe37061bbe9da25af0a71ef0bf2ec02a54b4479ab48c1832bd842dc
+  metadata.gz: 5c5faff89fb5e8fbf0a3c983f6d0da2bdb3a0aa46a246a51d1a6012495fea76b0a4a2141bb77111a21b34a44de0f5110187643e202ea482a3323b872be75fb4c
+  data.tar.gz: 1b94ac39d665d0acc1b0e6784cc12954125383777709b9fedc5016c569615fccd0e0337707d81228793be12f03005831127177d91f246245702e398d0b5c5d47

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## 0.1.30 (February 10, 2014)
+## 0.1.31 (March 7, 2015)
+
+Bugfixes:
+  - Avoid issue with has_and_belongs_to_many and transactions by using new after_commit_action version (fixes #88)
+
+## 0.1.30 (February 10, 2015)
 
 Bugfixes:
   - Correctly use custom relation primary keys (fixes #93)

data/Gemfile

@@ -3,8 +3,9 @@ source "https://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "after_commit_action", "~> 0.1.3"
+gem "after_commit_action", "~> 1.0.0"
 gem "activerecord", ">= 3.0.0"
+gem "activesupport", ">= 3.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -28,8 +28,9 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     addressable (2.3.6)
-    after_commit_action (0.1.3)
+    after_commit_action (1.0.0)
       activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
     arel (5.0.1.20140414130214)
     awesome_print (1.2.0)
     builder (3.2.2)
@@ -131,7 +132,8 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
-  after_commit_action (~> 0.1.3)
+  activesupport (>= 3.0.0)
+  after_commit_action (~> 1.0.0)
   awesome_print
   bundler (>= 1.2.0)
   database_cleaner (>= 1.1.1)

data/VERSION

@@ -1 +1 @@
-0.1.30
+0.1.31

data/counter_culture.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 0.1.30 ruby lib
+# stub: counter_culture 0.1.31 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.30"
+  s.version = "0.1.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Magnus von Koeller"]
-  s.date = "2015-02-10"
+  s.date = "2015-03-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 = [
@@ -108,15 +108,16 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bestvendor/counter_culture"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.3"
   s.summary = "Turbo-charged counter caches for your Rails app."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<after_commit_action>, ["~> 0.1.3"])
+      s.add_runtime_dependency(%q<after_commit_action>, ["~> 1.0.0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       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"])
@@ -125,8 +126,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
     else
-      s.add_dependency(%q<after_commit_action>, ["~> 0.1.3"])
+      s.add_dependency(%q<after_commit_action>, ["~> 1.0.0"])
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.10.0"])
@@ -136,8 +138,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     end
   else
-    s.add_dependency(%q<after_commit_action>, ["~> 0.1.3"])
+    s.add_dependency(%q<after_commit_action>, ["~> 1.0.0"])
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.10.0"])

data/lib/counter_culture.rb

@@ -1,12 +1,14 @@
 require 'after_commit_action'
+require 'active_support/concern'
 
 module CounterCulture
 
   module ActiveRecord
+    extend ActiveSupport::Concern
 
-    def self.included(base)
+    included do
       # also add class methods to ActiveRecord::Base
-      base.extend ClassMethods
+      extend ClassMethods
     end
 
     module ClassMethods
@@ -15,6 +17,8 @@ module CounterCulture
 
       # called to configure counter caches
       def counter_culture(relation, options = {})
+        include AfterCommitAction
+
         unless @after_commit_counter_cache
           # initialize callbacks only once
           after_create :_update_counts_after_create

data/spec/counter_culture_spec.rb

@@ -28,7 +28,7 @@ describe "CounterCulture" do
   end
 
 
-  it "should use relation foreign_key correctly", :focus => true do
+  it "should use relation foreign_key correctly" do
     post = AnotherPost.new
     comment = post.comments.build
     comment.comment = 'Comment'
@@ -37,7 +37,7 @@ describe "CounterCulture" do
     post.another_post_comments_count.should == 1
   end
 
-  it "should fix counts using relation foreign_key correctly", :focus => true do
+  it "should fix counts using relation foreign_key correctly" do
     post = AnotherPost.new
     comment = post.comments.build
     comment.comment = 'Comment'
@@ -849,6 +849,17 @@ describe "CounterCulture" do
     Category.all {|category| category.products_count.should == 0 }
   end
 
+  it "should not report correct counts when fix_counts is called" do
+    user1 = User.create
+    user2 = User.create
+
+    review1 = Review.create user_id: user1.id, product: Product.create
+    review2 = Review.create user_id: user2.id, product: Product.create
+
+    user1.update_columns reviews_count: 2
+
+    Review.counter_culture_fix_counts(skip_unsupported: true).should == [{ entity: 'User', id: user1.id, what: 'reviews_count', right: 1, wrong: 2 }]
+  end
 
   it "should fix a simple counter cache correctly" do
     user = User.create
@@ -1263,7 +1274,7 @@ describe "CounterCulture" do
     user.reviews_count.should == 2
   end
 
-  it "should use relation primary_key correctly", :focus => true do
+  it "should use relation primary_key correctly" do
     subcateg = Subcateg.create :subcat_id => Subcateg::SUBCAT_1
     post = Post.new
     post.subcateg = subcateg

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.