cached_counts 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 39cbb1ba185ecbe803bd6548f95a8cb97c7e3b88
+  data.tar.gz: be16dc5bf9dea10b397e9be394ec698ba6c0fc05
+SHA512:
+  metadata.gz: 888fb3234b3e787ad7761c6181c05a106c0a58248595f5a1a4f6d86595bab5fc9dfad19b6527101501f996a9f9905e6ebca1d4e6e4b24fda0aaec35390c7271a
+  data.tar.gz: d6cdcfdd27bbb3efa8cf31529c8b771c31f9a51964c46b519d1798ebff0c769ac72c520da32b3894caf80017187d727a5f548902097dc3057f0ebcb1d9c96878

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'rake'
+
 gemspec

data/Rakefile

@@ -1 +1,10 @@
 require 'bundler/gem_tasks'
+
+begin
+    require 'rspec/core/rake_task'
+      RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+    puts "rspec no available"
+end
+
+task :default => ['spec']

data/lib/cached_counts/cache.rb

@@ -2,15 +2,17 @@ module CachedCounts
   class Cache
     def initialize(scope)
       @scope = scope
+      @args  = []
     end
 
     def count(*args)
-      cached_count || uncached_count(*args)
+      @args = args
+      cached_count || uncached_count
     end
 
     # Clear out any count caches which have SQL that includes the scopes table
     def clear
-      invalid_keys = all_keys.select { |key| key.include?(@scope.table_name.downcase.singularize) }
+      invalid_keys = all_keys.select { |key| key.include?(@scope.table_name.downcase) }
       invalid_keys.each { |key| Rails.cache.delete(key) }
 
       Rails.cache.write(list_key, all_keys - invalid_keys)
@@ -24,8 +26,8 @@ module CachedCounts
       end
     end
 
-    def uncached_count(*args)
-      @scope.count_without_caching(*args).tap do |count|
+    def uncached_count
+      @scope.count_without_caching(*@args).tap do |count|
         Rails.cache.write(current_key, count)
         Rails.cache.write(list_key, all_keys + [current_key])
       end
@@ -40,7 +42,7 @@ module CachedCounts
     end
 
     def current_key
-      "cached_counts::#{@scope.to_sql.downcase}"
+      "cached_counts::#{@scope.to_sql.downcase}::#{@args}"
     end
   end
 end

data/lib/cached_counts/version.rb

@@ -1,3 +1,3 @@
 module CachedCounts
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/cached_counts/cache_spec.rb

@@ -18,13 +18,23 @@ describe CachedCounts::Cache do
         scope.should_receive(:count_without_caching).with('first').and_return(5)
         cache.count('first').should == 5
       end
+
+      it 'uses a different cache for different option values' do
+        scope.should_receive(:count_without_caching).with('first').and_return(5)
+        scope.should_receive(:count_without_caching).with('second').and_return(10)
+        scope.should_receive(:count_without_caching).with('second', { :hi => 'there' }).and_return(12)
+
+        cache.count('first').should == 5
+        cache.count('second').should == 10
+        cache.count('second', { :hi => 'there' }).should == 12
+      end
     end
 
     context 'when the cached key is blank' do
       before do
         scope.stub(:count_without_caching => 5)
         cache.count
-        Rails.cache.write(cache.send(:current_key), nil)
+        Rails.cache.delete(cache.send(:current_key))
       end
 
       it 'returns the real count' do

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cached_counts
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors:
 - Mario Visic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Speed up ActiveRecord counting with caching
@@ -121,27 +110,26 @@ files:
 homepage: https://github.com/desktoppr/cached_counts
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Uses the Rails cache to store cached counts for active record models as well
   as models with scopes
 test_files: