rspec-check-auth 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1 +1,2 @@
-v0.5 - Public Release
+v0.5 - Public Release
+v0.5.1 - Adding :only as an argument to CheckAuth#resource_actions

data/README.md

@@ -28,6 +28,8 @@ Here's an example block that expects HTML to be redirected to login_url and XML/
 
 ## Usage
 
+	require "rspec_check_auth"
+
 CheckAuth knows about different HTTP methods, and can figure out the usual crowd (POST create, DELETE destroy, etc.) You can override the method by passing a `:method` argument.
 
 	check_auth_for do |c|

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/rspec_check_auth/check_auth.rb

@@ -36,19 +36,41 @@ class CheckAuth
   # Any params given (other than :except) are passed to each action as params,
   # and actions that require an id (edit, show, update) get passed "some_id"
   # 
-  # Accepts :except => [:action, :names] for actions to be skipped in testing
+  # Accepts:
+  #   :only => [:action, :names]
+  #   :except => [:action, :names]
+  # 
+  # Either param can be a single action, or an array of actions. :only takes precedence over :except.
   # 
   def resource_actions params={}
-    skip = params.delete(:except).arrayize || {}
+    except = params.delete(:except).arrayize.compact
+    only = params.delete(:only).arrayize.compact
+
     params[:format] = params.has_key?(:format) ? params[:format].arrayize : [:html,:xml]
-    # Add each action, unless they should be skipped
-    add :index, params  unless skip.include?(:index)
-    add :new, params    unless skip.include?(:new)
-    add :create, params unless skip.include?(:create)
-    add :edit, {:id => "some_id"}.merge(params)   unless skip.include?(:edit)
-    add :show, {:id => "some_id"}.merge(params)   unless skip.include?(:show)
-    add :update, {:id => "some_id"}.merge(params) unless skip.include?(:update)
-    add :destroy, {:id => "some_id"}.merge(params) unless skip.include?(:destroy)
+
+    # Logic to see if we should add an action
+    # It should either be in :only, or :except isn't empty and it's not in :except
+    should_add = lambda do |action|
+      # Only isn't empty and our action is contained within
+      if !only.empty?
+        break only.include?(action)
+      end
+      # Except isn't empty and our action isn't contained therein
+      if !except.empty?
+        break !except.include?(action)
+      end
+      # Just add it
+      true
+    end
+
+    # Add each action, if we should
+    add :index, params                             if should_add[:index]
+    add :new, params                               if should_add[:new]
+    add :create, params                            if should_add[:create]
+    add :edit, {:id => "some_id"}.merge(params)    if should_add[:edit]
+    add :show, {:id => "some_id"}.merge(params)    if should_add[:show]
+    add :update, {:id => "some_id"}.merge(params)  if should_add[:update]
+    add :destroy, {:id => "some_id"}.merge(params) if should_add[:destroy]
   end
 
   def output

data/rspec-check-auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-check-auth}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Caius Durling"]
-  s.date = %q{2009-12-03}
+  s.date = %q{2010-06-28}
   s.description = %q{Quickly check your rails controller actions require authentication}
   s.email = %q{hello@brightbox.co.uk}
   s.extra_rdoc_files = [
@@ -31,12 +31,13 @@ Gem::Specification.new do |s|
      "lib/rspec_check_auth/extend_object.rb",
      "rspec-check-auth.gemspec",
      "spec/rspec_check_auth_spec.rb",
+     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/brightbox/rspec-check-auth}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  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",
@@ -47,7 +48,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])

data/spec/rspec_check_auth_spec.rb

@@ -89,6 +89,18 @@ describe "RspecCheckAuth" do
     end
   end
 
+  it "should only expect resources it's been told to" do
+    expect_request_for :index, :html
+    expect_request_for :index, :xml
+
+    expect_output_for(:html, [:index_html])
+    expect_output_for(:xml, [:index_xml])
+
+    CheckAuth.for do |c|
+      c.resource_actions :only => :index
+    end
+  end
+
   it "should add standard resource routes with extra params" do
     expect_requests_for_resource_actions :some => :fields
 

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--format progress
+--loadby mtime
+--reverse

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-check-auth
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  hash: 9
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Caius Durling
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 +00:00
+date: 2010-06-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Quickly check your rails controller actions require authentication
 email: hello@brightbox.co.uk
 executables: []
@@ -46,6 +56,7 @@ files:
 - lib/rspec_check_auth/extend_object.rb
 - rspec-check-auth.gemspec
 - spec/rspec_check_auth_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/brightbox/rspec-check-auth
@@ -57,21 +68,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Quickly check your rails controller actions require authentication