rspec-check-auth 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,2 +1,3 @@
+v0.5.2 - Default params for RESTful actions that require 'em
+v0.5.1 - Adding :only as an argument to CheckAuth#resource_actions
 v0.5 - Public Release
-v0.5.1 - Adding :only as an argument to CheckAuth#resource_actions

data/README.md

@@ -55,7 +55,11 @@ By default it tests via HTMl and XML, but adding more or less formats is no issu
 		c.parent_info :format => [:html, :json]
 	end
 
-Only want some of the usual crowd? No problem, just pass the `:except` param and `resource_actions` will shun those specified.
+Only want some of the usual crowd? No problem, just pass the `:only` param and `resource_actions` will only include those specified.
+
+	check_auth_for {|c| c.resource_actions :only => [:new, :create, :edit, :update] }
+
+And if you don't want some, but want everything else? Pass `:except` and those specified will be left out.
 
 	check_auth_for {|c| c.resource_actions :except => [:new, :create, :edit, :update] }
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/rspec_check_auth/check_auth/request.rb

@@ -5,18 +5,26 @@ class CheckAuth
   class Request
     attr_reader :action, :method, :params, :format
 
-    def initialize action, format, params
+    def initialize action, format, opts
       @action = action
       @format = format
-      @method = params[:method] || default_method
-      @params = params.except(:method)
+      @method = opts[:method] || default_method
+      self.params = opts.except(:method)
     end
 
-    # Adds the format into the params
-    # unless it's HTML
-    def params
-      return @params.merge(:format => @format.to_s) unless @format == :html
-      @params
+    # Sets up the params hash
+    # 
+    # Adds :format => self.format if self.format != :html
+    # Merges any passed params into default params for this action
+    # 
+    def params= param_hash
+      @params = default_params.merge(param_hash)
+
+      if @format == :html
+        @params.delete(:format)
+      else
+        @params.merge!(:format => format.to_s)
+      end
     end
 
     # Works out the default method
@@ -33,5 +41,16 @@ class CheckAuth
         :get
       end
     end
+
+    # Adds an id for actions that require it
+    def default_params
+      case @action.to_s
+      when /(show|edit|update|destroy)/
+        {:id => "some_id"}
+      else
+        {}
+      end
+    end
+
   end
 end

data/rspec-check-auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-check-auth}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Caius Durling"]
-  s.date = %q{2010-06-28}
+  s.date = %q{2010-07-02}
   s.description = %q{Quickly check your rails controller actions require authentication}
   s.email = %q{hello@brightbox.co.uk}
   s.extra_rdoc_files = [
@@ -30,7 +30,8 @@ Gem::Specification.new do |s|
      "lib/rspec_check_auth/extend_hash.rb",
      "lib/rspec_check_auth/extend_object.rb",
      "rspec-check-auth.gemspec",
-     "spec/rspec_check_auth_spec.rb",
+     "spec/lib/request_spec.rb",
+     "spec/lib/rspec_check_auth_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -40,7 +41,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Quickly check your rails controller actions require authentication}
   s.test_files = [
-    "spec/rspec_check_auth_spec.rb",
+    "spec/lib/request_spec.rb",
+     "spec/lib/rspec_check_auth_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/lib/request_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe CheckAuth::Request do
+
+  it "should create a valid instance" do
+    CheckAuth::Request.new(:index, :html, {}).should_not be_nil
+  end
+
+  it "should have default params when not overridden" do
+    r = CheckAuth::Request.new(:update, :html, {})
+    r.params.should == {:id => "some_id"}
+  end
+
+  it "should have a default id for show, edit, update, destroy actions" do
+    [:show, :edit, :update, :destroy].each do |action|
+      r = CheckAuth::Request.new(action, :html, {})
+      r.params.should == {:id => "some_id"}
+    end
+  end
+
+  it "should have no default params for index, new, create" do
+    [:index, :new, :create].each do |action|
+      r = CheckAuth::Request.new(action, :html, {})
+      r.params.should == {}
+    end
+  end
+
+  it "should override default params with custom ones" do
+    r = CheckAuth::Request.new(:update, :html, {:id => "blah blah"})
+    r.params.should == {:id => "blah blah"}
+  end
+
+  it "should not include :format in the params when format is html" do
+    r = CheckAuth::Request.new(nil, :html, {})
+    r.params.should == {}
+  end
+
+  it "should include :format in the params when format is not html" do
+    r = CheckAuth::Request.new(nil, :xml, {})
+    r.params.should == {:format => "xml"}
+  end
+
+end

data/spec/{rspec_check_auth_spec.rb → lib/rspec_check_auth_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "RspecCheckAuth" do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-check-auth
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Caius Durling
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 +01:00
+date: 2010-07-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,8 @@ files:
 - lib/rspec_check_auth/extend_hash.rb
 - lib/rspec_check_auth/extend_object.rb
 - rspec-check-auth.gemspec
-- spec/rspec_check_auth_spec.rb
+- spec/lib/request_spec.rb
+- spec/lib/rspec_check_auth_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -93,5 +94,6 @@ signing_key:
 specification_version: 3
 summary: Quickly check your rails controller actions require authentication
 test_files: 
-- spec/rspec_check_auth_spec.rb
+- spec/lib/request_spec.rb
+- spec/lib/rspec_check_auth_spec.rb
 - spec/spec_helper.rb