excon 0.5.6 → 0.5.7

data/Gemfile

@@ -6,7 +6,7 @@ group :benchmark do
   gem 'em-http-request'
   gem 'httparty'
   gem 'rest-client'
-  gem 'tach', '0.0.8'
+  gem 'tach', :path => '~/geemus/tach'
   gem 'typhoeus'
   gem 'sinatra'
   gem 'streamly_ffi'

data/benchmarks/excon_vs.rb

@@ -52,11 +52,15 @@ require 'rest_client'
 require 'tach'
 require 'typhoeus'
 
-url = 'http://localhost:9292/data/1000'
+size = 10_000
+path = '/data/' << size.to_s
+url = 'http://localhost:9292' << path
+
+times = 1_000
 
 with_server do
 
-  Tach.meter(1000) do
+  Tach.meter(times) do
 
     tach('curb (persistent)') do |n|
       curb = Curl::Easy.new
@@ -104,13 +108,13 @@ with_server do
     end
 
     tach('Net::HTTP') do
-      # Net::HTTP.get('localhost', '/data/1000', 9292)
-      Net::HTTP.start('localhost', 9292) {|http| http.get('/data/1000').body }
+      # Net::HTTP.get('localhost', path, 9292)
+      Net::HTTP.start('localhost', 9292) {|http| http.get(path).body }
     end
 
     Net::HTTP.start('localhost', 9292) do |http|
       tach('Net::HTTP (persistent)') do
-        http.get('/data/1000').body
+        http.get(path).body
       end
     end
 
@@ -158,4 +162,4 @@ end
 # | open-uri                 | 2.987051 |
 # +--------------------------+----------+
 # | em-http-request          | 4.123798 |
-# +--------------------------+----------+
+# +--------------------------+----------+

data/changelog.txt

@@ -1,3 +1,13 @@
+0.5.7 03/21/11
+==============
+
+* lazily connect, rather than connecting at #initialize
+* add rough first pass at stubbing
+* minor optimizations
+* ssl client certification support. thanks thommay
+* skip figuring out/setting Content-Length if one is supplied. Thanks pweldon
+* do not try to parse body for 205 and 304. Thanks seancribbs
+
 0.5.6 02/19/11
 ==============
 

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.5.6'
-  s.date              = '2011-02-19'
+  s.version           = '0.5.7'
+  s.date              = '2011-03-21'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -64,7 +64,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     README.rdoc
     Rakefile
     benchmarks/class_vs_lambda.rb
@@ -92,6 +91,7 @@ Gem::Specification.new do |s|
     tests/basic_tests.rb
     tests/rackups/basic.ru
     tests/rackups/thread_safety.ru
+    tests/stub_tests.rb
     tests/test_helper.rb
     tests/thread_safety_tests.rb
   ]

data/lib/excon.rb

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

data/lib/excon/connection.rb

@@ -28,7 +28,6 @@ module Excon
       }.merge!(params)
 
       @socket_key = '' << @connection[:host] << ':' << @connection[:port].to_s
-      reset
     end
 
     # Sends the supplied request to the destination host.
@@ -53,6 +52,16 @@ module Excon
           params[:path].insert(0, '/')
         end
 
+        unless stubs.empty?
+          for stub, response in stubs
+            # all specified non-headers params match and no headers were specified or all specified headers match
+            if [stub.keys - [:headers]].all? {|key| stub[key] == params[key] } &&
+              (!stub.has_key?(:headers) || stub[:headers].keys.all? {|key| stub[:headers][key] == params[:headers][key]})
+              return Excon::Response.new(response)
+            end
+          end
+        end
+
         # start with "METHOD /path"
         request = params[:method].to_s.upcase << ' ' << params[:path]
 
@@ -63,15 +72,8 @@ module Excon
         when Hash
           request << '?'
           for key, values in params[:query]
-            case values
-            when nil
-              request << key.to_s << '&'
-            when Array
-              values.each do |value|
-                request << key.to_s << '=' << CGI.escape(value.to_s) << '&'
-              end
-            else
-              request << key.to_s << '=' << CGI.escape(values.to_s) << '&'
+            for value in [*values]
+              request << key.to_s << '=' << CGI.escape(value.to_s) << '&'
             end
           end
           request.chop! # remove trailing '&'
@@ -81,15 +83,19 @@ module Excon
         request << HTTP_1_1
 
         # calculate content length and set to handle non-ascii
-        params[:headers]['Content-Length'] = case params[:body]
-        when File
-          params[:body].binmode
-          File.size(params[:body])
-        when String
-          params[:body].force_encoding('BINARY') if FORCE_ENC
-          params[:body].length
-        else
-          0
+        unless params[:headers].has_key?('Content-Length')
+          params[:headers]['Content-Length'] = case params[:body]
+          when File
+            params[:body].binmode
+            File.size(params[:body])
+          when String
+            if FORCE_ENC
+              params[:body].force_encoding('BINARY')
+            end
+            params[:body].length
+          else
+            0
+          end
         end
 
         # add headers to request
@@ -137,9 +143,7 @@ module Excon
       end
 
     rescue => request_error
-      if params[:idempotent] &&
-          (request_error.is_a?(Excon::Errors::SocketError) ||
-          (request_error.is_a?(Excon::Errors::HTTPStatusError) && response.status != 404))
+      if params[:idempotent] && [Excon::Errors::SocketError, Excon::Errors::HTTPStatusError].include?(request_error)
         retries_remaining ||= 4
         retries_remaining -= 1
         if retries_remaining > 0
@@ -156,6 +160,16 @@ module Excon
       (old_socket = sockets.delete(@socket_key)) && old_socket.close
     end
 
+    def stub(request_params, response_params)
+      stub = [request_params, response_params]
+      stubs << stub
+      stub
+    end
+
+    def stubs
+      @stubs ||= []
+    end
+
   private
     def connect
       new_socket = TCPSocket.open(@connection[:host], @connection[:port])
@@ -181,6 +195,11 @@ module Excon
           ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
 
+        if @connection.has_key?(:client_cert) && @connection.has_key?(:client_key)
+          ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@connection[:client_cert]))
+          ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@connection[:client_key]))
+        end
+
         # open ssl socket
         new_socket = OpenSSL::SSL::SSLSocket.new(new_socket, ssl_context)
         new_socket.sync_close = true
@@ -193,14 +212,7 @@ module Excon
       new_socket
     end
 
-    def closed?
-      sockets.has_key?(@socket_key) && sockets[@socket_key].closed?
-    end
-
     def socket
-      if closed?
-        reset
-      end
       sockets[@socket_key] ||= connect
     end
 

data/lib/excon/response.rb

@@ -1,5 +1,7 @@
 module Excon
   class Response
+    NO_ENTITY = [204, 205, 304].freeze
+
     attr_accessor :body, :headers, :status
 
     def initialize(attrs={})
@@ -24,7 +26,7 @@ module Excon
         end
       end
 
-      unless (params[:method].to_s.casecmp('HEAD') == 0) || response.status == 204
+      unless (params[:method].to_s.casecmp('HEAD') == 0) || NO_ENTITY.include?(response.status)
 
         # don't pass stuff into a block if there was an error
         if params[:expects] && ![*params[:expects]].include?(response.status)

data/tests/basic_tests.rb

@@ -5,7 +5,7 @@ with_rackup('basic.ru') do
     tests('GET /content-length/100') do
 
       connection = Excon.new('http://127.0.0.1:9292')
-      response = connection.request(:method => 'GET', :path => '/content-length/100')
+      response = connection.request(:method => :get, :path => '/content-length/100')
 
       tests('response.status').returns(200) do
         response.status
@@ -23,11 +23,11 @@ with_rackup('basic.ru') do
         response.headers['Content-Type']
       end
 
-      tests("Time.parse(response.headers['Date']).is_a?(Time)") do
+      test("Time.parse(response.headers['Date']).is_a?(Time)") do
         Time.parse(response.headers['Date']).is_a?(Time)
       end
 
-      tests("!!(response.headers['Server'] =~ /^WEBrick/)") do
+      test("!!(response.headers['Server'] =~ /^WEBrick/)") do
         !!(response.headers['Server'] =~ /^WEBrick/)
       end
 

data/tests/stub_tests.rb

@@ -0,0 +1,21 @@
+Shindo.tests('Excon stubs') do
+  tests("stub({:method => :get}, {:body => 'body', :status => 200})") do
+
+    connection = Excon.new('http://127.0.0.1:9292')
+    connection.stub({:method => :get}, {:body => 'body', :status => 200})
+    response = connection.request(:method => :get, :path => '/content-length/100')
+
+    tests('response.body').returns('body') do
+      response.body
+    end
+
+    tests('response.headers').returns({}) do
+      response.headers
+    end
+
+    tests('response.status').returns(200) do
+      response.status
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 -08:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - benchmarks/class_vs_lambda.rb
@@ -114,6 +113,7 @@ files:
 - tests/basic_tests.rb
 - tests/rackups/basic.ru
 - tests/rackups/thread_safety.ru
+- tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
 has_rdoc: true
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: excon
-rubygems_version: 1.4.2
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)

data/Gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: .
-  specs:
-    excon (0.5.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.2)
-    crack (0.1.8)
-    curb (0.7.8)
-    curl_ffi (0.0.8)
-      ffi
-    em-http-request (0.2.15)
-      addressable (>= 2.0.0)
-      eventmachine (>= 0.12.9)
-    eventmachine (0.12.10)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    formatador (0.0.16)
-    httparty (0.6.1)
-      crack (= 0.1.8)
-    mime-types (1.16)
-    open4 (1.0.1)
-    rack (1.2.1)
-    rake (0.8.7)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    shindo (0.2.0)
-      formatador (>= 0.0.16)
-    sinatra (1.1.0)
-      rack (~> 1.1)
-      tilt (~> 1.1)
-    streamly_ffi (0.2.6)
-      curl_ffi
-    tach (0.0.8)
-      formatador (>= 0.0.16)
-    tilt (1.1)
-    typhoeus (0.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  curb
-  em-http-request
-  excon!
-  httparty
-  open4
-  rest-client
-  shindo (= 0.2.0)
-  sinatra
-  streamly_ffi
-  tach (= 0.0.8)
-  typhoeus