excon 0.3.8 → 0.4.0

data/README.rdoc

@@ -6,7 +6,7 @@ Http(s) EXtended CONnections
 
   sudo gem install excon
 
-Now you are ready to get started, easiest is to use one off requests to start. Windows users see the addendum at the end.
+Now you are ready to get started, easiest is to use one off requests to start.
 
   require 'rubygems'
   require 'excon'
@@ -33,15 +33,19 @@ If you need to do something special with a response you can also pass a block th
 
 From there you should be able to make just about any request you might need.
 
-== Windows
+== HTTPS/SSL Issues
 
-On windows the default ssl peer certificate verification won't work out for you.  You can opt after requiring excon like this:
+On some systems the default ssl peer certificate verification won't work.  You can either set a different path to certificates:
 
   require 'rubygems'
   require 'excon'
-  Excon.ssl_verify_peer = false
+  Excon.ssl_ca_path = '/path/to/certs'
+
+or, simply turn peer verification off (less secure):
 
-I'll provide a better solution when I can (and you should know that in the mean time this is succeptible to man in the middle attacks).
+  require 'rubygems'
+  require 'excon'
+  Excon.ssl_verify_peer = false
 
 == Copyright
 

data/benchmarks/class_vs_lambda.rb

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'tach'
+
+class Concatenator
+  def initialize(string)
+    @string = string
+  end
+
+  def call(data)
+    @string << data
+  end
+end
+
+string = "0123456789ABCDEF"
+
+Tach.meter(100_000) do
+  tach('class') do
+    s = ""
+    obj = Concatenator.new(s)
+    10.times { obj.call(string) }
+  end
+
+  tach('lambda') do
+    s = ""
+    obj = lambda {|data| s << data }
+    10.times { obj.call(string) }
+  end
+end
+
+# ruby 1.9.2p136 (2010-12-25 revision 30365) [x86_64-linux]
+#
+#  +--------+----------+
+#  | tach   | total    |
+#  +--------+----------+
+#  | class  | 1.450284 |
+#  +--------+----------+
+#  | lambda | 2.506496 |
+#  +--------+----------+
+
+# ruby 1.8.7 (2010-12-23 patchlevel 330) [x86_64-linux]
+#
+#  +--------+----------+
+#  | tach   | total    |
+#  +--------+----------+
+#  | class  | 1.373917 |
+#  +--------+----------+
+#  | lambda | 2.589384 |
+#  +--------+----------+
+  
+

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.8'
-  s.date              = '2011-01-07'
+  s.version           = '0.4.0'
+  s.date              = '2011-01-12'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -65,6 +65,7 @@ Gem::Specification.new do |s|
     Gemfile
     README.rdoc
     Rakefile
+    benchmarks/class_vs_lambda.rb
     benchmarks/concat_vs_insert.rb
     benchmarks/concat_vs_interpolate.rb
     benchmarks/cr_lf.rb

data/lib/excon.rb

@@ -3,6 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'cgi'
 require 'openssl'
+require 'rbconfig'
 require 'socket'
 require 'uri'
 
@@ -13,15 +14,30 @@ require 'excon/response'
 module Excon
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.8'
+    VERSION = '0.4.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
-  @ssl_verify_peer = true
   def self.ssl_verify_peer
     @ssl_verify_peer
   end

data/lib/excon/connection.rb

@@ -26,7 +26,7 @@ module Excon
         :query    => uri.query,
         :scheme   => uri.scheme
       }.merge!(params)
-      @socket_key = "#{@connection[:host]}:#{@connection[:port]}"
+      @socket_key = '' << @connection[:host] << ':' << @connection[:port].to_s
       reset
     end
 
@@ -64,13 +64,13 @@ module Excon
           for key, values in params[:query]
             case values
             when nil
-              request << "#{key}&"
+              request << key.to_s << '&'
             when Array
               for value in values
-                request << "#{key}=#{CGI.escape(value.to_s)}&"
+                request << key.to_s << '=' << CGI.escape(value.to_s) << '&'
               end
             else
-              request << "#{key}=#{CGI.escape(values.to_s)}&"
+              request << key.to_s << '=' << CGI.escape(values.to_s) << '&'
             end
           end
           request.chop! # remove trailing '&'
@@ -168,10 +168,14 @@ module Excon
           # turn verification on
           ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
-          # use default cert store
-          store = OpenSSL::X509::Store.new
-          store.set_default_paths
-          ssl_context.cert_store = store
+          if Excon.ssl_ca_path
+            ssl_context.ca_path = Excon.ssl_ca_path
+          else
+            # use default cert store
+            store = OpenSSL::X509::Store.new
+            store.set_default_paths
+            ssl_context.cert_store = store
+          end
         else
           # turn verification off
           ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE

data/lib/excon/response.rb

@@ -23,7 +23,7 @@ module Excon
       unless params[:method].to_s.upcase == 'HEAD'
         if !block || (params[:expects] && ![*params[:expects]].include?(response.status))
           response.body = ''
-          block = lambda { |chunk| response.body << chunk }
+          block = Concatenator.new(response.body)
         end
 
         if response.headers['Transfer-Encoding'] && response.headers['Transfer-Encoding'].downcase == 'chunked'
@@ -59,4 +59,14 @@ module Excon
     end
 
   end
+
+  class Concatenator
+    def initialize(string)
+      @string = string
+    end
+
+    def call(data)
+      @string << data
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 8
-  version: 0.3.8
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -08:00
+date: 2011-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
+- benchmarks/class_vs_lambda.rb
 - benchmarks/concat_vs_insert.rb
 - benchmarks/concat_vs_interpolate.rb
 - benchmarks/cr_lf.rb