counter_culture 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0d12b75377e5baffc9364982bfd8d08f2f5530
-  data.tar.gz: 21a22f582dd41bc8a6e7d9cc85a70757f5acb982
+  metadata.gz: b8e94799083d30c0bd97dbcdd70290c18bcfcd68
+  data.tar.gz: 49074978dffb068623ecf6aec34483d84d4f3704
 SHA512:
-  metadata.gz: d0a5bba782c586130d2436ae029e147d848a3fd740ecf2060e45a43e8df8775401dedd7b1df23643a71420a7c5ecbab63f4a47359c770263cfc5997110d7b608
-  data.tar.gz: f83999e34478258e389cb0d893194b0839104c5f7fd3adcef11b2833bfae1b5de72b087fc0d71e8528aca3479b52b9664cdf43bddf8c12f67e5fcd3125e4851d
+  metadata.gz: 12d07d5c17e2f17eaadf865f180849b2a140f5d6a59cf074fdcbd98ac27dae74c0a340052a4bf1ea444029d592be2270d5b93985d599c7615287bafa31c8edd3
+  data.tar.gz: e5c827862773bb11853e2ee918b3b6559af9fcc087db6ec5bfd50cf428efed0d4fdd7560f0e3099e4e2237af6c17c7e31cce7a951af26c879953d11912638924

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.11.0 (May 4, 2018)
+
+Bugfixes:
+  - Fix `with_papertrail` behavior while still addressing the deprecation warning, and actually recording the correct counts (#218, see [airblade/paper_trail#1076](https://github.com/airblade/paper_trail/issues/1076))
+
 ## 1.10.1 (April 20, 2018)
 
 Improvements:

data/README.md

@@ -301,14 +301,23 @@ class Product < ActiveRecord::Base
 end
 ```
 
+If you would like to avoid this configuration and simply skip counter caches with
+dynamic column names, while still fixing those counters on the model that are not
+dynamic, you can pass `skip_unsupported`:
+
+```ruby
+Product.counter_culture_fix_counts skip_unsupported: true
+```
+
 #### Handling over-written, dynamic foreign keys
 
 Manually populating counter caches with dynamically over-written foreign keys (```:foreign_key_values``` option) is not supported. You will have to write code to handle this case yourself.
 
 ### Soft-deletes / `paranoia` gem
 
-This gem will keep counters correctly updated when using the `paranoia` gem for
-soft-delete support. However, to ensure that counts are incremented after a
+This gem will keep counters correctly updated when using the
+[`paranoia` gem](https://github.com/rubysherpas/paranoia)
+for soft-delete support. However, to ensure that counts are incremented after a
 restore you have to make sure that the call to `acts_as_paranoid` comes before
 the call to `counter_culture` in your model:
 
@@ -321,6 +330,22 @@ class SoftDelete < ActiveRecord::Base
 end
 ```
 
+### PaperTrail integration
+
+If you are using the [`paper_trail` gem](https://github.com/airblade/paper_trail)
+and would like new versions to be created when the counter cache columns are
+changed by counter_culture, you can set the `with_papertrail` option:
+
+```ruby
+class Review < ActiveRecord::Base
+  counter_culture :product, with_papertrail: true
+end
+
+class Product < ActiveRecord::Base
+  has_paper_trail
+end
+```
+
 #### Polymorphic associations
 
 counter_culture now supports polymorphic associations of one level only.

data/VERSION

@@ -1 +1 @@
-1.10.0
+1.11.0

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.10.0 ruby lib
+# stub: counter_culture 1.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.10.0"
+  s.version = "1.11.0"
 
   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-04-20"
+  s.date = "2018-05-07"
   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 = [

data/lib/counter_culture/counter.rb

@@ -71,8 +71,9 @@ module CounterCulture
           if @with_papertrail
             instance = klass.where(primary_key => id_to_change).first
             if instance
-              if PaperTrail::VERSION::MAJOR >= 9
-                instance.touch
+              if instance.paper_trail.respond_to?(:save_with_version)
+                # touch_with_version is deprecated starting in PaperTrail 9.0.0
+                instance.paper_trail.save_with_version(validate: false)
               else
                 instance.paper_trail.touch_with_version
               end

data/spec/counter_culture_spec.rb

@@ -1949,6 +1949,21 @@ describe "CounterCulture" do
 
       expect(product.reviews_count).to eq(1)
       expect(product.versions.count).to eq(2)
+
+      attrs_from_versions = YAML.load(product.versions.reorder(:id).last.object)
+      # should be the value before the counter change
+      expect(attrs_from_versions['reviews_count']).to eq(0)
+
+      user.reviews.create :user_id => user.id, :product_id => product.id, :approvals => 13
+
+      product.reload
+
+      expect(product.reviews_count).to eq(2)
+      expect(product.versions.count).to eq(3)
+
+      attrs_from_versions = YAML.load(product.versions.reorder(:id).last.object)
+      # should be the value before the counter change
+      expect(attrs_from_versions['reviews_count']).to eq(1)
     end
 
     it "does not create a papertrail version when papertrail flag not set" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action