counter_culture 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e696be357c398d2c9bcb23bde8ea01203ddbf8
-  data.tar.gz: 9d11a323ccdcd5e09f18e086e5cd948b0fd7bd36
+  metadata.gz: d255dba9072e3f8fee1a78ac3bbd9112cbe449f6
+  data.tar.gz: 69b380ba4f103f791e2bd307d45dd9a0fb2dd3f2
 SHA512:
-  metadata.gz: d87125c4933ac012ac93e5084079c86b85d1ad2420e04245ecb414f3cd4bb56d9e37b38404270b77061028b067545c0ec15cbf5dbb05ea9ed45942890eabdafe
-  data.tar.gz: a72a586a7ddd60204413200b3897b64bd9ec263dcfe5a0ddd4be525aa68404775e59a3a747724757682f29caf00e3bc304233b9c143b9fc5073f4e288a8e650d
+  metadata.gz: 7ad44a5e6be12700b283205746f62557b84e79aacddaa310c5132d15d12c799d4ad3ddbe9cfed39f8af49e877e128db6602c3381cb08a953df3abe3406e49e10
+  data.tar.gz: aae6886bea436036391dad5370ca83f69590fe88e0cdbd22c4dfcfac2c57eaab8b5fce2b999ca4688113c610fcf4fe5ce0a0a90a4f308e13026de97945f4599c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.16 (October 5, 2013)
+
+Features:
+  - Added support for touch option that updates timestamps when updating counter caches
+
 ## 0.1.15 (October 5, 2013)
 
 Features:

data/README.md

@@ -170,6 +170,15 @@ end
 
 Now, the ```Category``` model will keep an up-to-date counter-cache in the ```products_count``` column of the ```categories``` table. Each product will affect the counts of both its immediate category and that category's parent. This will work with any number of levels.
 
+### 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:
+```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.
+
 ### Manually populating counter cache values
 
 You will sometimes want to populate counter-cache values from primary data. This is required when adding counter-caches to existing data. It is also recommended to run this regularly (at BestVendor, we run it once a week) to catch any incorrect values in the counter caches.
@@ -224,7 +233,7 @@ end
 
 #### Handling over-written, dynamic foreign keys
 
-Manually populating counter caches with dynamicall over-written foreign keys (```:foreign_key_values``` option) is not supported. You will have to write code to handle this case yourself.
+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.
 
 #### Polymorphic associations
 

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/counter_culture.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]

data/lib/counter_culture.rb

@@ -31,7 +31,8 @@ module CounterCulture
           :counter_cache_name => (options[:column_name] || "#{name.tableize}_count"),
           :column_names => options[:column_names],
           :delta_column => options[:delta_column],
-          :foreign_key_values => options[:foreign_key_values]
+          :foreign_key_values => options[:foreign_key_values],
+          :touch => options[:touch]
         }
       end
 
@@ -275,10 +276,23 @@ module CounterCulture
                           end
         execute_after_commit do
           # increment or decrement?
-          delta = options[:increment] ? delta_magnitude : -delta_magnitude
+          operator = options[:increment] ? '+' : '-'
+
+          # we don't use Rails' update_counters because we support changing the timestamp
+          quoted_column = connection.quote_column_name(options[: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 options[:touch]
+            current_time = current_time_from_proper_timezone
+            timestamp_attributes_for_update_in_model.each do |timestamp_column|
+              updates << "#{timestamp_column} = '#{current_time.to_formatted_s(:sql)}'"
+            end
+          end
 
-          # do it!
-          relation_klass(options[:relation]).update_counters(id_to_change, options[:counter_column] => delta)
+          relation_klass(options[:relation]).where(self.class.primary_key => id_to_change).update_all updates.join(', ')
         end
       end
     end

data/spec/counter_culture_spec.rb

@@ -1098,6 +1098,20 @@ describe "CounterCulture" do
     user.reload
     user.review_value_sum.round(1).should == 0
   end
+
+  it "should update the timestamp if touch: true is set" do
+    user = User.create
+    product = Product.create
+
+    sleep 1
+
+    review = Review.create :user_id => user.id, :product_id => product.id
+
+    user.reload; product.reload
+
+    user.created_at.to_i.should == user.updated_at.to_i
+    product.created_at.to_i.should < product.updated_at.to_i
+  end
   
   describe "#previous_model" do
     let(:user){User.create :name => "John Smith", :manages_company_id => 1}

data/spec/models/review.rb

@@ -2,7 +2,7 @@ class Review < ActiveRecord::Base
   belongs_to :user
   belongs_to :product
 
-  counter_culture :product
+  counter_culture :product, :touch => true
   counter_culture :product, :column_name => 'rexiews_count'
   counter_culture :user
   counter_culture :user, :column_name => Proc.new { |model| model.review_type ? "#{model.review_type}_count" : nil }, :column_names => {"reviews.review_type = 'using'" => 'using_count', "reviews.review_type = 'tried'" => 'tried_count'}

data/spec/schema.rb

@@ -21,6 +21,8 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "tried_count",         :default => 0, :null => false
     t.integer  "managers_count",      :default => 0, :null => false
     t.integer  "review_approvals_count",      :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "industries", :force => true do |t|
@@ -30,6 +32,8 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "using_count",         :default => 0, :null => false
     t.integer  "tried_count",         :default => 0, :null => false
     t.integer  "review_approvals_count",      :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "products", :force => true do |t|
@@ -37,6 +41,8 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "reviews_count",       :default => 0, :null => false
     t.integer  "rexiews_count",       :default => 0, :null => false
     t.integer  "category_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "reviews", :force => true do |t|
@@ -46,6 +52,8 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "product_id"
     t.integer  "approvals"
     t.float    "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "users", :force => true do |t|
@@ -58,26 +66,36 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "review_approvals_count",      :default => 0, :null => false
     t.string   "has_string_id_id"
     t.float    "review_value_sum",    :default => 0.0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "categories", :force => true do |t|
     t.string   "name"
     t.integer  "products_count",       :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "has_string_ids", :force => true, :id => false do |t|
     t.string   "id", :default => '', :null => false
     t.string   "something"
     t.integer  "users_count",        :null => false, :default => 0
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
   add_index "has_string_ids", :id, :unique => true
 
   create_table "simple_mains", :force => true do |t|
     t.integer "simple_dependents_count", :null => false, :default => 0
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
   
   create_table "simple_dependents", :force => true do |t|
     t.integer "simple_main_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Magnus von Koeller