counter_culture 1.8.0 → 2.7.0

data/Rakefile

@@ -1,48 +1,21 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "counter_culture"
-  gem.homepage = "http://github.com/magnusvk/counter_culture"
-  gem.license = "MIT"
-  gem.summary = %Q{Turbo-charged counter caches for your Rails app.}
-  gem.description = %Q{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.}
-  gem.email = "magnus@vonkoeller.de"
-  gem.authors = ["Magnus von Koeller"]
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rdoc/task'
+require 'counter_culture/version'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = CounterCulture::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "counter_culture #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task default: :spec

data/counter_culture.gemspec

@@ -1,174 +1,45 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: counter_culture 1.8.0 ruby lib
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'counter_culture/version'
 
-Gem::Specification.new do |s|
-  s.name = "counter_culture"
-  s.version = "1.8.0"
+Gem::Specification.new do |spec|
+  spec.name          = 'counter_culture'
+  spec.version       = CounterCulture::VERSION
+  spec.authors       = ['Magnus von Koeller']
+  spec.email         = ["magnus@vonkoeller.de"]
 
-  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-08-30"
-  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 = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".travis.yml",
-    "CHANGELOG.md",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "circle.yml",
-    "counter_culture.gemspec",
-    "lib/counter_culture.rb",
-    "lib/counter_culture/counter.rb",
-    "lib/counter_culture/extensions.rb",
-    "lib/counter_culture/reconciler.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_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.rb",
-    "spec/models/subcateg.rb",
-    "spec/models/transaction.rb",
-    "spec/models/twitter_review.rb",
-    "spec/models/user.rb",
-    "spec/rails_app/.gitignore",
-    "spec/rails_app/Gemfile",
-    "spec/rails_app/Gemfile.lock",
-    "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"
-  ]
-  s.homepage = "http://github.com/magnusvk/counter_culture"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Turbo-charged counter caches for your Rails app."
+  spec.summary       = 'Turbo-charged counter caches for your Rails app.'
+  spec.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.'
+  spec.homepage      = 'https://github.com/magnusvk/counter_culture'
+  spec.license       = 'MIT'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<after_commit_action>, ["~> 1.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>, ["~> 3.0"])
-      s.add_development_dependency(%q<awesome_print>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<paranoia>, [">= 0"])
-      s.add_development_dependency(%q<paper_trail>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.1"])
-    else
-      s.add_dependency(%q<after_commit_action>, ["~> 1.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>, ["~> 3.0"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<paranoia>, [">= 0"])
-      s.add_dependency(%q<paper_trail>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.2.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.1"])
-    end
-  else
-    s.add_dependency(%q<after_commit_action>, ["~> 1.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>, ["~> 3.0"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<paranoia>, [">= 0"])
-    s.add_dependency(%q<paper_trail>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.2.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.1"])
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-end
+  spec.extra_rdoc_files = ['LICENSE.txt', 'README.md']
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'activerecord', '>= 4.2'
+  spec.add_dependency 'activesupport', '>= 4.2'
 
+  spec.add_development_dependency 'appraisal', '> 2.0.0'
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'database_cleaner', '>= 1.1.1'
+  spec.add_development_dependency 'discard'
+  spec.add_development_dependency 'paper_trail'
+  spec.add_development_dependency 'paranoia'
+  spec.add_development_dependency 'rails', '>= 4.2'
+  spec.add_development_dependency 'rake', '>= 10.0'
+  spec.add_development_dependency 'rdoc', '~> 5.0.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-extra-formatters'
+  spec.add_development_dependency 'simplecov', '~> 0.16.1'
+  spec.add_development_dependency 'timecop'
+end

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.gemfile

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

data/lib/counter_culture.rb

@@ -1,7 +1,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

@@ -1,6 +1,6 @@
 module CounterCulture
   class Counter
-    CONFIG_OPTIONS = [ :column_names, :counter_cache_name, :delta_column, :foreign_key_values, :touch, :delta_magnitude, :execute_after_commit ]
+    CONFIG_OPTIONS = [ :column_names, :counter_cache_name, :delta_column, :foreign_key_values, :touch, :delta_magnitude]
     ACTIVE_RECORD_VERSION = Gem.loaded_specs["activerecord"].version
 
     attr_reader :model, :relation, *CONFIG_OPTIONS
@@ -9,13 +9,16 @@ module CounterCulture
       @model = model
       @relation = relation.is_a?(Enumerable) ? relation : [relation]
 
-      @counter_cache_name = options.fetch(:column_name, "#{model.name.tableize}_count")
+      if options.fetch(:execute_after_commit, false)
+        fail("execute_after_commit was removed; updates now run within the transaction")
+      end
+
+      @counter_cache_name = options.fetch(:column_name, "#{model.name.demodulize.tableize}_count")
       @column_names = options[:column_names]
       @delta_column = options[:delta_column]
       @foreign_key_values = options[:foreign_key_values]
       @touch = options.fetch(:touch, false)
       @delta_magnitude = options[:delta_magnitude] || 1
-      @execute_after_commit = options.fetch(:execute_after_commit, false)
       @with_papertrail = options.fetch(:with_papertrail, false)
     end
 
@@ -29,7 +32,6 @@ module CounterCulture
     #   :delta_column => override the default count delta (1) with the value of this column in the counted record
     #   :was => whether to get the current value or the old value of the
     #      first part of the relation
-    #   :execute_after_commit => execute the column update outside of the transaction to avoid deadlocks
     #   :with_papertrail => update the column via Papertrail touch_with_version method
     def change_counter_cache(obj, options)
       change_counter_column = options.fetch(:counter_column) { counter_cache_name_for(obj) }
@@ -45,36 +47,60 @@ module CounterCulture
                           else
                             counter_delta_magnitude_for(obj)
                           end
-        execute_change_counter_cache(obj, options) do
-          # 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)
-
-          updates = []
-          # this updates the actual counter
-          updates << "#{quoted_column} = COALESCE(#{quoted_column}, 0) #{operator} #{delta_magnitude}"
-          # and here we update the timestamp, if so desired
-          if touch
-            current_time = obj.send(:current_time_from_proper_timezone)
-            timestamp_columns = obj.send(:timestamp_attributes_for_update_in_model)
-            timestamp_columns << touch if touch != true
-            timestamp_columns.each do |timestamp_column|
-              updates << "#{timestamp_column} = '#{current_time.to_formatted_s(:db)}'"
-            end
+        # increment or decrement?
+        operator = options[:increment] ? '+' : '-'
+
+        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}"
+        # and here we update the timestamp, if so desired
+        if touch
+          current_time = obj.send(:current_time_from_proper_timezone)
+          timestamp_columns = obj.send(:timestamp_attributes_for_update_in_model)
+          if touch != true
+            # starting in Rails 6 this is frozen
+            timestamp_columns = timestamp_columns.dup
+            timestamp_columns << touch
+          end
+          timestamp_columns.each do |timestamp_column|
+            updates << "#{timestamp_column} = '#{current_time.to_formatted_s(:db)}'"
           end
+        end
 
-          klass = relation_klass(relation, source: obj, was: options[:was])
-          primary_key = relation_primary_key(relation, source: obj, was: options[:was])
+        primary_key = relation_primary_key(relation, source: obj, was: options[:was])
 
-          if @with_papertrail
-            instance = klass.where(primary_key => id_to_change).first
-            instance.paper_trail.touch_with_version if instance
-          end
+        if @with_papertrail
+          instance = klass.where(primary_key => id_to_change).first
+          if instance
+            if instance.paper_trail.respond_to?(:save_with_version)
+              # touch_with_version is deprecated starting in PaperTrail 9.0.0
+
+              current_time = obj.send(:current_time_from_proper_timezone)
+              timestamp_columns = obj.send(:timestamp_attributes_for_update_in_model)
+              timestamp_columns.each do |timestamp_column|
+                instance.send("#{timestamp_column}=", current_time)
+              end
 
-          klass.where(primary_key => id_to_change).update_all updates.join(', ')
+              instance.paper_trail.save_with_version(validate: false)
+            else
+              instance.paper_trail.touch_with_version
+            end
+          end
         end
+
+        klass.where(primary_key => id_to_change).update_all updates.join(', ')
       end
     end
 
@@ -264,21 +290,13 @@ module CounterCulture
       changes_method = ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0") ? :saved_changes : :changed_attributes
       obj.public_send(changes_method).each do |key, value|
         old_value = ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0") ? value.first : value
-        prev.public_send("#{key}=", old_value)
+        prev[key] = old_value
       end
 
       prev
     end
 
     private
-    def execute_change_counter_cache(obj, options)
-      if execute_after_commit
-        obj.execute_after_commit { yield }
-      else
-        yield
-      end
-    end
-
     def attribute_was(obj, attr)
       changes_method =
         if ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0")