kaminari-cache 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc756bf9a9f6776df73096cc3d33a38c39344f44
-  data.tar.gz: 656f41364b790bd5b32f9b99d9681aaec6f90054
+  metadata.gz: 7d81b9849b289d81b82e69d267d2545ebd1b8dfd
+  data.tar.gz: c8e200c01ea5902312bc445efbe49dc48a6503d8
 SHA512:
-  metadata.gz: faa5fdc2f2fdbf248c59d63e945ca43dc6d7780571830e8c8d98058e39ecb10f98df998e1edcdcedeb915b165c0d12914a639d9a95d3ace9d43ec79220f2d9b5
-  data.tar.gz: 809b04e56b0ed82f009627002bcfccec9b3abf2afca0e4742c2738e1a888f6bb198ba4562c2ffffaf9b89f09db06319ddfd02956f5a7e153e406fe969054e221
+  metadata.gz: b1c389bb91168c6f88a6adae8e31f1af7c55050c56ce21daccaaf3209b6da75856a3006227c8893dab834d9fb66e3f1d72cee36f1e4e4e2099737ee068aed482
+  data.tar.gz: c80f3c930b39eaee793af4325b74d41e3b9967f7cef609490c1259fcd5101516efdde8060db36ec6e2a8b16458c5dfb7dda5f241b5f086f92e7314f3b4714d54

data/README.md

@@ -33,6 +33,9 @@ In your controller:
                      :start => :desc,
                      :updated_at => :desc
                    }
+                   # :locale => :fr,
+                   # :scope => :latest,
+                   # :includes => :occurrences
 ```
 
 In your view:
@@ -42,6 +45,18 @@ In your view:
   end
 ```
 
+**Note** that `fetch_page` returns an array of type `Kaminari::PaginatableArray` so if you use something like *Draper* which decorates *ActiveRecord* collections, you'll need to decorate them manualy and delegate the needed methods:
+
+In an initializer (config/initializers/draper.rb):
+```ruby
+  Draper::CollectionDecorator.delegate :current_page, :total_pages, :limit_value, :total_count
+```
+
+In your controller:
+```ruby
+  @events = Draper::CollectionDecorator.new Event.fetch_page(...)
+```
+
 ## TODO
 
 * Testing!

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/kaminari-cache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kaminari-cache"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim"]
-  s.date = "2013-11-10"
+  s.date = "2013-11-30"
   s.description = "Kaminari Cache is a simple caching layer and sweeper for Kaminari pagination"
   s.email = "powerjim@gmail.com"
   s.extra_rdoc_files = [

data/lib/kaminari-cache.rb

@@ -40,9 +40,11 @@ module KaminariCache
       key = cache_key(options)
       entries = Rails.cache.fetch(key) do
         Rails.logger.info "Cache miss: #{key.to_s}"
-        scope = self.page(options[:page]).per(options[:per])
-        scope = apply_sort(scope, options[:order]) if options[:order]
+        scope = self.send(options[:scope]) if options[:scope]
+        scope = (scope || self).page(options[:page]).per(options[:per])
         scope = apply_locale(scope, options[:locale]) if options[:locale]
+        scope = apply_includes(scope, options[:includes]) if options[:includes]
+        scope = apply_sort(scope, options[:order]) if options[:order]
         Kaminari::PaginatableArray.new(scope.to_a,
           :limit => scope.limit_value,
           :offset => scope.offset_value,
@@ -58,6 +60,8 @@ module KaminariCache
         key << options[:per]
         key << [:locale, options[:locale]] if options[:locale]
         key << [:order, options[:order]] if options[:order]
+        key << [:scope, options[:scope]] if options[:scope]
+        key << [:includes, options[:includes]] if options[:includes]
         expanded_key(key)
       end
 
@@ -97,6 +101,12 @@ module KaminariCache
         scope = scope.with_translations(locale) if scope.respond_to? :with_translations
         scope
       end
+      def apply_includes(scope, includes)
+        includes.each do |i|
+          scope = scope.includes(i)
+        end
+        scope
+      end
     end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari-cache