excon 0.3.3 → 0.3.4

data/benchmarks/merging.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'tach'
+
+Tach.meter(10_000) do
+
+  tach('merge') do
+    default = { :a => 1, :b => 2 }
+    override = { :b => 3, :c => 4 }
+    override = default.merge(override)
+  end
+
+  tach('loop') do
+    default = { :a => 1, :b => 2 }
+    override = { :b => 3, :c => 4 }
+    for key, value in default
+      override[key] ||= default[key]
+    end
+    override
+  end
+
+end

data/benchmarks/vs_stdlib.rb

@@ -0,0 +1,82 @@
+require 'rubygems' if RUBY_VERSION < '1.9'
+
+require 'sinatra/base'
+require 'tach'
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'excon')
+
+module Excon
+  class Server < Sinatra::Base
+
+    def self.run
+      Rack::Handler::WEBrick.run(
+        Excon::Server.new,
+        :Port => 9292,
+        :AccessLog => [],
+        :Logger => WEBrick::Log.new(nil, WEBrick::Log::ERROR)
+      )
+    end
+
+    get '/data/:amount' do |amount|
+      'x' * amount.to_i
+    end
+
+  end
+end
+
+def with_server(&block)
+  pid = Process.fork do
+    Excon::Server.run
+  end
+  loop do
+    sleep(1)
+    begin
+      Excon.get('http://localhost:9292/api/foo')
+      break
+    rescue
+    end
+  end
+  yield
+ensure
+  Process.kill(9, pid)
+end
+
+require 'net/http'
+require 'open-uri'
+
+url = 'http://localhost:9292/data/1000'
+
+with_server do
+
+  Tach.meter(100) do
+
+    tach('Excon') do
+      Excon.get(url).body
+    end
+
+#    tach('Excon (persistent)') do |times|
+#      excon = Excon.new(url)
+#      times.times do
+#        excon.request(:method => 'get').body
+#      end
+#    end
+
+    tach('Net::HTTP') do
+      # Net::HTTP.get('localhost', '/data/1000', 9292)
+      Net::HTTP.start('localhost', 9292) {|http| http.get('/data/1000').body }
+    end
+
+#    tach('Net::HTTP (persistent)') do |times|
+#      Net::HTTP.start('localhost', 9292) do |http|
+#        times.times do
+#          http.get('/data/1000').body
+#        end
+#      end
+#    end
+
+#    tach('open-uri') do
+#      open(url).read
+#    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.3.3'
-  s.date              = '2010-12-10'
+  s.version           = '0.3.4'
+  s.date              = '2010-12-13'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -70,7 +70,9 @@ Gem::Specification.new do |s|
     benchmarks/cr_lf.rb
     benchmarks/excon_vs.rb
     benchmarks/headers_split_vs_match.rb
+    benchmarks/merging.rb
     benchmarks/strip_newline.rb
+    benchmarks/vs_stdlib.rb
     excon.gemspec
     lib/excon.rb
     lib/excon/connection.rb

data/lib/excon.rb

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

data/lib/excon/connection.rb

@@ -26,7 +26,7 @@ module Excon
         :query    => uri.query,
         :scheme   => uri.scheme
       }.merge!(params)
-      set_socket_key
+      @socket_key = "#{@connection[:host]}:#{@connection[:port]}"
       reset
     end
 
@@ -90,8 +90,10 @@ module Excon
         end
 
         # add headers to request
-        for key, value in params[:headers]
-          request << key.to_s << ': ' << value.to_s << CR_NL
+        for key, values in params[:headers]
+          for value in [*values]
+            request << key.to_s << ': ' << value.to_s << CR_NL
+          end
         end
 
         # add additional "\r\n" to indicate end of headers
@@ -146,7 +148,7 @@ module Excon
     end
 
     def reset
-      (old_socket = sockets.delete(socket_key)) && old_socket.close
+      (old_socket = sockets.delete(@socket_key)) && old_socket.close
     end
 
     private
@@ -178,26 +180,19 @@ module Excon
     end
 
     def closed?
-      sockets[socket_key] && sockets[socket_key].closed?
+      sockets[@socket_key] && sockets[@socket_key].closed?
     end
 
     def socket
       if closed?
         reset
       end
-      sockets[socket_key] ||= connect
+      sockets[@socket_key] ||= connect
     end
 
     def sockets
       Thread.current[:_excon_sockets] ||= {}
     end
 
-    def socket_key
-      @connection[:socket_key]
-    end
-
-    def set_socket_key
-      @connection[:socket_key] = "#{@connection[:host]}:#{@connection[:port]}"
-    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -08:00
+date: 2010-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,9 @@ files:
 - benchmarks/cr_lf.rb
 - benchmarks/excon_vs.rb
 - benchmarks/headers_split_vs_match.rb
+- benchmarks/merging.rb
 - benchmarks/strip_newline.rb
+- benchmarks/vs_stdlib.rb
 - excon.gemspec
 - lib/excon.rb
 - lib/excon/connection.rb