excon 0.26.0 → 0.27.0

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 gem 'jruby-openssl', :platform => :jruby
+gem 'unicorn', :platform => :mri
 
 # group :benchmark do
 #   gem 'em-http-request'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.26.0)
+    excon (0.27.0)
 
 GEM
   remote: http://rubygems.org/
@@ -21,11 +21,13 @@ GEM
       bouncy-castle-java (>= 1.5.0147)
     json (1.7.3)
     json (1.7.3-java)
+    kgio (2.8.0)
     multi_json (1.3.6)
     open4 (1.3.0)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
+    raindrops (0.11.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -36,6 +38,10 @@ GEM
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
+    unicorn (4.6.3)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
 
 PLATFORMS
   java
@@ -52,3 +58,4 @@ DEPENDENCIES
   rdoc
   shindo
   sinatra
+  unicorn

data/README.md

@@ -86,12 +86,6 @@ connection.request(:idempotent => true, :retry_limit => 6)
 # opt-out of nonblocking operations for performance and/or as a workaround
 connection.request(:nonblock => false)
 
-# opt-in to omitting port from http:80 and https:443
-connection.request(:omit_default_port => true)
-
-# set longer connect_timeout (default is 60 seconds)
-connection.request(:connect_timeout => 360)
-
 # set longer read_timeout (default is 60 seconds)
 connection.request(:read_timeout => 360)
 
@@ -104,6 +98,12 @@ connection.request(:write_timeout => 360)
 # requests in time-sensitive scenarios.
 #
 connection = Excon.new('http://geemus.com/', :tcp_nodelay => true)
+
+# opt-in to omitting port from http:80 and https:443
+connection = Excon.new('http://geemus.com/', :omit_default_port => true)
+
+# set longer connect_timeout (default is 60 seconds)
+connection = Excon.new('http://geemus.com/', :connect_timeout => 360)
 ```
 
 Chunked Requests
@@ -116,7 +116,7 @@ file = File.open('data')
 
 chunker = lambda do
   # Excon.defaults[:chunk_size] defaults to 1048576, ie 1MB
-  # to_s will convert the nil receieved after everything is read to the final empty chunk
+  # to_s will convert the nil received after everything is read to the final empty chunk
   file.read(Excon.defaults[:chunk_size]).to_s
 end
 
@@ -161,14 +161,30 @@ You can specify a proxy URL that Excon will use with both HTTP and HTTPS connect
 ```ruby
 connection = Excon.new('http://geemus.com', :proxy => 'http://my.proxy:3128')
 connection.request(:method => 'GET')
+
+Excon.get('http://geemus.com', :proxy => 'http://my.proxy:3128')
 ```
 
 The proxy URL must be fully specified, including scheme (e.g. "http://") and port.
 
-Proxy support must be set when establishing a connection object and cannot be overridden in individual requests. Because of this it is unavailable in one-off requests (Excon.get, etc.)
+Proxy support must be set when establishing a connection object and cannot be overridden in individual requests.
 
 NOTE: Excon will use the environment variables `http_proxy` and `https_proxy` if they are present. If these variables are set they will take precedence over a :proxy option specified in code. If "https_proxy" is not set, the value of "http_proxy" will be used for both HTTP and HTTPS connections.
 
+Unix Socket Support
+------------------
+
+The Unix socket will work for one-off requests and multiuse connections.  A Unix socket path must be provided separate from the resource path.
+
+```ruby
+connection = Excon.new('unix:///', :socket => '/tmp/unicorn.sock')
+connection.request(:method => :get, :path => '/ping')
+
+Excon.get('unix:///ping', :socket => '/tmp/unicorn.sock')
+```
+
+NOTE: Proxies will be ignored when using a Unix socket, since a Unix socket has to be local.
+
 Stubs
 -----
 

data/changelog.txt

@@ -1,3 +1,14 @@
+0.27.0 10/04/2013
+=================
+
+display warnings based on ruby and/or debug settings
+add missing valid connection keys
+remove 1.8.7 related nonblock warning
+add support for unix sockets
+cleanup constants
+improve test setup to minimize server spawning
+separate connection/request key validation
+
 0.26.0 09/24/2013
 =================
 

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.26.0'
-  s.date              = '2013-09-24'
+  s.version           = '0.27.0'
+  s.date              = '2013-10-04'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -109,6 +109,7 @@ Gem::Specification.new do |s|
     lib/excon/socket.rb
     lib/excon/ssl_socket.rb
     lib/excon/standard_instrumentor.rb
+    lib/excon/unix_socket.rb
     tests/authorization_header_tests.rb
     tests/bad_tests.rb
     tests/basic_tests.rb

data/lib/excon.rb

@@ -70,14 +70,17 @@ require 'excon/middlewares/response_parser'
 require 'excon/response'
 require 'excon/socket'
 require 'excon/ssl_socket'
+require 'excon/unix_socket'
 require 'excon/standard_instrumentor'
 
 module Excon
   class << self
 
     def display_warning(warning)
-      # Ruby convention mandates complete silence when VERBOSE == nil
-      $stderr.puts(warning) if !ENV['VERBOSE'].nil?
+      # Respect Ruby's $VERBOSE setting, unless EXCON_DEBUG is set
+      if !$VERBOSE.nil? || ENV['EXCON_DEBUG']
+        $stderr.puts(warning)
+      end
     end
 
     # Status of mocking

data/lib/excon/connection.rb

@@ -26,7 +26,7 @@ module Excon
       @data[:proxy]
     end
     def proxy=(new_proxy)
-      Excon.display_warning("Excon::Connection#proxy= is deprecated use Excon::Connection#data[:proxy]= instead (#{caller.first})") if !ENV['VERBOSE'].nil?
+      Excon.display_warning("Excon::Connection#proxy= is deprecated use Excon::Connection#data[:proxy]= instead (#{caller.first})")
       @data[:proxy] = new_proxy
     end
 
@@ -39,13 +39,14 @@ module Excon
     #     @option params [Fixnum] :port The port on which to connect, to the destination host
     #     @option params [Hash]   :query Default query; appended to the 'scheme://host:port/path/' in the form of '?key=value'. Will only be used if params[:query] is not supplied to Connection#request
     #     @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
+    #     @option params [String] :socket The path to the unix socket (required for 'unix://' connections)
     #     @option params [String] :ciphers Only use the specified SSL/TLS cipher suites; use OpenSSL cipher spec format e.g. 'HIGH:!aNULL:!3DES' or 'AES256-SHA:DES-CBC3-SHA'
     #     @option params [String] :proxy Proxy server; e.g. 'http://myproxy.com:8888'
     #     @option params [Fixnum] :retry_limit Set how many times we'll retry a failed request.  (Default 4)
     #     @option params [Class] :instrumentor Responds to #instrument as in ActiveSupport::Notifications
     #     @option params [String] :instrumentor_name Name prefix for #instrument events.  Defaults to 'excon'
     def initialize(params = {})
-      invalid_keys_warning(params, Excon::VALID_CONNECTION_KEYS)
+      validate_params!(params, VALID_CONNECTION_KEYS)
       @data = Excon.defaults.dup
       # merge does not deep-dup, so make sure headers is not the original
       @data[:headers] = @data[:headers].dup
@@ -55,15 +56,17 @@ module Excon
 
       @data.merge!(params)
 
-      no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"] || ""
-      no_proxy_list = no_proxy_env.scan(/\*?\.?([^\s,:]+)(?::(\d+))?/i).map { |s| [s[0], s[1]] }
-      unless no_proxy_list.index { |h| /(^|\.)#{h[0]}$/.match(@data[:host]) && (h[1].nil? || h[1].to_i == @data[:port]) }
-        if @data[:scheme] == HTTPS && (ENV.has_key?('https_proxy') || ENV.has_key?('HTTPS_PROXY'))
-          @data[:proxy] = setup_proxy(ENV['https_proxy'] || ENV['HTTPS_PROXY'])
-        elsif (ENV.has_key?('http_proxy') || ENV.has_key?('HTTP_PROXY'))
-          @data[:proxy] = setup_proxy(ENV['http_proxy'] || ENV['HTTP_PROXY'])
-        elsif @data.has_key?(:proxy)
-          @data[:proxy] = setup_proxy(@data[:proxy])
+      unless @data[:scheme] == UNIX
+        no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"] || ""
+        no_proxy_list = no_proxy_env.scan(/\*?\.?([^\s,:]+)(?::(\d+))?/i).map { |s| [s[0], s[1]] }
+        unless no_proxy_list.index { |h| /(^|\.)#{h[0]}$/.match(@data[:host]) && (h[1].nil? || h[1].to_i == @data[:port]) }
+          if @data[:scheme] == HTTPS && (ENV.has_key?('https_proxy') || ENV.has_key?('HTTPS_PROXY'))
+            @data[:proxy] = setup_proxy(ENV['https_proxy'] || ENV['HTTPS_PROXY'])
+          elsif (ENV.has_key?('http_proxy') || ENV.has_key?('HTTP_PROXY'))
+            @data[:proxy] = setup_proxy(ENV['http_proxy'] || ENV['HTTP_PROXY'])
+          elsif @data.has_key?(:proxy)
+            @data[:proxy] = setup_proxy(@data[:proxy])
+          end
         end
       end
 
@@ -87,7 +90,19 @@ module Excon
         @data[:headers]['Authorization'] ||= 'Basic ' << ['' << user.to_s << ':' << pass.to_s].pack('m').delete(Excon::CR_NL)
       end
 
-      @socket_key = '' << @data[:scheme] << '://' << @data[:host] << ':' << @data[:port].to_s
+      @socket_key = '' << @data[:scheme]
+      if @data[:scheme] == UNIX
+        if @data[:host]
+          raise ArgumentError, "The `:host` parameter should not be set for `unix://` connections.\n" +
+                               "When supplying a `unix://` URI, it should start with `unix:/` or `unix:///`."
+        elsif !@data[:socket]
+          raise ArgumentError, 'You must provide a `:socket` for `unix://` connections'
+        else
+          @socket_key << '://' << @data[:socket]
+        end
+      else
+        @socket_key << '://' << @data[:host]<< ':' << @data[:port].to_s
+      end
       reset
     end
 
@@ -210,18 +225,19 @@ module Excon
     #   @param [Hash<Symbol, >] params One or more optional params, override defaults set in Connection.new
     #     @option params [String] :body text to be sent over a socket
     #     @option params [Hash<Symbol, String>] :headers The default headers to supply in a request
-    #     @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
     #     @option params [String] :path appears after 'scheme://host:port/'
-    #     @option params [Fixnum] :port The port on which to connect, to the destination host
     #     @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
-    #     @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
     def request(params={}, &block)
+      validate_params!(params, VALID_REQUEST_KEYS)
       # @data has defaults, merge in new params to override
       datum = @data.merge(params)
-      invalid_keys_warning(params, VALID_CONNECTION_KEYS)
       datum[:headers] = @data[:headers].merge(datum[:headers] || {})
 
-      datum[:headers]['Host']   ||= '' << datum[:host] << port_string(datum)
+      if datum[:scheme] == UNIX
+        datum[:headers]['Host']   ||= '' << datum[:socket]
+      else
+        datum[:headers]['Host']   ||= '' << datum[:host] << port_string(datum)
+      end
       datum[:retries_remaining] ||= datum[:retry_limit]
 
       # if path is empty or doesn't start with '/', insert one
@@ -338,10 +354,11 @@ module Excon
       end
     end
 
-    def invalid_keys_warning(argument, valid_keys)
-      invalid_keys = argument.keys - valid_keys
+    def validate_params!(params, valid_keys)
+      invalid_keys = params.keys - valid_keys
       unless invalid_keys.empty?
         Excon.display_warning("The following keys are invalid: #{invalid_keys.map(&:inspect).join(', ')}")
+        invalid_keys.each {|key| params.delete(key) }
       end
     end
 
@@ -359,6 +376,8 @@ module Excon
     def socket
       sockets[@socket_key] ||= if @data[:scheme] == HTTPS
         Excon::SSLSocket.new(@data)
+      elsif @data[:scheme] == UNIX
+        Excon::UnixSocket.new(@data)
       else
         Excon::Socket.new(@data)
       end

data/lib/excon/constants.rb

@@ -1,5 +1,7 @@
 module Excon
 
+  VERSION = '0.27.0'
+
   CR_NL = "\r\n"
 
   DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cacert.pem"))
@@ -29,24 +31,18 @@ module Excon
 
   REDACTED = 'REDACTED'
 
-  VALID_CONNECTION_KEYS = [
+  UNIX = 'unix'
+
+  USER_AGENT = 'excon/' << VERSION
+
+  VALID_REQUEST_KEYS = [
     :body,
     :captures,
     :chunk_size,
-    :client_key,
-    :client_cert,
-    :certificate,
-    :private_key,
-    :connect_timeout,
-    :connection,
     :debug_request,
     :debug_response,
-    :error,
-    :exception,
     :expects,
-    :family,
     :headers,
-    :host,
     :idempotent,
     :instrumentor,
     :instrumentor_name,
@@ -54,32 +50,41 @@ module Excon
     :middlewares,
     :mock,
     :nonblock,
-    :omit_default_port,
-    :password,
     :path,
     :pipeline,
-    :port,
-    :proxy,
     :query,
     :read_timeout,
     :request_block,
-    :response,
     :response_block,
-    :retries_remaining,
+    :retries_remaining, # used internally
     :retry_limit,
+    :write_timeout
+  ]
+
+  VALID_CONNECTION_KEYS = VALID_REQUEST_KEYS + [
+    :ciphers,
+    :client_key,
+    :client_cert,
+    :certificate,
+    :certificate_path,
+    :private_key,
+    :private_key_path,
+    :connect_timeout,
+    :family,
+    :host,
+    :omit_default_port,
+    :password,
+    :port,
+    :proxy,
     :scheme,
-    :tcp_nodelay,
-    :uri_parser,
-    :user,
+    :socket,
     :ssl_ca_file,
     :ssl_verify_peer,
-    :stack,
-    :write_timeout
+    :tcp_nodelay,
+    :uri_parser,
+    :user
   ]
 
-  VERSION = '0.26.0'
-  USER_AGENT = 'excon/' << VERSION
-
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO
       module WaitReadable; end

data/lib/excon/middlewares/idempotent.rb

@@ -6,9 +6,9 @@ module Excon
             Excon::Errors::HTTPStatusError].any? {|ex| datum[:error].kind_of?(ex) } && datum[:retries_remaining] > 1
           # reduces remaining retries, reset connection, and restart request_call
           datum[:retries_remaining] -= 1
-          datum.delete(:response)
-          datum.delete(:error)
-          datum[:connection].request(datum)
+          connection = datum.delete(:connection)
+          datum.reject! {|key, _| !VALID_REQUEST_KEYS.include?(key) }
+          connection.request(datum)
         else
           @stack.error_call(datum)
         end

data/lib/excon/ssl_socket.rb

@@ -10,7 +10,7 @@ module Excon
       # create ssl context
       ssl_context = OpenSSL::SSL::SSLContext.new
       ssl_context.ciphers = @data[:ciphers]
-      
+
       if @data[:ssl_verify_peer]
         # turn verification on
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
@@ -103,7 +103,6 @@ module Excon
     def check_nonblock_support
       # backwards compatability for things lacking nonblock
       if !DEFAULT_NONBLOCK && @data[:nonblock]
-        Excon.display_warning("Excon nonblock is not supported by your OpenSSL::SSL::SSLSocket")
         @data[:nonblock] = false
       end
     end

data/lib/excon/unix_socket.rb

@@ -0,0 +1,22 @@
+module Excon
+  class UnixSocket < Excon::Socket
+
+    private
+
+    def connect
+      begin
+        @socket = ::UNIXSocket.new(@data[:socket])
+      rescue Errno::ECONNREFUSED
+        @socket.close if @socket
+        raise
+      end
+
+      if @data[:tcp_nodelay]
+        @socket.setsockopt(::Socket::IPPROTO_TCP,
+                           ::Socket::TCP_NODELAY,
+                           true)
+      end
+    end
+
+  end
+end

data/tests/authorization_header_tests.rb

@@ -1,5 +1,5 @@
-with_rackup('basic_auth.ru') do
-  Shindo.tests('Excon basics (Authorization data redacted)') do
+Shindo.tests('Excon basics (Authorization data redacted)') do
+  with_rackup('basic_auth.ru') do
     cases = [
              ['user & pass', 'http://user1:pass1@foo.com/', 'Basic dXNlcjE6cGFzczE='],
              ['email & pass', 'http://foo%40bar.com:pass1@foo.com/', 'Basic Zm9vQGJhci5jb206cGFzczE='],

data/tests/basic_tests.rb

@@ -1,67 +1,61 @@
-with_rackup('basic.ru') do
-  Shindo.tests('Excon basics') do
+Shindo.tests('Excon basics') do
+  with_rackup('basic.ru') do
     basic_tests
-  end
-
-  Shindo.tests('explicit uri passed to connection') do
-    connection = Excon::Connection.new({
-      :host             => '127.0.0.1',
-      :nonblock         => false,
-      :port             => 9292,
-      :scheme           => 'http',
-      :ssl_verify_peer  => false
-    })
 
-    tests('GET /content-length/100') do
-      response = connection.request(:method => :get, :path => '/content-length/100')
-
-      tests('response[:status]').returns(200) do
+    tests('explicit uri passed to connection') do
+      tests('GET /content-length/100').returns(200) do
+        connection = Excon::Connection.new({
+          :host             => '127.0.0.1',
+          :nonblock         => false,
+          :port             => 9292,
+          :scheme           => 'http',
+          :ssl_verify_peer  => false
+        })
+        response = connection.request(:method => :get, :path => '/content-length/100')
         response[:status]
       end
     end
   end
 end
 
-with_rackup('basic_auth.ru') do
-  Shindo.tests('Excon basics (Basic Auth Pass)') do
+Shindo.tests('Excon basics (Basic Auth Pass)') do
+  with_rackup('basic_auth.ru') do
     basic_tests('http://test_user:test_password@127.0.0.1:9292')
-  end
 
-  Shindo.tests('Excon basics (Basic Auth Fail)') do
-    cases = [
-      ['correct user, no password', 'http://test_user@127.0.0.1:9292'],
-      ['correct user, wrong password', 'http://test_user:fake_password@127.0.0.1:9292'],
-      ['wrong user, correct password', 'http://fake_user:test_password@127.0.0.1:9292'],
-    ]
-    cases.each do |desc,url|
-      connection = Excon.new(url)
-      response = connection.request(:method => :get, :path => '/content-length/100')
-
-      tests("response.status for #{desc}").returns(401) do
-        response.status
+    tests('Excon basics (Basic Auth Fail)') do
+      cases = [
+        ['correct user, no password', 'http://test_user@127.0.0.1:9292'],
+        ['correct user, wrong password', 'http://test_user:fake_password@127.0.0.1:9292'],
+        ['wrong user, correct password', 'http://fake_user:test_password@127.0.0.1:9292'],
+      ]
+      cases.each do |desc,url|
+        tests("response.status for #{desc}").returns(401) do
+          connection = Excon.new(url)
+          response = connection.request(:method => :get, :path => '/content-length/100')
+          response.status
+        end
       end
-
     end
   end
 end
 
-with_rackup('ssl.ru') do
-  Shindo.tests('Excon basics (ssl)') do
+Shindo.tests('Excon basics (ssl)') do
+  with_rackup('ssl.ru') do
     basic_tests('https://127.0.0.1:9443')
   end
 end
 
-with_rackup('ssl_verify_peer.ru') do
-  Shindo.tests('Excon basics (ssl file)',['focus']) do
-    connection = Excon::Connection.new({
-      :host             => '127.0.0.1',
-      :nonblock         => false,
-      :port             => 8443,
-      :scheme           => 'https',
-      :ssl_verify_peer  => false
-    })
+Shindo.tests('Excon basics (ssl file)',['focus']) do
+  with_rackup('ssl_verify_peer.ru') do
 
     tests('GET /content-length/100').raises(Excon::Errors::SocketError) do
+      connection = Excon::Connection.new({
+        :host             => '127.0.0.1',
+        :nonblock         => false,
+        :port             => 8443,
+        :scheme           => 'https',
+        :ssl_verify_peer  => false
+      })
       connection.request(:method => :get, :path => '/content-length/100')
     end
 
@@ -72,17 +66,19 @@ with_rackup('ssl_verify_peer.ru') do
                )
 
   end
+end
 
-  Shindo.tests('Excon basics (ssl file paths)',['focus']) do
-    connection = Excon::Connection.new({
-      :host             => '127.0.0.1',
-      :nonblock         => false,
-      :port             => 8443,
-      :scheme           => 'https',
-      :ssl_verify_peer  => false
-    })
+Shindo.tests('Excon basics (ssl file paths)',['focus']) do
+  with_rackup('ssl_verify_peer.ru') do
 
     tests('GET /content-length/100').raises(Excon::Errors::SocketError) do
+      connection = Excon::Connection.new({
+        :host             => '127.0.0.1',
+        :nonblock         => false,
+        :port             => 8443,
+        :scheme           => 'https',
+        :ssl_verify_peer  => false
+      })
       connection.request(:method => :get, :path => '/content-length/100')
     end
 
@@ -92,19 +88,35 @@ with_rackup('ssl_verify_peer.ru') do
                )
 
   end
