counter_culture 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf58d3caa98a0fbb9741d974f746a6071a7a28e9
-  data.tar.gz: 38e56a66e6e995ab3df7d9cc0ece39f58bc408b4
+  metadata.gz: dbd19171ad987974f7c8b1a22586f79d213480fb
+  data.tar.gz: ec110a9a8e59b1edd33b1208d588bf2640229dec
 SHA512:
-  metadata.gz: e301243129495b31dc32759c6757aa16ab553f829ebe762e317ff3a59657b62cf9f102b3dbde939e3259c2dd3958fae0eeae9632e53f684bdbe334ba89f16d58
-  data.tar.gz: 4d54dfeb834c6c81d754665f7fb0250c050b4ca8509da255a3546605f91dd5c51ac78ca271af80fd9ecc77e4782878d23375f010b132ecdd2965429d9a2cea37
+  metadata.gz: ecc374dd09b2af3f7ae325acb30f567b87258aeebce9fbd236266f1ed64b13965dd4c50b11db7a45d634c107d314438c578819975aa10e37c1abc1445ce474ff
+  data.tar.gz: 6c837a717f549c2b4767c769c9d79087ab0b6c8bde80ed411acbf5fbd75bc144e4fceb0ded912624a2a68c8f5b830a24eac6ecc34416dd10e40304da70630274

data/.travis.yml

@@ -3,12 +3,14 @@ rvm:
   - "2.2.5"
   - "2.3.1"
 env:
-  - "RAILS_VERSION=3.2.0"
-  - "RAILS_VERSION=4.0.0"
-  - "RAILS_VERSION=4.1.0"
-  - "RAILS_VERSION=4.2.0"
-  - "RAILS_VERSION=5.0.0"
-  - "RAILS_VERSION=5.1.0"
+  - 'RAILS_VERSION="~> 3.2.0"'
+  - 'RAILS_VERSION="~> 4.0.0"'
+  - 'RAILS_VERSION="~> 4.1.0"'
+  - 'RAILS_VERSION="~> 4.2.0"'
+  - 'RAILS_VERSION="~> 5.0.0"'
+  - 'RAILS_VERSION="= 5.1.4"'
+  - 'RAILS_VERSION="= 5.1.5"'
+  - 'RAILS_VERSION="~> 5.1.5"'
 install:
   - bundle update
 script: TRAVIS=true bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.9.1 (March 1, 2017)
+
+Bugfixes:
+  - Address an edge-case test regression caused by Rails 5.1.5 that was causing counts to be off when saving changes from an `after_create` callback
+
 ## 1.9.0 (November 29, 2017)
 
 Improvements:

data/Gemfile

@@ -14,13 +14,13 @@ group :development, :test do
 
   rails = case ENV["RAILS_VERSION"]
   when "master"
-    {github: "rails/rails"}
+    { github: "rails/rails" }
   when nil, ""
     ">= 3.1.0"
   else
-    "~> #{ENV["RAILS_VERSION"]}"
+    ENV["RAILS_VERSION"]
   end
-  gem "rails", rails
+  gem "rails", ENV['RAILS_VERSION']
 
   gem "rspec", "~> 3.0"
   gem "awesome_print"

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.9.1

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 1.9.0 ruby lib
+# stub: counter_culture 1.9.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.9.0"
+  s.version = "1.9.1"
 
   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 = "2017-11-29"
+  s.date = "2018-03-01"
   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 = [
@@ -131,7 +131,7 @@ Gem::Specification.new do |s|
       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<rails>, ["= 5.1.5"])
       s.add_development_dependency(%q<rspec>, ["~> 3.0"])
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
@@ -145,7 +145,7 @@ Gem::Specification.new do |s|
       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<rails>, ["= 5.1.5"])
       s.add_dependency(%q<rspec>, ["~> 3.0"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
@@ -160,7 +160,7 @@ Gem::Specification.new do |s|
     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<rails>, ["= 5.1.5"])
     s.add_dependency(%q<rspec>, ["~> 3.0"])
     s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])

data/lib/counter_culture/extensions.rb

@@ -79,7 +79,6 @@ module CounterCulture
       if @_counter_culture_active
         # don't do anything; we are already active for this transaction
       else
-        @_counter_culture_active = true
         block.call
         execute_after_commit { @_counter_culture_active = false}
       end
@@ -88,6 +87,7 @@ module CounterCulture
     # called by after_create callback
     def _update_counts_after_create
       _wrap_in_counter_culture_active do
+        @_counter_culture_active = true
         self.class.after_commit_counter_cache.each do |counter|
           # increment counter cache
           counter.change_counter_cache(self, :increment => true)
@@ -98,6 +98,7 @@ module CounterCulture
     # called by after_destroy callback
     def _update_counts_after_destroy
       _wrap_in_counter_culture_active do
+        @_counter_culture_active = true
         self.class.after_commit_counter_cache.each do |counter|
           # decrement counter cache
           counter.change_counter_cache(self, :increment => false)
@@ -118,6 +119,8 @@ module CounterCulture
               (counter.delta_column && counter.attribute_changed?(self, counter.delta_column)) ||
               counter_cache_name != counter_cache_name_was
 
+            @_counter_culture_active = true
+
             # increment the counter cache of the new value
             counter.change_counter_cache(self, :increment => true, :counter_column => counter_cache_name)
             # decrement the counter cache of the old value

data/lib/generators/templates/counter_culture_migration.rb.erb

@@ -1,6 +1,6 @@
 class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def self.up<% counter_cache_columns.each do |column| %>
-    add_column :<%= table_name %>, :<%= column %>, :integer, null: false, default:  0
+    add_column :<%= table_name %>, :<%= column %>, :integer, null: false, default: 0
 <% end %>  end
 
   def self.down<% counter_cache_columns.each do |column| %>

data/test_rails_versions.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-for RAILS_VERSION in "3.2.0" "4.0.0" "4.1.0" "4.2.0" "5.0.0" "5.1.0"
+for RAILS_VERSION in "~> 3.2.0" "~> 4.0.0" "~> 4.1.0" "~> 4.2.0" "~> 5.0.0" "= 5.1.4" "= 5.1.5" "~> 5.1.5"
 do
   export RAILS_VERSION
   echo "Rails $RAILS_VERSION"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -70,16 +70,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.1.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement