kaminari-cache 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd346ed313038cb55c741d06729a13c6dcea10ba
-  data.tar.gz: aeaacf07a5d424d1a82cacdb655d5e251cc310f7
+  metadata.gz: 40a6c8743a9b33e40dabbca3cfb4e6c9b68122d3
+  data.tar.gz: 0e066aca66deda9ba7110f936781dee0e410ad5f
 SHA512:
-  metadata.gz: 91c3ca3fb42ba66bf26149429a23a27a4df27c2f186ee05a98e983f188d36f9280cb2ac3c992579013fc744816e6d47410103493bcc08dd75f6c3d65776737c6
-  data.tar.gz: c94a58db9708c84896ca19668fcbb7a5463cf5047eef7256bc3840dc373af0833900ab0243e6723663f9cffa0df583381bda16a0ecee48aef6d0424bf1f2c527
+  metadata.gz: 99c31e7aa6e5859939826fb112c71d5f5097f58b48966f5ffe3515c2b1af8d8474da690bbf36d8b992eb2897d4711acb8675808fb7982daedeb555cbda291efc
+  data.tar.gz: ffc6ab33fea68aaf79d5441e824f7082efac2360b9f1ce00466b3d1c4ae65491fca3db82eba84966a13a4925b4d9544ff80d1883f78304ab8277812bbdeca9cc

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/kaminari-cache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kaminari-cache"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim"]
-  s.date = "2013-11-05"
+  s.date = "2013-11-10"
   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

@@ -37,9 +37,12 @@ module KaminariCache
         :page => 1,
         :per => Kaminari.config.max_per_page || Kaminari.config.default_per_page
       )
-      entries = Rails.cache.fetch(cache_key(options)) do
+      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])
+        scope = apply_sort(scope, options[:order]) if options[:order]
+        scope = apply_locale(scope, options[:locale]) if options[:locale]
         Kaminari::PaginatableArray.new(scope.to_a,
           :limit => scope.limit_value,
           :offset => scope.offset_value,
@@ -48,32 +51,53 @@ module KaminariCache
       end
     end
 
-    def cache_key(options)
-      key = [:kaminari, self.name.downcase]
-      key << options[:page]
-      key << options[:per]
-      key << ["order", options[:order]] if options[:order]
-      key
-    end
+    private
+      def cache_key(options)
+        key = [:kaminari, self.name.pluralize.downcase]
+        key << options[:page]
+        key << options[:per]
+        key << [:locale, options[:locale]] if options[:locale]
+        key << [:order, options[:order]] if options[:order]
+        expanded_key(key)
+      end
 
-    def apply_sort(scope, order)
-      case order
-        when Symbol
-          scope.order! order
-        when String
-          scope.order! order
-        when Hash
-          order.each do |k, v|
-            if v.empty?
-              scope.order! k
+      def expanded_key(key)
+        return key.cache_key.to_s if key.respond_to?(:cache_key)
+        case key
+          when Array
+            if key.size > 1
+              key = key.collect{|element| expanded_key(element)}
             else
-              scope.order! "#{k.to_s} #{v.to_s}"
+              key = key.first
             end
-          end
+          when Hash
+            key = key.sort_by { |k,_| k.to_s }.collect{|k,v| "#{k}=#{v}"}
+        end
+        key.to_param
+      end
+
+      def apply_sort(scope, order)
+        case order
+          when Symbol
+            scope.order! order
+          when String
+            scope.order! order
+          when Hash
+            order.each do |k, v|
+              if v.empty?
+                scope.order! k
+              else
+                scope.order! "#{k.to_s} #{v.to_s}"
+              end
+            end
+        end
+        scope
+      end
+      def apply_locale(scope, locale)
+        scope = scope.with_translations(locale) if scope.respond_to? :with_translations
+        scope
       end
-      scope
     end
-  end
 end
 
 ActiveRecord::Base.send(:include, KaminariCache)

metadata

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