+end
 
-  Shindo.tests('Excon basics (ssl string)', ['focus']) do
-    connection = Excon::Connection.new({
-      :host             => '127.0.0.1',
-      :nonblock         => false,
-      :port             => 8443,
-      :scheme           => 'https',
-      :ssl_verify_peer  => false
-    })
-
+Shindo.tests('Excon basics (ssl string)', ['focus']) do
+  with_rackup('ssl_verify_peer.ru') do
     basic_tests('https://127.0.0.1:8443',
                 :private_key => File.read(File.join(File.dirname(__FILE__), 'data', 'excon.cert.key')),
                 :certificate => File.read(File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt'))
                )
   end
 end
+
+Shindo.tests('Excon basics (Unix socket)') do
+  pending if RUBY_PLATFORM == 'java' # need to find suitable server for jruby
+
+  file_name = '/tmp/unicorn.sock'
+  with_unicorn('basic.ru', file_name) do
+    basic_tests("unix:/", :socket => file_name)
+
+    tests('explicit uri passed to connection') do
+      tests('GET /content-length/100').returns(200) do
+        connection = Excon::Connection.new({
+          :socket           => file_name,
+          :nonblock         => false,
+          :scheme           => 'unix',
+          :ssl_verify_peer  => false
+        })
+        response = connection.request(:method => :get, :path => '/content-length/100')
+        response[:status]
+      end
+    end
+  end
+end

data/tests/middlewares/instrumentation_tests.rb

@@ -84,11 +84,11 @@ Shindo.tests('Excon instrumentation') do
     [:host, :path, :port, :scheme].select {|k| @events.first.payload.has_key? k}
   end
 
-  tests('params in request overwrite those in constructor').returns('cheezburger') do
+  tests('params in request overwrite those in constructor').returns('/cheezburger') do
     subscribe(/excon/)
     stub_success
-    make_request(false, :host => 'cheezburger')
-    @events.first.payload[:host]
+    make_request(false, :path => '/cheezburger')
+    @events.first.payload[:path]
   end
 
   tests('notify on retry').returns(3) do

data/tests/query_string_tests.rb

@@ -1,5 +1,5 @@
-with_rackup('query_string.ru') do
-  Shindo.tests('Excon query string variants') do
+Shindo.tests('Excon query string variants') do
+  with_rackup('query_string.ru') do
     connection = Excon.new('http://127.0.0.1:9292')
 
     tests(":query => {:foo => 'bar'}") do

data/tests/requests_tests.rb

@@ -1,9 +1,9 @@
-with_rackup('basic.ru') do
-  Shindo.tests('requests should succeed') do
-
-    connection = Excon.new('http://127.0.0.1:9292')
+Shindo.tests('requests should succeed') do
+  with_rackup('basic.ru') do
 
     tests('HEAD /content-length/100, GET /content-length/100') do
+
+      connection = Excon.new('http://127.0.0.1:9292')
       responses = connection.requests([
         {:method => :head, :path => '/content-length/100'},
         {:method => :get, :path => '/content-length/100'}
@@ -27,19 +27,18 @@ with_rackup('basic.ru') do
 
     end
 
-  end
+    tests('requests should succeed with tcp_nodelay') do
 
-  Shindo.tests('requests should succeed with tcp_nodelay') do
+      connection = Excon.new('http://127.0.0.1:9292', :tcp_nodelay => true)
 
-    connection = Excon.new('http://127.0.0.1:9292', :tcp_nodelay => true)
+      tests('GET /content-length/100') do
+        responses = connection.requests([
+          {:method => :get, :path => '/content-length/100'}
+        ])
 
-    tests('GET /content-length/100') do
-      responses = connection.requests([
-        {:method => :get, :path => '/content-length/100'}
-      ])
-
-      tests('get content length is 100').returns('100') do
-        responses.last.headers['Content-Length']
+        tests('get content length is 100').returns('100') do
+          responses.last.headers['Content-Length']
+        end
       end
     end
   end

data/tests/test_helper.rb

@@ -23,6 +23,7 @@ def basic_tests(url = 'http://127.0.0.1:9292', options = {})
         end
 
         tests("response.headers['Connection']").returns('Keep-Alive') do
+          pending if connection.data[:scheme] == Excon::UNIX
           response.headers['Connection']
         end
 
@@ -35,10 +36,12 @@ def basic_tests(url = 'http://127.0.0.1:9292', options = {})
         end
 
         test("Time.parse(response.headers['Date']).is_a?(Time)") do
+          pending if connection.data[:scheme] == Excon::UNIX
           Time.parse(response.headers['Date']).is_a?(Time)
         end
 
         test("!!(response.headers['Server'] =~ /^WEBrick/)") do
+          pending if connection.data[:scheme] == Excon::UNIX
           !!(response.headers['Server'] =~ /^WEBrick/)
         end
 
@@ -47,6 +50,7 @@ def basic_tests(url = 'http://127.0.0.1:9292', options = {})
         end
 
         tests("response.remote_ip").returns("127.0.0.1") do
+          pending if connection.data[:scheme] == Excon::UNIX
           response.remote_ip
         end
 
@@ -56,8 +60,10 @@ def basic_tests(url = 'http://127.0.0.1:9292', options = {})
 
         tests("deprecated block usage").returns(['x' * 100, 0, 100]) do
           data = []
-          connection.request(:method => :get, :path => '/content-length/100') do |chunk, remaining_length, total_length|
-            data = [chunk, remaining_length, total_length]
+          silence_warnings do
+            connection.request(:method => :get, :path => '/content-length/100') do |chunk, remaining_length, total_length|
+              data = [chunk, remaining_length, total_length]
+            end
           end
           data
         end
@@ -194,6 +200,14 @@ def env_stack
   @env_stack ||= []
 end
 
+def silence_warnings
+  orig_verbose = $VERBOSE
+  $VERBOSE = nil
+  yield
+ensure
+  $VERBOSE = orig_verbose
+end
+
 def rackup_path(*parts)
   File.expand_path(File.join(File.dirname(__FILE__), 'rackups', *parts))
 end
@@ -215,6 +229,26 @@ ensure
   end
 end
 
+def with_unicorn(name, file_name='/tmp/unicorn.sock')
+  unless RUBY_PLATFORM == 'java'
+    GC.disable
+    pid, w, r, e = Open4.popen4("unicorn", "-l", "unix://#{file_name}", rackup_path(name))
+    until e.gets =~ /worker=0 ready/; end
+  else
+    # need to find suitable server for jruby
+  end
+  yield
+ensure
+  unless RUBY_PLATFORM == 'java'
+    Process.kill(9, pid)
+    GC.enable
+    Process.wait(pid)
+  end
+  if File.exist?(file_name)
+    File.delete(file_name)
+  end
+end
+
 def server_path(*parts)
   File.expand_path(File.join(File.dirname(__FILE__), 'servers', *parts))
 end

data/tests/thread_safety_tests.rb

@@ -1,5 +1,5 @@
-with_rackup('thread_safety.ru') do
-  Shindo.tests('Excon thread safety') do
+Shindo.tests('Excon thread safety') do
+  with_rackup('thread_safety.ru') do
     connection = Excon.new('http://127.0.0.1:9292')
 
     long_thread = Thread.new {

data/tests/timeout_tests.rb

@@ -1,7 +1,7 @@
-with_rackup('timeout.ru') do
-  Shindo.tests('read should timeout') do
-    [false, true].each do |nonblock|
+Shindo.tests('read should timeout') do
+  with_rackup('timeout.ru') do
 
+    [false, true].each do |nonblock|
       connection = Excon.new('http://127.0.0.1:9292', :nonblock => nonblock)
 
       tests("nonblock => #{nonblock} hits read_timeout").raises(Excon::Errors::Timeout) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -189,6 +189,7 @@ files:
 - lib/excon/socket.rb
 - lib/excon/ssl_socket.rb
 - lib/excon/standard_instrumentor.rb
+- lib/excon/unix_socket.rb
 - tests/authorization_header_tests.rb
 - tests/bad_tests.rb
 - tests/basic_tests.rb
@@ -242,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2550839664096284654
+      hash: 1969698144445099887
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: