@@ -1,5 +1,8 @@ +source "http://gemcutter.org" + gem 'rack' gem 'rack-test' +gem 'halorgium-actionpack', '=3.0.pre' only :test do gem 'rake' Gemfile @@ -1,9 +1,13 @@ require 'rack' require 'rack/test' require 'forwardable' +require 'action_dispatch/middleware/stack' +require 'active_support' +require 'active_support/core_ext/array/extract_options' +require 'active_support/core_ext/string/inflections' module Rack - class Client < Rack::Builder + class Client VERSION = "0.2.0" include Rack::Test::Methods @@ -14,16 +18,29 @@ module Rack def_delegators :new, *HTTP_METHODS end - def run(*args, &block) - @ran = true - super(*args, &block) + def initialize(*args, &block) + @stack = Stack.new(*args) + @stack.instance_eval(&block) if block_given? end + attr_reader :stack - def to_app(*args, &block) - run Rack::Client::HTTP unless @ran - super(*args, &block) + def call(env) + app.call(env) + end + + def app + stack.app + end + + class Stack < ActionDispatch::MiddlewareStack + def run(endpoint) + @endpoint = endpoint + end + + def app + build(@endpoint || Rack::Client::HTTP) + end end - alias app to_app end end lib/rack/client.rb 2fe16ea80af981c32aa3a7021be33c4114f5453c Tim Carey-Smith tim@spork.in http://github.com/halorgium/rack-client/commit/b71c63b65da78dbb672be63af1da814e0e8e05ca b71c63b65da78dbb672be63af1da814e0e8e05ca 2009-11-06T22:19:10-08:00 2009-11-06T22:19:10-08:00 Shift to ActionDispatch for the stack for more useful abilities 9b26cf30b40bcc329bdb7f4a743f41311456f928 Tim Carey-Smith tim@spork.in