excon 0.39.6 → 0.40.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2M2NWI4NmRiODMxZTgzNDk2NjE2MjBlYjk2Yjc0MjlkMDBmNWFkOQ==
+    ODlkNWVjNzM5NDE2MzY0NzhmYWRlYzJjNDYzMWI3NTE0ZDQ4MWJlNg==
   data.tar.gz: !binary |-
-    MWJjMTRjZjg0MjYwOWQ1OWMzY2Q3ODRkMTk2MGQ0N2Q0ODQ2NjRiNQ==
+    ZGFiN2VhOTJiNDRjMGVhYWE3YjU0NjIyYjZiZTg3YWIyMmU0ZThjMQ==
 SHA512:
   metadata.gz: !binary |-
-    ODE4MmIwY2FmNGRhYTVmODI2MjA1OWI1OTQ3ZTI2Yjc3YzZhZjZjZDFhNTQ0
-    ZTM5ZTMyYjc3NzA1NDk4NjMxNzdiMTJmNDIyOWY2MjI0OTdkY2E4OGRhMDlk
-    NWM0YjA0YTJmN2Y0MTI1MTc3MDNjZmVmNWY4YTBmMGI5ZDBmMDM=
+    NDMxNjEzM2M1YjhmNmE4MTNjMjljNDkzNWMyZjUxNmIyYWE2ZGFiYmQyMDBk
+    MWQzZTZlMDE1YzE3MmEwZWQzMjQyMGFiMWViZjhlMzlmZjI0M2IwMDE5YmI4
+    ODg4MjczZDczYjNhZDhlMzA5MTAwNTlkNjZhMzk1Njc4ZDgzYjc=
   data.tar.gz: !binary |-
-    ZGMwM2M3ZjQ1MTBiOTY2ZjUwY2U5MzVjYzcyMTA4ZjAwYWVmNTQwNDQ4ZTZh
-    OTU0M2NiMzUxNDYwNWIyNzk0YThmY2U3NTY2OGFkOTQ2NmUwNjI3YjBiMTJl
-    NTc0ZTUzMDE0ZDA0ZTk3M2ZkNzQ2NTRkY2Y2ZmI0MDA4OGY5ZTI=
+    ZDk4MTk3ZmYxYjJkY2E5YTFhNWFjMWUxYmEyYTA5MjllNWVhZmY1NjEwOTU0
+    YzUyYjY1NDcwZmYyZTEwNzQ0M2RmZWY3YjE1YjlkYTk2NmU3NGYyOGFmNTNh
+    YWFkYTc1OTkxYTk0NTI2MzFjZjFmM2MwMDg0Mzc5OTM0YzE3YmQ=

data/CONTRIBUTORS.md

@@ -37,6 +37,7 @@
 * Jonathan Dance <github@wuputah.com>
 * Jonathan Dance <jd@wuputah.com>
 * Jonathan Roes <jroes@jroes.net>
+* Joshua Gross <joshua@surfeasy.com>
 * Joshua Mckinney <joshmckin@gmail.com>
 * Joshua Napoli <jnapoli@swipely-napoli.home>
 * Joshua Napoli <jnapoli@swipely-napoli.local>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.39.6)
+    excon (0.40.0)
 
 GEM
   remote: http://rubygems.org/

data/changelog.txt

@@ -1,3 +1,10 @@
+0.40.0 10/06/2014
+=================
+
+fix support for specifying ssl_ca_path
+more consistent response_block/response.body behavior for mocks
+add support for proxies running on unix domain sockets
+
 0.39.6 09/22/2014
 =================
 

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.39.6'
-  s.date              = '2014-09-22'
+  s.version           = '0.40.0'
+  s.date              = '2014-10-06'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -179,8 +179,10 @@ module Excon
     end
 
     def response_call(datum)
+      # ensure response_block is yielded to and body is empty from middlewares
       if datum.has_key?(:response_block) && !datum[:response][:body].empty?
         response_body = datum[:response][:body].dup
+        datum[:response][:body] = ''
         content_length = remaining = response_body.bytesize
         while remaining > 0
           datum[:response_block].call(response_body.slice!(0, [datum[:chunk_size], remaining].min), [remaining - datum[:chunk_size], 0].max, content_length)
@@ -371,10 +373,11 @@ module Excon
     end
 
     def socket
-      sockets[@socket_key] ||= if @data[:scheme] == HTTPS
-        Excon::SSLSocket.new(@data)
-      elsif @data[:scheme] == UNIX
+      unix_proxy = @data[:proxy] ? @data[:proxy][:scheme] == UNIX : false
+      sockets[@socket_key] ||= if @data[:scheme] == UNIX || unix_proxy
         Excon::UnixSocket.new(@data)
+      elsif @data[:scheme] == HTTPS
+        Excon::SSLSocket.new(@data)
       else
         Excon::Socket.new(@data)
       end
@@ -405,11 +408,10 @@ module Excon
           # no processing needed
         when String
           uri = URI.parse(@data[:proxy])
