excon 0.6.2 → 0.6.3

data/benchmarks/excon.rb

@@ -0,0 +1,69 @@
+require 'rubygems' if RUBY_VERSION < '1.9'
+require 'bundler'
+
+Bundler.require(:default)
+Bundler.require(:benchmark)
+
+require 'sinatra/base'
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'excon')
+
+module Excon
+  class Server < Sinatra::Base
+
+    def self.run
+      Rack::Handler::WEBrick.run(
+        Excon::Server.new,
+        :Port => 9292,
+        :AccessLog => [],
+        :Logger => WEBrick::Log.new(nil, WEBrick::Log::ERROR)
+      )
+    end
+
+    get '/data/:amount' do |amount|
+      'x' * amount.to_i
+    end
+
+  end
+end
+
+def with_server(&block)
+  pid = Process.fork do
+    Excon::Server.run
+  end
+  loop do
+    sleep(1)
+    begin
+      Excon.get('http://localhost:9292/api/foo')
+      break
+    rescue
+    end
+  end
+  yield
+ensure
+  Process.kill(9, pid)
+end
+
+require 'tach'
+
+size = 10_000
+path = '/data/' << size.to_s
+url = 'http://localhost:9292' << path
+
+times = 1_000
+
+with_server do
+
+  Tach.meter(times) do
+
+    tach('Excon') do
+      Excon.get(url).body
+    end
+
+    excon = Excon.new(url)
+    tach('Excon (persistent)') do
+      excon.request(:method => 'get').body
+    end
+
+  end
+end

data/benchmarks/headers_split_vs_match.rb

@@ -1,29 +1,3 @@
-# require 'benchmark'
-
-# COUNT = 1_000_000
-# data = "Content-Length: 100"
-# Benchmark.bmbm(25) do |bench|
-#   bench.report('regex') do
-#     COUNT.times do
-#       header = data.match(/(.*):\s(.*)/)
-#     end
-#   end
-#   bench.report('split') do
-#     COUNT.times do
-#       header = data.split(': ')
-#     end
-#   end
-# end
-
-# Rehearsal ------------------------------------------------------------
-# regex                      4.270000   0.010000   4.280000 (  4.294186)
-# split                      3.870000   0.000000   3.870000 (  3.885645)
-# --------------------------------------------------- total: 8.150000sec
-# 
-#                                user     system      total        real
-# regex                      4.260000   0.010000   4.270000 (  4.284764)
-# split                      3.860000   0.010000   3.870000 (  3.882795)
-
 require 'rubygems'
 require 'tach'
 
@@ -34,10 +8,23 @@ Tach.meter(1_000_000) do
     header = [$1, $2]
   end
   tach('split') do
-    header = data.split(': ')
+    header = data.split(': ', 2)
+  end
+  tach('split regex') do
+    header = data.split(/:\s*/, 2)
   end
 end
 
+#  +-------------+----------+
+#  | tach        | total    |
+#  +-------------+----------+
+#  | split regex | 5.940233 |
+#  +-------------+----------+
+#  | split       | 7.327549 |
+#  +-------------+----------+
+#  | regex       | 8.736390 |
+#  +-------------+----------+
+
 # +-------+----------+----------+
 # | tach  | average  | total    |
 # +-------+----------+----------+

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.6.2'
-  s.date              = '2011-04-11'
+  s.version           = '0.6.3'
+  s.date              = '2011-05-02'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
     benchmarks/concat_vs_interpolate.rb
     benchmarks/cr_lf.rb
     benchmarks/downcase-eq-eq_vs_casecmp.rb
+    benchmarks/excon.rb
     benchmarks/excon_vs.rb
     benchmarks/for_vs_array_each.rb
     benchmarks/for_vs_hash_each.rb
@@ -89,11 +90,13 @@ Gem::Specification.new do |s|
     lib/excon/errors.rb
     lib/excon/response.rb
     tests/basic_tests.rb
+    tests/header_tests.rb
     tests/proxy_tests.rb
     tests/query_string_tests.rb
     tests/rackups/basic.ru
     tests/rackups/proxy.ru
     tests/rackups/query_string.ru
+    tests/rackups/response_header.ru
     tests/rackups/thread_safety.ru
     tests/stub_tests.rb
     tests/test_helper.rb

data/lib/excon.rb

@@ -13,7 +13,7 @@ require 'excon/response'
 
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.6.2'
+    VERSION = '0.6.3'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/connection.rb

