counter_culture 2.2.2 → 2.2.3

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.0"
+gem "rails", "~> 4.2.0"
+gem "pg", "~> 0.15"
+gem "mysql2"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.0"
+gem "rails", "~> 5.0.0"
+gem "pg", "~> 1.0"
+gem "mysql2"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.0"
+gem "rails", "~> 5.1.0"
+gem "pg", "~> 1.0"
+gem "mysql2"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.4"
+gem "rails", "~> 5.2.0"
+gem "pg", "~> 1.0"
+gem "mysql2"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.0.rc1.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.4"
+gem "rails", "~> 6.0.0.rc1.0"
+gem "pg", "~> 1.0"
+gem "mysql2"
+
+gemspec path: "../"

data/lib/counter_culture.rb

@@ -2,6 +2,7 @@ require 'after_commit_action'
 require 'active_support/concern'
 require 'active_support/lazy_load_hooks'
 
+require 'counter_culture/version'
 require 'counter_culture/extensions'
 require 'counter_culture/counter'
 require 'counter_culture/reconciler'

data/lib/counter_culture/counter.rb

@@ -50,9 +50,18 @@ module CounterCulture
         # increment or decrement?
         operator = options[:increment] ? '+' : '-'
 
-        # we don't use Rails' update_counters because we support changing the timestamp
-        quoted_column = model.connection.quote_column_name(change_counter_column)
+        klass = relation_klass(relation, source: obj, was: options[:was])
+
+        # MySQL throws an ambiguous column error if any joins are present and we don't include the
+        # table name. We isolate this change to MySQL because sqlite has the opposite behavior and
+        # throws an exception if the table name is present after UPDATE.
+        quoted_column = if klass.connection.adapter_name == 'Mysql2'
+                          "#{klass.quoted_table_name}.#{model.connection.quote_column_name(change_counter_column)}"
+                        else
+                          "#{model.connection.quote_column_name(change_counter_column)}"
+                        end
 
+        # we don't use Rails' update_counters because we support changing the timestamp
         updates = []
         # this updates the actual counter
         updates << "#{quoted_column} = COALESCE(#{quoted_column}, 0) #{operator} #{delta_magnitude}"
@@ -66,7 +75,6 @@ module CounterCulture
           end
         end
 
-        klass = relation_klass(relation, source: obj, was: options[:was])
         primary_key = relation_primary_key(relation, source: obj, was: options[:was])
 
         if @with_papertrail

data/lib/counter_culture/version.rb

@@ -0,0 +1,3 @@
+module CounterCulture
+  VERSION = '2.2.3'.freeze
+end

data/run_tests_locally.sh

@@ -0,0 +1,18 @@
+#! /bin/bash
+
+set -e
+source /usr/local/share/chruby/chruby.sh
+
+for RUBY_VERSION in 2.3.8 2.4.6 2.5.5 2.6.2; do
+  chruby $RUBY_VERSION
+  ruby --version
+
+  (bundle check > /dev/null || bundle install)
+  gem install appraisal
+  bundle exec appraisal install
+
+  for DB in mysql2 postgresql sqlite3; do
+    echo "RUBY $RUBY_VERSION; DB $DB"
+    DB=$DB bundle exec appraisal rspec spec/counter_culture_spec.rb
+  done
+done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -30,86 +30,86 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: discard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: discard
+  name: paper_trail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,66 +151,109 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paper_trail
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-extra-formatters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.16.1
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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'
 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.
-email: magnus@vonkoeller.de
+email:
+- magnus@vonkoeller.de
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -218,106 +261,30 @@ extra_rdoc_files:
 - README.md
 files:
 - ".document"
+- ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - circle.yml
 - counter_culture.gemspec
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.0.rc1.gemfile
 - lib/counter_culture.rb
 - lib/counter_culture/counter.rb
 - lib/counter_culture/extensions.rb
 - lib/counter_culture/reconciler.rb
+- lib/counter_culture/version.rb
 - lib/generators/counter_culture_generator.rb
 - lib/generators/templates/counter_culture_migration.rb.erb
-- spec/counter_culture_spec.rb
-- spec/models/another_post.rb
-- spec/models/another_post_comment.rb
-- spec/models/candidate.rb
-- spec/models/candidate_profile.rb
-- spec/models/categ.rb
-- spec/models/category.rb
-- spec/models/company.rb
-- spec/models/conditional_dependent.rb
-- spec/models/conditional_main.rb
-- spec/models/conversation.rb
-- spec/models/has_non_pk_id.rb
-- spec/models/has_string_id.rb
-- spec/models/industry.rb
-- spec/models/person.rb
-- spec/models/poly_employee.rb
-- spec/models/poly_image.rb
-- spec/models/poly_product.rb
-- spec/models/post.rb
-- spec/models/post_comment.rb
-- spec/models/product.rb
-- spec/models/review.rb
-- spec/models/simple_dependent.rb
-- spec/models/simple_main.rb
-- spec/models/simple_review.rb
-- spec/models/soft_delete_discard.rb
-- spec/models/soft_delete_paranoia.rb
-- spec/models/subcateg.rb
-- spec/models/transaction.rb
-- spec/models/twitter_review.rb
-- spec/models/user.rb
-- spec/models/with_module/model1.rb
-- spec/models/with_module/model2.rb
-- spec/rails_app/.gitignore
-- spec/rails_app/Gemfile
-- spec/rails_app/README.rdoc
-- spec/rails_app/Rakefile
-- spec/rails_app/app/assets/images/rails.png
-- spec/rails_app/app/assets/javascripts/application.js
-- spec/rails_app/app/assets/stylesheets/application.css
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/helpers/application_helper.rb
-- spec/rails_app/app/mailers/.gitkeep
-- spec/rails_app/app/models/.gitkeep
-- spec/rails_app/app/views/layouts/application.html.erb
-- spec/rails_app/config.ru
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/database.yml
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/development.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/backtrace_silencers.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/mime_types.rb
-- spec/rails_app/config/initializers/paper_trail.rb
-- spec/rails_app/config/initializers/secret_token.rb
-- spec/rails_app/config/initializers/session_store.rb
-- spec/rails_app/config/initializers/wrap_parameters.rb
-- spec/rails_app/config/locales/en.yml
-- spec/rails_app/config/routes.rb
-- spec/rails_app/db/seeds.rb
-- spec/rails_app/lib/assets/.gitkeep
-- spec/rails_app/lib/tasks/.gitkeep
-- spec/rails_app/log/.gitkeep
-- spec/rails_app/public/404.html
-- spec/rails_app/public/422.html
-- spec/rails_app/public/500.html
-- spec/rails_app/public/favicon.ico
-- spec/rails_app/public/index.html
-- spec/rails_app/public/robots.txt
-- spec/rails_app/script/rails
-- spec/rails_app/test/fixtures/.gitkeep
-- spec/rails_app/test/functional/.gitkeep
-- spec/rails_app/test/integration/.gitkeep
-- spec/rails_app/test/performance/browsing_test.rb
-- spec/rails_app/test/test_helper.rb
-- spec/rails_app/test/unit/.gitkeep
-- spec/rails_app/vendor/assets/javascripts/.gitkeep
-- spec/rails_app/vendor/assets/stylesheets/.gitkeep
-- spec/rails_app/vendor/plugins/.gitkeep
-- spec/schema.rb
-- spec/spec_helper.rb
-- test_rails_versions.sh
+- run_tests_locally.sh
 homepage: http://github.com/magnusvk/counter_culture
 licenses:
 - MIT
@@ -337,8 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.