action_param_caching 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e4faa5c154d84293cc12b12e1835a5dc10d516
-  data.tar.gz: dce5f7b4583f52dbd22c8f9c718b25369684f6f6
+  metadata.gz: af2efb7d4b2e8e93e987c154450467fc5a6cd033
+  data.tar.gz: 54c135c51ef4f9675ef95972ebfdee17179dc605
 SHA512:
-  metadata.gz: ebfb09d03f19638197d1d59c3056236f95490b24fbac332e4bfc922313622bc349f5c398fae8099f9b88489d3eacff49e3e5ebe090855e07eccc47b529a6cf88
-  data.tar.gz: 1b5d612c40ef423c64bc4ceb6a2506af8c396daf624cf23f025081045d2264f8753fed49ab1432f5f6701899875530d3561565b629eb769f8440eb030ca781ce
+  metadata.gz: 33378ceee82abfb723d4a21cba13eb61adb0a40946107b20d7314506d45e55e7d048231de2fe381e1e022f86b02655c7fe38bc67a02fc4e6dbafaa3894c88ad9
+  data.tar.gz: e79cae2094f1ae7845b356489854ba459c187e7f85081e90b7bdff8e67f836e5fc3a9a31db371cd8367f54512e349772404299ca29efd4a688e67e13b7fb1cf1

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - "1.9.3"
+  - "2.0.0"

data/lib/action_param_caching/action_config.rb

@@ -15,7 +15,7 @@ module ActionParamCaching
 
     def initialize(controller_path, action, valid_params = [], filter_starting_with = nil)
       @action = action
-      if valid_params
+      if valid_params and !valid_params.empty?
         @valid_params = valid_params
         @valid_params << :controller << :action << :format
       end

data/lib/action_param_caching/version.rb

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

data/spec/action_config_spec.rb

@@ -4,21 +4,21 @@ module ActionParamCaching
   describe ActionConfig do
     context "in order to track the cache configuration of an action" do
       it "is initialized with valid params, an action, and a prefix filter" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index,[:id, :name, :amount], '_')
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index,[:id, :name, :amount], '_')
         cache_config.action.should == :index
-        cache_config.valid_params.should == [:id, :name, :amount]
+        cache_config.valid_params.should == [:id, :name, :amount, :controller, :action, :format]
         cache_config.filter_starting_with.should == '_'
       end
 
       it "sets the correct default values for valid params and prefix filters" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index)
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index)
         cache_config.action.should == :index
-        cache_config.valid_params.should == []
-        cache_config.filter_starting_with.should be_nil
+        cache_config.valid_params.should == nil
+        cache_config.filter_starting_with.should == '_'
       end
 
       it "tracks if a cache has been configured" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index)
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index)
         cache_config.did_config_cache.should be_false
         cache_config.did_config_cache = true
         cache_config.did_config_cache.should be_true
@@ -27,55 +27,57 @@ module ActionParamCaching
 
     context "when generating action cache arguments" do
       it "has an if condition when you specify valid params" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index,[:id, :name, :amount], '_')
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index,[:id, :name, :amount], '_')
         cache_args = cache_config.cache_args
         cache_args[:if].should be
       end
 
       it "does not have an if condition if you don't specify valid params" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index)
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller",:index)
         cache_args = cache_config.cache_args
         cache_args[:if].should be_nil
       end
 
       it "has a the correct cache path when stripping params with a prefix" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index,[:id, :name, :amount], '_')
-
-
-        cache_config.stubs(:params).returns( {:_remove_me => true} )
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index,[:id, :name, :amount], '_')
+        request = mock
+        request.stubs(:params).returns( {:_remove_me => true, :controller => "some_controller", :action => :index, :format => 'json'} )
         cache_args = cache_config.cache_args
         proc = cache_args[:cache_path]
-        proc.call(nil).should == ""
+        proc.call(request).should == {:controller => "some_controller", :action => :index, :format => 'json'}.to_query
       end
 
       it "has a the correct cache path under normal conditions" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index,[:id, :name, :amount])
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index,[:id, :name, :amount])
         cache_args = cache_config.cache_args
-        cache_config.stubs(:params).returns( {:_remove_me => false} )
+        request = mock
+        request.stubs(:params).returns( {:_remove_me => false, :controller => "some_controller", :action => :index, :format => 'json'} )
         proc = cache_args[:cache_path]
-        proc.call(nil).should == cache_config.params.to_query
+        proc.call(request).should == {:controller => "some_controller", :action => :index, :format => 'json'}.to_query
       end
 
       it "does not have a if argument if the valid params are empty" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index)
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index)
         cache_args = cache_config.cache_args
         cache_args[:if].should be_nil
       end
 
       it "does have an if argument that returns true if the params are a subset of the valid params" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index,[:id, :name, :amount])
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index,[:id, :name, :amount])
         cache_args = cache_config.cache_args
-        cache_config.stubs(:params).returns( {:id => 23, :name => "test"} )
+        request = mock
+        request.stubs(:params).returns( {:id => 23, :name => "test", :controller => "some_controller", :action => :index, :format => 'json'} )
         proc = cache_args[:if]
-        proc.call.should be_true
+        proc.call(request).should be_true
       end
 
       it "does have an if argument that returns false if the params are not a subset of the valid params" do
-        cache_config = ActionParamCaching::ActionConfig.new(:index,[:id, :name, :amount])
+        cache_config = ActionParamCaching::ActionConfig.new("some_controller", :index,[:id, :name, :amount])
         cache_args = cache_config.cache_args
-        cache_config.stubs(:params).returns( {:id => 23, :name => "test", :not => "valid"} )
+        request = mock
+        request.stubs(:params).returns( {:id => 23, :name => "test", :not => "valid", :controller => "some_controller", :action => :index, :format => 'json'} )
         proc = cache_args[:if]
-        proc.call.should be_false
+        proc.call(request).should be_false
       end
     end
   end

data/spec/rails/action_controller_spec.rb

@@ -4,6 +4,9 @@ class TestController
   extend ActionParamCaching::Rails::ActionController
   def self.caches_action(action, args)
   end
+  def self.controller_path
+    "some_controller"
+  end
 end
 
 module ActionParamCaching
@@ -20,7 +23,7 @@ module ActionParamCaching
 
       it "provided a means to set a set or subset or params to cache on" do
         TestController.cache_with_params :on => [:test2], :with_set_or_subset => [:param1, :param2]
-        TestController.action_cache_configs[:test2].valid_params.should == [:param1, :param2]
+        TestController.action_cache_configs[:test2].valid_params.should == [:param1, :param2, :controller, :action, :format]
       end
 
       it "provides a means to filter params that have a prefix" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_param_caching
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - cparratto
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md