-          unless uri.host && uri.port && uri.scheme
-            raise Excon::Errors::ProxyParseError, "Proxy is invalid"
-          end
           @data[:proxy] = {
             :host       => uri.host,
+            # path is only sensible for a Unix socket proxy
+            :path       => uri.scheme == UNIX ? uri.path : nil,
             :port       => uri.port,
             :scheme     => uri.scheme,
           }
@@ -419,6 +421,16 @@ module Excon
           if uri.user
             @data[:proxy][:user] = uri.user
           end
+          if @data[:proxy][:scheme] == UNIX
+            if @data[:proxy][:host]
+              raise ArgumentError, "The `:host` parameter should not be set for `unix://` proxies.\n" +
+                                   "When supplying a `unix://` URI, it should start with `unix:/` or `unix:///`."
+            end
+          else
+            unless uri.host && uri.port && uri.scheme
+              raise Excon::Errors::ProxyParseError, "Proxy is invalid"
+            end
+          end
         else
           raise Excon::Errors::ProxyParseError, "Proxy is invalid"
         end

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.39.6'
+  VERSION = '0.40.0'
 
   CR_NL = "\r\n"
 
@@ -81,6 +81,7 @@ module Excon
     :scheme,
     :socket,
     :ssl_ca_file,
+    :ssl_ca_path,
     :ssl_verify_callback,
     :ssl_verify_peer,
     :ssl_version,

data/lib/excon/response.rb

@@ -46,7 +46,8 @@ module Excon
         :status        => status
       }
 
-      unless datum[:scheme] == UNIX
+      unix_proxy = datum[:proxy] ? datum[:proxy][:scheme] == UNIX : false
+      unless datum[:scheme] == UNIX || unix_proxy
         datum[:response].merge!(
           :remote_ip     => socket.remote_ip,
           :local_port    => socket.local_port,

data/lib/excon/unix_socket.rb

@@ -5,8 +5,10 @@ module Excon
 
     def connect
       @socket  = ::Socket.new(::Socket::AF_UNIX, ::Socket::SOCK_STREAM, 0)
-      sockaddr = ::Socket.sockaddr_un(@data[:socket])
-
+      # If a Unix proxy was specified, the :path option will be set for it,
+      # otherwise fall back to the :socket option.
+      proxy_path = @data[:proxy] ? @data[:proxy][:path] : nil
+      sockaddr = ::Socket.sockaddr_un(proxy_path || @data[:socket])
       if @nonblock
         begin
           @socket.connect_nonblock(sockaddr)

data/tests/middlewares/canned_response_tests.rb

@@ -12,13 +12,23 @@ Shindo.tests("Excon support for middlewares that return canned responses") do
     end
   end
 
-  tests('does not mutate the canned response body').returns("canned") do
+  tests('does not mutate the canned response body').returns(the_body) do
+    Excon.get(
+      'http://some-host.com/some-path',
+      :middlewares    => [canned_response_middleware] + Excon.defaults[:middlewares]
+    ).body
+  end
+
+  tests('yields non-mutated body to response_block').returns(the_body) do
+    body = ''
+    response_block = lambda { |chunk, _, _| body << chunk }
     Excon.get(
       'http://some-host.com/some-path',
       :middlewares    => [canned_response_middleware] + Excon.defaults[:middlewares],
-      :response_block => Proc.new { } # to force streaming
+      :response_block => response_block
     )
-    the_body
+    body
   end
+
 end
 

data/tests/middlewares/mock_tests.rb

@@ -35,7 +35,7 @@ Shindo.tests('Excon stubs') do
       response.status
     end
 
-    tests('request body with response_block given').returns('body') do
+    tests('response_block yields body').returns('body') do
       body = ''
       response_block = lambda do |chunk, remaining_bytes, total_bytes|
         body << chunk
@@ -44,6 +44,11 @@ Shindo.tests('Excon stubs') do
       body
     end
 
+    tests('response.body empty with response_block').returns('') do
+      response_block = lambda { |_, _, _| }
+      connection.request(:method => :get, :path => '/content-length/100', :response_block => response_block).body
+    end
+
     Excon.stubs.clear
 
   end
@@ -99,7 +104,7 @@ Shindo.tests('Excon stubs') do
       response.status
     end
 
-    tests('request body with response block given').returns('body') do
+    tests('response_block yields body').returns('body') do
       body = ''
       response_block = lambda do |chunk, remaining_bytes, total_bytes|
         body << chunk
@@ -108,6 +113,11 @@ Shindo.tests('Excon stubs') do
       body
     end
 
+    tests('response.body empty with response_block').returns('') do
+      response_block = lambda { |_, _, _| }
+      connection.request(:body => 'body', :method => :get, :path => '/content-length/100', :response_block => response_block).body
+    end
+
     Excon.stubs.clear
 
   end
@@ -146,7 +156,8 @@ Shindo.tests('Excon stubs') do
   Excon.stubs.clear
 
   tests("stub({}, {:body => 'x' * (Excon::DEFAULT_CHUNK_SIZE + 1)})") do
-    test("with response_block") do
+
+    test("response_block yields body") do
       connection = Excon.new('http://127.0.0.1:9292', :mock => true)
       Excon.stub({}, {:body => 'x' * (Excon::DEFAULT_CHUNK_SIZE + 1)})
 
@@ -157,6 +168,14 @@ Shindo.tests('Excon stubs') do
       connection.request(:method => :get, :path => '/content-length/100', :response_block => response_block)
       chunks == ['x' * Excon::DEFAULT_CHUNK_SIZE, 'x']
     end
+
+    tests("response.body empty with response_block").returns('') do
+      connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+      Excon.stub({}, {:body => 'x' * (Excon::DEFAULT_CHUNK_SIZE + 1)})
+      response_block = lambda { |_, _, _| }
+      connection.request(:method => :get, :path => '/content-length/100', :response_block => response_block).body
+    end
+
   end
 
   Excon.stubs.clear

data/tests/proxy_tests.rb

@@ -27,6 +27,27 @@ Shindo.tests('Excon proxy support') do
       end
     end
 
+    tests('with fully-specified Unix socket proxy: unix:///') do
+      connection = nil
+
+      tests('connection.data[:proxy][:host]').returns(nil) do
+        connection = Excon.new('http://foo.com', :proxy => 'unix:///tmp/myproxy.sock')
+        connection.data[:proxy][:host]
+      end
+
+      tests('connection.data[:proxy][:port]').returns(nil) do
+        connection.data[:proxy][:port]
+      end
+
+      tests('connection.data[:proxy][:scheme]').returns('unix') do
+        connection.data[:proxy][:scheme]
+      end
+
+      tests('connection.data[:proxy][:path]').returns('/tmp/myproxy.sock') do
+        connection.data[:proxy][:path]
+      end
+    end
+
     def env_proxy_tests(env)
       env_init(env)
 
@@ -138,6 +159,35 @@ Shindo.tests('Excon proxy support') do
       env_restore
     end
 
+    tests('with a unix socket proxy config from the environment') do
+      env_init({
+        'http_proxy' => 'unix:///tmp/myproxy.sock',
+      })
+
+      tests('an https connection') do
+        connection = nil
+
+        tests('connection.data[:proxy][:host]').returns(nil) do
+          connection = Excon.new('https://secret.com')
+          connection.data[:proxy][:host]
+        end
+
+        tests('connection.data[:proxy][:port]').returns(nil) do
+          connection.data[:proxy][:port]
+        end
+
+        tests('connection.data[:proxy][:scheme]').returns('unix') do
+          connection.data[:proxy][:scheme]
+        end
+
+        tests('connection.data[:proxy][:path]').returns('/tmp/myproxy.sock') do
+          connection.data[:proxy][:path]
+        end
+      end
+
+      env_restore
+    end
+
   end
 
   with_rackup('proxy.ru') do
@@ -200,5 +250,32 @@ Shindo.tests('Excon proxy support') do
 
   end
 
+  with_unicorn('proxy.ru', 'unix:///tmp/myproxy.sock') do
+    pending if RUBY_PLATFORM == 'java' # need to find suitable server for jruby
+
+    tests('http proxying over unix socket: http://foo.com:8080') do
+      response = nil
+
+      tests('response.status').returns(200) do
+        connection = Excon.new('http://foo.com:8080', :proxy => 'unix:///tmp/myproxy.sock')
+        response = connection.request(:method => :get, :path => '/bar', :query => {:alpha => 'kappa'})
+
+        response.status
+      end
+
+      tests('sent Sent-Host header').returns('foo.com:8080') do
+        response.headers['Sent-Host']
+      end
+
+      tests('sent Proxy-Connection header').returns('Keep-Alive') do
+        response.headers['Sent-Proxy-Connection']
+      end
+
+      tests('response.body (proxied content)').returns('proxied content') do
+        response.body
+      end
+    end
+  end
+
   env_restore
 end

data/tests/response_tests.rb

@@ -20,6 +20,11 @@ Shindo.tests('Excon Response Parsing') do
           end
         end
 
+        tests('simple response has empty body').returns('') do
+          response_block = lambda { |_, _, _| }
+          Excon.get('http://127.0.0.1:9292/chunked/simple', :response_block => response_block).body
+        end
+
         tests('with expected response status').
               returns([['hello ', nil, nil], ['world', nil, nil]]) do
           capture_response_block do |block|
@@ -69,6 +74,11 @@ Shindo.tests('Excon Response Parsing') do
           end
         end
 
+        tests('simple response has empty body').returns('') do
+          response_block = lambda { |_, _, _| }
+          Excon.get('http://127.0.0.1:9292/content-length/simple', :response_block => response_block).body
+        end
+
         tests('with expected response status').
               returns([['hello', 6, 11], [' worl', 1, 11], ['d', 0, 11]]) do
           capture_response_block do |block|
@@ -111,6 +121,11 @@ Shindo.tests('Excon Response Parsing') do
           end
         end
 
+        tests('simple response has empty body').returns('') do
+          response_block = lambda { |_, _, _| }
+          Excon.get('http://127.0.0.1:9292/unknown/simple', :response_block => response_block).body
+        end
+
         tests('with expected response status').
               returns([['hello', nil, nil], [' worl', nil, nil], ['d', nil, nil]]) do
           capture_response_block do |block|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.39.6
+  version: 0.40.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport