excon 0.30.0 → 0.31.0

data/tests/response_tests.rb

@@ -156,12 +156,14 @@ Shindo.tests('Excon Response Parsing') do
     tests('Transfer-Encoding') do
 
       tests('used with chunked response') do
-        resp = Excon.post(
-          'http://127.0.0.1:9292/echo/transfer-encoded/chunked',
-          :body => 'hello world'
-        )
+        resp = nil
 
         tests('server sent transfer-encoding').returns('gzip, chunked') do
+          resp = Excon.post(
+            'http://127.0.0.1:9292/echo/transfer-encoded/chunked',
+            :body => 'hello world'
+          )
+
           resp[:headers]['Transfer-Encoding-Sent']
         end
 
@@ -175,12 +177,14 @@ Shindo.tests('Excon Response Parsing') do
       end
 
       tests('used with non-chunked response') do
-        resp = Excon.post(
-          'http://127.0.0.1:9292/echo/transfer-encoded',
-          :body => 'hello world'
-        )
+        resp = nil
 
         tests('server sent transfer-encoding').returns('gzip') do
+          resp = Excon.post(
+            'http://127.0.0.1:9292/echo/transfer-encoded',
+            :body => 'hello world'
+          )
+
           resp[:headers]['Transfer-Encoding-Sent']
         end
 
@@ -195,14 +199,16 @@ Shindo.tests('Excon Response Parsing') do
 
       # sends TE header without gzip/deflate accepted (see requests_tests)
       tests('with a :response_block') do
-        resp = nil
-        captures = capture_response_block do |block|
-          resp = Excon.post('http://127.0.0.1:9292/echo/transfer-encoded/chunked',
-                            :body => 'hello world',
-                            :response_block => block)
-        end
+        captures = nil
 
         tests('server does not compress').returns('chunked') do
+          resp = nil
+          captures = capture_response_block do |block|
+            resp = Excon.post('http://127.0.0.1:9292/echo/transfer-encoded/chunked',
+                              :body => 'hello world',
+                              :response_block => block)
+          end
+
           resp[:headers]['Transfer-Encoding-Sent']
         end
 

data/tests/servers/good.rb

@@ -17,7 +17,7 @@ module GoodServer
   #
   # Each connection to this server is persistent unless the client sends
   # "Connection: close" in the request. If a response requires the connection
-  # to be closed, it should set `@persistent = false` and send "Connection: close".
+  # to be closed, use `start_response(:persistent => false)`.
   def send_response(request)
     type, path = request[:uri].path.split('/', 3)[1, 2]
     case type
@@ -25,11 +25,18 @@ module GoodServer
       case path
       when 'request'
         data = Marshal.dump(request)
-        send_data "HTTP/1.1 200 OK\r\n"
+        start_response
         send_data "Content-Length: #{ data.size }\r\n"
         send_data "\r\n"
         send_data data
 
+      when 'request_count'
+        (@request_count ||= '0').next!
+        start_response
+        send_data "Content-Length: #{ @request_count.size }\r\n"
+        send_data "\r\n"
+        send_data @request_count
+
       when /(content|transfer)-encoded\/?(.*)/
         if (encoding_type = $1) == 'content'
           accept_header = 'Accept-Encoding'
@@ -70,7 +77,7 @@ module GoodServer
         end
         encodings = encodings.compact.join(', ')
 
-        send_data "HTTP/1.1 200 OK\r\n"
+        start_response
         # let the test know what the server sent
         send_data "#{ encoding_header }-Sent: #{ encodings }\r\n"
         send_data "#{ encoding_header }: #{ encodings }\r\n" unless encodings.empty?
@@ -91,7 +98,7 @@ module GoodServer
     when 'chunked'
       case path
       when 'simple'
-        send_data "HTTP/1.1 200 OK\r\n"
+        start_response
         send_data "Transfer-Encoding: chunked\r\n"
         send_data "\r\n"
         # chunk-extension is currently ignored.
@@ -105,7 +112,7 @@ module GoodServer
 
       # merged trailers also support continuations
       when 'trailers'
-        send_data "HTTP/1.1 200 OK\r\n"
+        start_response
         send_data "Transfer-Encoding: chunked\r\n"
         send_data "Test-Header: one, two\r\n"
         send_data "\r\n"
@@ -118,24 +125,21 @@ module GoodServer
     when 'content-length'
       case path
       when 'simple'
-        send_data "HTTP/1.1 200 OK\r\n"
+        start_response
         send_data "Content-Length: 11\r\n"
         send_data "\r\n"
         send_data "hello world"
       end
 
     when 'unknown'
-      @persistent = false
       case path
       when 'simple'
-        send_data "HTTP/1.1 200 OK\r\n"
-        send_data "Connection: close\r\n"
+        start_response(:persistent => false)
         send_data "\r\n"
         send_data "hello world"
 
       when 'header_continuation'
-        send_data "HTTP/1.1 200 OK\r\n"
-        send_data "Connection: close\r\n"
+        start_response(:persistent => false)
         send_data "Test-Header: one, two\r\n"
         send_data "Test-Header: three, four,\r\n"
         send_data "  five, six\r\n"
@@ -147,7 +151,7 @@ module GoodServer
       # Excon will close these connections due to the errors.
       case path
       when 'malformed_header'
-        send_data "HTTP/1.1 200 OK\r\n"
+        start_response
         send_data "Bad-Header\r\n"  # no ':'
         send_data "\r\n"
         send_data "hello world"
@@ -159,8 +163,18 @@ module GoodServer
         send_data "hello world"
       end
     end
+  end
+
+  # Sends response status-line, plus headers common to all responses.
+  def start_response(opts = {})
+    opts = {
+      :status     => '200 OK',
+      :persistent => @persistent  # true unless client sent Connection: close
+    }.merge!(opts)
 
-    close_connection(true) unless @persistent
+    @persistent = opts[:persistent]
+    send_data "HTTP/1.1 #{ opts[:status] }\r\n"
+    send_data "Connection: close\r\n" unless @persistent
   end
 
   def post_init
@@ -173,6 +187,7 @@ module GoodServer
   # The data is buffered, then processed and removed from the buffer
   # as data becomes available until the @request is complete.
   def receive_data(data)
+    @buffer.seek(0, IO::SEEK_END)
     @buffer.write(data)
 
     parse_headers unless @request
@@ -180,12 +195,15 @@ module GoodServer
 
     if @request_complete
       send_response(@request)
-      sync_buffer
-      @request = nil
-      @request_complete = false
+      if @persistent
+        @request = nil
+        @request_complete = false
+        # process remaining buffer for next request
+        receive_data('') unless @buffer.eof?
+      else
+        close_connection(true)
+      end
     end
-
-    @buffer.seek(0, IO::SEEK_END)  # wait for more data
   end
 
   # Removes the processed portion of the buffer
@@ -243,8 +261,8 @@ module GoodServer
               sync_buffer
             else # last-chunk
               @buffer.read(2)  # the final \r\n may or may not be in the buffer
+              sync_buffer
               @chunk_size = nil
-              @body_pos = nil
               @request_complete = true
             end
           end
@@ -263,10 +281,9 @@ module GoodServer
       @buffer.rewind
       unless @buffer.eof?  # buffer only contained the headers
         @request[:body] << @buffer.read(@content_length - @request[:body].size)
+        sync_buffer
         if @request[:body].size == @content_length
           @request_complete = true
-        else
-          sync_buffer
         end
       end
     else

data/tests/test_helper.rb

@@ -1,7 +1,8 @@
 require 'rubygems' if RUBY_VERSION < '1.9'
-require 'bundler'
-
-Bundler.require(:default, :development)
+require 'bundler/setup'
+require 'excon'
+require 'delorean'
+require 'open4'
 
 Excon.defaults.merge!(
   :connect_timeout  => 5,
@@ -10,17 +11,22 @@ Excon.defaults.merge!(
 )
 
 def basic_tests(url = 'http://127.0.0.1:9292', options = {})
-  reset_connection = !!options.delete(:reset_connection)
-  [false, true].each do |nonblock|
-    options = options.merge({:ssl_verify_peer => false, :nonblock => nonblock })
-    connection = Excon.new(url, options)
+  ([true, false] * 2).combination(2).to_a.uniq.each do |nonblock, persistent|
+    connection = nil
+    test do
+      options = options.merge({:ssl_verify_peer => false, :nonblock => nonblock, :persistent => persistent })
+      connection = Excon.new(url, options)
+      true
+    end
 
-    tests("nonblock => #{nonblock}") do
+    tests("nonblock => #{nonblock}, persistent => #{persistent}") do
 
       tests('GET /content-length/100') do
-        response = connection.request(:method => :get, :path => '/content-length/100')
+        response = nil
 
         tests('response.status').returns(200) do
+          response = connection.request(:method => :get, :path => '/content-length/100')
+
           response.status
         end
 
@@ -28,11 +34,6 @@ def basic_tests(url = 'http://127.0.0.1:9292', options = {})
           response[:status]
         end
 
-        tests("response.headers['Connection']").returns('Keep-Alive') do
-          pending if connection.data[:scheme] == Excon::UNIX
-          response.headers['Connection']
-        end
-
         tests("response.headers['Content-Length']").returns('100') do
           response.headers['Content-Length']
         end
@@ -88,9 +89,6 @@ def basic_tests(url = 'http://127.0.0.1:9292', options = {})
       tests('POST /body-sink') do
 
         tests('response.body').returns("5000000") do
-          if reset_connection && !nonblock
-            connection.reset
-          end
           response = connection.request(:method => :post, :path => '/body-sink', :headers => { 'Content-Type' => 'text/plain' }, :body => 'x' * 5_000_000)
           response.body
         end
@@ -178,6 +176,13 @@ def basic_tests(url = 'http://127.0.0.1:9292', options = {})
 
       end
 
+      tests('should succeed with tcp_nodelay').returns(200) do
+        options = options.merge(:ssl_verify_peer => false, :nonblock => nonblock, :tcp_nodelay => true)
+        connection = Excon.new(url, options)
+        response = connection.request(:method => :get, :path => '/content-length/100')
+        response.status
+      end
+
     end
   end
 end
@@ -228,7 +233,7 @@ end
 
 def with_rackup(name)
   unless RUBY_PLATFORM == 'java'
-    GC.disable
+    GC.disable if RUBY_VERSION < '1.9'
     pid, w, r, e = Open4.popen4("rackup", rackup_path(name))
   else
     pid, w, r, e = IO.popen4("rackup", rackup_path(name))
@@ -238,14 +243,29 @@ def with_rackup(name)
 ensure
   Process.kill(9, pid)
   unless RUBY_PLATFORM == 'java'
-    GC.enable
+    GC.enable if RUBY_VERSION < '1.9'
     Process.wait(pid)
   end
+
+  # dump server errors
+  lines = e.read.split($/)
+  while line = lines.shift
+    case line
+    when /(ERROR|Error)/
+      unless line =~ /(null cert chain|did not return a certificate|SSL_read:: internal error)/
+        in_err = true
+        puts
+      end
+    when /^(127|localhost)/
+      in_err = false
+    end
+    puts line if in_err
+  end
 end
 
 def with_unicorn(name, file_name='/tmp/unicorn.sock')
   unless RUBY_PLATFORM == 'java'
-    GC.disable
+    GC.disable if RUBY_VERSION < '1.9'
     pid, w, r, e = Open4.popen4("unicorn", "-l", "unix://#{file_name}", rackup_path(name))
     until e.gets =~ /worker=0 ready/; end
   else
@@ -255,7 +275,7 @@ def with_unicorn(name, file_name='/tmp/unicorn.sock')
 ensure
   unless RUBY_PLATFORM == 'java'
     Process.kill(9, pid)
-    GC.enable
+    GC.enable if RUBY_VERSION < '1.9'
     Process.wait(pid)
   end
   if File.exist?(file_name)
@@ -269,7 +289,7 @@ end
 
 def with_server(name)
   unless RUBY_PLATFORM == 'java'
-    GC.disable
+    GC.disable if RUBY_VERSION < '1.9'
     pid, w, r, e = Open4.popen4(server_path("#{name}.rb"))
   else
     pid, w, r, e = IO.popen4(server_path("#{name}.rb"))
@@ -279,7 +299,7 @@ def with_server(name)
 ensure
   Process.kill(9, pid)
   unless RUBY_PLATFORM == 'java'
-    GC.enable
+    GC.enable if RUBY_VERSION < '1.9'
     Process.wait(pid)
   end
 end

data/tests/thread_safety_tests.rb

@@ -12,10 +12,10 @@ Shindo.tests('Excon thread safety') do
       Thread.current[:success] = response.body == '2'
     }
 
-    long_thread.join
-    short_thread.join
-
     test('long_thread') do
+      long_thread.join
+      short_thread.join
+
       long_thread[:success]
     end
 

data/tests/timeout_tests.rb

@@ -2,12 +2,11 @@ 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
+        connection = Excon.new('http://127.0.0.1:9292', :nonblock => nonblock)
         connection.request(:method => :get, :path => '/timeout', :read_timeout => 1)
       end
-
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -205,6 +205,7 @@ files:
 - tests/middlewares/instrumentation_tests.rb
 - tests/middlewares/mock_tests.rb
 - tests/middlewares/redirect_follower_tests.rb
+- tests/pipeline_tests.rb
 - tests/proxy_tests.rb
 - tests/query_string_tests.rb
 - tests/rackups/basic.rb
@@ -220,9 +221,10 @@ files:
 - tests/rackups/ssl_verify_peer.ru
 - tests/rackups/thread_safety.ru
 - tests/rackups/timeout.ru
+- tests/rackups/webrick_patch.rb
 - tests/request_headers_tests.rb
 - tests/request_method_tests.rb
-- tests/requests_tests.rb
+- tests/request_tests.rb
 - tests/response_tests.rb
 - tests/servers/bad.rb
 - tests/servers/eof.rb
@@ -248,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1886435120012632846
+      hash: -1399644688570873046
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/tests/requests_tests.rb

@@ -1,73 +0,0 @@
-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'}
-      ])
-
-      tests('head body is empty').returns('') do
-        responses.first.body
-      end
-
-      tests('head content length is 100').returns('100') do
-        responses.first.headers['Content-Length']
-      end
-
-      tests('get body is non-empty').returns('x' * 100) do
-        responses.last.body
-      end
-
-      tests('get content length is 100').returns('100') do
-        responses.last.headers['Content-Length']
-      end
-
-    end
-
-    tests('requests should succeed with tcp_nodelay') do
-
-      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 is 100').returns('100') do
-          responses.last.headers['Content-Length']
-        end
-      end
-    end
-  end
-
-  with_server('good') do
-
-    tests('sets transfer-coding and connection options') do
-
-      tests('without a :response_block') do
-        request = Marshal.load(
-          Excon.get('http://127.0.0.1:9292/echo/request').body
-        )
-        returns('trailers, deflate, gzip') { request[:headers]['TE'] }
-        returns('TE') { request[:headers]['Connection'] }
-      end
-
-      tests('with a :response_block') do
-        captures = capture_response_block do |block|
-          Excon.get('http://127.0.0.1:9292/echo/request',
-                    :response_block => block)
-        end
-        data = captures.map {|capture| capture[0] }.join
-        request = Marshal.load(data)
-
-        returns('trailers') { request[:headers]['TE'] }
-        returns('TE') { request[:headers]['Connection'] }
-      end
-
-    end
-
-  end
-end