arid_cache 0.2.5 → 0.2.6

data/README.rdoc

@@ -281,7 +281,8 @@ The version of Rails shouldn't matter much, but it's working on 2.3.4.
 
 == Known Issues
 
-1. Caches that contains duplicate records (for example from the result of a join), will only return unique records on subsequent calls.  This is because of the way <tt>find</tt> works when selecting multiple ids.  For example, if your query returns <tt>[#<User id: 1>, #<User id: 1>, #<User id: 1>]</tt>, the IDs are cached as <tt>[1,1,1]</tt>.  On the next call to the cache we load the IDs using <tt>User.find_all_by_id([1,1,1])</tt> which returns <tt>[#<User id: 1>]</tt>, not <tt>[#<User id: 1>, #<User id: 1>, #<User id: 1>]</tt> as you might have expected.
+1. <b>Caches that contains duplicate records will only return unique records on subsequent calls</b>.  This is because of the way <tt>find</tt> works when selecting multiple ids.  For example, if your query returns <tt>[#<User id: 1>, #<User id: 1>, #<User id: 1>]</tt>, the IDs are cached as <tt>[1,1,1]</tt>.  On the next call to the cache we load the IDs using <tt>User.find_all_by_id([1,1,1])</tt> which returns <tt>[#<User id: 1>]</tt>, not <tt>[#<User id: 1>, #<User id: 1>, #<User id: 1>]</tt> as you might have expected.
+2. <b>You can't cache polymorphic arrays</b> e.g. [#<User id: 1>, #<Pet id: 5>] because it expects all ActiveRecords to be of the same class.  We could accept a <tt>:polymorphic => true</tt> option but I don't think this is a great idea because instantiating all the records would result in a lot of queries to the individual tables.
 
 == Wish List / Coming Soon
 

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/arid_cache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arid_cache}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl Varga"]
-  s.date = %q{2010-01-20}
+  s.date = %q{2010-01-21}
   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.rb

@@ -113,7 +113,7 @@ module AridCache
       
       def fetch_and_paginate
         if combined_options.include?(:order) # order and paginate in the database
-          klass.paginate(cached.ids, opts_for_find.merge(opts_for_paginate))
+          klass.paginate(cached.ids, { :total_entries => cached.ids.size }.merge(opts_for_find.merge(opts_for_paginate)))
         else # paginate in memory
           paged_ids = cached.ids.paginate(opts_for_paginate)
           paged_ids.replace(klass.find_all_by_id(paged_ids, opts_for_find(paged_ids)))

data/test/arid_cache_test.rb

@@ -291,7 +291,7 @@ class AridCacheTest < ActiveSupport::TestCase
     assert_equal User.successful.find(:all, :order => 'name DESC'), User.cached_most_successful
     assert_equal User.successful.find(:all, :order => 'name DESC'), User.cached_most_successful   
   end
-
+  
   test "should not raise an error if all cached ids cannot be found" do
     @user.cached_companies
     key = @user.arid_cache_key('companies')
@@ -301,7 +301,7 @@ class AridCacheTest < ActiveSupport::TestCase
     assert_nothing_raised { @user.cached_companies }
     assert_equal @user.cached_companies, @user.companies
   end
-
+  
   test "should not raise an error if all cached ids cannot be found while paginating" do
     @user.cached_companies
     key = @user.arid_cache_key('companies')
@@ -311,13 +311,24 @@ class AridCacheTest < ActiveSupport::TestCase
     assert_nothing_raised { @user.cached_companies(:page => 1, :order => 'name DESC') }
     assert_equal @user.cached_companies(:page => 1, :order => 'name DESC'), @user.companies.paginate(:page => 1, :order => 'name DESC')
   end
-
+  
   test "should handle empty collections" do
     @user.cached_empty_collection { [] }
     assert_nothing_raised { @user.cached_empty_collection }
     assert_nothing_raised { @user.cached_empty_collection }
   end
-                
+
+  test "should return proper paginate results when we include order" do
+    total = @user.companies.count
+    assert_queries(2) do
+      @user.cached_companies
+      page = @user.cached_companies(:page => 2, :per_page => 3, :order => 'name desc') # call again to get cached results
+      assert_equal total,          page.total_entries
+      assert_equal 2,              page.current_page
+      assert_equal (total/3.0).ceil, page.total_pages
+    end
+  end
+                  
   #
   # Tests requiring manual verification by looking at the SQL logs.
   # TODO move these to a separate class.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arid_cache
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Karl Varga
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 +08:00
+date: 2010-01-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency