example/protectedlobster.ru @@ -22,8 +22,12 @@ module Rack instance_eval(&block) end - def use(middleware, *args) - @ins << lambda { |app| middleware.new(app, *args) } + def use(middleware, *args, &block) + @ins << if block_given? + lambda { |app| middleware.new(app, *args, &block) } + else + lambda { |app| middleware.new(app, *args) } + end end def run(app) lib/rack/builder.rb @@ -25,4 +25,26 @@ context "Rack::Builder" do Rack::MockRequest.new(app).get("/").should.be.server_error Rack::MockRequest.new(app).get("/").should.be.server_error end + + specify "supports blocks on use" do + app = Rack::Builder.new do + use Rack::ShowExceptions + use Rack::Auth::Basic do |username, password| + 'secret' == password + end + + run lambda { |env| [200, {}, 'Hi Boss'] } + end + + response = Rack::MockRequest.new(app).get("/") + response.should.be.client_error + response.status.should.equal 401 + + # with auth... + response = Rack::MockRequest.new(app).get("/", + 'HTTP_AUTHORIZATION' => 'Basic ' + ["joe:secret"].pack("m*")) + response.status.should.equal 200 + response.body.to_s.should.equal 'Hi Boss' + end + end test/spec_rack_builder.rb 443896e2e9bcf46a3ba05cd085c0837c8d6a4c82 Christian Neukirchen chneukirchen@gmail.com http://github.com/rtomayko/rack/commit/0639994b6b95ab737d5f86a97b110fa63a61dab3 0639994b6b95ab737d5f86a97b110fa63a61dab3 2008-02-24T09:51:00-08:00 2008-02-24T09:51:00-08:00 Let Rack::Builder#use accept blocks Contributed by Corey Jewett. darcs-hash:20080224175153-4fc50-92205606f938818e1a6e4e8d702ef3083f5e0c5a.gz 5e492a2e1aefac53b7ef6859fcd185c048097952 Christian Neukirchen chneukirchen@gmail.com