excon 0.35.0 → 0.36.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjBhZDU0MzQxYTIxMjM5OGMzNWEzOTA0YjBlNWU5OTUyNTQ2MmQ5Ng==
+    NDU5NjFhMTVjODUyOTk3NWI0NzRmNjI4YTlkY2U4ZGU4M2JlZDNlNQ==
   data.tar.gz: !binary |-
-    NTAzN2ZjNGRhZjMxMWM3NjAxNzMzYjk2ZGZmNzdmMjUwNWY3ZmNmYg==
+    M2ExNjg1NjdjZDFjMGMxNmMwNzQwM2NmOWEwMTBmN2U4ZWUxY2NjZg==
 SHA512:
   metadata.gz: !binary |-
-    MWYxYzdmZTU1YzY0ZTk5MjZhMDQ4OTVhNmVmMzZmYmYyNTc0YWFjOGFjNmRj
-    NDM2ZjllM2MzZmVjYmZmYjdmMGQzOWJkMGVmYTlmNDM0ZGY3OWQ4NTU2NmEz
-    MmU3NTczMWU1ZWExMGQ1ZWJkODYyNTU5YWFkMTc4OWJhZTg3ODc=
+    YWViOTA0NjQ1N2E5ZWY0ZTlmNGJiZTE0ZmUzMTg2YmFhOTQ0NDBhYTRlMWVk
+    MzM2OWI2YzE3MjQzMzA2ZTY3ZWUxYWUzMzI2ZGJlYWRkNjMyODYzODhhYTBj
+    M2Q1NDZjYzA2N2UwYmY3YmM4YzU3NzI0M2YxYjY4YzZiNzU4ZTc=
   data.tar.gz: !binary |-
-    ODFkZWNlNTY3Nzk3MWQxYWY4OTQ3ZmMwZTllMDBmZjBjYjUxZTcxYzlkNGUy
-    ZWVmZTQ2MTlmOGYxNDU0NTYyMGZkOWQ5YTU3NmQwNWI5MjZiMmU0YzVkMDU3
-    YzY4Y2MwMGNjZmMxNzA1OWFhNTQ1Y2YyNWY5ZGEyMzcxNzI1NTU=
+    MTM2ZTExOTYxMzFlZjlkY2E3M2Q3YjVjMDRkOGQzOTc3NTUxMGVlYzMwMzAy
+    NWU0OTFjZWM4NDRmZjEzYTIzY2M1ZjJhYmRkYmY3MzhiNTllMDlkYWJiYWRk
+    NjM1M2YwNmU2OTU5MDVhMjQxMTQwMTFkYTY1ZDllN2VkMTY1ZTE=

data/Gemfile.lock

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

data/changelog.txt

@@ -1,4 +1,9 @@
-0.34.0 06/03/2014
+0.36.0 06/04/2014
+=================
+
+fix to reconcile streaming changes for chunked encoding
+
+0.35.0 06/03/2014
 =================
 
 fix for responses with content_length

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.35.0'
-  s.date              = '2014-06-03'
+  s.version           = '0.36.0'
+  s.date              = '2014-06-04'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.35.0'
+  VERSION = '0.36.0'
 
   CR_NL = "\r\n"
 

data/lib/excon/response.rb

@@ -76,14 +76,23 @@ module Excon
         end
 
         if transfer_encoding_chunked
-          # 2 == "\r\n".length
           if response_block
             while (chunk_size = socket.readline.chop!.to_i(16)) > 0
-              response_block.call(socket.read(chunk_size + 2).chop!, nil, nil)
+              chunk_size += 2 # 2 == "\r\n".length
+              while chunk_size > 0
+                chunk = socket.read(chunk_size)
+                chunk_size -= chunk.length
+                response_block.call(chunk.chop!, nil, nil)
+              end
             end
           else
             while (chunk_size = socket.readline.chop!.to_i(16)) > 0
-              datum[:response][:body] << socket.read(chunk_size + 2).chop!
+              chunk_size += 2 # 2 == "\r\n".length
+              while chunk_size > 0
+                chunk = socket.read(chunk_size)
+                chunk_size -= chunk.length
+                datum[:response][:body] << chunk.chop!
+              end
             end
           end
           parse_headers(socket, datum) # merge trailers into headers

data/tests/basic_tests.rb

@@ -38,21 +38,34 @@ Shindo.tests('Excon streaming basics') do
       end
     end
 
+    # expect the full response as a string and expect it to
+    # take a (timeout * pieces) seconds (with fixed Content-Length header)
+    tests('simple blocking request on streaming endpoint with fixed length').returns([res.join(''),'response time ok']) do
+      start = Time.now
+      ret = Excon.get('http://127.0.0.1:9292/streamed/fixed_length').body
+
+      if Time.now - start <= timeout*3
+        [ret, 'streaming response came too quickly']
+      else
+        [ret, 'response time ok']
+      end
+    end
+
     # expect each response piece to arrive to the body right away
     # and wait for timeout until next one arrives
-    tests('simple request with response_block on streaming endpoint').returns([res,'response times ok']) do
+    def timed_streaming_test(endpoint, timeout)
       ret = []
       timing = 'response times ok'
       start = Time.now
-      Excon.get('http://127.0.0.1:9292/streamed/simple', :response_block => lambda do |c,r,t|
+      Excon.get(endpoint, :response_block => lambda do |c,r,t|
+        # add the response
+        ret.push(c)
         # check if the timing is ok
         # each response arrives after timeout and before timeout + 1
         cur_time = Time.now - start
         if cur_time < ret.length * timeout or cur_time > (ret.length+1) * timeout
           timing = 'response time not ok!'
         end
-        # add the response
-        ret.push(c)
       end)
       # validate the final timing
       if Time.now - start <= timeout*3
@@ -60,6 +73,15 @@ Shindo.tests('Excon streaming basics') do
       end
       [ret, timing]
     end
+
+    tests('simple request with response_block on streaming endpoint').returns([res,'response times ok']) do
+      timed_streaming_test('http://127.0.0.1:9292/streamed/simple', timeout)
+    end
+
+    tests('simple request with response_block on streaming endpoint with fixed length').returns([res,'response times ok']) do
+      timed_streaming_test('http://127.0.0.1:9292/streamed/fixed_length', timeout)
+    end
+
   end
 end
 

data/tests/rackups/streaming.ru

@@ -1,14 +1,24 @@
 use Rack::ContentType, "text/plain"
 
 app = lambda do |env|
+  # streamed pieces to be sent
+  pieces = %w{Hello streamy world}
+
   response_headers = {}
+
+  # set a fixed content length in the header if requested
+  if env['REQUEST_PATH'] == '/streamed/fixed_length'
+    response_headers['Content-Length'] = pieces.join.length.to_s
+  end
+
   response_headers["rack.hijack"] = lambda do |io|
     # Write directly to IO of the response
     begin
-      ['Hello','streamy','world'].each do |x|
+      # return the response in pieces
+      pieces.each do |x|
+        sleep 1
         io.write(x)
         io.flush
-        sleep 1
       end
     ensure
       io.close

metadata

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