excon 0.5.0 → 0.5.1

data/Gemfile.lock

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

data/benchmarks/excon_vs.rb

@@ -137,23 +137,25 @@ end
 # +--------------------------+----------+
 # | tach                     | total    |
 # +--------------------------+----------+
-# | Excon (persistent)       | 1.521565 |
+# | Excon (persistent)       | 1.529095 |
 # +--------------------------+----------+
-# | Excon                    | 1.624180 |
+# | curb (persistent)        | 1.740387 |
 # +--------------------------+----------+
-# | Typhoeus                 | 1.918563 |
+# | Typhoeus                 | 1.876236 |
 # +--------------------------+----------+
-# | StreamlyFFI (persistent) | 1.933218 |
+# | Excon                    | 2.001858 |
 # +--------------------------+----------+
-# | Net::HTTP (persistent)   | 2.418454 |
+# | StreamlyFFI (persistent) | 2.200701 |
 # +--------------------------+----------+
-# | Net::HTTP                | 2.439801 |
+# | Net::HTTP                | 2.395704 |
 # +--------------------------+----------+
-# | HTTParty                 | 2.609180 |
+# | Net::HTTP (persistent)   | 2.418099 |
 # +--------------------------+----------+
-# | RestClient               | 2.905853 |
+# | HTTParty                 | 2.659317 |
 # +--------------------------+----------+
-# | open-uri                 | 2.936382 |
+# | RestClient               | 2.958159 |
 # +--------------------------+----------+
-# | em-http-request          | 3.933757 |
+# | open-uri                 | 2.987051 |
 # +--------------------------+----------+
+# | em-http-request          | 4.123798 |
+# +--------------------------+----------+

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.5.0'
+  s.version           = '0.5.1'
   s.date              = '2011-02-11'
   s.rubyforge_project = 'excon'
 

data/lib/excon.rb

@@ -13,23 +13,13 @@ require 'excon/response'
 
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 
   unless const_defined?(:CHUNK_SIZE)
     CHUNK_SIZE = 1048576 # 1 megabyte
   end
 
-  # @see Connection#initialize
-  # Initializes a new keep-alive session for a given remote host
-  #   @param [String] url The destination URL
-  #   @param [Hash<Symbol, >] params One or more option params to set on the Connection instance
-  #   @return [Connection] A new Excon::Connection instance
-  def self.new(url, params = {})
-    Excon::Connection.new(url, params)
-  end
-
-  # Class-level instance variables and generic HTTP methods
   class << self
     # @return [String] The filesystem path to the SSL Certificate Authority
     attr_accessor :ssl_ca_path
@@ -40,6 +30,22 @@ module Excon
     # setup ssl defaults based on platform
     @ssl_verify_peer = Config::CONFIG['host_os'] !~ /mswin|win32|dos|cygwin|mingw/i
 
+    # @see Connection#initialize
+    # Initializes a new keep-alive session for a given remote host
+    #   @param [String] url The destination URL
+    #   @param [Hash<Symbol, >] params One or more option params to set on the Connection instance
+    #   @return [Connection] A new Excon::Connection instance
+    def new(url, params = {})
+      Excon::Connection.new(url, params)
+    end
+
+    # Change the status of ssl peer verification
+    # @see Excon#ssl_verify_peer (attr_reader)
+    def ssl_verify_peer=(new_ssl_verify_peer)
+      @ssl_verify_peer = new_ssl_verify_peer && true || false
+    end
+
+    # Generic non-persistent HTTP methods
     %w{connect delete get head options post put trace}.each do |method|
       eval <<-DEF
         def #{method}(url, params = {}, &block)
@@ -48,10 +54,4 @@ module Excon
       DEF
     end
   end
-
-  # Change the status of ssl peer verification
-  # @see Excon#ssl_verify_peer (attr_reader)
-  def self.ssl_verify_peer=(new_ssl_verify_peer)
-    @ssl_verify_peer = new_ssl_verify_peer && true || false
-  end
 end

data/lib/excon/response.rb

@@ -10,6 +10,7 @@ module Excon
 
     def self.parse(socket, params={})
       response = new(:status => socket.readline[9, 11].to_i)
+      block_given = block_given?
 
       while true
         (data = socket.readline).chop!
@@ -24,48 +25,47 @@ module Excon
 
       unless params[:method].to_s.casecmp('HEAD') == 0
 
-        if response.headers.has_key?('Transfer-Encoding') && response.headers['Transfer-Encoding'].casecmp('chunked') == 0
-          while true
-            chunk_size = socket.readline.chop!.to_i(16)
-
-            break if chunk_size < 1
-                                          # 2 == "/r/n".length
-            (chunk = socket.read(chunk_size+2)).chop!
+        # don't pass stuff into a block if there was an error
+        if params[:expects] && ![*params[:expects]].include?(response.status)
+          block_given = false
+        end
 
-            if block_given?
-              yield chunk
-            else
-              response.body << chunk
+        if block_given
+          if response.headers.has_key?('Transfer-Encoding') && response.headers['Transfer-Encoding'].casecmp('chunked') == 0
+            while true
+              chunk_size = socket.readline.chop!.to_i(16)
+              break if chunk_size < 1
+              yield socket.read(chunk_size+2).chop! # 2 == "/r/n".length
+            end
+          elsif response.headers.has_key?('Connection') && response.headers['Connection'].casecmp('close') == 0
+            yield socket.read
+          elsif response.headers.has_key?('Content-Length')
+            remaining = response.headers['Content-Length'].to_i
+            while remaining > 0
+              yield socket.read([CHUNK_SIZE, remaining].min)
+              remaining -= CHUNK_SIZE
             end
           end
-
-        elsif response.headers.has_key?('Connection') && response.headers['Connection'].casecmp('close') == 0
-          chunk = socket.read
-
-          if block_given?
-            yield chunk
-          else
-            response.body << chunk
-          end
-
-        elsif response.headers.has_key?('Content-Length')
-          remaining = response.headers['Content-Length'].to_i
-
-          while remaining > 0
-            chunk = socket.read([CHUNK_SIZE, remaining].min)
-
-            if block_given?
-              yield chunk
-            else
-              response.body << chunk
+        else
+          if response.headers.has_key?('Transfer-Encoding') && response.headers['Transfer-Encoding'].casecmp('chunked') == 0
+            while true
+              chunk_size = socket.readline.chop!.to_i(16)
+              break if chunk_size < 1
+              response.body << socket.read(chunk_size + 2).chop! # 2 == "/r/n".length
+            end
+          elsif response.headers.has_key?('Connection') && response.headers['Connection'].casecmp('close') == 0
+            response.body << socket.read
+          elsif response.headers.has_key?('Content-Length')
+            remaining = response.headers['Content-Length'].to_i
+            while remaining > 0
+              response.body << socket.read([CHUNK_SIZE, remaining].min)
+              remaining -= CHUNK_SIZE
             end
-
-            remaining -= CHUNK_SIZE
           end
         end
       end
 
-      return response
+      response
     end
 
   end # class Response

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - geemus (Wesley Beary)