custom_counter_cache 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e16038b77238baabc391d19e164da1d310e8994a
-  data.tar.gz: a7a55ac0ec831e3ac147ee49e590c202af470bcf
+  metadata.gz: 182f8ab75fb7fc29e78199d05904ac3a8b432b20
+  data.tar.gz: 7bae0ad737c88fd4bfc682e212c3c87de790ccb9
 SHA512:
-  metadata.gz: ac5ecba570c52c9a56734588f102d9264487a550906d665d361d6ef126a48ab5b8831802d84a38641bc8e140c7354234be39195663bac46ab3d0e878f2a4c1fd
-  data.tar.gz: a5f7d3147b895a5c1317c50915915928514ffbd70944704773f1452be65fc7d670ccb4803fc18d02445464e0b6fc8dfe7227e57da03ee5a47b2fc09bd1efd6c5
+  metadata.gz: 434dafe982b66628bf6562cb9cad6a873677fc599042b516a3d12a3e84b55352954c7d26c8989c433123fc23223bf53b4e9f5b65835d4f1cc6fbdf06861b0de3
+  data.tar.gz: 20192d909056d15648e7960d60d13de4c8ca2f6f33cb9ed171f35cfeaa11386ade1dc5433fcdcc416a18be45f0f35f2ac18952585033ecc16a9c9a622c06e6f0

data/lib/custom_counter_cache.rb

@@ -1,3 +1,4 @@
+require 'custom_counter_cache/model'
+
 module CustomCounterCache
-  require 'custom_counter_cache/model'
 end

data/lib/custom_counter_cache/model.rb

@@ -1,17 +1,15 @@
-module CustomCounterCache::Model
-
-  def self.included(base)
-    base.extend ActsAsMethods
-  end
+require 'active_support/concern'
 
-  module ActsAsMethods
+module CustomCounterCache::Model
+  extend ActiveSupport::Concern
 
+  module ClassMethods
     def define_counter_cache(cache_column, &block)
       return unless table_exists?
 
       # counter accessors
       unless column_names.include?(cache_column.to_s)
-        has_many :counters, :as => :countable, :dependent => :destroy
+        has_many :counters, as: :countable, dependent: :destroy
         define_method "#{cache_column}" do
           # check if the counter is loaded
           if counters.loaded? && counter = counters.detect{|c| c.key == cache_column.to_s }
@@ -24,7 +22,7 @@ module CustomCounterCache::Model
           if ( counter = counters.find_by_key(cache_column.to_s) )
             counter.update_attribute :value, count.to_i
           else
-            counters.create :key => cache_column.to_s, :value => count.to_i
+            counters.create key: cache_column.to_s, value: count.to_i
           end
         end
       end
@@ -46,7 +44,7 @@ module CustomCounterCache::Model
       cache_column = cache_column.to_sym
       method_name  = "callback_#{cache_column}".to_sym
       reflection   = reflect_on_association(association)
-      foreign_key  = reflection.options[:foreign_key] || reflection.association_foreign_key
+      foreign_key  = reflection.try(:foreign_key) || reflection.association_foreign_key
 
       # define callback
       define_method method_name do
@@ -73,9 +71,7 @@ module CustomCounterCache::Model
       after_update  method_name, options
       after_destroy method_name, options
     end
-
   end
-
 end
 
 ActiveRecord::Base.send :include, CustomCounterCache::Model

data/lib/custom_counter_cache/version.rb

@@ -1,5 +1,5 @@
 module CustomCounterCache
 
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
 end

data/test/counter_test.rb

@@ -14,44 +14,65 @@ class CounterTest < MiniTest::Unit::TestCase
   end
 
   def test_create_and_destroy_counter
-    @user.articles.create(:state => 'published')
+    @user.articles.create(state: 'published')
     assert_equal 1, Counter.count
     @user.destroy
     assert_equal 0, Counter.count
   end
 
+  def test_create_and_destroy_polymorphic_association_counter
+    @article = @user.articles.create(state: "published")
+    assert_equal 0, @article.comments.size
+    @comment = @article.comments.create(state: "published")
+    assert_equal 1, @article.comments.size
+    @article.destroy
+    assert_equal 0, @article.comments.size
+  end
+
   def test_increment_and_decrement_counter_with_conditions
-    @article = @user.articles.create(:state => 'unpublished')
+    @article = @user.articles.create(state: 'unpublished')
     assert_equal 0, @user.published_count
     @article.update_attribute :state, 'published'
     assert_equal 1, @user.published_count
-    3.times { |i| @user.articles.create(:state => 'published') }
+    3.times { |i| @user.articles.create(state: 'published') }
     assert_equal 4, @user.published_count
-    @user.articles.each {|a| a.update_attributes(:state => 'unpublished') }
+    @user.articles.each {|a| a.update_attributes(state: 'unpublished') }
     assert_equal 0, @user.published_count
   end
 
