counter_culture 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd19171ad987974f7c8b1a22586f79d213480fb
-  data.tar.gz: ec110a9a8e59b1edd33b1208d588bf2640229dec
+  metadata.gz: d533810e55052bcda7977adb7fdff4137d04067a
+  data.tar.gz: 674d61d6f4252bdf24f79d4aaab15be41c2ef258
 SHA512:
-  metadata.gz: ecc374dd09b2af3f7ae325acb30f567b87258aeebce9fbd236266f1ed64b13965dd4c50b11db7a45d634c107d314438c578819975aa10e37c1abc1445ce474ff
-  data.tar.gz: 6c837a717f549c2b4767c769c9d79087ab0b6c8bde80ed411acbf5fbd75bc144e4fceb0ded912624a2a68c8f5b830a24eac6ecc34416dd10e40304da70630274
+  metadata.gz: 34d9fea6a252d09e834425d7f385d4662335335ac98bf84bd8eb25afd480119ce6017731ba9bf2a716b9d9026e02931531ccb79841595de0e32676640e921d56
+  data.tar.gz: d505de4c567898de988956e15656e214b9733d7d0b910a4de34c7b0cda64acb255d57795bcf824973ea8e918bf1fc15732769fb24b0381259383158531766ffd

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-  - "2.2.5"
-  - "2.3.1"
+  - "2.2.10"
+  - "2.3.7"
+  - "2.4.4"
+  - "2.5.1"
 env:
   - 'RAILS_VERSION="~> 3.2.0"'
   - 'RAILS_VERSION="~> 4.0.0"'
@@ -11,6 +13,25 @@ env:
   - 'RAILS_VERSION="= 5.1.4"'
   - 'RAILS_VERSION="= 5.1.5"'
   - 'RAILS_VERSION="~> 5.1.5"'
+  - 'RAILS_VERSION="~> 5.2.0"'
+matrix:
+  exclude:
+  - rvm: "2.2.10"
+    env: 'RAILS_VERSION="= 5.1.4"'
+  - rvm: "2.2.10"
+    env: 'RAILS_VERSION="= 5.1.5"'
+  - rvm: "2.4.4"
+    env: 'RAILS_VERSION="~> 3.2.0"'
+  - rvm: "2.4.4"
+    env: 'RAILS_VERSION="~> 4.0.0"'
+  - rvm: "2.4.4"
+    env: 'RAILS_VERSION="~> 4.1.0"'
+  - rvm: "2.5.1"
+    env: 'RAILS_VERSION="~> 3.2.0"'
+  - rvm: "2.5.1"
+    env: 'RAILS_VERSION="~> 4.0.0"'
+  - rvm: "2.5.1"
+    env: 'RAILS_VERSION="~> 4.1.0"'
 install:
   - bundle update
 script: TRAVIS=true bundle exec rake spec

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-## 1.9.1 (March 1, 2017)
+## 1.9.2 (April 13, 2018)
+
+Bugfixes:
+  - When using paranoia, call increment / decrement only once when calling destroy or restore on the same model multiple times
+
+Improvements:
+  - Address deprecation warning when enabling paper_trail touch in paper_trail version 9.0
+  - Address `Arel` deprecation warnings in Rails 5.2
+
+Changes:
+  - Test against Ruby 2.2 through 2.5, Rails 3.2 through 5.2
+  - Don't test Rails 3.2 through 4.1 against Ruby 2.4 or 2.5 as those versions of Rails will not work with those versions of Ruby
+  - Avoid various deprecation warnings being triggered in the test
+
+## 1.9.1 (March 1, 2018)
 
 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

data/Gemfile

@@ -20,7 +20,7 @@ group :development, :test do
   else
     ENV["RAILS_VERSION"]
   end
-  gem "rails", ENV['RAILS_VERSION']
+  gem "rails", rails
 
   gem "rspec", "~> 3.0"
   gem "awesome_print"
@@ -28,7 +28,11 @@ group :development, :test do
 
   # to test the integration
   gem "paranoia"
-  gem "paper_trail"
+  if RUBY_VERSION < "2.3.0"
+    gem "paper_trail", "< 9.0.0"
+  else
+    gem "paper_trail"
+  end
 end
 
 group :development do

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.9.2

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.1 ruby lib
+# stub: counter_culture 1.9.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.9.1"
+  s.version = "1.9.2"
 
   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 = "2018-03-01"
+  s.date = "2018-04-14"
   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 = [
@@ -67,7 +67,6 @@ Gem::Specification.new do |s|
     "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",
@@ -131,7 +130,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>, ["= 5.1.5"])
+      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"])
@@ -145,7 +144,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>, ["= 5.1.5"])
+      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"])
@@ -160,7 +159,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>, ["= 5.1.5"])
+    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"])

data/lib/counter_culture/counter.rb

@@ -70,7 +70,13 @@ module CounterCulture
 
           if @with_papertrail
             instance = klass.where(primary_key => id_to_change).first
-            instance.paper_trail.touch_with_version if instance
+            if instance
+              if PaperTrail::VERSION::MAJOR >= 9
+                instance.touch
+              else
+                instance.paper_trail.touch_with_version
+              end
+            end
           end
 
           klass.where(primary_key => id_to_change).update_all updates.join(', ')

data/lib/counter_culture/extensions.rb

@@ -19,10 +19,17 @@ module CounterCulture
 
           # initialize callbacks only once
           after_create :_update_counts_after_create
-          after_destroy :_update_counts_after_destroy
+          before_destroy :_update_counts_after_destroy, if: -> (model) do
+            if model.respond_to?(:paranoia_destroyed?)
+              !model.paranoia_destroyed?
+            else
+              true
+            end
+          end
           after_update :_update_counts_after_update
-          if respond_to?(:after_restore)
-            after_restore :_update_counts_after_create
+          if respond_to?(:before_restore)
+            before_restore :_update_counts_after_create,
+              if: -> (model) { model.deleted? }
           end
 
           # we keep a list of all counter caches we must maintain

data/lib/counter_culture/reconciler.rb

@@ -47,7 +47,7 @@ module CounterCulture
 
     def polymorphic_associated_model_classes
       foreign_type_field = relation_reflect(relation).foreign_type
-      model.pluck("DISTINCT #{foreign_type_field}").compact.map(&:constantize)
+      model.pluck(Arel.sql("DISTINCT #{foreign_type_field}")).compact.map(&:constantize)
     end
 
     def associated_model_class

data/spec/counter_culture_spec.rb

@@ -1302,7 +1302,7 @@ describe "CounterCulture" do
 
     SimpleMain.find_each { |main| expect(main.simple_dependents_count).to eq(3) }
 
-    SimpleMain.order('random()').limit(A_FEW).update_all simple_dependents_count: 1
+    SimpleMain.order(Arel.sql('random()')).limit(A_FEW).update_all simple_dependents_count: 1
     SimpleDependent.counter_culture_fix_counts :batch_size => A_BATCH
 
     SimpleMain.find_each { |main| expect(main.simple_dependents_count).to eq(3) }
@@ -1320,7 +1320,7 @@ describe "CounterCulture" do
 
     ConditionalMain.find_each { |main| expect(main.conditional_dependents_count).to eq(main.id % 2 == 0 ? 3 : 0) }
 
-    ConditionalMain.order('random()').limit(A_FEW).update_all :conditional_dependents_count => 1
+    ConditionalMain.order(Arel.sql('random()')).limit(A_FEW).update_all :conditional_dependents_count => 1
     ConditionalDependent.counter_culture_fix_counts :batch_size => A_BATCH
 
     ConditionalMain.find_each { |main| expect(main.conditional_dependents_count).to eq(main.id % 2 == 0 ? 3 : 0) }
@@ -1338,7 +1338,7 @@ describe "CounterCulture" do
 
     SimpleMain.find_each { |main| expect(main.simple_dependents_count).to eq(main.id % 4) }
 
-    SimpleMain.order('random()').limit(A_FEW).update_all simple_dependents_count: 1
+    SimpleMain.order(Arel.sql('random()')).limit(A_FEW).update_all simple_dependents_count: 1
     SimpleDependent.counter_culture_fix_counts :batch_size => A_BATCH
 
     SimpleMain.find_each { |main| expect(main.simple_dependents_count).to eq(main.id % 4) }
@@ -1663,6 +1663,39 @@ describe "CounterCulture" do
       sd.restore
       expect(company.reload.soft_deletes_count).to eq(1)
     end
+
+    it "runs destroy callback only once" do
+      skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+      company = Company.create!
+      sd = SoftDelete.create!(company_id: company.id)
+
+      expect(company.reload.soft_deletes_count).to eq(1)
+
+      sd.destroy
+      expect(company.reload.soft_deletes_count).to eq(0)
+
+      sd.destroy
+      expect(company.reload.soft_deletes_count).to eq(0)
+    end
+
+    it "runs restore callback only once" do
+      skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+      company = Company.create!
+      sd = SoftDelete.create!(company_id: company.id)
+
+      expect(company.reload.soft_deletes_count).to eq(1)
+
+      sd.destroy
+      expect(company.reload.soft_deletes_count).to eq(0)
+
+      sd.restore
+      expect(company.reload.soft_deletes_count).to eq(1)
+
+      sd.restore
+      expect(company.reload.soft_deletes_count).to eq(1)
+    end
   end
 
   describe "with polymorphic_associations" do
@@ -1840,9 +1873,12 @@ describe "CounterCulture" do
 
   describe "with papertrail support", versioning: true do
     it "creates a papertrail version when changed" do
-      if Rails.version > "4.0.0" && Rails.version < "4.1.0"
+      if Rails.version < "5.0.0"
         skip("Unsupported in this version of Rails")
       end
+      if RUBY_VERSION < "2.3.0" && Rails.version >= "5.2.0"
+        skip("Unsupported in this combination of Ruby and Rails")
+      end
 
       user = User.create
       product = Product.create
@@ -1859,9 +1895,12 @@ describe "CounterCulture" do
     end
 
     it "does not create a papertrail version when papertrail flag not set" do
-      if Rails.version > "4.0.0" && Rails.version < "4.1.0"
+      if Rails.version < "5.0.0"
         skip("Unsupported in this version of Rails")
       end
+      if RUBY_VERSION < "2.3.0" && Rails.version >= "5.2.0"
+        skip("Unsupported in this combination of Ruby and Rails")
+      end
 
       user = User.create
       product = Product.create

data/spec/models/product.rb

@@ -3,5 +3,7 @@ class Product < ActiveRecord::Base
 
   counter_culture :category, :foreign_key_values => proc {|foreign_key_value| Category.pluck(:id) }
 
-  has_paper_trail
+  if Rails.version >= "5.0.0"
+    has_paper_trail
+  end
 end

data/spec/models/review.rb

@@ -2,7 +2,7 @@ class Review < ActiveRecord::Base
   belongs_to :user
   belongs_to :product
 
-  counter_culture :product, :touch => true, :with_papertrail => true
+  counter_culture :product, :touch => true, :with_papertrail => Rails.version >= "5.0.0"
   counter_culture :product, :column_name => 'rexiews_count', touch: :rexiews_updated_at
   counter_culture :user
   counter_culture :user, :column_name => proc { |model| model.review_type && model.review_type != 'null' ? "#{model.review_type}_count" : nil }, :column_names => {"reviews.review_type = 'using'" => 'using_count', "reviews.review_type = 'tried'" => 'tried_count', "reviews.review_type = 'null'" => nil}

data/spec/models/user.rb

@@ -9,7 +9,9 @@ class User < ActiveRecord::Base
   has_many :reviews
   accepts_nested_attributes_for :reviews, :allow_destroy => true
 
-  has_paper_trail
+  if Rails.version >= "5.0.0"
+    has_paper_trail
+  end
 
   default_scope do
     if _default_scope_enabled

data/spec/rails_app/config/application.rb

@@ -54,5 +54,9 @@ module RailsApp
     if Rails.version >= "4.2.0" && Rails.version < "5.0.0"
       config.active_record.raise_in_transactional_callbacks = true
     end
+
+    if config.active_record.sqlite3.respond_to?(:represent_boolean_as_integer=)
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
   end
 end

data/test_rails_versions.sh

@@ -2,12 +2,22 @@
 
 set -e
 
-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"
-  bundle update
-  bundle exec rspec spec
+source /usr/local/share/chruby/chruby.sh
+
+for RUBY_VERSION in "2.2.10" "2.3.7" "2.4.4" "2.5.1"; do
+  chruby $RUBY_VERSION
+  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.6" "~> 5.2.0"; do
+    echo "Ruby $RUBY_VERSION; Rails $RAILS_VERSION"
+    if ( [ "$RUBY_VERSION" == "2.2.10" ] && ( [ "$RAILS_VERSION" == "= 5.1.4" ] || [ "$RAILS_VERSION" == "= 5.1.5" ] ) ) || \
+        ( ( [ "$RUBY_VERSION" == "2.4.4" ] || ( [ "$RUBY_VERSION" == "2.5.1" ] ) && ( [ "$RAILS_VERSION" == "~> 3.2.0" ] || [ "$RAILS_VERSION" == "~> 4.0.0" ] || [ "$RAILS_VERSION" == "~> 4.1.0" ] ) ) ); then
+      echo "Skipping"
+      continue
+    fi
+    export RAILS_VERSION
+    type bundle > /dev/null || gem install bundler
+    bundle update
+    bundle exec rspec spec
+  done
 done
 
 unset RAILS_VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-04-14 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: 5.1.5
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,6 @@ files:
 - 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

data/spec/rails_app/Gemfile.lock

@@ -1,150 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    counter_culture (1.6.2)
-      activerecord (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      after_commit_action (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    after_commit_action (1.0.1)
-      activerecord (>= 3.0.0)
-      activesupport (>= 3.0.0)
-    arel (6.0.3)
-    builder (3.2.2)
-    coffee-rails (4.2.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.2)
-    erubis (2.7.0)
-    execjs (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    jquery-rails (4.2.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.3)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    paper_trail (7.0.3)
-      activerecord (>= 4.0, < 5.2)
-      request_store (~> 1.1)
-    rack (1.6.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
-    request_store (1.3.2)
-    sass (3.4.22)
-    sass-rails (5.0.6)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    sprockets (3.7.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.12)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    uglifier (3.0.3)
-      execjs (>= 0.3.0, < 3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coffee-rails
-  counter_culture!
-  jquery-rails
-  paper_trail
-  rails (~> 4.2.0)
-  sass-rails
-  sqlite3
-  uglifier
-
-BUNDLED WITH
-   1.14.6