http 0.0.2 → 0.1.0

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
   - 1.8.7
   - 1.9.2
-  - rbx-2.0
+  - rbx
   - jruby

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.1.0
+-----
+* Testing against WEBrick
+* Curb compatibility (require 'http/compat/curb')
+
 0.0.1
 -----
 * Initial half-baked release

data/README.md

@@ -1,5 +1,6 @@
 Http
 ====
+[![Build Status](http://travis-ci.org/tarcieri/http.png)](http://travis-ci.org/tarcieri/http)
 
 Ruby has always been this extremely web-focused language, and yet despite the
 selection of HTTP libraries out there, I always find myself falling back on
@@ -17,19 +18,17 @@ Making Requests
 
 Let's start with getting things:
 
-    Http.get "http://www.google.com"
+```ruby
+Http.get "http://www.google.com"
+```
 
 That's it! The result is the response body.
 
-Don't like "Http"? No worries, this works as well:
-
-    HTTP.get "http://www.google.com"
-
-After all, There Is More Than One Way To Do It!
-
 Making POST requests is simple too. Want to POST a form?
 
-	Http.post "http://example.com/resource", :form => {:foo => "42"}
+```ruby
+Http.post "http://example.com/resource", :form => {:foo => "42"}
+```
 
 It's easy!
 
@@ -40,7 +39,9 @@ The Http library uses the concept of chaining to simplify requests. Let's say
 you want to get the latest commit of this library from Github in JSON format.
 One way we could do this is by tacking a filename on the end of the URL:
 
-    Http.get "https://github.com/tarcieri/http/commit/HEAD.json"
+```ruby
+Http.get "https://github.com/tarcieri/http/commit/HEAD.json"
+```
 
 The Github API happens to support this approach, but really this is a bit of a
 hack that makes it easy for people typing URLs into the address bars of
@@ -48,8 +49,10 @@ browsers to perform the act of content negotiation. Since we have access to
 the full, raw power of HTTP, we can perform content negotiation the way HTTP
 intends us to, by using the Accept header:
 
-    Http.with_headers(:accept => 'application/json').
-      get("https://github.com/tarcieri/http/commit/HEAD")
+```ruby
+Http.with_headers(:accept => 'application/json').
+  get("https://github.com/tarcieri/http/commit/HEAD")
+```
 
 This requests JSON from Github. Github is smart enough to understand our
 request and returns a response with Content-Type: application/json. If you
@@ -58,8 +61,10 @@ JSON.parse, the Http library will attempt to parse the JSON response.
 
 A shorter alias exists for HTTP.with_headers:
 
-	Http.with(:accept => 'application/json').
-	  get("https://github.com/tarcieri/http/commit/HEAD")
+```ruby
+Http.with(:accept => 'application/json').
+  get("https://github.com/tarcieri/http/commit/HEAD")
+```
 
 Content Negotiation
 -------------------
@@ -68,11 +73,26 @@ As important a concept as content negotiation is HTTP, it sure should be easy,
 right? But usually it's not, and so we end up adding ".json" onto the ends of
 our URLs because the existing mechanisms make it too hard. It should be easy:
 
-    Http.accept(:json).get("https://github.com/tarcieri/http/commit/HEAD")
+```ruby
+Http.accept(:json).get("https://github.com/tarcieri/http/commit/HEAD")
+```
 
 This adds the appropriate Accept header for retrieving a JSON response for the
 given resource.
 
+Curb Compatibility
+------------------
+
+The Http gem provides partial compatibility with the Curb::Easy API. This is
+great if you're transitioning to JRuby and need a drop-in API-compatible
+replacement for Curb.
+
+To use the Curb compatibility, do:
+
+```ruby
+require 'http/compat/curb'
+```
+
 Contributing to Http
 --------------------
 

data/lib/http.rb

@@ -5,7 +5,6 @@ require 'http/mime_type'
 require 'http/parameters'
 require 'http/response'
 
-
 # THIS IS ENTIRELY TEMPORARY, I ASSURE YOU
 require 'net/https'
 require 'uri'
@@ -14,7 +13,3 @@ require 'uri'
 module Http
   extend Chainable
 end
-
-# TIMTOWTDI!
-HTTP = Http
-HttpClient = Http::Client

data/lib/http/client.rb

@@ -7,54 +7,54 @@ module Http
         @uri = uri
       else
         # Why the FUCK can't Net::HTTP do this?
-        @uri = URI(uri)
+        @uri = URI(uri.to_s)
       end
 
       @options = {:response => :object}.merge(options)
     end
 
     # Request a get sans response body
-    def head(uri, options = {})
+    def head(options = {})
       request :head, options
     end
 
     # Get a resource
-    def get(uri, options = {})
+    def get(options = {})
       request :get, options
     end
 
     # Post to a resource
-    def post(uri, options = {})
+    def post(options = {})
       request :post, options
     end
 
     # Put to a resource
-    def put(uri, options = {})
+    def put(options = {})
       request :put, options
     end
 
     # Delete a resource
-    def delete(uri, options = {})
+    def delete(options = {})
       request :delete, options
     end
 
     # Echo the request back to the client
-    def trace(uri, options = {})
+    def trace(options = {})
       request :trace, options
     end
 
     # Return the methods supported on the given URI
-    def options(uri, options = {})
+    def options(options = {})
       request :options, options
     end
 
     # Convert to a transparent TCP/IP tunnel
-    def connect(uri, options = {})
+    def connect(options = {})
       request :connect, options
     end
 
     # Apply partial modifications to a resource
-    def patch(uri, options = {})
+    def patch(options = {})
       request :patch, options
     end
 

data/lib/http/compat/curb.rb

@@ -0,0 +1,86 @@
+require 'http'
+
+# Compatibility with the Curb gem
+module Curl
+  module Err
+    class CurlError < RuntimeError; end
+    class ConnectionFailedError < CurlError; end
+    class HostResolutionError < CurlError; end
+  end
+
+  class Easy
+    attr_accessor :headers, :encoding
+    attr_reader   :response_code, :body_str
+
+    def self.http_post(url, request_body = nil)
+      Easy.new(url).tap { |e| e.http_post(request_body) }
+    end
+
+    def self.http_get(url, request_body = nil)
+      Easy.new(url).tap { |e| e.http_get(request_body) }
+    end
+
+    def initialize(url = nil, method = nil, request_body = nil, headers = {})
+      @url = url
+      @method = method
+      @request_body = request_body
+      @headers = headers
+      @response_code = @body_str = nil
+    end
+
+    def perform
+      client = Http::Client.new @url, :headers => @headers
+      response = client.send @method
+      @response_code, @body_str = response.code, response.body
+      true
+    rescue SocketError => ex
+      if ex.message['getaddrinfo'] || ex.message['ame or service not known']
+        raise Err::HostResolutionError, ex.message
+      else
+        raise Err::ConnectionFailedError, ex.message
+      end
+    end
+
+    def http_get(request_body = nil)
+      @method, @request_body = :get, request_body
+      perform
+    end
+
+    def http_put(request_body = nil)
+      @method, @request_body = :put, request_body
+      perform
+    end
+
+     def http_post(request_body = nil)
+      @method, @request_body = :post, request_body
+      perform
+    end
+
+    def http_delete
+      @method = :delete
+      perform
+    end
+  end
+  
+  class Multi
+    def initialize
+      @clients = []
+      @done = false
+    end
+    
+    def add(client)
+      @clients << client
+    end
+    
+    
+    def perform
+      return if @done
+      
+      @clients.map do |client|
+        Thread.new { client.perform }
+      end.each(&:join)
+
+      @done = true
+    end
+  end
+end

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module Http
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/http/compat/curb_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+require 'http/compat/curb'
+
+describe Curl do
+  let(:test_endpoint)  { "http://127.0.0.1:#{TEST_SERVER_PORT}/" }
+
+  describe Curl::Easy do
+    it "gets resources" do
+      response = Curl::Easy.http_get test_endpoint
+      response.body_str.should match(/<!doctype html>/)
+    end
+
+    context :errors do
+      it "raises Curl::Err::HostResolutionError if asked to connect to a nonexistent domain" do
+        expect {
+          Curl::Easy.http_get "http://totallynonexistentdomain.com"
+        }.to raise_exception(Curl::Err::HostResolutionError)
+      end
+    end
+  end
+  
+  describe Curl::Multi do
+    it "gets resources" do
+      requests  = [test_endpoint]
+      responses = []
+      
+      multi = Curl::Multi.new
+      
+      requests.each do |url|
+        response = Curl::Easy.new url, :get
+        multi.add response
+        responses << response
+      end
+
+      multi.perform
+      responses.first.body_str.should match(/<!doctype html>/)
+    end
+  end
+end

data/spec/http_spec.rb

@@ -2,35 +2,32 @@ require 'spec_helper'
 require 'json'
 
 describe Http do
+  let(:test_endpoint) { "http://127.0.0.1:#{TEST_SERVER_PORT}/" }
+  
   context "getting resources" do
     it "should be easy" do
-      # Fuck it, we'll do it live! (Testing against WEBRick or something coming soon)
-      response = Http.get "http://www.google.com"
+      response = Http.get test_endpoint
       response.should match(/<!doctype html>/)
     end
 
     context "with headers" do
       it "should be easy" do
-        response = Http.accept(:json).get("https://github.com/tarcieri/http/commit/HEAD")
-
-        # Congratulations first committer, your prize is to break the build!
-        response['commit']['author']['name'].should == "Tony Arcieri"
+        response = Http.accept(:json).get test_endpoint
+        response['json'].should be_true
       end
     end
   end
 
   context "posting to resources" do
     it "should be easy" do
-      fragment = "<!doctype html><html><head><title>example</title></head></html>"
-      response = Http.post "http://validator.w3.org/check", :form => {:fragment => fragment}
-
-      response.should match(/HTML5/)
+      response = Http.post test_endpoint, :form => {:example => 'testing'}
+      response.should == "passed :)"
     end
   end
 
   context "head requests" do
     it "should be easy" do
-      response = Http.head "http://www.google.com"
+      response = Http.head test_endpoint
       response.status.should == 200
       response['content-type'].should match(/html/)
     end

data/spec/spec_helper.rb

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

data/spec/support/mock_server.rb

@@ -0,0 +1,59 @@
+require 'webrick'
+
+TEST_SERVER_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'
+        response.body = '{"json": true}'
+      else
+        response['Content-Type'] = 'text/html'
+        response.body   = "<!doctype html>"
+      end
+    else
+      response.status = 404
+    end
+  end
+  
+  def do_POST(request, response)
+    case request.path
+    when "/"
+      if request.query['example'] == 'testing'
+        response.status = 200
+        response.body   = "passed :)"
+      else
+        response.status = 400
+        response.vody   = "invalid! >:E"
+      end
+    else
+      response.status = 404
+    end
+  end
+  
+  def do_HEAD(request, response)
+    case request.path
+    when "/"
+      response.status = 200
+      response['Content-Type'] = 'text/html'
+    else
+      response.status = 404
+    end
+  end
+end
+
+MockServer = WEBrick::HTTPServer.new(:Port => TEST_SERVER_PORT, :AccessLog => [])
+MockServer.mount "/", MockService
+
+Thread.new  { MockServer.start }
+trap("INT") { MockServer.shutdown; exit }
+
+# hax: wait for webrick to start
+sleep 0.1

metadata

@@ -1,58 +1,78 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: http
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
-authors:
+authors: 
 - Tony Arcieri
 - Carl Lerche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-26 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70233139252940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70233139252940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70233139252380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
-  prerelease: false
-  version_requirements: *70233139252380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70233139251960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70233139251960
-description: HTTP so awesome it will lure Catherine Zeta Jones into your unicorn petting
-  zoo
-email:
+  version_requirements: *id003
+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
@@ -65,6 +85,7 @@ files:
 - lib/http.rb
 - lib/http/chainable.rb
 - lib/http/client.rb
+- lib/http/compat/curb.rb
 - lib/http/mime_type.rb
 - lib/http/mime_types/json.rb
 - lib/http/parameters.rb
@@ -73,33 +94,46 @@ files:
 - parser/common.rl
 - parser/http.rl
 - parser/multipart.rl
+- spec/http/compat/curb_spec.rb
 - spec/http_spec.rb
 - spec/spec_helper.rb
+- spec/support/mock_server.rb
+has_rdoc: true
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Made entirely of Ruby (and Ragel and C and Java)
-test_files:
+test_files: 
+- spec/http/compat/curb_spec.rb
 - spec/http_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/support/mock_server.rb