+  def test_increment_and_decrement_polymorphic_counter_with_conditions
+    @article = @user.articles.create(state: "published")
+    @comment = @article.comments.create(state: "unpublished")
+    assert_equal 0, @article.comments_count
+    @comment.update_attribute :state, "published"
+    assert_equal 1, @article.comments_count
+    3.times { |i| @article.comments.create(state: "published") }
+    assert_equal 4, @article.comments_count
+    @article.comments.each { |c| c.update_attributes(state: "unpublished") }
+    assert_equal 0, @article.comments_count
+  end
+
   def test_increment_and_decrement_counter_with_conditions_on_model_with_counter_column
-    @ball = @box.balls.create(:color => 'red')
+    @ball = @box.balls.create(color: 'red')
     assert_equal 0, @box.reload.green_balls_count
     @ball.update_attribute :color, 'green'
     assert_equal 1, @box.reload.green_balls_count
-    3.times { |i| @box.balls.create(:color => 'green') }
+    3.times { |i| @box.balls.create(color: 'green') }
     assert_equal 4, @box.reload.green_balls_count
-    @box.balls.each {|b| b.update_attributes(:color => 'red') }
+    @box.balls.each {|b| b.update_attributes(color: 'red') }
     assert_equal 0, @box.reload.green_balls_count
   end
 
   # Test that an eager loaded
   def test_eager_loading_with_no_counter
-    @article = @user.articles.create(:state => 'unpublished')
+    @article = @user.articles.create(state: 'unpublished')
     user = User.includes(:counters).first
     assert_equal 0, user.published_count
 
   end
 
   def test_eager_loading_with_counter
-    @article = @user.articles.create(:state => 'published')
+    @article = @user.articles.create(state: 'published')
     @user = User.includes(:counters).find(@user.id)
     assert_equal 1, @user.published_count
   end

data/test/test_helper.rb

@@ -5,45 +5,63 @@ require 'action_view'
 require 'active_record'
 require 'custom_counter_cache'
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 
-ActiveRecord::Schema.define(:version => 1) do
+ActiveRecord::Schema.define(version: 1) do
   create_table :users do |t|
   end
+
   create_table :articles do |t|
     t.belongs_to :user
-    t.string :state, :default => 'unpublished'
+    t.string :state, default: 'unpublished'
   end
+
+  create_table :comments do |t|
+    t.belongs_to :user
+    t.references :commentable, polymorphic: true
+    t.string :state, default: "unpublished"
+  end
+
   create_table :counters do |t|
-    t.references :countable, :polymorphic => true
-    t.string :key, :null => false
-    t.integer :value, :null => false, :default => 0
+    t.references :countable, polymorphic: true
+    t.string :key, null: false
+    t.integer :value, null: false, default: 0
   end
-  add_index :counters, [ :countable_id, :countable_type, :key ], :unique => true
+  add_index :counters, [ :countable_id, :countable_type, :key ], unique: true
 
   create_table :boxes do |t|
-    t.integer :green_balls_count, :default => 0
+    t.integer :green_balls_count, default: 0
   end
+
   create_table :balls do |t|
     t.belongs_to :box
-    t.string :color, :default => 'red'
+    t.string :color, default: 'red'
   end
 end
 
 class User < ActiveRecord::Base
-  has_many :articles
+  has_many :articles, dependent: :destroy
   define_counter_cache :published_count do |user|
-    user.articles.where(:articles => { :state => 'published' }).count
+    user.articles.where(articles: { state: 'published' }).count
   end
 end
 
 class Article < ActiveRecord::Base
   belongs_to :user
-  update_counter_cache :user, :published_count, :if => Proc.new { |article| article.state_changed? }
+  update_counter_cache :user, :published_count, if: Proc.new { |article| article.state_changed? }
+  has_many :comments, as: :commentable, dependent: :destroy
+  define_counter_cache :comments_count do |article|
+    article.comments.where(state: "published").count
+  end
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :commentable, polymorphic: true
+  update_counter_cache :commentable, :comments_count, if: Proc.new { |comment| comment.state_changed? }
 end
 
 class Counter < ActiveRecord::Base
-  belongs_to :countable, :polymorphic => true
+  belongs_to :countable, polymorphic: true
 end
 
 class Box < ActiveRecord::Base
@@ -55,6 +73,6 @@ end
 
 class Ball < ActiveRecord::Base
   belongs_to :box
-  scope :green, lambda { where(:color => 'green') }
-  update_counter_cache :box, :green_balls_count, :if => Proc.new { |ball| ball.color_changed? }
+  scope :green, lambda { where(color: 'green') }
+  update_counter_cache :box, :green_balls_count, if: Proc.new { |ball| ball.color_changed? }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_counter_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Cedric Howe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails