excon 0.4.0 → 0.5.0

data/Gemfile.lock

@@ -0,0 +1,55 @@
+PATH
+  remote: .
+  specs:
+    excon (0.4.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.2)
+    crack (0.1.8)
+    curb (0.7.8)
+    curl_ffi (0.0.8)
+      ffi
+    em-http-request (0.2.15)
+      addressable (>= 2.0.0)
+      eventmachine (>= 0.12.9)
+    eventmachine (0.12.10)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    formatador (0.0.16)
+    httparty (0.6.1)
+      crack (= 0.1.8)
+    mime-types (1.16)
+    open4 (1.0.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    shindo (0.2.0)
+      formatador (>= 0.0.16)
+    sinatra (1.1.0)
+      rack (~> 1.1)
+      tilt (~> 1.1)
+    streamly_ffi (0.2.6)
+      curl_ffi
+    tach (0.0.8)
+      formatador (>= 0.0.16)
+    tilt (1.1)
+    typhoeus (0.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  curb
+  em-http-request
+  excon!
+  httparty
+  open4
+  rest-client
+  shindo (= 0.2.0)
+  sinatra
+  streamly_ffi
+  tach (= 0.0.8)
+  typhoeus

data/README.rdoc

@@ -6,47 +6,45 @@ Http(s) EXtended CONnections
 
   sudo gem install excon
 
-Now you are ready to get started, easiest is to use one off requests to start.
+Now you are ready to get started using one off requests.
 
   require 'rubygems'
   require 'excon'
   Excon.get('http://geemus.com')
 
-This will return a response object, which has body, headers and status attributes you can check out.
+The returned response object has #body, #headers and #status attributes. Supported one off requests are #connect, #delete, #get, #head, #options, #post, #put, and #trace
 
-This supports all the major http verbs: [connect, delete, get, head, options, post, put, trace]
-
-You can also create a connection to try and keep open across multiple requests (more performant!).
+You can also create a connection to reuse across multiple requests (more performant!).
 
   connection = Excon.new('http://geemus.com')
   connection.request(:method => 'GET')
 
-You can also specify more complicated options to either style of call
+Both one off and persistent connections also support many other options, for example:
 
   Excon.get('http://geemus.com', :headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
   # or
   connection.request(:method => 'GET', :headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
 
-If you need to do something special with a response you can also pass a block that will be called with each chunk.
+You can also stream responses by passing a block that will receive each chunk.
 
   Excon.get('http://geemus.com') {|chunk| p chunk }
 
-From there you should be able to make just about any request you might need.
+These options can be combined to make pretty much any request you might need.
 
 == HTTPS/SSL Issues
 
-On some systems the default ssl peer certificate verification won't work.  You can either set a different path to certificates:
+By default excon will try to verify peer certificates when using ssl for https, unfortunately on some operating systems the defaults will not work. This will likely manifest itself as something like "Excon::Errors::SocketError: SSL_connect returned=1 ..."
+
+If you have the misfortune of running into this problem you have a couple options. First, if you have certificates in a location that defaults fail to locate you can set a different path to certificates:
 
-  require 'rubygems'
-  require 'excon'
   Excon.ssl_ca_path = '/path/to/certs'
 
-or, simply turn peer verification off (less secure):
+or failing that, you can turn off peer verification (less secure):
 
-  require 'rubygems'
-  require 'excon'
   Excon.ssl_verify_peer = false
 
+Either of these should allow you to work around the socket error and continue with getting your work done.
+
 == Copyright
 
 (The MIT License)

data/benchmarks/downcase-eq-eq_vs_casecmp.rb

@@ -0,0 +1,169 @@
+# Copied from my benchmark_hell repo: github.com/sgonyea/benchmark_hell
+
+require 'benchmark'
+
+iters = 1000000
+
+comp  = "hello"
+hello = "HelLo"
+
+puts 'String#downcase == vs. String#casecmp'
+Benchmark.bmbm do |x|
+  x.report('String#downcase1') do
+    iters.times.each do
+      hello.downcase == comp
+    end
+  end
+
+  x.report('String#downcase2') do
+    iters.times.each do
+      "HelLo".downcase == "hello"
+    end
+  end
+
+  x.report('String#downcase3') do
+    iters.times.each do
+      var = "HelLo"
+      var.downcase!
+      var == "hello"
+    end
+  end
+
+  x.report('casecmp1') do
+    iters.times.each do
+      hello.casecmp(comp).zero?
+    end
+  end
+
+  x.report('casecmp1-1') do
+    iters.times.each do
+      hello.casecmp(comp) == 0
+    end
+  end
+
+  x.report('casecmp2') do
+    iters.times.each do
+      "HelLo".casecmp(comp).zero?
+    end
+  end
+
+  x.report('casecmp2-1') do
+    iters.times.each do
+      "HelLo".casecmp(comp) == 0
+    end
+  end
+end
+
+=begin
+rvm exec bash -c 'echo && echo $RUBY_VERSION && echo && ruby downcase-eq-eq_vs_casecmp.rb'
+
+jruby-1.5.6
+
+String#downcase == vs. String#casecmp
+Rehearsal ----------------------------------------------------
+String#downcase1   0.461000   0.000000   0.461000 (  0.387000)
+String#downcase2   0.269000   0.000000   0.269000 (  0.269000)
+String#downcase3   0.224000   0.000000   0.224000 (  0.224000)
+casecmp1           0.157000   0.000000   0.157000 (  0.157000)
+casecmp1-1         0.153000   0.000000   0.153000 (  0.153000)
+casecmp2           0.163000   0.000000   0.163000 (  0.163000)
+casecmp2-1         0.163000   0.000000   0.163000 (  0.163000)
+------------------------------------------- total: 1.590000sec
+
+                       user     system      total        real
+String#downcase1   0.190000   0.000000   0.190000 (  0.191000)
+String#downcase2   0.225000   0.000000   0.225000 (  0.225000)
+String#downcase3   0.190000   0.000000   0.190000 (  0.190000)
+casecmp1           0.125000   0.000000   0.125000 (  0.125000)
+casecmp1-1         0.127000   0.000000   0.127000 (  0.127000)
+casecmp2           0.144000   0.000000   0.144000 (  0.144000)
+casecmp2-1         0.147000   0.000000   0.147000 (  0.147000)
+
+macruby-0.7.1
+
+String#downcase == vs. String#casecmp
+Rehearsal ----------------------------------------------------
+String#downcase1   2.340000   0.040000   2.380000 (  1.765141)
+String#downcase2   5.510000   0.100000   5.610000 (  3.893249)
+String#downcase3   4.200000   0.080000   4.280000 (  3.031621)
+casecmp1           0.270000   0.000000   0.270000 (  0.267613)
+casecmp1-1         0.190000   0.000000   0.190000 (  0.188848)
+casecmp2           1.450000   0.020000   1.470000 (  1.027956)
+casecmp2-1         1.380000   0.030000   1.410000 (  0.951474)
+------------------------------------------ total: 15.610000sec
+
+                       user     system      total        real
+String#downcase1   2.350000   0.040000   2.390000 (  1.774292)
+String#downcase2   5.890000   0.120000   6.010000 (  4.214038)
+String#downcase3   4.530000   0.090000   4.620000 (  3.286059)
+casecmp1           0.270000   0.000000   0.270000 (  0.271119)
+casecmp1-1         0.190000   0.000000   0.190000 (  0.189462)
+casecmp2           1.540000   0.030000   1.570000 (  1.104751)
+casecmp2-1         1.440000   0.030000   1.470000 (  0.999689)
+
+rbx-head
+
+String#downcase == vs. String#casecmp
+Rehearsal ----------------------------------------------------
+String#downcase1   0.702746   0.005229   0.707975 (  0.621969)
+String#downcase2   0.701429   0.001617   0.703046 (  0.691833)
+String#downcase3   1.042835   0.002952   1.045787 (  0.953992)
+casecmp1           0.654571   0.002239   0.656810 (  0.480158)
+casecmp1-1         0.484706   0.001105   0.485811 (  0.398601)
+casecmp2           0.564140   0.001579   0.565719 (  0.545332)
+casecmp2-1         0.554889   0.001153   0.556042 (  0.539569)
+------------------------------------------- total: 4.721190sec
+
+                       user     system      total        real
+String#downcase1   0.491199   0.001081   0.492280 (  0.493727)
+String#downcase2   0.631059   0.001018   0.632077 (  0.629885)
+String#downcase3   0.968867   0.002504   0.971371 (  0.976734)
+casecmp1           0.364496   0.000434   0.364930 (  0.365262)
+casecmp1-1         0.373140   0.000562   0.373702 (  0.374136)
+casecmp2           0.487644   0.001057   0.488701 (  0.490302)
+casecmp2-1         0.469868   0.001178   0.471046 (  0.472220)
+
+ruby-1.8.7-p330
+
+String#downcase == vs. String#casecmp
+Rehearsal ----------------------------------------------------
+String#downcase1   0.780000   0.000000   0.780000 (  0.783979)
+String#downcase2   0.950000   0.000000   0.950000 (  0.954109)
+String#downcase3   0.960000   0.000000   0.960000 (  0.960554)
+casecmp1           0.440000   0.000000   0.440000 (  0.442546)
+casecmp1-1         0.490000   0.000000   0.490000 (  0.487795)
+casecmp2           0.530000   0.000000   0.530000 (  0.535819)
+casecmp2-1         0.570000   0.000000   0.570000 (  0.574653)
+------------------------------------------- total: 4.720000sec
+
+                       user     system      total        real
+String#downcase1   0.780000   0.000000   0.780000 (  0.780692)
+String#downcase2   0.980000   0.010000   0.990000 (  0.982925)
+String#downcase3   0.960000   0.000000   0.960000 (  0.961501)
+casecmp1           0.440000   0.000000   0.440000 (  0.444528)
+casecmp1-1         0.490000   0.000000   0.490000 (  0.487437)
+casecmp2           0.540000   0.000000   0.540000 (  0.537686)
+casecmp2-1         0.570000   0.000000   0.570000 (  0.574253)
+
+ruby-1.9.2-p136
+
+String#downcase == vs. String#casecmp
+Rehearsal ----------------------------------------------------
+String#downcase1   0.750000   0.000000   0.750000 (  0.750523)
+String#downcase2   1.190000   0.000000   1.190000 (  1.193346)
+String#downcase3   1.030000   0.010000   1.040000 (  1.036435)
+casecmp1           0.640000   0.000000   0.640000 (  0.640327)
+casecmp1-1         0.480000   0.000000   0.480000 (  0.484709)  # With all this crap running, some flukes pop out
+casecmp2           0.820000   0.000000   0.820000 (  0.822223)
+casecmp2-1         0.660000   0.000000   0.660000 (  0.664190)
+------------------------------------------- total: 5.580000sec
+
+                       user     system      total        real
+String#downcase1   0.760000   0.000000   0.760000 (  0.759816)
+String#downcase2   1.150000   0.010000   1.160000 (  1.150792)
+String#downcase3   1.000000   0.000000   1.000000 (  1.005549)
+casecmp1           0.650000   0.000000   0.650000 (  0.644021)
+casecmp1-1         0.490000   0.000000   0.490000 (  0.494456)
+casecmp2           0.820000   0.000000   0.820000 (  0.817689)
+casecmp2-1         0.680000   0.000000   0.680000 (  0.685121)
+=end

data/benchmarks/has_key-vs-hash[key].rb

@@ -0,0 +1,177 @@
+# Copied from my benchmark_hell repo: github.com/sgonyea/benchmark_hell
+
+require 'benchmark'
+
+iters = 1000000
+hash  = {
+  'some_key' => 'some_val',
+  'nil_key' => nil
+}
+
+puts 'Hash#has_key vs. Hash#[]'
+Benchmark.bmbm do |x|
+  x.report('Hash#has_key') do
+    iters.times.each do
+      hash.has_key? 'some_key'
+    end
+  end
+
+  x.report('Hash#has_key (if statement)') do
+    iters.times.each do
+      if hash.has_key?('other_key')
+        "hooray!"
+      end
+    end
+  end
+  
+  x.report('Hash#has_key (non-existant)') do
+    iters.times.each do
+      hash.has_key? 'other_key'
+    end
+  end
+
+  x.report('Hash#[]') do
+    iters.times.each do
+      hash['some_key']
+    end
+  end
+
+  x.report('Hash#[] (if statement)') do
+    iters.times.each do
+      if hash['some_key']
+        "hooray!"
+      end
+    end
+  end
+
+  x.report('Hash#[] (non-existant)') do
+    iters.times.each do
+      hash['other_key']
+    end
+  end
+  
+  x.report('Hash#has_key (if statement) explicit nil check') do
+    iters.times.each do
+      if hash.has_key?('nil_key') && !hash['nil_key'].nil?
+        "hooray!"
+      end
+    end
+  end
+  
+  
+  x.report('Hash#has_key (if statement) implicit nil check') do
+    iters.times.each do
+      if hash.has_key?('nil_key') && hash['nil_key']
+        "hooray!"
+      end
+    end
+  end
+  
+  x.report('Hash#[] (if statement with nil)') do
+    iters.times.each do
+      if hash['nil_key']
+        "hooray!"
+      end
+    end
+  end
+end
+
+=begin
+
+$ rvm exec bash -c 'echo $RUBY_VERSION && ruby has_key-vs-hash\[key\].rb'
+
+jruby-1.5.6
+Hash#has_key vs. Hash#[]
+Rehearsal ---------------------------------------------------------------
+Hash#has_key                  0.410000   0.000000   0.410000 (  0.341000)
+Hash#has_key (if statement)   0.145000   0.000000   0.145000 (  0.145000)
+Hash#has_key (non-existant)   0.116000   0.000000   0.116000 (  0.116000)
+Hash#[]                       0.189000   0.000000   0.189000 (  0.189000)
+Hash#[] (if statement)        0.176000   0.000000   0.176000 (  0.176000)
+Hash#[] (non-existant)        0.302000   0.000000   0.302000 (  0.302000)
+------------------------------------------------------ total: 1.338000sec
+
+                                  user     system      total        real
+Hash#has_key                  0.128000   0.000000   0.128000 (  0.128000)
+Hash#has_key (if statement)   0.128000   0.000000   0.128000 (  0.128000)
+Hash#has_key (non-existant)   0.153000   0.000000   0.153000 (  0.153000)
+Hash#[]                       0.206000   0.000000   0.206000 (  0.206000)
+Hash#[] (if statement)        0.182000   0.000000   0.182000 (  0.182000)
+Hash#[] (non-existant)        0.252000   0.000000   0.252000 (  0.252000)
+
+macruby-0.7.1
+Hash#has_key vs. Hash#[]
+Rehearsal ---------------------------------------------------------------
+Hash#has_key                  2.530000   0.050000   2.580000 (  1.917643)
+Hash#has_key (if statement)   2.590000   0.050000   2.640000 (  1.935221)
+Hash#has_key (non-existant)   2.580000   0.050000   2.630000 (  1.964230)
+Hash#[]                       2.240000   0.040000   2.280000 (  1.640999)
+Hash#[] (if statement)        3.620000   0.070000   3.690000 (  2.530248)
+Hash#[] (non-existant)        2.060000   0.040000   2.100000 (  1.473487)
+----------------------------------------------------- total: 15.920000sec
+
+                                  user     system      total        real
+Hash#has_key                  2.230000   0.030000   2.260000 (  1.661843)
+Hash#has_key (if statement)   2.180000   0.040000   2.220000 (  1.605644)
+Hash#has_key (non-existant)   2.160000   0.040000   2.200000 (  1.582561)
+Hash#[]                       2.160000   0.030000   2.190000 (  1.581448)
+Hash#[] (if statement)        3.440000   0.070000   3.510000 (  2.393421)
+Hash#[] (non-existant)        2.330000   0.040000   2.370000 (  1.699338)
+
+rbx-head
+Hash#has_key vs. Hash#[]
+Rehearsal ---------------------------------------------------------------
+Hash#has_key                  0.660584   0.004932   0.665516 (  0.508601)
+Hash#has_key (if statement)   0.261708   0.000532   0.262240 (  0.263021)
+Hash#has_key (non-existant)   0.265908   0.000827   0.266735 (  0.259509)
+Hash#[]                       0.396607   0.001189   0.397796 (  0.372997)
+Hash#[] (if statement)        0.553003   0.001589   0.554592 (  0.543859)
+Hash#[] (non-existant)        0.323748   0.000884   0.324632 (  0.319055)
+------------------------------------------------------ total: 2.471511sec
+
+                                  user     system      total        real
+Hash#has_key                  0.332239   0.000819   0.333058 (  0.333809)
+Hash#has_key (if statement)   0.284344   0.000521   0.284865 (  0.285330)
+Hash#has_key (non-existant)   0.339695   0.001301   0.340996 (  0.324259)
+Hash#[]                       0.298555   0.000368   0.298923 (  0.299557)
+Hash#[] (if statement)        0.392755   0.000773   0.393528 (  0.395473)
+Hash#[] (non-existant)        0.277721   0.000464   0.278185 (  0.278540)
+
+ruby-1.8.7-p330
+Hash#has_key vs. Hash#[]
+Rehearsal ---------------------------------------------------------------
+Hash#has_key                  0.450000   0.000000   0.450000 (  0.450143)
+Hash#has_key (if statement)   0.440000   0.000000   0.440000 (  0.448278)
+Hash#has_key (non-existant)   0.420000   0.000000   0.420000 (  0.416959)
+Hash#[]                       0.450000   0.000000   0.450000 (  0.450727)
+Hash#[] (if statement)        0.550000   0.000000   0.550000 (  0.555043)
+Hash#[] (non-existant)        0.530000   0.000000   0.530000 (  0.527189)
+------------------------------------------------------ total: 2.840000sec
+
+                                  user     system      total        real
+Hash#has_key                  0.440000   0.000000   0.440000 (  0.447746)
+Hash#has_key (if statement)   0.450000   0.000000   0.450000 (  0.450331)
+Hash#has_key (non-existant)   0.420000   0.000000   0.420000 (  0.419157)
+Hash#[]                       0.450000   0.000000   0.450000 (  0.454438)
+Hash#[] (if statement)        0.570000   0.000000   0.570000 (  0.563948)
+Hash#[] (non-existant)        0.520000   0.000000   0.520000 (  0.527866)
+
+ruby-1.9.2-p136
+Hash#has_key vs. Hash#[]
+Rehearsal ---------------------------------------------------------------
+Hash#has_key                  0.690000   0.000000   0.690000 (  0.691657)
+Hash#has_key (if statement)   0.630000   0.000000   0.630000 (  0.638418)
+Hash#has_key (non-existant)   0.640000   0.000000   0.640000 (  0.637510)
+Hash#[]                       0.580000   0.000000   0.580000 (  0.584500)
+Hash#[] (if statement)        0.840000   0.010000   0.850000 (  0.837541)
+Hash#[] (non-existant)        0.810000   0.000000   0.810000 (  0.811598)
+------------------------------------------------------ total: 4.200000sec
+
+                                  user     system      total        real
+Hash#has_key                  0.690000   0.000000   0.690000 (  0.694192)
+Hash#has_key (if statement)   0.640000   0.000000   0.640000 (  0.641729)
+Hash#has_key (non-existant)   0.630000   0.000000   0.630000 (  0.634470)
+Hash#[]                       0.580000   0.000000   0.580000 (  0.587844)
+Hash#[] (if statement)        0.830000   0.000000   0.830000 (  0.832323)
+Hash#[] (non-existant)        0.790000   0.010000   0.800000 (  0.791689)
+=end

data/benchmarks/implicit_block-vs-explicit_block.rb

@@ -0,0 +1,98 @@
+# Copied from my benchmark_hell repo: github.com/sgonyea/benchmark_hell
+
+require 'benchmark'
+
+iters = 1000000
+
+def do_explicit(&block)
+  var = "hello"
+  block.call(var)
+end
+
+def do_implicit
+  var = "hello"
+  yield(var)
+end
+
+puts 'explicit block vs implicit'
+Benchmark.bmbm do |x|
+  x.report('explicit') do
+    iters.times.each do
+      do_explicit {|var|
+        var << "goodbye"
+      }
+    end
+  end
+
+  x.report('implicit') do
+    iters.times.each do
+      do_implicit {|var|
+        var << "goodbye"
+      }
+    end
+  end
+end
+
+=begin
+rvm exec bash -c 'echo && echo $RUBY_VERSION && echo && ruby implicit_block-vs-explicit_block.rb'
+
+jruby-1.5.6
+
+explicit block vs implicit
+Rehearsal --------------------------------------------
+explicit   1.163000   0.000000   1.163000 (  1.106000)
+implicit   0.499000   0.000000   0.499000 (  0.499000)
+----------------------------------- total: 1.662000sec
+
+               user     system      total        real
+explicit   0.730000   0.000000   0.730000 (  0.730000)
+implicit   0.453000   0.000000   0.453000 (  0.453000)
+
+macruby-0.7.1
+
+explicit block vs implicit
+Rehearsal --------------------------------------------
+explicit   5.070000   0.130000   5.200000 (  3.546388)
+implicit   3.140000   0.050000   3.190000 (  2.255986)
+----------------------------------- total: 8.390000sec
+
+               user     system      total        real
+explicit   5.340000   0.140000   5.480000 (  3.774963)
+implicit   3.170000   0.060000   3.230000 (  2.279951)
+
+rbx-head
+
+explicit block vs implicit
+Rehearsal --------------------------------------------
+explicit   1.270136   0.006507   1.276643 (  1.181588)
+implicit   0.839831   0.002203   0.842034 (  0.820849)
+----------------------------------- total: 2.118677sec
+
+               user     system      total        real
+explicit   0.960593   0.001526   0.962119 (  0.966404)
+implicit   0.700361   0.001126   0.701487 (  0.703591)
+
+ruby-1.8.7-p330
+
+explicit block vs implicit
+Rehearsal --------------------------------------------
+explicit   3.970000   0.000000   3.970000 (  3.985157)
+implicit   1.560000   0.000000   1.560000 (  1.567599)
+----------------------------------- total: 5.530000sec
+
+               user     system      total        real
+explicit   3.990000   0.010000   4.000000 (  4.002637)
+implicit   1.560000   0.000000   1.560000 (  1.560901)
+
+ruby-1.9.2-p136
+
+explicit block vs implicit
+Rehearsal --------------------------------------------
+explicit   2.620000   0.010000   2.630000 (  2.633762)
+implicit   1.080000   0.000000   1.080000 (  1.076809)
+----------------------------------- total: 3.710000sec
+
+               user     system      total        real
+explicit   2.630000   0.010000   2.640000 (  2.637658)
+implicit   1.070000   0.000000   1.070000 (  1.073589)
+=end

data/benchmarks/string_ranged_index.rb

@@ -0,0 +1,87 @@
+# Copied from my benchmark_hell repo: github.com/sgonyea/benchmark_hell
+
+require 'benchmark'
+
+iters = 1000000
+
+string = "Test String OMG"
+
+puts 'String ranged index vs. "coordinates"'
+Benchmark.bmbm do |x|
+  x.report('ranged index') do
+    iters.times.each do
+      text = string[2..9]
+    end
+  end
+
+  x.report('coordinates') do
+    iters.times.each do
+      text = string[2, 9]
+    end
+  end
+end
+
+=begin
+rvm exec bash -c 'echo && echo $RUBY_VERSION && echo && ruby string_ranged_index.rb'
+
+
+jruby-1.5.6
+
+String ranged index vs. "coordinates"
+Rehearsal ------------------------------------------------
+ranged index   0.419000   0.000000   0.419000 (  0.372000)
+coordinates    0.167000   0.000000   0.167000 (  0.167000)
+--------------------------------------- total: 0.586000sec
+
+                   user     system      total        real
+ranged index   0.158000   0.000000   0.158000 (  0.159000)
+coordinates    0.125000   0.000000   0.125000 (  0.125000)
+
+macruby-0.7.1
+
+String ranged index vs. "coordinates"
+Rehearsal ------------------------------------------------
+ranged index   1.490000   0.030000   1.520000 (  1.061326)
+coordinates    1.410000   0.030000   1.440000 (  0.973640)
+--------------------------------------- total: 2.960000sec
+
+                   user     system      total        real
+ranged index   1.520000   0.030000   1.550000 (  1.081424)
+coordinates    1.480000   0.030000   1.510000 (  1.029214)
+
+rbx-head
+
+String ranged index vs. "coordinates"
+Rehearsal ------------------------------------------------
+ranged index   1.333304   0.009398   1.342702 (  1.229629)
+coordinates    0.306087   0.000603   0.306690 (  0.303538)
+--------------------------------------- total: 1.649392sec
+
+                   user     system      total        real
+ranged index   0.923626   0.001597   0.925223 (  0.927411)
+coordinates    0.298910   0.000533   0.299443 (  0.300255)
+
+ruby-1.8.7-p330
+
+String ranged index vs. "coordinates"
+Rehearsal ------------------------------------------------
+ranged index   0.730000   0.000000   0.730000 (  0.738612)
+coordinates    0.660000   0.000000   0.660000 (  0.660689)
+--------------------------------------- total: 1.390000sec
+
+                   user     system      total        real
+ranged index   0.750000   0.000000   0.750000 (  0.746172)
+coordinates    0.640000   0.000000   0.640000 (  0.640687)
+
+ruby-1.9.2-p136
+
+String ranged index vs. "coordinates"
+Rehearsal ------------------------------------------------
+ranged index   0.670000   0.000000   0.670000 (  0.679046)
+coordinates    0.620000   0.000000   0.620000 (  0.622257)
+--------------------------------------- total: 1.290000sec
+
+                   user     system      total        real
+ranged index   0.680000   0.000000   0.680000 (  0.686510)
+coordinates    0.620000   0.000000   0.620000 (  0.624269)
+=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.4.0'
-  s.date              = '2011-01-12'
+  s.version           = '0.5.0'
+  s.date              = '2011-02-11'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["geemus (Wesley Beary)"]
   s.email    = 'geemus@gmail.com'
-  s.homepage = 'http://github.com/geemus/NAME'
+  s.homepage = 'https://github.com/geemus/excon'
 
   ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   # s.add_development_dependency('DEVDEPNAME', [">= 1.1.0", "< 2.0.0"])
   s.add_development_dependency('open4')
-  s.add_development_dependency('shindo', '0.1.10')
+  s.add_development_dependency('shindo', '0.2.0')
   s.add_development_dependency('sinatra')
 
   ## Leave this section as-is. It will be automatically generated from the
@@ -63,15 +63,20 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
+    Gemfile.lock
     README.rdoc
     Rakefile
     benchmarks/class_vs_lambda.rb
     benchmarks/concat_vs_insert.rb
     benchmarks/concat_vs_interpolate.rb
     benchmarks/cr_lf.rb
+    benchmarks/downcase-eq-eq_vs_casecmp.rb
     benchmarks/excon_vs.rb
+    benchmarks/has_key-vs-hash[key].rb
     benchmarks/headers_split_vs_match.rb
+    benchmarks/implicit_block-vs-explicit_block.rb
     benchmarks/merging.rb
+    benchmarks/string_ranged_index.rb
     benchmarks/strip_newline.rb
     benchmarks/vs_stdlib.rb
     excon.gemspec
@@ -79,9 +84,11 @@ Gem::Specification.new do |s|
     lib/excon/connection.rb
     lib/excon/errors.rb
     lib/excon/response.rb
-    tests/config.ru
+    tests/basic_tests.rb
+    tests/rackups/basic.ru
+    tests/rackups/thread_safety.ru
     tests/test_helper.rb
-    tests/threaded_tests.rb
+    tests/thread_safety_tests.rb
   ]
   # = MANIFEST =
 

data/lib/excon.rb

@@ -12,44 +12,16 @@ require 'excon/errors'
 require 'excon/response'
 
 module Excon
-
   unless const_defined?(:VERSION)
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 
   unless const_defined?(:CHUNK_SIZE)
     CHUNK_SIZE = 1048576 # 1 megabyte
   end
 
-  def self.ssl_ca_path
-    @ssl_ca_path
-  end
-
-  def self.ssl_ca_path=(new_ssl_ca_path)
-    @ssl_ca_path = new_ssl_ca_path
-  end
-
-  # setup ssl defaults based on platform
-  case Config::CONFIG['host_os']
-  when /mswin|win32|dos|cygwin|mingw/i
-    @ssl_verify_peer = false
-  else
-    @ssl_verify_peer = true
-  end
-
-  # Status of ssl peer verification
-  def self.ssl_verify_peer
-    @ssl_verify_peer
-  end
-
-  # change the status of ssl peer verification
-  def self.ssl_verify_peer=(new_ssl_verify_peer)
-    @ssl_verify_peer = new_ssl_verify_peer
-  end
-
   # @see Connection#initialize
-  #  Initializes a new keep-alive session for a given remote host
-  #
+  # 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
@@ -57,12 +29,29 @@ module Excon
     Excon::Connection.new(url, params)
   end
 
-  %w{connect delete get head options post put trace}.each do |method|
-    eval <<-DEF
-      def self.#{method}(url, params = {}, &block)
-        new(url).request(params.merge!(:method => :#{method}), &block)
-      end
-    DEF
+  # 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
+
+    # @return [true, false] Whether or not to verify the peer's SSL certificate / chain
+    attr_reader :ssl_verify_peer
+
+    # setup ssl defaults based on platform
+    @ssl_verify_peer = Config::CONFIG['host_os'] !~ /mswin|win32|dos|cygwin|mingw/i
+
+    %w{connect delete get head options post put trace}.each do |method|
+      eval <<-DEF
+        def #{method}(url, params = {}, &block)
+          new(url).request(params.merge!(:method => :#{method}), &block)
+        end
+      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/connection.rb

@@ -1,10 +1,10 @@
 module Excon
   class Connection
-
     attr_reader :connection
 
     CR_NL     = "\r\n"
     HTTP_1_1  = " HTTP/1.1\r\n"
+    FORCE_ENC = String.respond_to?(:force_encoding)
 
     # Initializes a new Connection instance
     #   @param [String] url The destination URL
@@ -26,6 +26,7 @@ module Excon
         :query    => uri.query,
         :scheme   => uri.scheme
       }.merge!(params)
+
       @socket_key = '' << @connection[:host] << ':' << @connection[:port].to_s
       reset
     end
@@ -45,10 +46,10 @@ module Excon
         # connection has defaults, merge in new params to override
         params = @connection.merge(params)
         params[:headers] = @connection[:headers].merge(params[:headers] || {})
-        params[:headers]['Host'] ||= "#{params[:host]}:#{params[:port]}"
+        params[:headers]['Host'] ||= '' << params[:host] << ':' << params[:port].to_s
 
         # if path is empty or doesn't start with '/', insert one
-        unless params[:path][0..0] == '/'
+        unless params[:path][0, 1] == '/'
           params[:path].insert(0, '/')
         end
 
@@ -83,11 +84,9 @@ module Excon
         params[:headers]['Content-Length'] = case params[:body]
         when File
           params[:body].binmode
-          File.size(params[:body].path)
+          File.size(params[:body])
         when String
-          if params[:body].respond_to?(:force_encoding)
-            params[:body].force_encoding('BINARY')
-          end
+          params[:body].force_encoding('BINARY') if FORCE_ENC
           params[:body].length
         else
           0
@@ -119,16 +118,18 @@ module Excon
 
         # read the response
         response = Excon::Response.parse(socket, params, &block)
+
         if response.headers['Connection'] == 'close'
           reset
         end
+
         response
       rescue => socket_error
         reset
         raise(Excon::Errors::SocketError.new(socket_error))
       end
 
-      if params[:expects] && ![*params[:expects]].include?(response.status)
+      if params.has_key?(:expects) && ![*params[:expects]].include?(response.status)
         reset
         raise(Excon::Errors.status_error(params, response))
       else
@@ -136,7 +137,7 @@ module Excon
       end
 
     rescue => request_error
-      if params[:idempotent] &&
+      if params.has_key?(:idempotent) &&
           (request_error.is_a?(Excon::Errors::SocketError) ||
           (request_error.is_a?(Excon::Errors::HTTPStatusError) && response.status != 404))
         retries_remaining ||= 4
@@ -155,8 +156,7 @@ module Excon
       (old_socket = sockets.delete(@socket_key)) && old_socket.close
     end
 
-    private
-
+  private
     def connect
       new_socket = TCPSocket.open(@connection[:host], @connection[:port])
 
@@ -194,7 +194,7 @@ module Excon
     end
 
     def closed?
-      sockets[@socket_key] && sockets[@socket_key].closed?
+      sockets.has_key?(@socket_key) && sockets[@socket_key].closed?
     end
 
     def socket

data/lib/excon/errors.rb

@@ -7,7 +7,11 @@ module Excon
       attr_reader :socket_error
 
       def initialize(socket_error=nil)
-        super(socket_error.message)
+        if socket_error.message =~ /certificate verify failed/
+          super('Unable to verify certificate, please set `Excon.ssl_ca_path = path_to_certs` or `Excon.ssl_verify_peer = false` (less secure).')
+        else
+          super(socket_error.message)
+        end
         set_backtrace(socket_error.backtrace)
         @socket_error = socket_error
       end

data/lib/excon/response.rb

@@ -1,17 +1,19 @@
 module Excon
   class Response
+    attr_accessor :body, :headers, :status
 
-    def self.parse(socket, params = {}, &block)
-      if params[:block]
-        print "  \e[33m[WARN] params[:block] is deprecated, please pass the block to the request\e[0m"
-        block = params[:block]
-      end
+    def initialize(attrs={})
+      @body    = attrs[:body]    || ''
+      @headers = attrs[:headers] || {}
+      @status  = attrs[:status]
+    end
 
-      response = new
+    def self.parse(socket, params={})
+      response = new(:status => socket.readline[9, 11].to_i)
 
-      response.status = socket.readline[9..11].to_i
       while true
-        data = socket.readline.chop!
+        (data = socket.readline).chop!
+
         unless data.empty?
           key, value = data.split(': ')
           response.headers[key] = value
@@ -20,53 +22,51 @@ module Excon
         end
       end
 
-      unless params[:method].to_s.upcase == 'HEAD'
-        if !block || (params[:expects] && ![*params[:expects]].include?(response.status))
-          response.body = ''
-          block = Concatenator.new(response.body)
-        end
+      unless params[:method].to_s.casecmp('HEAD') == 0
 
-        if response.headers['Transfer-Encoding'] && response.headers['Transfer-Encoding'].downcase == 'chunked'
+        if response.headers.has_key?('Transfer-Encoding') && response.headers['Transfer-Encoding'].casecmp('chunked') == 0
           while true
             chunk_size = socket.readline.chop!.to_i(16)
-            chunk = socket.read(chunk_size + 2).chop! # 2 == "/r/n".length
-            if chunk_size > 0
-              block.call(chunk)
+
+            break if chunk_size < 1
+                                          # 2 == "/r/n".length
+            (chunk = socket.read(chunk_size+2)).chop!
+
+            if block_given?
+              yield chunk
             else
-              break
+              response.body << chunk
             end
           end
-        elsif response.headers['Connection'] && response.headers['Connection'].downcase == 'close'
-          block.call(socket.read)
-        elsif response.headers['Content-Length']
+
+        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
-            block.call(socket.read([CHUNK_SIZE, remaining].min))
+            chunk = socket.read([CHUNK_SIZE, remaining].min)
+
+            if block_given?
+              yield chunk
+            else
+              response.body << chunk
+            end
+
             remaining -= CHUNK_SIZE
           end
         end
       end
 
-      response
-    end
-
-    attr_accessor :body, :headers, :status
-
-    def initialize(attributes = {})
-      @body    = attributes[:body] || ''
-      @headers = attributes[:headers] || {}
-      @status  = attributes[:status]
-    end
-
-  end
-
-  class Concatenator
-    def initialize(string)
-      @string = string
+      return response
     end
 
-    def call(data)
-      @string << data
-    end
-  end
-end
+  end # class Response
+end # module Excon

data/tests/basic_tests.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+with_rackup('basic.ru') do
+  Shindo.tests('Excon basics') do
+    tests('GET /content-length/100') do
+
+      connection = Excon.new('http://127.0.0.1:9292')
+      response = connection.request(:method => 'GET', :path => '/content-length/100')
+
+      tests('response.status').returns(200) do
+        response.status
+      end
+
+      tests("response.headers['Connection']").returns('Keep-Alive') do
+        response.headers['Connection']
+      end
+
+      tests("response.headers['Content-Length']").returns('100') do
+        response.headers['Content-Length']
+      end
+
+      tests("response.headers['Content-Type']").returns('text/html;charset=utf-8') do
+        response.headers['Content-Type']
+      end
+
+      test("Time.parse(response.headers['Date']).is_a?(Time)") do
+        Time.parse(response.headers['Date']).is_a?(Time)
+      end
+
+      test("!!(response.headers['Server'] =~ /^WEBrick/)") do
+        !!(response.headers['Server'] =~ /^WEBrick/)
+      end
+
+      tests("response.body").returns('x' * 100) do
+        response.body
+      end
+    end
+  end
+end

data/tests/rackups/basic.ru

@@ -0,0 +1,9 @@
+require 'sinatra'
+
+class App < Sinatra::Base
+  get '/content-length/:value' do |value|
+    'x' * value.to_i
+  end
+end
+
+run App

data/tests/test_helper.rb

@@ -3,13 +3,13 @@ require 'bundler'
 
 Bundler.require(:default, :development)
 
-def local_file(*parts)
-  File.expand_path(File.join(File.dirname(__FILE__), *parts))
+def rackup_path(*parts)
+  File.expand_path(File.join(File.dirname(__FILE__), 'rackups', *parts))
 end
 
-def with_rackup(configru = local_file('config.ru'))
-  pid, w, r, e = Open4.popen4("rackup #{configru}")
-  while `lsof -p #{pid} -P -i | grep ruby | grep TCP`.chomp.empty?; end
+def with_rackup(name)
+  pid, w, r, e = Open4.popen4("rackup #{rackup_path(name)}")
+  until e.gets =~ /HTTPServer#start:/; end
   yield
 ensure
   Process.kill(9, pid)

data/tests/thread_safety_tests.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+with_rackup('thread_safety.ru') do
+  Shindo.tests('Excon thread safety') do
+    connection = Excon.new('http://127.0.0.1:9292')
+
+    long_thread = Thread.new {
+      response = connection.request(:method => 'GET', :path => '/id/1/wait/2')
+      Thread.current[:success] = response.body == '1'
+    }
+
+    short_thread = Thread.new {
+      response = connection.request(:method => 'GET', :path => '/id/2/wait/1')
+      Thread.current[:success] = response.body == '2'
+    }
+
+    long_thread.join
+    short_thread.join
+
+    test('long_thread') do
+      long_thread[:success]
+    end
+
+    test('short_thread') do
+      short_thread[:success]
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -08:00
+date: 2011-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 10
-        version: 0.1.10
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -72,15 +72,20 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - benchmarks/class_vs_lambda.rb
 - benchmarks/concat_vs_insert.rb
 - benchmarks/concat_vs_interpolate.rb
 - benchmarks/cr_lf.rb
+- benchmarks/downcase-eq-eq_vs_casecmp.rb
 - benchmarks/excon_vs.rb
+- benchmarks/has_key-vs-hash[key].rb
 - benchmarks/headers_split_vs_match.rb
+- benchmarks/implicit_block-vs-explicit_block.rb
 - benchmarks/merging.rb
+- benchmarks/string_ranged_index.rb
 - benchmarks/strip_newline.rb
 - benchmarks/vs_stdlib.rb
 - excon.gemspec
@@ -88,11 +93,13 @@ files:
 - lib/excon/connection.rb
 - lib/excon/errors.rb
 - lib/excon/response.rb
-- tests/config.ru
+- tests/basic_tests.rb
+- tests/rackups/basic.ru
+- tests/rackups/thread_safety.ru
 - tests/test_helper.rb
-- tests/threaded_tests.rb
+- tests/thread_safety_tests.rb
 has_rdoc: true
-homepage: http://github.com/geemus/NAME
+homepage: https://github.com/geemus/excon
 licenses: []
 
 post_install_message: 
@@ -121,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: excon
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)

data/tests/threaded_tests.rb

@@ -1,24 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
-
-with_rackup do
-  Shindo.tests do
-    test('threaded requests') do
-      connection = Excon.new('http://127.0.0.1:9292')
-
-      long_thread = Thread.new {
-        response = connection.request(:method => 'GET', :path => '/id/1/wait/2')
-        Thread.current[:success] = response.body == '1'
-      }
-
-      short_thread = Thread.new {
-        response = connection.request(:method => 'GET', :path => '/id/2/wait/1')
-        Thread.current[:success] = response.body == '2'
-      }
-
-      long_thread.join
-      short_thread.join
-
-      long_thread[:success] && short_thread[:success]
-    end
-  end
-end