@@ -1,7 +1,7 @@ require 'rack/lobster' use Rack::ShowExceptions -use Rack::Auth::Basic do |username, password| +use Rack::Auth::Basic, "Lobster 2.0" do |username, password| 'secret' == password end example/protectedlobster.ru @@ -8,8 +8,8 @@ module Rack attr_accessor :realm - def initialize(app, &authenticator) - @app, @authenticator = app, authenticator + def initialize(app, realm=nil, &authenticator) + @app, @realm, @authenticator = app, realm, authenticator end lib/rack/auth/abstract/handler.rb @@ -21,7 +21,7 @@ module Rack attr_writer :passwords_hashed - def initialize(app) + def initialize(*args) super @passwords_hashed = nil end lib/rack/auth/digest/md5.rb @@ -35,7 +35,7 @@ context 'Rack::Auth::Basic' do response.should.be.a.client_error response.status.should.equal 401 response.should.include 'WWW-Authenticate' - response.headers['WWW-Authenticate'].should =~ /Basic realm="/ + response.headers['WWW-Authenticate'].should =~ /Basic realm="#{Regexp.escape(realm)}"/ response.body.should.be.empty end @@ -66,4 +66,8 @@ context 'Rack::Auth::Basic' do end end + specify 'realm as optional constructor arg' do + app = Rack::Auth::Basic.new(unprotected_app, realm) { true } + assert_equal realm, app.realm + end end test/spec_rack_auth_basic.rb @@ -218,4 +218,9 @@ context 'Rack::Auth::Digest::MD5' do response.body.to_s.should.equal 'Hi Alice' end end + + specify 'realm as optional constructor arg' do + app = Rack::Auth::Digest::MD5.new(unprotected_app, realm) { true } + assert_equal realm, app.realm + end end test/spec_rack_auth_digest.rb db1c378de3268f7749a59dba3fd9a71ffd25a4e3 Brian Candler b.candler@pobox.com http://github.com/chneukirchen/rack/commit/ebb03fac2da1eb4d6baa6fe676f3f9e67241d7e3 ebb03fac2da1eb4d6baa6fe676f3f9e67241d7e3 2009-02-27T15:34:31-08:00 2009-02-26T09:06:24-08:00 Allow realm to be passed to auth handler's initialize method Signed-off-by: Ryan Tomayko <rtomayko@gmail.com> 9aedd70799bf23fd34f18998ae4ecc94234b5b8c Ryan Tomayko rtomayko@gmail.com