warden 1.0.1 → 1.0.2

data/History.rdoc

@@ -1,3 +1,6 @@
+== Version 1.0.2
+* Added :intercept_401 to Warden::Config
+
 == Version 1.0.1
 * Bug fix on strategies errors handler
 

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
-gem 'rspec'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require File.join(File.dirname(__FILE__), "lib", "warden", "version")
 
 begin
@@ -26,7 +25,7 @@ end
 task :default => :spec
 
 desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-fs --color --backtrace)
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = %w(-fs --color --backtrace)
 end

data/lib/warden/config.rb

@@ -32,13 +32,14 @@ module Warden
       end
     end
 
-    hash_accessor :failure_app, :default_scope
+    hash_accessor :failure_app, :default_scope, :intercept_401
 
     def initialize(other={})
       merge!(other)
       self[:default_scope]      ||= :default
       self[:scope_defaults]     ||= {}
       self[:default_strategies] ||= {}
+      self[:intercept_401] = true unless key?(:intercept_401)
     end
 
     def initialize_copy(other)

data/lib/warden/manager.rb

@@ -38,13 +38,13 @@ module Warden
       result ||= {}
       case result
       when Array
-        if result.first == 401 && !env['warden'].custom_failure?
+        if result.first == 401 && intercept_401?(env)
           process_unauthenticated(env)
         else
           result
         end
       when Hash
-        process_unauthenticated(env, result || {})
+        process_unauthenticated(env, result)
       end
     end
 
@@ -81,6 +81,10 @@ module Warden
 
   private
 
+    def intercept_401?(env)
+      config[:intercept_401] && !env['warden'].custom_failure?
+    end
+
     # When a request is unauthentiated, here's where the processing occurs.
     # It looks at the result of the proxy to see if it's been executed and what action to take.
     # :api: private

data/lib/warden/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Warden
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ Dir[File.join(File.dirname(__FILE__), "helpers", "**/*.rb")].each do |f|
   require f
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(Warden::Spec::Helpers)
 
   def load_strategies

data/spec/warden/manager_spec.rb

@@ -225,6 +225,16 @@ describe Warden::Manager do
         result[2].should == ["Fail From The App"]
       end
 
+      it "should allow you to customize the response without the explicit call to custom_failure! if not intercepting 401" do
+        app = lambda do |e|
+          [401,{'Content-Type' => 'text/plain'},["Fail From The App"]]
+        end
+        env = env_with_params
+        result = setup_rack(app, :intercept_401 => false).call(env)
+        result[0].should == 401
+        result[2].should == ["Fail From The App"]
+      end
+
       it "should render the failure application for a 401 if no custom_failure flag is set" do
         app = lambda do |e|
           [401,{'Content-Type' => 'text/plain'},["Fail From The App"]]

data/warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warden}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2010-10-12}
+  s.date = %q{2010-11-09}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -35,8 +35,6 @@ Gem::Specification.new do |s|
      "lib/warden/test/helpers.rb",
      "lib/warden/test/warden_helpers.rb",
      "lib/warden/version.rb",
-     "script/destroy",
-     "script/generate",
      "spec/helpers/request_helper.rb",
      "spec/helpers/strategies/failz.rb",
      "spec/helpers/strategies/invalid.rb",
@@ -56,7 +54,6 @@ Gem::Specification.new do |s|
      "spec/warden/strategies_spec.rb",
      "spec/warden/test/helpers_spec.rb",
      "spec/warden/test/test_mode_spec.rb",
-     "spec/warden_spec.rb",
      "warden.gemspec"
   ]
   s.homepage = %q{http://github.com/hassox/warden}
@@ -84,8 +81,7 @@ Gem::Specification.new do |s|
      "spec/warden/strategies/base_spec.rb",
      "spec/warden/strategies_spec.rb",
      "spec/warden/test/helpers_spec.rb",
-     "spec/warden/test/test_mode_spec.rb",
-     "spec/warden_spec.rb"
+     "spec/warden/test/test_mode_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warden
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +11:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,8 +77,6 @@ files:
 - lib/warden/test/helpers.rb
 - lib/warden/test/warden_helpers.rb
 - lib/warden/version.rb
-- script/destroy
-- script/generate
 - spec/helpers/request_helper.rb
 - spec/helpers/strategies/failz.rb
 - spec/helpers/strategies/invalid.rb
@@ -98,7 +96,6 @@ files:
 - spec/warden/strategies_spec.rb
 - spec/warden/test/helpers_spec.rb
 - spec/warden/test/test_mode_spec.rb
-- spec/warden_spec.rb
 - warden.gemspec
 has_rdoc: true
 homepage: http://github.com/hassox/warden
@@ -154,4 +151,3 @@ test_files:
 - spec/warden/strategies_spec.rb
 - spec/warden/test/helpers_spec.rb
 - spec/warden/test/test_mode_spec.rb
-- spec/warden_spec.rb

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '.'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:newgem_simple, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '.'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:newgem_simple, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/spec/warden_spec.rb

@@ -1,5 +0,0 @@
-# encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "warden" do
-end