@@ -146,6 +146,7 @@ module Excon
 
         # write out the request, sans body
         socket.write(request)
+        socket.flush
 
         # write out the body
         if params[:body]
@@ -185,6 +186,9 @@ module Excon
         retries_remaining ||= 4
         retries_remaining -= 1
         if retries_remaining > 0
+          if params[:body].respond_to?(:pos=)
+            params[:body].pos = 0
+          end
           retry
         else
           raise(request_error)
@@ -254,7 +258,7 @@ module Excon
       new_socket.post_connection_check(@connection[:host])
       new_socket
     end
-    
+
     def open_socket
       if @proxy
         socket = TCPSocket.open(@proxy[:host], @proxy[:port])

data/lib/excon/response.rb

@@ -23,7 +23,7 @@ module Excon
       block_given = block_given?
 
       until ((data = socket.readline).chop!).empty?
-        key, value = data.split(': ', 2)
+        key, value = data.split(/:\s*/, 2)
         response.headers[key] = ([*response.headers[key]] << value).compact.join(', ')
         if key.casecmp('Content-Length') == 0
           content_length = value.to_i
@@ -78,6 +78,17 @@ module Excon
 
       response
     end
+    
+    # Retrieve a specific header value. Header names are treated case-insensitively.
+    #   @param [String] name Header name
+    def get_header(name)
+      headers.each do |key,value|
+        if key.casecmp(name) == 0 
+          return value 
+        end
+      end
+      nil
+    end
 
   end # class Response
 end # module Excon

data/tests/header_tests.rb

@@ -0,0 +1,49 @@
+Shindo.tests('Excon response header support') do
+
+  with_rackup('response_header.ru') do
+
+    tests('Response#get_header') do
+      connection = Excon.new('http://foo.com:8080', :proxy => 'http://localhost:9292')
+      response = connection.request(:method => :get, :path => '/foo')
+
+      tests('with variable header capitalization') do
+        
+        tests('response.get_header("content-type")').returns('text/html') do
+          response.get_header("content-type")
+        end
+        
+        tests('response.get_header("custom-header")').returns('foo') do
+          response.get_header("custom-header")
+        end
+        
+        tests('response.get_header("lowercase-header")').returns('bar') do
+          response.get_header("lowercase-header")
+        end
+        
+      end
+      
+      tests('when provided key capitalization varies') do
+        
+        tests('response.get_header("CONTENT-TYPE")').returns('text/html') do
+          response.get_header("CONTENT-TYPE")
+        end
+        
+        tests('response.get_header("CoNtEnT-TyPe")').returns('text/html') do
+          response.get_header("CoNtEnT-TyPe")
+        end
+        
+      end
+      
+      tests('when header is unavailable') do
+        
+        tests('response.get_header("missing")').returns(nil) do
+          response.get_header("missing")
+        end
+        
+      end
+      
+    end
+
+  end
+
+end

data/tests/rackups/response_header.ru

@@ -0,0 +1,14 @@
+require 'sinatra'
+
+class App < Sinatra::Base
+  get('/foo') do
+    headers(
+      "Content-Type" => 'text/html',
+      "CUSTOM-HEADER" => 'foo',
+      "lowercase-header" => 'bar'
+    )
+    'primary content'
+  end
+end
+
+run App

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -07:00
-default_executable: 
+date: 2011-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -93,6 +92,7 @@ files:
 - benchmarks/concat_vs_interpolate.rb
 - benchmarks/cr_lf.rb
 - benchmarks/downcase-eq-eq_vs_casecmp.rb
+- benchmarks/excon.rb
 - benchmarks/excon_vs.rb
 - benchmarks/for_vs_array_each.rb
 - benchmarks/for_vs_hash_each.rb
@@ -111,16 +111,17 @@ files:
 - lib/excon/errors.rb
 - lib/excon/response.rb
 - tests/basic_tests.rb
+- tests/header_tests.rb
 - tests/proxy_tests.rb
 - tests/query_string_tests.rb
 - tests/rackups/basic.ru
 - tests/rackups/proxy.ru
 - tests/rackups/query_string.ru
+- tests/rackups/response_header.ru
 - tests/rackups/thread_safety.ru
 - tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
-has_rdoc: true
 homepage: https://github.com/geemus/excon
 licenses: []
 
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: excon
-rubygems_version: 1.4.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)