http 0.1.0 → 0.2.0

data/spec/http/options/new_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Http::Options, "new" do
+
+  it 'supports a Options instance' do
+    opts = Http::Options.new
+    Http::Options.new(opts).should eq(opts)
+  end
+
+  context 'with a Hash' do
+
+    it 'coerces :response correctly' do
+      opts = Http::Options.new(:response => :object)
+      opts.response.should eq(:object)
+    end
+
+    it 'coerces :headers correctly' do
+      opts = Http::Options.new(:headers => {:accept => "json"})
+      opts.headers.should eq(:accept => "json")
+    end
+
+    it 'coerces :form correctly' do
+      opts = Http::Options.new(:form => {:foo => 42})
+      opts.form.should eq(:foo => 42)
+    end
+
+    it 'coerces :callbacks correctly' do
+      before, after = Proc.new{|r| :before}, Proc.new{|r| :after}
+      callbacks = {:request => [before], :response => [after]}
+      opts = Http::Options.new(:callbacks => callbacks)
+      opts.callbacks.should eq({
+        :request  => [before],
+        :response => [after]
+      })
+    end
+
+  end
+
+end

data/spec/http/options/response_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Http::Options, "response" do
+
+  let(:opts){ Http::Options.new }
+
+  it 'defaults to :auto' do
+    opts.response.should eq(:auto)
+  end
+
+  it 'may be specified with with_response' do
+    opts2 = opts.with_response(:body)
+    opts.response.should eq(:auto)
+    opts2.response.should eq(:body)
+  end
+
+  it 'recognizes invalid responses' do
+    lambda{ 
+      opts.with_response(:not_a_valid_response)
+    }.should raise_error(ArgumentError, /not_a_valid_response/)
+  end
+
+end
+

data/spec/http/options_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Http::Options do
+
+  let(:options){ Http::Options.new(:response => :body) }
+
+  it 'behaves like a Hash for reading' do
+    options[:response].should eq(:body)
+    options[:nosuchone].should be_nil
+  end
+
+  it 'is able to coerce to a Hash' do
+    options.to_hash.should be_a(Hash)
+    options.to_hash[:response].should eq(:body)
+  end
+
+  it 'is stacktrace friendly' do
+    begin
+      options.with_response(:notrecognized)
+      true.should be_false
+    rescue ArgumentError => ex
+      puts ex.backtrace.first.should match(/options_spec/)
+    end
+  end
+
+end

data/spec/http/response_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Http::Response do
+
+  let(:subject){ Http::Response.new }
+
+  describe "the response headers" do
+
+    it 'are available through Hash-like methods' do
+      subject["Content-Type"] = "text/plain"
+      subject["Content-Type"].should eq("text/plain")
+    end
+
+    it 'are available through a `headers` accessor' do
+      subject["Content-Type"] = "text/plain"
+      subject.headers.should eq("Content-Type" => "text/plain")
+    end
+
+  end
+
+  describe "parse_body" do
+
+    it 'works on a registered mime-type' do
+      subject["Content-Type"] = "application/json"
+      subject.body = ::JSON.dump("hello" => "World")
+      subject.parse_body.should eq("hello" => "World")
+    end
+
+    it 'returns the body on an unregistered mime-type' do
+      subject["Content-Type"] = "text/plain"
+      subject.body = "Hello world"
+      subject.parse_body.should eq("Hello world")
+    end
+
+  end
+
+  describe "to_a" do
+
+    it 'mimics Rack' do
+      subject.tap do |r|
+        r.status  = 200
+        r.headers = {"Content-Type" => "text/plain"}
+        r.body    = "Hello world"
+      end
+      expected = [
+        200,
+        {"Content-Type" => "text/plain"},
+        "Hello world"
+      ]
+      subject.to_a.should eq(expected)
+    end
+
+    it 'uses parse_body if known mime-type' do
+      subject.tap do |r|
+        r.status  = 200
+        r.headers = {"Content-Type" => "application/json"}
+        r.body    = ::JSON.dump("hello" => "World")
+      end
+      expected = [
+        200,
+        {"Content-Type" => "application/json"},
+        {"hello" => "World"}
+      ]
+      subject.to_a.should eq(expected)
+    end
+
+  end
+
+end

data/spec/http_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 require 'json'
 
 describe Http do
-  let(:test_endpoint) { "http://127.0.0.1:#{TEST_SERVER_PORT}/" }
-  
+  let(:test_endpoint) { "http://127.0.0.1:#{ExampleService::PORT}/" }
+
   context "getting resources" do
     it "should be easy" do
       response = Http.get test_endpoint
@@ -16,6 +16,22 @@ describe Http do
         response['json'].should be_true
       end
     end
+
+    context "with callbacks" do
+      it "fires a request callback" do
+        pending 'Http::Request is not yet implemented'
+
+        request = nil
+        Http.on(:request) {|r| request = r}.get test_endpoint
+        request.should be_a Http::Request
+      end
+
+      it "fires a response callback" do
+        response = nil
+        Http.on(:response) {|r| response = r}.get test_endpoint
+        response.should be_a Http::Response
+      end
+    end
   end
 
   context "posting to resources" do
@@ -32,4 +48,10 @@ describe Http do
       response['content-type'].should match(/html/)
     end
   end
+
+  it "should be chainable" do
+    response = Http.accept(:json).on(:response){|r| seen = r}.get(test_endpoint)
+    response['json'].should be_true
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,2 @@
-$:.push File.expand_path("../lib")
 require 'http'
-require 'support/mock_server'
+require 'support/example_server'

data/spec/support/{mock_server.rb → example_server.rb}

@@ -1,15 +1,13 @@
 require 'webrick'
 
-TEST_SERVER_PORT = 65432
+class ExampleService < WEBrick::HTTPServlet::AbstractServlet
+  PORT = 65432
 
-class MockService < WEBrick::HTTPServlet::AbstractServlet
-  class << self; attr_accessor :post_handler; end
-  
   def do_GET(request, response)
     case request.path
     when "/"
       response.status = 200
-      
+
       case request['Accept']
       when 'application/json'
         response['Content-Type'] = 'application/json'
@@ -22,7 +20,7 @@ class MockService < WEBrick::HTTPServlet::AbstractServlet
       response.status = 404
     end
   end
-  
+
   def do_POST(request, response)
     case request.path
     when "/"
@@ -31,13 +29,13 @@ class MockService < WEBrick::HTTPServlet::AbstractServlet
         response.body   = "passed :)"
       else
         response.status = 400
-        response.vody   = "invalid! >:E"
+        response.body   = "invalid! >:E"
       end
     else
       response.status = 404
     end
   end
-  
+
   def do_HEAD(request, response)
     case request.path
     when "/"
@@ -49,11 +47,10 @@ class MockService < WEBrick::HTTPServlet::AbstractServlet
   end
 end
 
-MockServer = WEBrick::HTTPServer.new(:Port => TEST_SERVER_PORT, :AccessLog => [])
-MockServer.mount "/", MockService
+ExampleServer = WEBrick::HTTPServer.new(:Port => ExampleService::PORT, :AccessLog => [])
+ExampleServer.mount "/", ExampleService
 
-Thread.new  { MockServer.start }
-trap("INT") { MockServer.shutdown; exit }
+t = Thread.new { ExampleServer.start }
+trap("INT")    { ExampleServer.shutdown; exit }
 
-# hax: wait for webrick to start
-sleep 0.1
+Thread.pass while t.status and t.status != "sleep"

metadata

@@ -1,78 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: http
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Tony Arcieri
-- Carl Lerche
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-26 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
+date: 2012-03-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: certified
+  requirement: &70273361267740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70273361267740
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70273361267320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70273361267320
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70273361266900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70273361266900
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70273361266480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: HTTP so awesome it will lure Catherine Zeta Jones into your unicorn petting zoo
-email: 
+  prerelease: false
+  version_requirements: *70273361266480
+description: HTTP so awesome it will lure Catherine Zeta Jones into your unicorn petting
+  zoo
+email:
 - tony.arcieri@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -88,52 +78,57 @@ files:
 - lib/http/compat/curb.rb
 - lib/http/mime_type.rb
 - lib/http/mime_types/json.rb
-- lib/http/parameters.rb
+- lib/http/options.rb
+- lib/http/request.rb
 - lib/http/response.rb
+- lib/http/uri_backport.rb
 - lib/http/version.rb
-- parser/common.rl
-- parser/http.rl
-- parser/multipart.rl
 - spec/http/compat/curb_spec.rb
+- spec/http/options/callbacks_spec.rb
+- spec/http/options/form_spec.rb
+- spec/http/options/headers_spec.rb
+- spec/http/options/merge_spec.rb
+- spec/http/options/new_spec.rb
+- spec/http/options/response_spec.rb
+- spec/http/options_spec.rb
+- spec/http/response_spec.rb
 - spec/http_spec.rb
 - spec/spec_helper.rb
-- spec/support/mock_server.rb
-has_rdoc: true
+- spec/support/example_server.rb
 homepage: https://github.com/tarcieri/http
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Made entirely of Ruby (and Ragel and C and Java)
-test_files: 
+summary: HTTP should be easy
+test_files:
 - spec/http/compat/curb_spec.rb
+- spec/http/options/callbacks_spec.rb
+- spec/http/options/form_spec.rb
+- spec/http/options/headers_spec.rb
+- spec/http/options/merge_spec.rb
+- spec/http/options/new_spec.rb
+- spec/http/options/response_spec.rb
+- spec/http/options_spec.rb
+- spec/http/response_spec.rb
 - spec/http_spec.rb
 - spec/spec_helper.rb
-- spec/support/mock_server.rb
+- spec/support/example_server.rb