counter_culture 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32ed47b22301d4d8c78b84070e31848f83f9400
-  data.tar.gz: e65f3e880c94317dd98ad5ec7f4f47d06af13653
+  metadata.gz: abf23aa3efb1a2f3257bbf6892182ce3ae4ce928
+  data.tar.gz: dba604aa21f0c043169ff3b7f49050450b74f870
 SHA512:
-  metadata.gz: d6af1fba641af3a199d2e0f9f1a5cfe53e387c585a71dda8395b97f71ff4beccc45c89542dcae6ac9d54c26b1bfa723421c6dd5af1cd25f3a477285862aea908
-  data.tar.gz: 7d73f3bcd4a5671a4c92d69d4155483b44495d2451cb2bf1299f560a3ff03dab824c3c87b375c4ab82953e0a135614feeb78d144eb669a775576190f668f0443
+  metadata.gz: fa34f25d6de4af563033c744e84b82a6ba2b45a14115f74245fa73b40e09e51a3882634863b0aa1d94bb6c7b004b73392c5f7b11180f6c55f47825d27af00c6f
+  data.tar.gz: 2a317f9b84e3d1f47b6a686cf3d53360514796905fcba622f19c897569fd17b806f99f7e563434ef4759d0d22212dd15db5134217d116debfc4849e3aef3fddc

data/.travis.yml

@@ -8,7 +8,7 @@ env:
   - "RAILS_VERSION=4.1.0"
   - "RAILS_VERSION=4.2.0"
   - "RAILS_VERSION=5.0.0"
-  - "RAILS_VERSION=5.1.0.rc1"
+  - "RAILS_VERSION=5.1.0"
 install:
   - bundle update
 script: TRAVIS=true bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.7.0 (June 12, 2017)
+
+Improvements:
+  - Support for creating `paper_trail` versions when counters change
+
 ## 1.6.2 (April 26, 2017)
 
 Bugfixes;

data/Gemfile

@@ -28,6 +28,7 @@ group :development, :test do
 
   # to test the integration
   gem "paranoia"
+  gem "paper_trail"
 end
 
 group :development do

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.7.0

data/counter_culture.gemspec

@@ -2,20 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 1.6.2 ruby lib
+# stub: counter_culture 1.7.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "counter_culture".freeze
-  s.version = "1.6.2"
+  s.name = "counter_culture"
+  s.version = "1.7.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Magnus von Koeller".freeze]
-  s.date = "2017-04-26"
-  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.".freeze
-  s.email = "magnus@vonkoeller.de".freeze
+  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-06-12"
+  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 = [
-    "CHANGELOG.md",
     "LICENSE.txt",
     "README.md"
   ]
@@ -89,6 +88,7 @@ Gem::Specification.new do |s|
     "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",
@@ -118,54 +118,57 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "test_rails_versions.sh"
   ]
-  s.homepage = "http://github.com/magnusvk/counter_culture".freeze
-  s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.10".freeze
-  s.summary = "Turbo-charged counter caches for your Rails app.".freeze
+  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."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<after_commit_action>.freeze, ["~> 1.0"])
-      s.add_runtime_dependency(%q<activerecord>.freeze, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 3.0.0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rails>.freeze, [">= 3.1.0"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
-      s.add_development_dependency(%q<awesome_print>.freeze, [">= 0"])
-      s.add_development_dependency(%q<timecop>.freeze, [">= 0"])
-      s.add_development_dependency(%q<paranoia>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 1.2.0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1"])
+      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>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<activerecord>.freeze, [">= 3.0.0"])
-      s.add_dependency(%q<activesupport>.freeze, [">= 3.0.0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<rails>.freeze, [">= 3.1.0"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
-      s.add_dependency(%q<awesome_print>.freeze, [">= 0"])
-      s.add_dependency(%q<timecop>.freeze, [">= 0"])
-      s.add_dependency(%q<paranoia>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, [">= 1.2.0"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
+      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>.freeze, ["~> 1.0"])
-    s.add_dependency(%q<activerecord>.freeze, [">= 3.0.0"])
-    s.add_dependency(%q<activesupport>.freeze, [">= 3.0.0"])
-    s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<rails>.freeze, [">= 3.1.0"])
-    s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
-    s.add_dependency(%q<awesome_print>.freeze, [">= 0"])
-    s.add_dependency(%q<timecop>.freeze, [">= 0"])
-    s.add_dependency(%q<paranoia>.freeze, [">= 0"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, [">= 1.2.0"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
+    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
 end
 

data/lib/counter_culture/counter.rb

@@ -15,6 +15,7 @@ module CounterCulture
       @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
 
     # increments or decrements a counter cache
@@ -28,6 +29,7 @@ module CounterCulture
     #   :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) }
 
@@ -64,6 +66,12 @@ module CounterCulture
 
           klass = relation_klass(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
+
           klass.where(primary_key => id_to_change).update_all updates.join(', ')
         end
       end

data/spec/counter_culture_spec.rb

@@ -1822,4 +1822,36 @@ describe "CounterCulture" do
       end
     end
   end
+
+  describe "with papertrail support", versioning: true do
+    it "creates a papertrail version when changed" do
+      user = User.create
+      product = Product.create
+
+      expect(product.reviews_count).to eq(0)
+      expect(product.versions.count).to eq(1)
+
+      user.reviews.create :user_id => user.id, :product_id => product.id, :approvals => 13
+
+      product.reload
+
+      expect(product.reviews_count).to eq(1)
+      expect(product.versions.count).to eq(2)
+    end
+
+    it "does not create a papertrail version when papertrail flag not set" do
+      user = User.create
+      product = Product.create
+
+      expect(user.reviews_count).to eq(0)
+      expect(user.versions.count).to eq(1)
+
+      user.reviews.create :user_id => user.id, :product_id => product.id, :approvals => 13
+
+      user.reload
+
+      expect(user.reviews_count).to eq(1)
+      expect(user.versions.count).to eq(1)
+    end
+  end
 end

data/spec/models/product.rb

@@ -3,4 +3,5 @@ class Product < ActiveRecord::Base
 
   counter_culture :category, :foreign_key_values => proc {|foreign_key_value| Category.pluck(:id) }
 
+  has_paper_trail
 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
+  counter_culture :product, :touch => true, :with_papertrail => true
   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,6 +9,8 @@ class User < ActiveRecord::Base
   has_many :reviews
   accepts_nested_attributes_for :reviews, :allow_destroy => true
 
+  has_paper_trail
+
   default_scope do
     if _default_scope_enabled
       query = joins("LEFT OUTER JOIN companies")

data/spec/rails_app/Gemfile

@@ -23,6 +23,8 @@ gem 'jquery-rails'
 
 gem 'counter_culture', path: '../..'
 
+gem 'paper_trail'
+
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
 

data/spec/rails_app/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../..
   specs:
-    counter_culture (0.2.3)
+    counter_culture (1.6.2)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      after_commit_action (~> 1.0.0)
+      after_commit_action (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -78,6 +78,9 @@ GEM
     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)
@@ -106,6 +109,7 @@ GEM
       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)
@@ -136,10 +140,11 @@ DEPENDENCIES
   coffee-rails
   counter_culture!
   jquery-rails
+  paper_trail
   rails (~> 4.2.0)
   sass-rails
   sqlite3
   uglifier
 
 BUNDLED WITH
-   1.13.6
+   1.14.6

data/spec/rails_app/config/initializers/paper_trail.rb

@@ -0,0 +1 @@
+PaperTrail.config.track_associations = false

data/spec/schema.rb

@@ -213,4 +213,15 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer "candidate_id"
     t.integer "conversations_count", :default => 0, :null => false
   end
+
+  create_table :versions, :force => true do |t|
+    t.string   :item_type
+    t.integer  :item_id,   null: false
+    t.string   :event,     null: false
+    t.integer  :whodunnit
+    t.text    :object
+    t.text    :object_changes
+    t.datetime :created_at
+  end
+  add_index :versions, [:item_id, :item_type]
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require "rails_app/config/environment"
 
 require 'rspec'
 require 'counter_culture'
+require 'paper_trail/frameworks/rspec'
 
 CI_TEST_RUN = (ENV['TRAVIS'] && 'TRAVIS') || (ENV['CIRCLECI'] && 'CIRCLE') || ENV["CI"] && 'CI'
 

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.rc1"
+for RAILS_VERSION in "3.2.0" "4.0.0" "4.1.0" "4.2.0" "5.0.0" "5.1.0"
 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.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: paper_trail
+  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'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +200,6 @@ email: magnus@vonkoeller.de
 executables: []
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
@@ -259,6 +272,7 @@ files:
 - 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
@@ -307,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.