excon 0.45.1 → 0.45.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb3c2e59bcdc04bc44b0f35f0980c867bbbf473
-  data.tar.gz: c44d0ea79c4cd3e68b3170ac995f70d71705c6db
+  metadata.gz: 8fdb02fc261d826e83a7b33488486b4a3236c609
+  data.tar.gz: 921e5479f0beffa9487cb7d8d518e42f12d8acb5
 SHA512:
-  metadata.gz: 424698e41e10a91c88385de9bfc8858add4232dd341ec22122095fb657ab88d4fac181320e69525e0e9ddbedcb835697359d1a88e0aacfc0fb024b479c1fe956
-  data.tar.gz: 8c25c646e3a66aa51bc49029c0bb0b52b2bb0878e85d9143c03261a3ba42684fd0fcfaf4df8b053d8b16146e473c331e4a744ad5314c61062354d55ca0fe3839
+  metadata.gz: 1aa150b70ac25a38a6b2c862054ae680d406b40f685ca767a792ef2d35522ec856aacd8d56aa344cd18e13d91c563ae737d1d3e2d4ff11ef4328639a0e4dfe9c
+  data.tar.gz: 00b918d4dc23c27b0fb9871125be50e6ae51460a6517db29b85af86216e76d5c0c49db6a8b1a3820dc4221116cc2efd884c64bae594117e204eb0ba85ed67ef8

data/Gemfile.lock

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

data/changelog.txt

@@ -1,3 +1,13 @@
+0.45.2 04/16/2015
+=================
+
+add raw_status reader
+improved tests around response/status
+rescue IO::WaitWritable for SSL sockets also
+indentation fixes
+tighten rescue in ssl socket connect to better report non-timeouts
+rescue EAGAIN and EWOULDBLOCK for non-blocking connects
+
 0.45.1 03/27/2015
 =================
 

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.45.1'
-  s.date              = '2015-03-27'
+  s.version           = '0.45.2'
+  s.date              = '2015-04-16'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -122,6 +122,7 @@ Gem::Specification.new do |s|
     tests/authorization_header_tests.rb
     tests/bad_tests.rb
     tests/basic_tests.rb
+    tests/complete_responses.rb
     tests/data/127.0.0.1.cert.crt
     tests/data/127.0.0.1.cert.key
     tests/data/excon.cert.crt

data/lib/excon/constants.rb

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

data/lib/excon/response.rb

@@ -22,6 +22,12 @@ module Excon
     def status
       @data[:status]
     end
+    def status_line
+      @data[:status_line]
+    end
+    def status_line=(new_status_line)
+      @data[:status_line] = new_status_line
+    end
     def reason_phrase=(new_reason_phrase)
       @data[:reason_phrase] = new_reason_phrase
     end
@@ -53,6 +59,7 @@ module Excon
         :body          => '',
         :headers       => Excon::Headers.new,
         :status        => status,
+        :status_line   => line,
         :reason_phrase => reason_phrase
       }
 

data/lib/excon/socket.rb

@@ -64,12 +64,12 @@ module Excon
     end
 
     def legacy_readline
-       begin
+      begin
         Timeout.timeout(@data[:read_timeout]) do
           @socket.readline
-      end
+        end
       rescue Timeout::Error
-      raise Excon::Errors::Timeout.new('read timeout reached')
+        raise Excon::Errors::Timeout.new('read timeout reached')
       end
     end
 
@@ -163,37 +163,37 @@ module Excon
 
     def read_nonblock(max_length)
       begin
-            if max_length
-              until @read_buffer.length >= max_length
-                @read_buffer << @socket.read_nonblock(max_length - @read_buffer.length)
-              end
-            else
-              loop do
-                @read_buffer << @socket.read_nonblock(@data[:chunk_size])
-              end
-            end
-          rescue OpenSSL::SSL::SSLError => error
-            if error.message == 'read would block'
-              if timeout_reached('read')  
-                raise_timeout_error('read') 
-              else 
-                retry
-              end
-            else
-              raise(error)
-            end
-          rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
-            if @read_buffer.empty?
-              # if we didn't read anything, try again...
-              if timeout_reached('read') 
-                raise_timeout_error('read') 
-              else
-                retry
-              end
-            end
-          rescue EOFError
-            @eof = true
+        if max_length
+          until @read_buffer.length >= max_length
+            @read_buffer << @socket.read_nonblock(max_length - @read_buffer.length)
+          end
+        else
+          loop do
+            @read_buffer << @socket.read_nonblock(@data[:chunk_size])
+          end
+        end
+      rescue OpenSSL::SSL::SSLError => error
+        if error.message == 'read would block'
+          if timeout_reached('read')  
+            raise_timeout_error('read') 
+          else 
+            retry
           end
+        else
+          raise(error)
+        end
+      rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
+        if @read_buffer.empty?
+          # if we didn't read anything, try again...
+          if timeout_reached('read') 
+            raise_timeout_error('read') 
+          else
+            retry
+          end
+        end
+      rescue EOFError
+        @eof = true
+      end
 
       if max_length
         if @read_buffer.empty?
@@ -234,7 +234,7 @@ module Excon
     def write_nonblock(data)
       if FORCE_ENC
         data.force_encoding('BINARY')
-          end
+      end
       loop do
         written = nil
         begin

data/lib/excon/ssl_socket.rb

@@ -118,16 +118,17 @@ module Excon
         if @nonblock
           begin
             @socket.connect_nonblock
-          rescue IO::WaitReadable
+          rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
             IO.select([@socket])
             retry
+          rescue IO::WaitWritable
+            IO.select(nil, [@socket])
+            retry
           end
         else
           @socket.connect
         end
-      rescue OpenSSL::SSL::SSLError
-        raise
-      rescue
+      rescue Errno::ETIMEDOUT, Timeout::Error
         raise Excon::Errors::Timeout.new('connect timeout reached')
       end
 

data/tests/complete_responses.rb

@@ -0,0 +1,31 @@
+Shindo.tests('Excon Response Validation') do
+  env_init
+
+  with_server('good') do
+    tests('good responses with complete headers') do
+        100.times do
+          res = Excon.get('http://127.0.0.1:9292/chunked/simple')
+          returns(true) { res.body == "hello world" }
+          returns(true) { res.status_line ==  "HTTP/1.1 200 OK\r\n" }
+          returns(true) { res.status == 200}
+          returns(true) { res.reason_phrase == "OK" }
+          returns(true) { res.remote_ip == "127.0.0.1" }
+      end
+    end
+  end
+ 
+  with_server('error') do
+    tests('error responses with complete headers') do
+        100.times do
+          res = Excon.get('http://127.0.0.1:9292/error/not_found')
+          returns(true) { res.body == "server says not found" }
+          returns(true) { res.status_line ==  "HTTP/1.1 404 Not Found\r\n" }
+          returns(true) { res.status == 404}
+          returns(true) { res.reason_phrase == "Not Found" }
+          returns(true) { res.remote_ip == "127.0.0.1" }
+      end
+    end
+  end
+  
+  env_restore
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.45.1
+  version: 0.45.2
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -198,6 +198,7 @@ files:
 - tests/authorization_header_tests.rb
 - tests/bad_tests.rb
 - tests/basic_tests.rb
+- tests/complete_responses.rb
 - tests/data/127.0.0.1.cert.crt
 - tests/data/127.0.0.1.cert.key
 - tests/data/excon.cert.crt