rack-client 0.1.1 → 0.3.0

data/spec/handler/em_http_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+if ''.respond_to?(:bytesize) || # String#bytesize defined by em-http-request > 0.2.7
+   RUBY_VERSION != '1.8.7'      # em-spec is broken on 1.8.7
+
+  describe Rack::Client::Handler::EmHttp do
+    include EM::Spec
+
+    def client
+      Rack::Client.new { run Rack::Client::Handler::EmHttp.new("http://localhost:#{server.port}") }
+    end
+
+    def finish
+      done
+    end
+
+    before(:each) { done }
+    after(:each) { done }
+
+    it_should_behave_like "Asynchronous Request API"
+  end
+end

data/spec/handler/excon_spec.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Rack::Client::Handler::Excon do
+  let(:client) { Rack::Client.new { run Rack::Client::Handler::Excon.new("http://localhost:#{server.port}") } }
+
+  it_should_behave_like "Synchronous Request API"
+end

data/spec/handler/net_http_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Rack::Client::Handler::NetHTTP do
+  let(:client) { Rack::Client.new("http://localhost:#{server.port}") { run Rack::Client::Handler::NetHTTP } }
+
+  it_should_behave_like "Synchronous Request API"
+  it_should_behave_like "Asynchronous Request API"
+end

data/spec/handler/sync_api_spec.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+share_examples_for "Synchronous Request API" do
+  context 'DELETE request' do
+    it 'can handle a No Content response' do
+      response = client.delete("/shelf/ctm")
+      response.status.should == 204
+    end
+  end
+
+  context 'GET request' do
+    it 'has the proper response for a basic request' do
+      response = client.get("/ping")
+      response.status.should == 200
+      response.body.to_s.should == 'pong'
+      response["Content-Type"].should == 'text/html'
+      response["Content-Length"].to_i.should == 4
+    end
+
+    it 'can handle a temporary redirect response' do
+      response = client.get("/redirect")
+      response.status.should == 302
+      response["Location"].should == "/after-redirect"
+    end
+
+    it 'can return an empty body' do
+      response = client.get("/empty")
+      response.body.should be_empty
+    end
+  end
+
+  context 'HEAD request' do
+    it 'can handle ETag headers' do
+      response = client.head("/shelf")
+      response.status.should == 200
+      response["ETag"].should == "828ef3fdfa96f00ad9f27c383fc9ac7f"
+    end
+  end
+
+  context 'POST request' do
+    it 'can send a request body' do
+      response = client.post("/posted", {}, "some data")
+      response.status.should == 201
+      response["Created"].should == "awesome"
+    end
+  end
+
+  context 'PUT request' do
+    it 'can send a request body' do
+      response = client.put("/shelf/ctm", {}, "some data")
+      response.status.should == 200
+      response["Location"].should == "/shelf/ctm"
+    end
+  end
+end

data/spec/handler/typhoeus_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Rack::Client::Handler::Excon do
+
+  def client
+    Rack::Client::Handler::Typhoeus # manual autoload :(
+
+    hydra = self.hydra
+    Rack::Client.new { run Rack::Client::Handler::Typhoeus.new("http://localhost:#{server.port}", hydra) }
+  end
+
+  def hydra
+    @@hydra ||= Typhoeus::Hydra.new
+  end
+
+  def finish
+    hydra.run
+  end
+
+  it_should_behave_like "Synchronous Request API"
+  it_should_behave_like "Asynchronous Request API"
+end

data/spec/middleware_helper.rb

@@ -0,0 +1,37 @@
+class LoggerCheck
+  def initialize(app, &block)
+    @app, @block = app, block
+  end
+
+  def call(env)
+    logger = env['rack.logger']
+
+    @app.call(env)
+  ensure
+    @block.call(logger)
+  end
+end
+
+class ETagFixed < Rack::ETag
+  def call(env)
+    status, headers, body = @app.call(env)
+
+    if !headers.has_key?('ETag')
+      digest, body = digest_body(body)
+      headers['ETag'] = %("#{digest}")
+    end
+
+    [status, headers, body]
+  end
+
+  private
+  def digest_body(body)
+    digest = Digest::MD5.new
+    parts = []
+    body.each do |part|
+      digest << part
+      parts << part
+    end
+    [digest.hexdigest, parts]
+  end
+end

data/spec/middleware_spec.rb

@@ -1,10 +1,53 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Rack::Client, "with a standard piece of Rack middleware" do
-  it "successfully uses that middleware" do
-    client = Rack::Client.new { use Rack::ETag }
-    response = client.get("http://localhost:9292/no-etag")
-    response.status.should == 200
-    response.headers["ETag"].should_not be_empty
+  context "Rack::ETag" do
+    let(:client) do
+      Rack::Client.new("http://localhost:#{server.port}") do
+        use Rack::ETag
+        run Rack::Client::Handler::NetHTTP
+      end
+    end
+
+    it "successfully uses that middleware" do
+      pending "Rack::ETag fixes streaming bodies (http://github.com/rack/rack/commit/f10713cce876d370ee5f1018928521d4b43e0dce)"
+
+      response = client.get("http://localhost:#{server.port}/no-etag")
+      response.status.should == 200
+      response.headers["ETag"].should_not be_empty
+    end
+  end
+
+  context "Rack::ETag (fixed for streaming)" do
+    let(:client) do
+      Rack::Client.new("http://localhost:#{server.port}") do
+        use ETagFixed
+        run Rack::Client::Handler::NetHTTP
+      end
+    end
+
+    it "successfully uses that middleware" do
+      response = client.get("http://localhost:#{server.port}/no-etag")
+      response.status.should == 200
+      response.headers["ETag"].should_not be_empty
+    end
+  end
+
+  context "Rack::Logger" do
+    let(:client) do
+      Rack::Client.new("http://localhost:#{server.port}") do
+        use Rack::Logger
+        use LoggerCheck do |logger|
+          logger.class.should == Logger
+        end
+        run Rack::Client::Handler::NetHTTP
+      end
+    end
+
+    it "successfully uses that middleware" do
+      response = client.get("http://localhost:#{server.port}/no-etag")
+      response.status.should == 200
+    end
   end
 end
+

data/spec/parser/json_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Rack::Client::Parser::JSON do
+  let(:client) do
+    Rack::Client.new("http://localhost:#{server.port}") do
+      use Rack::Client::Parser
+      run Rack::Client::Handler::NetHTTP
+    end
+  end
+
+  context 'Synchronous API' do
+    it "injects the parsed body into the response" do
+      response = client.get("http://localhost:#{server.port}/hash.json")
+      response.headers['rack-client.body_collection'].should == [{'foo' => 'bar'}]
+    end
+
+    it "injects the dumped body into the request" do
+      response = client.post("http://localhost:#{server.port}/echo", {'rack-client.body_collection' => [{'foo' => 'bar'}], 'Content-Type' => 'application/json'}, {})
+      response.headers['rack-client.body_collection'].should == [{'foo' => 'bar'}]
+    end
+  end
+end

data/spec/parser/yaml_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Rack::Client::Parser::YAML do
+  let(:client) do
+    Rack::Client.new("http://localhost:#{server.port}") do
+      use Rack::Client::Parser
+      run Rack::Client::Handler::NetHTTP
+    end
+  end
+
+  context 'Synchronous API' do
+    it "injects the parsed body into the response" do
+      response = client.get("http://localhost:#{server.port}/hash.yml")
+      response.headers['rack-client.body_collection'].should == [{:foo => :bar}]
+    end
+
+    it "injects the dumped body into the request" do
+      response = client.post("http://localhost:#{server.port}/echo", {'rack-client.body_collection' => [{:foo => :bar}], 'Content-Type' => 'application/x-yaml'}, {})
+      response.headers['rack-client.body_collection'].should == [{:foo => :bar}]
+    end
+  end
+end

data/spec/server_helper.rb

@@ -0,0 +1,72 @@
+class InThreadServer
+  def self.rackup(*a)
+    server = new(*a)
+    server.start
+    server
+  end
+
+  attr_accessor :port, :port_range, :pre_spawn_callback, :config_ru, :running
+
+  def initialize(config_ru, pre_spawn_callback = nil, port_range = 8000..10000)
+    @config_ru, @pre_spawn_callback, @port_range = config_ru, pre_spawn_callback, port_range
+  end
+
+  def start
+    return if running
+    find_port
+    pre_spawn
+    spawn_server_thread
+    wait_for_server
+    @running = true
+  end
+
+  def stop
+    @thread.kill
+    @running= false
+  end
+
+  def find_port
+    return if @port
+
+    @port = @port_range.min
+
+    while(system("lsof -i tcp:#{self.port} > /dev/null")) do
+      @port += 1
+    end
+  end
+
+  def pre_spawn
+    pre_spawn_callback.call(self) if pre_spawn_callback
+  end
+
+  def spawn_server_thread
+    @thread ||= Thread.new {
+      begin
+        Rack::Server.new(:Port => @port, :config => @config_ru, :server => 'mongrel').start
+      rescue
+        $stderr.puts "Failed to start server"
+        $stderr.puts $!.inspect
+        $stderr.puts $!.backtrace
+        abort
+      end
+    }
+  end
+
+  def wait_for_server
+    loop do
+      begin
+        Rack::Client.get("http://127.0.0.1:#{@port}/")
+        break
+      rescue Errno::ECONNREFUSED
+        sleep 1
+      end
+    end
+  end
+end
+
+class DigestServer < Rack::Auth::Digest::MD5
+  def initialize(*)
+    super
+    self.opaque = '12345'
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,20 @@
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'rack/client'
+
 require 'rubygems'
 require 'spec'
-require 'rack/contrib'
-gem 'rack-test'
+require 'em-spec/rspec'
+
+dir = File.expand_path(File.dirname(__FILE__))
+require dir + '/server_helper'
+require dir + '/middleware_helper'
+require dir + '/handler/sync_api_spec'
+require dir + '/handler/async_api_spec'
+
+Spec::Runner.configure do |config|
+  def server
+    @@server ||= InThreadServer.rackup(File.expand_path(File.dirname(__FILE__) + '/apps/example.org.ru'))
+  end
 
-require File.expand_path(File.dirname(__FILE__) + "/../lib/rack/client")
+  def finish() end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-client
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tim Carey-Smith
@@ -9,29 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-31 00:00:00 -07:00
+date: 2010-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "1"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rack-test
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id001
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  name: rack
 description: A client wrapper around a Rack app or HTTP
 email: tim@spork.in
 executables: []
@@ -45,18 +44,61 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
-- lib/rack
-- lib/rack/client
-- lib/rack/client/auth.rb
+- lib/rack/client/adapter/base.rb
+- lib/rack/client/adapter/simple.rb
+- lib/rack/client/adapter.rb
+- lib/rack/client/auth/abstract/challenge.rb
+- lib/rack/client/auth/basic.rb
+- lib/rack/client/auth/digest/challenge.rb
+- lib/rack/client/auth/digest/md5.rb
+- lib/rack/client/auth/digest/params.rb
+- lib/rack/client/body.rb
+- lib/rack/client/cache/cachecontrol.rb
+- lib/rack/client/cache/context.rb
+- lib/rack/client/cache/entitystore.rb
+- lib/rack/client/cache/key.rb
+- lib/rack/client/cache/metastore.rb
+- lib/rack/client/cache/options.rb
+- lib/rack/client/cache/request.rb
+- lib/rack/client/cache/response.rb
+- lib/rack/client/cache/storage.rb
+- lib/rack/client/cache.rb
+- lib/rack/client/cookie_jar/context.rb
+- lib/rack/client/cookie_jar/cookie.rb
+- lib/rack/client/cookie_jar/cookiestore.rb
+- lib/rack/client/cookie_jar/options.rb
+- lib/rack/client/cookie_jar/request.rb
+- lib/rack/client/cookie_jar/response.rb
+- lib/rack/client/cookie_jar/storage.rb
+- lib/rack/client/cookie_jar.rb
+- lib/rack/client/dual_band.rb
 - lib/rack/client/follow_redirects.rb
-- lib/rack/client/http.rb
+- lib/rack/client/handler/em-http.rb
+- lib/rack/client/handler/excon.rb
+- lib/rack/client/handler/net_http.rb
+- lib/rack/client/handler/typhoeus.rb
+- lib/rack/client/handler.rb
+- lib/rack/client/headers.rb
+- lib/rack/client/parser/base.rb
+- lib/rack/client/parser/body_collection.rb
+- lib/rack/client/parser/context.rb
+- lib/rack/client/parser/json.rb
+- lib/rack/client/parser/middleware.rb
+- lib/rack/client/parser/request.rb
+- lib/rack/client/parser/response.rb
+- lib/rack/client/parser/yaml.rb
+- lib/rack/client/parser.rb
+- lib/rack/client/response.rb
+- lib/rack/client/version.rb
 - lib/rack/client.rb
 - demo/client.rb
 - demo/config.ru
 - demo/demo.rb
 - demo/demo_spec.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/halorgium/rack-client
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -66,27 +108,40 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rack-client
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A client wrapper around a Rack app or HTTP
 test_files: 
-- spec/apps
 - spec/apps/example.org.ru
-- spec/auth_spec.rb
-- spec/core_spec.rb
+- spec/auth/basic_spec.rb
+- spec/auth/digest/md5_spec.rb
+- spec/cache_spec.rb
+- spec/cookie_jar_spec.rb
 - spec/endpoint_spec.rb
+- spec/follow_redirect_spec.rb
+- spec/handler/async_api_spec.rb
+- spec/handler/em_http_spec.rb
+- spec/handler/excon_spec.rb
+- spec/handler/net_http_spec.rb
+- spec/handler/sync_api_spec.rb
+- spec/handler/typhoeus_spec.rb
+- spec/middleware_helper.rb
 - spec/middleware_spec.rb
-- spec/redirect_spec.rb
+- spec/parser/json_spec.rb
+- spec/parser/yaml_spec.rb
+- spec/server_helper.rb
 - spec/spec_helper.rb