custom_counter_cache 0.0.3 → 0.0.4

data/lib/custom_counter_cache/model.rb

@@ -11,7 +11,12 @@ module CustomCounterCache::Model
       unless column_names.include?(cache_column) # Object.const_defined?(:Counter)
         has_many :counters, :as => :countable, :dependent => :destroy
         define_method "#{cache_column}" do
-          counters.find(:first, :conditions => { :key => cache_column.to_s }).value rescue 0
+          # Check if the counter is already loaded (e.g. eager-loaded)
+          if counters.loaded? && counter = counters.detect{|c| c.key == cache_column.to_s }
+            counter.value
+          else
+            counters.find(:first, :conditions => { :key => cache_column.to_s }).value rescue 0
+          end
         end
         define_method "#{cache_column}=" do |count|
           if ( counter = counters.find(:first, :conditions => { :key => cache_column.to_s }) )

data/lib/custom_counter_cache/version.rb

@@ -1,5 +1,5 @@
 module CustomCounterCache
   
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   
 end

data/test/counter_test.rb

@@ -5,27 +5,41 @@ class CounterTest < Test::Unit::TestCase
   def setup
     @user = User.create
   end
-  
+
   def test_default_counter_value
-    assert @user.published_count, 0
+    assert_equal 0, @user.published_count
   end
-  
+
   def test_create_and_destroy_counter
     @user.articles.create(:state => 'published')
-    assert Counter.count, 1
-    @user.articles.delete_all
-    assert Counter.count, 0
+    assert_equal 1, Counter.count
+    @user.destroy
+    assert_equal 0, Counter.count
   end
-  
+
   def test_increment_and_decrement_counter_with_conditions
     @article = @user.articles.create(:state => 'unpublished')
-    assert @user.published_count, 0
+    assert_equal 0, @user.published_count
     @article.update_attribute :state, 'published'
-    assert @user.published_count, 1
+    assert_equal 1, @user.published_count
     3.times { |i| @user.articles.create(:state => 'published') }
-    assert @user.published_count, 4
-    @user.articles.update_all "state = 'unpublished'"
-    assert @user.published_count, 0
+    assert_equal 4, @user.published_count
+    @user.articles.each {|a| a.update_attributes(:state => 'unpublished') }
+    assert_equal 0, @user.published_count
+  end
+
+  # Test that an eager loaded
+  def test_eager_loading_with_no_counter
+    @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')
+    @user = User.includes(:counters).find(@user.id)
+    assert_equal 1, @user.published_count
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: custom_counter_cache
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Cedric Howe
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-07 00:00:00 -05:00
-default_executable: 
+date: 2012-07-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -33,8 +32,36 @@ dependencies:
         version: "2.3"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: debugger
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: ""
-email: cedric@freezerbox.com
+email: cedric@howe.net
 executables: []
 
 extensions: []
@@ -47,7 +74,6 @@ files:
 - lib/custom_counter_cache.rb
 - test/counter_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/cedric/custom_counter_cache/
 licenses: []
 
@@ -79,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: custom_counter_cache
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Custom counter_cache functionality that supports conditions and multiple models.