action_param_caching 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c6b29a8741ef24c1edac15707d7b61fa06efeda
-  data.tar.gz: 9b376aafbfea4ce2694cf8f9b53ab0a7ab2dfbad
+  metadata.gz: 35e4faa5c154d84293cc12b12e1835a5dc10d516
+  data.tar.gz: dce5f7b4583f52dbd22c8f9c718b25369684f6f6
 SHA512:
-  metadata.gz: 37b484fc6f4bc14f16937bf741156d1c2330339b24201183238d9839fbb21044dc485076b65c7cd9f9303e9d294f76c5b3528f1ea7c6d6a3805fce4947ae3464
-  data.tar.gz: 6eee390dcd05028bf45db078e57c301b8c747f337e803ae137f62870a3a34ee904951436488c097c9fdc9308bc3254d7c9ad8b0f5e8f100723bb134a56dbebf0
+  metadata.gz: ebfb09d03f19638197d1d59c3056236f95490b24fbac332e4bfc922313622bc349f5c398fae8099f9b88489d3eacff49e3e5ebe090855e07eccc47b529a6cf88
+  data.tar.gz: 1b5d612c40ef423c64bc4ceb6a2506af8c396daf624cf23f025081045d2264f8753fed49ab1432f5f6701899875530d3561565b629eb769f8440eb030ca781ce

data/README.md

@@ -1,6 +1,6 @@
 # ActionParamCaching
 
-Action param caching simplfies action caching bases on parameter values. It allows you to quickly specify what actions you want to cache base on the parameters they are passed, the set of parameters you are interested in caching on, and an option prefix value for ignoring parameters that are designed to bust your cache.
+Action param caching simplifies action caching based on parameter values. It allows you to quickly specify what actions you want to cache base on the parameters they are passed, the set of parameters you are interested in caching on, and an option prefix value for ignoring parameters that are designed to bust your cache.
 
 ## Installation
 
@@ -22,7 +22,7 @@ Or install it yourself as:
  2. Require 'action_param_caching'
  3. Add 'extend ActionParamCaching::Rails::ActionController' to your controller
  4. Add the correct param cache statement to your controller.
-    - Standard statement for full param chaching:
+    - Standard statement for full param caching:
       cache_with_params :on => [:index]
     - Cache on a set or subset
       cache_with_params :on => [:index], :with_set_or_subset => [:param1, :param2]

data/lib/action_param_caching/action_config.rb

@@ -3,11 +3,27 @@ module ActionParamCaching
     attr_reader :action, :valid_params, :filter_starting_with, :argz
     attr_accessor :did_config_cache
 
-    def initialize(action, valid_params = [], filter_starting_with = nil)
+    def self.store_lookup(controller, action, config)
+       @lookup = {} if @lookup.nil?
+       @lookup[controller] = {} if @lookup[controller].nil?
+       @lookup[controller][action] = config
+    end
+
+    def self.lookup
+      @lookup
+    end
+
+    def initialize(controller_path, action, valid_params = [], filter_starting_with = nil)
       @action = action
-      @valid_params = valid_params
+      if valid_params
+        @valid_params = valid_params
+        @valid_params << :controller << :action << :format
+      end
       @filter_starting_with = filter_starting_with
+      @filter_starting_with ||= '_'
       @did_config_cache = false
+
+      ActionParamCaching::ActionConfig.store_lookup(controller_path, action, self)
     end
 
     def cache_args
@@ -27,15 +43,19 @@ module ActionParamCaching
     end
 
     def filtered_path_proc
-      Proc.new { |request| params.delete_if { |k,v| k.to_s.start_with?(@filter_starting_with) }.to_query }
+      Proc.new { |request|
+        request.params.delete_if { |k,v| k.to_s.start_with?(
+                                                            ActionParamCaching::ActionConfig.lookup[request.params[:controller]][request.params[:action].to_sym].filter_starting_with) }.to_query }
     end
 
     def path_proc
-      Proc.new { |request| params.to_query }
+      Proc.new { |request| request.params.to_query }
     end
 
     def if_proc
-      Proc.new { params.collect{|key, value| @valid_params.include?(key)}.all? }
+      Proc.new { |request|
+        request.params.collect{|key, value| ActionParamCaching::ActionConfig.lookup[request.params[:controller]][request.params[:action].to_sym].valid_params.include?(key.to_sym) ||
+                                            key.to_s.start_with?(ActionParamCaching::ActionConfig.lookup[request.params[:controller]][request.params[:action].to_sym].filter_starting_with)}.all? }
     end
   end
 end

data/lib/action_param_caching/rails/action_controller.rb

@@ -7,7 +7,7 @@ module ActionParamCaching
         @action_cache_configs = {} if @action_cache_configs.nil?
 
         options[:on].each do |action|
-          @action_cache_configs[action] = ActionParamCaching::ActionConfig.new(action, options[:with_set_or_subset], options[:filter_starting_with]) unless @action_cache_configs[action]
+          @action_cache_configs[action] = ActionParamCaching::ActionConfig.new(self.controller_path, action, options[:with_set_or_subset], options[:filter_starting_with]) unless @action_cache_configs[action]
         end
 
         options[:on].each do |action|

data/lib/action_param_caching/version.rb

@@ -1,3 +1,3 @@
 module ActionParamCaching
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_param_caching
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - cparratto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler