counter_culture 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 257485aedd64efe7fa6d054b77d54170f88df34a
-  data.tar.gz: fd59ea55659f4c66717f7386945bb93268a2c5ad
+  metadata.gz: 45d1871f0c220d0b4ada77d026082e91c02ec396
+  data.tar.gz: a3e3b9cbdbab8d8de36b05f1946d6e978e8a1ee8
 SHA512:
-  metadata.gz: 1056dad890bac7862cc6f3d9a729412e85efbbe00d31798cc2f0f9b504c6b163e23b86df16c803703ba4f8e17e52d5a66e27b131bf4a27ede191192d0b76666b
-  data.tar.gz: 84cd87e9e0a0c3044087f5273139937ab1aec2650df93fbcf39e4fd1aa3d3f6c41541073fcf79407389951f236c3c75ad3e25facbe158fe886f35d698ff1e8cf
+  metadata.gz: a79ae365d86fdd374c75a1a7267564a99d3b43885c45905f5a7ef7abc6aff6d04095f241af792d13ed5f5f5979d4dbb73d753417255deeb8183693a621fbc706
+  data.tar.gz: 166f643bd80237a11548e908c9708d2311d651ceec97504fb62228e5050ed21a37555456e06c4e65111bad6c43f2b0b4e89f1b2b6e5ef7d3381dc703efd247b6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.0 (February 21, 2017)
+
+New features:
+  - Add support for custom timestamp column with `touch` option
+
 ## 1.1.1 (January 13, 2017)
 
 Bugfixes:

data/Gemfile

@@ -14,6 +14,7 @@ group :development, :test do
   gem "rails", '>= 3.1.0'
   gem "rspec", "~> 3.0"
   gem "awesome_print"
+  gem "timecop"
 end
 
 group :development do

data/Gemfile.lock

@@ -150,6 +150,7 @@ GEM
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
+    timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -170,6 +171,7 @@ DEPENDENCIES
   rspec (~> 3.0)
   rspec-extra-formatters
   sqlite3
+  timecop
 
 BUNDLED WITH
    1.13.7

data/README.md

@@ -198,12 +198,21 @@ Now, the ```Category``` model will keep an up-to-date counter-cache in the ```pr
 
 ### Updating timestamps when counts change
 
-By default, counter_culture does not update the timestamp of models when it updates their counter caches. If you would like every change in the counter cache column to result in an updated timestamp, simply set the touch option to true like so:
+By default, counter_culture does not update the timestamp of models when it updates their counter caches. If you would like every change in the counter cache column to result in an updated timestamp, simply set the touch option to true:
 ```ruby
   counter_culture :category, :touch => true
 ```
 
-This can be useful when you use Rails' caching mechanism and display a counter cache's value in the cached fragment.
+This is useful when you require your caches to get invalidated when the counter cache changes.
+
+### Custom timestamp column
+
+You may also specify a custom timestamp column that gets updated only when a particular counter cache changes:
+```ruby
+  counter_culture :category, :touch => 'category_count_changed'
+```
+
+With this option, any time the `category_counter_cache` changes both the `category_count_changed` and `updated_at` columns will get updated.
 
 ### Executing counter cache updates after commit
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/circle.yml

@@ -1,3 +1,6 @@
+machine:
+  ruby:
+    version: 2.3.1
 database:
   override:
     - echo "No database setup required..."

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.1.1 ruby lib
+# stub: counter_culture 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.1.1"
+  s.version = "1.2.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 = "2017-01-13"
+  s.date = "2017-02-21"
   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 = [
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
-    ".ruby-version",
     ".travis.yml",
     "CHANGELOG.md",
     "Gemfile",
@@ -130,6 +129,7 @@ Gem::Specification.new do |s|
       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<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.1"])
@@ -141,6 +141,7 @@ Gem::Specification.new do |s|
       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<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.2.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.1"])
@@ -153,6 +154,7 @@ Gem::Specification.new do |s|
     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<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.2.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.1"])

data/lib/counter_culture/counter.rb

@@ -56,7 +56,9 @@ module CounterCulture
           # and here we update the timestamp, if so desired
           if touch
             current_time = obj.send(:current_time_from_proper_timezone)
-            obj.send(:timestamp_attributes_for_update_in_model).each do |timestamp_column|
+            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
           end

data/spec/counter_culture_spec.rb

@@ -1402,14 +1402,27 @@ describe "CounterCulture" do
     user = User.create
     product = Product.create
 
-    sleep 1
+    Timecop.travel(1.second.from_now) do
+      review = Review.create :user_id => user.id, :product_id => product.id
 
-    review = Review.create :user_id => user.id, :product_id => product.id
+      user.reload; product.reload
+
+      expect(user.created_at.to_i).to eq(user.updated_at.to_i)
+      expect(product.created_at.to_i).to be < product.updated_at.to_i
+    end
+  end
 
-    user.reload; product.reload
+  it "should update the timestamp for custom column if touch: rexiews_updated_at is set" do
+    product = Product.create
+
+    Timecop.travel(1.second.from_now) do
+      Review.create :product_id => product.id
 
-    expect(user.created_at.to_i).to eq(user.updated_at.to_i)
-    expect(product.created_at.to_i).to be < product.updated_at.to_i
+      product.reload
+
+      expect(product.created_at.to_i).to be < product.rexiews_updated_at.to_i
+      expect(product.created_at.to_i).to be < product.updated_at.to_i
+    end
   end
 
   it "should update counts correctly when creating using nested attributes" do

data/spec/models/review.rb

@@ -3,7 +3,7 @@ class Review < ActiveRecord::Base
   belongs_to :product
 
   counter_culture :product, :touch => true
-  counter_culture :product, :column_name => 'rexiews_count'
+  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}
   counter_culture :user, :column_name => 'review_approvals_count', :delta_column => 'approvals'

data/spec/schema.rb

@@ -50,6 +50,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "reviews_count",               :default => 0, :null => false
     t.integer  "simple_reviews_count",        :default => 0, :null => false
     t.integer  "rexiews_count",               :default => 0, :null => false
+    t.datetime "rexiews_updated_at"
     t.integer  "twitter_reviews_count",       :default => 0, :null => false
     t.integer  "category_id"
     t.datetime "created_at"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !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'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,6 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile

data/.ruby-version

@@ -1 +0,0 @@
-2.2.4