excon 0.5.2 → 0.5.3

data/Gemfile.lock

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

data/benchmarks/headers_case_sensitivity.rb

@@ -0,0 +1,83 @@
+require 'rubygems'
+require 'stringio'
+require 'tach'
+
+def all_match_socket
+  io = StringIO.new
+  io << "Connection: close\n"
+  io << "Content-Length: 000\n"
+  io << "Content-Type: text/html\n"
+  io << "Date: Xxx, 00 Xxx 0000 00:00:00 GMT\n"
+  io << "Server: xxx\n"
+  io << "Transfer-Encoding: chunked\n"
+  io << "\n\n"
+  io.rewind
+  io
+end
+
+Formatador.display_line('all_match')
+Formatador.indent do
+  Tach.meter(10_000) do
+    tach('compare on read') do
+      socket, headers = all_match_socket, {}
+      until ((data = socket.readline).chop!).empty?
+        key, value = data.split(': ')
+        headers[key] = value
+        (key.casecmp('Transfer-Encoding') == 0) && (value.casecmp('chunked') == 0)
+        (key.casecmp('Connection') == 0) && (value.casecmp('close') == 0)
+        (key.casecmp('Content-Length') == 0)
+      end
+    end
+
+    tach('original') do
+      socket, headers = all_match_socket, {}
+      until ((data = socket.readline).chop!).empty?
+        key, value = data.split(': ')
+        headers[key] = value
+      end
+      headers.has_key?('Transfer-Encoding') && headers['Transfer-Encoding'].casecmp('chunked') == 0
+      headers.has_key?('Connection') && headers['Connection'].casecmp('close') == 0
+      headers.has_key?('Content-Length')
+    end
+  end
+end
+
+def none_match_socket
+  io = StringIO.new
+  io << "Cache-Control: max-age=0\n"
+  io << "Content-Type: text/html\n"
+  io << "Date: Xxx, 00 Xxx 0000 00:00:00 GMT\n"
+  io << "Expires: Xxx, 00 Xxx 0000 00:00:00 GMT\n"
+  io << "Last-Modified: Xxx, 00 Xxx 0000 00:00:00 GMT\n"
+  io << "Server: xxx\n"
+  io << "\n\n"
+  io.rewind
+  io
+end
+
+Formatador.display_line('none_match')
+Formatador.indent do
+  Tach.meter(10_000) do
+    tach('compare on read') do
+      socket, headers = none_match_socket, {}
+      until ((data = socket.readline).chop!).empty?
+        key, value = data.split(': ')
+        headers[key] = value
+        (key.casecmp('Transfer-Encoding') == 0) && (value.casecmp('chunked') == 0)
+        (key.casecmp('Connection') == 0) && (value.casecmp('close') == 0)
+        (key.casecmp('Content-Length') == 0)
+      end
+    end
+
+    tach('original') do
+      socket, headers = none_match_socket, {}
+      until ((data = socket.readline).chop!).empty?
+        key, value = data.split(': ')
+        headers[key] = value
+      end
+      headers.has_key?('Transfer-Encoding') && headers['Transfer-Encoding'].casecmp('chunked') == 0
+      headers.has_key?('Connection') && headers['Connection'].casecmp('close') == 0
+      headers.has_key?('Content-Length')
+    end
+  end
+end

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.5.2'
-  s.date              = '2011-02-11'
+  s.version           = '0.5.3'
+  s.date              = '2011-02-17'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
     benchmarks/downcase-eq-eq_vs_casecmp.rb
     benchmarks/excon_vs.rb
     benchmarks/has_key-vs-hash[key].rb
+    benchmarks/headers_case_sensitivity.rb
     benchmarks/headers_split_vs_match.rb
     benchmarks/implicit_block-vs-explicit_block.rb
     benchmarks/merging.rb

data/lib/excon.rb

@@ -13,7 +13,7 @@ require 'excon/response'
 
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.5.2'
+    VERSION = '0.5.3'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/connection.rb

@@ -137,7 +137,7 @@ module Excon
       end
 
     rescue => request_error
-      if params.has_key?(:idempotent) &&
+      if params[:idempotent] &&
           (request_error.is_a?(Excon::Errors::SocketError) ||
           (request_error.is_a?(Excon::Errors::HTTPStatusError) && response.status != 404))
         retries_remaining ||= 4

data/lib/excon/response.rb

@@ -12,14 +12,15 @@ module Excon
       response = new(:status => socket.readline[9, 11].to_i)
       block_given = block_given?
 
-      while true
-        (data = socket.readline).chop!
-
-        unless data.empty?
-          key, value = data.split(': ')
-          response.headers[key] = value
-        else
-          break
+      until ((data = socket.readline).chop!).empty?
+        key, value = data.split(': ')
+        response.headers[key] = value
+        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
+        elsif (key.casecmp('Connection') == 0) && (value.casecmp('close') == 0)
+          @connection_close = true
         end
       end
 
@@ -31,30 +32,30 @@ module Excon
         end
 
         if block_given
-          if response.headers.has_key?('Transfer-Encoding') && response.headers['Transfer-Encoding'].casecmp('chunked') == 0
+          if @transfer_encoding_chunked
             while (chunk_size = socket.readline.chop!.to_i(16)) > 0
               yield socket.read(chunk_size + 2).chop! # 2 == "/r/n".length
             end
             socket.read(2) # 2 == "/r/n".length
-          elsif response.headers.has_key?('Connection') && response.headers['Connection'].casecmp('close') == 0
+          elsif @connection_close
             yield socket.read
-          elsif response.headers.has_key?('Content-Length')
-            remaining = response.headers['Content-Length'].to_i
+          else
+            remaining = @content_length
             while remaining > 0
               yield socket.read([CHUNK_SIZE, remaining].min)
               remaining -= CHUNK_SIZE
             end
           end
         else
-          if response.headers.has_key?('Transfer-Encoding') && response.headers['Transfer-Encoding'].casecmp('chunked') == 0
+          if @transfer_encoding_chunked
             while (chunk_size = socket.readline.chop!.to_i(16)) > 0
               response.body << socket.read(chunk_size + 2).chop! # 2 == "/r/n".length
             end
             socket.read(2) # 2 == "/r/n".length
-          elsif response.headers.has_key?('Connection') && response.headers['Connection'].casecmp('close') == 0
+          elsif @connection_close
             response.body << socket.read
-          elsif response.headers.has_key?('Content-Length')
-            remaining = response.headers['Content-Length'].to_i
+          else
+            remaining = @content_length
             while remaining > 0
               response.body << socket.read([CHUNK_SIZE, remaining].min)
               remaining -= CHUNK_SIZE

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -08:00
+date: 2011-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - benchmarks/downcase-eq-eq_vs_casecmp.rb
 - benchmarks/excon_vs.rb
 - benchmarks/has_key-vs-hash[key].rb
+- benchmarks/headers_case_sensitivity.rb
 - benchmarks/headers_split_vs_match.rb
 - benchmarks/implicit_block-vs-explicit_block.rb
 - benchmarks/merging.rb
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: excon
-rubygems_version: 1.5.0
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)