excon 0.19.0 → 0.19.1

data/Gemfile.lock

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

data/changelog.txt

@@ -1,3 +1,8 @@
+0.19.1 02/27/2013
+=================
+
+fix for ssl proxies to allow connect response to be read
+
 0.19.0 02/27/2013
 =================
 

data/excon.gemspec

@@ -13,7 +13,7 @@ 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.19.0'
+  s.version           = '0.19.1'
   s.date              = '2013-02-27'
   s.rubyforge_project = 'excon'
 

data/lib/excon/connection.rb

@@ -315,63 +315,7 @@ module Excon
 
     def response(datum={})
       unless datum.has_key?(:response)
-        datum[:response] = {
-          :body       => '',
-          :headers    => {},
-          :status     => socket.read(12)[9, 11].to_i,
-          :remote_ip  => socket.remote_ip
-        }
-        socket.readline # read the rest of the status line and CRLF
-
-        until ((data = socket.readline).chop!).empty?
-          key, value = data.split(/:\s*/, 2)
-          datum[:response][:headers][key] = ([*datum[:response][:headers][key]] << value).compact.join(', ')
-          if key.casecmp('Content-Length') == 0
-            content_length = value.to_i
-          elsif (key.casecmp('Transfer-Encoding') == 0) && (value.casecmp('chunked') == 0)
-            transfer_encoding_chunked = true
-          end
-        end
-
-        unless (['HEAD', 'CONNECT'].include?(datum[:method].to_s.upcase)) || NO_ENTITY.include?(datum[:response][:status])
-
-          # check to see if expects was set and matched
-          expected_status = !datum.has_key?(:expects) || [*datum[:expects]].include?(datum[:response][:status])
-
-          # if expects matched and there is a block, use it
-          if expected_status && datum.has_key?(:response_block)
-            if transfer_encoding_chunked
-              # 2 == "/r/n".length
-              while (chunk_size = socket.readline.chop!.to_i(16)) > 0
-                datum[:response_block].call(socket.read(chunk_size + 2).chop!, nil, nil)
-              end
-              socket.read(2)
-            elsif remaining = content_length
-              while remaining > 0
-                datum[:response_block].call(socket.read([datum[:chunk_size], remaining].min), [remaining - datum[:chunk_size], 0].max, content_length)
-                remaining -= datum[:chunk_size]
-              end
-            else
-              while remaining = socket.read(datum[:chunk_size])
-                datum[:response_block].call(remaining, remaining.length, content_length)
-              end
-            end
-          else # no block or unexpected status
-            if transfer_encoding_chunked
-              while (chunk_size = socket.readline.chop!.to_i(16)) > 0
-                datum[:response][:body] << socket.read(chunk_size + 2).chop! # 2 == "/r/n".length
-              end
-              socket.read(2) # 2 == "/r/n".length
-            elsif remaining = content_length
-              while remaining > 0
-                datum[:response][:body] << socket.read([datum[:chunk_size], remaining].min)
-                remaining -= datum[:chunk_size]
-              end
-            else
-              datum[:response][:body] << socket.read
-            end
-          end
-        end
+        datum = Excon::Response.parse(socket, datum)
       end
 
       datum[:stack].response_call(datum)

data/lib/excon/constants.rb

@@ -69,7 +69,7 @@ module Excon
     :write_timeout
   ]
 
-  VERSION = '0.19.0'
+  VERSION = '0.19.1'
 
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO

data/lib/excon/response.rb

@@ -29,6 +29,67 @@ module Excon
       @data[:remote_ip]
     end
 
+    def self.parse(socket, datum)
+      datum[:response] = {
+        :body       => '',
+        :headers    => {},
+        :status     => socket.read(12)[9, 11].to_i,
+        :remote_ip  => socket.remote_ip
+      }
+      socket.readline # read the rest of the status line and CRLF
+
+      until ((data = socket.readline).chop!).empty?
+        key, value = data.split(/:\s*/, 2)
+        datum[:response][:headers][key] = ([*datum[:response][:headers][key]] << value).compact.join(', ')
+        if key.casecmp('Content-Length') == 0
+          content_length = value.to_i
+        elsif (key.casecmp('Transfer-Encoding') == 0) && (value.casecmp('chunked') == 0)
+          transfer_encoding_chunked = true
+        end
+      end
+
+      unless (['HEAD', 'CONNECT'].include?(datum[:method].to_s.upcase)) || NO_ENTITY.include?(datum[:response][:status])
+
+        # check to see if expects was set and matched
+        expected_status = !datum.has_key?(:expects) || [*datum[:expects]].include?(datum[:response][:status])
+
+        # if expects matched and there is a block, use it
+        if expected_status && datum.has_key?(:response_block)
+          if transfer_encoding_chunked
+            # 2 == "/r/n".length
+            while (chunk_size = socket.readline.chop!.to_i(16)) > 0
+              datum[:response_block].call(socket.read(chunk_size + 2).chop!, nil, nil)
+            end
+            socket.read(2)
+          elsif remaining = content_length
+            while remaining > 0
+              datum[:response_block].call(socket.read([datum[:chunk_size], remaining].min), [remaining - datum[:chunk_size], 0].max, content_length)
+              remaining -= datum[:chunk_size]
+            end
+          else
+            while remaining = socket.read(datum[:chunk_size])
+              datum[:response_block].call(remaining, remaining.length, content_length)
+            end
+          end
+        else # no block or unexpected status
+          if transfer_encoding_chunked
+            while (chunk_size = socket.readline.chop!.to_i(16)) > 0
+              datum[:response][:body] << socket.read(chunk_size + 2).chop! # 2 == "/r/n".length
+            end
+            socket.read(2) # 2 == "/r/n".length
+          elsif remaining = content_length
+            while remaining > 0
+              datum[:response][:body] << socket.read([datum[:chunk_size], remaining].min)
+              remaining -= datum[:chunk_size]
+            end
+          else
+            datum[:response][:body] << socket.read
+          end
+        end
+      end
+      datum
+    end
+
     def initialize(params={})
       @data = {
         :body     => '',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
   prerelease: 
 platform: ruby
 authors:
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4361906214434444580
+      hash: 518823091680124147
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: