arid_cache 1.4.0 → 1.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    arid_cache (1.3.6)
+    arid_cache (1.4.1)
       will_paginate
 
 GEM

data/Gemfile.rails2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    arid_cache (1.3.6)
+    arid_cache (1.4.0)
       will_paginate
 
 GEM

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/arid_cache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arid_cache}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl Varga"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-04-19}
   s.description = %q{AridCache makes caching easy and effective.  AridCache supports caching on all your model named scopes, class methods and instance methods right out of the box.  AridCache prevents caching logic from cluttering your models and clarifies your logic by making explicit calls to cached result sets.
 AridCache is designed for handling large, expensive ActiveRecord collections but is equally useful for caching anything else as well.
 }

data/lib/arid_cache/cache_proxy/options.rb

@@ -20,6 +20,7 @@ module AridCache
           end
           paginate_opts[:per_page] = klass && klass.per_page || 30
         end
+        paginate_opts[:page] = 1 if paginate_opts[:page].nil?
         paginate_opts[:total_entries] = records.size unless records.nil?
         paginate_opts
       end

data/spec/arid_cache/arid_cache_spec.rb

@@ -42,4 +42,18 @@ describe AridCache do
     AridCache.raw_with_options = true
     AridCache.raw_with_options.should be_true
   end
+  
+  describe "pagination" do
+    before :each do
+      @user = User.make
+      @user.companies << Company.make
+    end                
+    
+    it "should not fail if the page is nil" do
+      lambda {
+        @user.cached_companies(:page => nil) 
+        @user.cached_companies(:page => nil) # works when seeding, so call again to load from cache        
+      }.should_not raise_error(WillPaginate::InvalidPage)
+    end
+  end
 end

data/spec/arid_cache/cache_proxy/options_spec.rb

@@ -24,10 +24,13 @@ describe AridCache::CacheProxy::Options do
     new_options(:force => true).force?.should be_true
   end
 
-  it "paginate?" do
-    new_options(:page => 1).paginate?.should be_true
-    new_options(:per_page => 1).paginate?.should be_false
-    new_options(:page => 1, :per_page => 1).paginate?.should be_true
+  describe "paginate?" do
+    it "should be true if the :page option is present" do
+      new_options(:page => 1).paginate?.should be_true
+      new_options(:page => nil).paginate?.should be_true
+      new_options(:per_page => 1).paginate?.should be_false
+      new_options(:page => 1, :per_page => 1).paginate?.should be_true
+    end
   end
 
   it "raw?" do
@@ -98,6 +101,12 @@ describe AridCache::CacheProxy::Options do
         :per_page => 3
       ).opts_for_paginate[:per_page].should == 3
     end
+
+    it "page should default to 1 if it is nil" do
+      new_options(
+        :page => nil
+      ).opts_for_paginate[:page].should == 1
+    end
   end
 
   describe "proxies" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arid_cache
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Karl Varga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -07:00
+date: 2011-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency