excon 0.2.8 → 0.3.0

data/Gemfile

@@ -6,8 +6,9 @@ group :benchmark do
   gem 'em-http-request'
   gem 'httparty'
   gem 'rest-client'
-  gem 'tach', '0.0.5'
+  gem 'tach', '0.0.8'
   gem 'typhoeus'
   gem 'sinatra'
   gem 'streamly_ffi'
+  gem 'curb'
 end

data/benchmarks/excon_vs.rb

@@ -6,7 +6,7 @@ Bundler.require(:benchmark)
 
 require 'sinatra/base'
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'excon')
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'excon')
 
 module Excon
   class Server < Sinatra::Base
@@ -58,14 +58,35 @@ with_server do
 
   Tach.meter(1000) do
 
-    tach('em-http-request') do
-      EventMachine.run {
-        http = EventMachine::HttpRequest.new(url).get
+    tach('curb (persistent)') do |n|
+      curb = Curl::Easy.new
+
+      n.times do
+        curb.url = url
+        curb.http_get
+        curb.body_str
+      end
+    end
 
-        http.callback {
-          http.response
-          EventMachine.stop
-        }
+    tach('em-http-request') do |n|
+      EventMachine.run {
+        count = 0
+
+        n.times do
+          http = EventMachine::HttpRequest.new(url).get
+
+          http.callback {
+            http.response
+            count += 1
+            EM.stop if count == n
+          }
+
+          http.errback {
+            http.response
+            count += 1
+            EM.stop if count == n
+          }
+        end
       }
     end
 
@@ -135,4 +156,4 @@ end
 # | open-uri                 | 2.936382 |
 # +--------------------------+----------+
 # | em-http-request          | 3.933757 |
-# +--------------------------+----------+
+# +--------------------------+----------+

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.2.8'
-  s.date              = '2010-11-30'
+  s.version           = '0.3.0'
+  s.date              = '2010-12-09'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon.rb

@@ -13,7 +13,7 @@ require 'excon/response'
 module Excon
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.8'
+    VERSION = '0.3.0'
   end
 
   unless const_defined?(:CHUNK_SIZE)
@@ -33,7 +33,9 @@ module Excon
   %w{connect delete get head options post put trace}.each do |method|
     eval <<-DEF
       def self.#{method}(url, params = {}, &block)
-        new(url).request(params.merge!(:method => :#{method}), &block)
+        connection = new(url)
+        connection.reset
+        connection.request(params.merge!(:method => :#{method}), &block)
       end
     DEF
   end

data/lib/excon/connection.rb

@@ -19,7 +19,7 @@ module Excon
     def initialize(url, params = {})
       uri = URI.parse(url)
       @connection = {
-        :headers  => {},
+        :headers  => { 'Host' => uri.host },
         :host     => uri.host,
         :path     => uri.path,
         :port     => uri.port,
@@ -42,31 +42,37 @@ module Excon
     #     @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
     def request(params, &block)
       begin
-        params[:path] ||= @connection[:path]
+        # connection has defaults, merge in new params to override
+        params = @connection.merge(params)
+        params[:headers] = @connection[:headers].merge(params[:headers])
+
+        # if path is empty or doesn't start with '/', insert one
         unless params[:path][0..0] == '/'
           params[:path].insert(0, '/')
         end
 
+        # start with "METHOD /path"
         request = params[:method].to_s.upcase << ' ' << params[:path]
-        if query = (params[:query] || @connection[:query])
+
+        # add query to path, if there is one
+        case params[:query]
+        when String
+          request << '?' << params[:query]
+        when Hash
           request << '?'
-          case query
-          when String
-            request << query
-          else
-            for key, values in query
-              for value in [*values]
-                value_string = value && ('=' << CGI.escape(value.to_s))
-                request << key.to_s << value_string.to_s << '&'
-              end
+          for key, values in params[:query]
+            for value in [*values]
+              value_string = value && ('=' << CGI.escape(value.to_s))
+              request << key.to_s << value_string.to_s << '&'
             end
-            request.chop! # remove trailing '&'
           end
+          request.chop! # remove trailing '&'
         end
+
+        # finish first line with "HTTP/1.1\r\n"
         request << HTTP_1_1
-        params[:headers] ||= @connection[:headers]
-        params[:headers]['Host'] ||= params[:host] || @connection[:host]
-        params[:body] ||= @connection[:body]
+
+        # calculate content length and set to handle non-ascii
         params[:headers]['Content-Length'] = case params[:body]
         when File
           params[:body].binmode
@@ -79,12 +85,19 @@ module Excon
         else
           0
         end
+
+        # add headers to request
         for key, value in params[:headers]
           request << key.to_s << ': ' << value.to_s << CR_NL
         end
+
+        # add additional "\r\n" to indicate end of headers
         request << CR_NL
+
+        # write out the request, sans body
         socket.write(request)
 
+        # write out the body
         if params[:body]
           if params[:body].is_a?(String)
             socket.write(params[:body])
@@ -95,6 +108,7 @@ module Excon
           end
         end
 
+        # read the response
         response = Excon::Response.parse(socket, params, &block)
         if response.headers['Connection'] == 'close'
           reset

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -08:00
+date: 2010-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency