excon 0.11.0 → 0.12.0

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.11.0'
-  s.date              = '2012-03-15'
+  s.version           = '0.12.0'
+  s.date              = '2012-03-18'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -88,6 +88,7 @@ Gem::Specification.new do |s|
     benchmarks/strip_newline.rb
     benchmarks/vs_stdlib.rb
     changelog.txt
+    data/cacert.pem
     excon.gemspec
     lib/excon.rb
     lib/excon/connection.rb

data/lib/excon.rb

@@ -27,6 +27,7 @@ module Excon
         :mock               => false,
         :read_timeout       => 60,
         :retry_limit        => DEFAULT_RETRY_LIMIT,
+        :ssl_ca_file        => DEFAULT_CA_FILE,
         :ssl_verify_peer    => RbConfig::CONFIG['host_os'] !~ /mswin|win32|dos|cygwin|mingw/i,
         :write_timeout      => 60
       }

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 
   unless const_defined?(:CHUNK_SIZE)
@@ -11,6 +11,10 @@ module Excon
     CR_NL = "\r\n"
   end
 
+  unless const_defined?(:DEFAULT_CA_FILE)
+    DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cacert.pem"))
+  end
+
   unless const_defined?(:DEFAULT_RETRY_LIMIT)
     DEFAULT_RETRY_LIMIT = 4
   end

data/lib/excon/ssl_socket.rb

@@ -23,14 +23,14 @@ module Excon
       # create ssl context
       ssl_context = OpenSSL::SSL::SSLContext.new
 
-      if Excon.defaults[:ssl_verify_peer]
+      if params[:ssl_verify_peer]
         # turn verification on
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
-        if Excon.defaults[:ssl_ca_path]
-          ssl_context.ca_path = Excon.defaults[:ssl_ca_path]
-        elsif Excon.defaults[:ssl_ca_file]
-          ssl_context.ca_file = Excon.defaults[:ssl_ca_file]
+        if params[:ssl_ca_path]
+          ssl_context.ca_path = params[:ssl_ca_path]
+        elsif params[:ssl_ca_file]
+          ssl_context.ca_file = params[:ssl_ca_file]
         else
           # use default cert store
           store = OpenSSL::X509::Store.new
@@ -64,7 +64,7 @@ module Excon
       @socket.connect
 
       # verify connection
-      if Excon.defaults[:ssl_verify_peer]
+      if params[:ssl_verify_peer]
         @socket.post_connection_check(@params[:host])
       end
 

data/tests/rackups/basic.rb

@@ -11,6 +11,17 @@ class Basic < Sinatra::Base
   end
 
   post('/echo') do
+    echo
+  end
+
+  put('/echo') do
+    echo
+  end
+
+  private
+
+  def echo
     request.body.read
   end
+
 end

data/tests/test_helper.rb

@@ -4,10 +4,10 @@ require 'bundler'
 Bundler.require(:default, :development)
 
 def basic_tests(url = 'http://127.0.0.1:9292')
-  tests('GET /content-length/100') do
 
-    Excon.defaults[:ssl_verify_peer] = false
-    connection = Excon.new(url)
+  connection = Excon.new(url, :ssl_verify_peer => false)
+
+  tests('GET /content-length/100') do
     response = connection.request(:method => :get, :path => '/content-length/100')
 
     tests('response.status').returns(200) do
@@ -63,8 +63,6 @@ def basic_tests(url = 'http://127.0.0.1:9292')
 
   tests('POST /body-sink') do
 
-    connection = Excon.new(url)
-
     tests('response.body').returns("5000000") do
       response = connection.request(:method => :post, :path => '/body-sink', :headers => { 'Content-Type' => 'text/plain' }, :body => 'x' * 5_000_000)
       response.body
@@ -79,9 +77,12 @@ def basic_tests(url = 'http://127.0.0.1:9292')
 
   tests('POST /echo') do
 
-    connection = Excon.new(url)
+    tests('without request_block').returns('x' * 100) do
+      response = connection.request(:method => :post, :path => '/echo', :body => 'x' * 100)
+      response.body
+    end
 
-    tests('request_block usage').returns('x' * 100) do
+    tests('with request_block').returns('x' * 100) do
       data = ['x'] * 100
       request_block = lambda do
         data.shift.to_s
@@ -92,6 +93,23 @@ def basic_tests(url = 'http://127.0.0.1:9292')
 
   end
 
+  tests('PUT /echo') do
+
+    tests('without request_block').returns('x' * 100) do
+      response = connection.request(:method => :put, :path => '/echo', :body => 'x' * 100)
+      response.body
+    end
+
+    tests('request_block usage').returns('x' * 100) do
+      data = ['x'] * 100
+      request_block = lambda do
+        data.shift.to_s
+      end
+      response = connection.request(:method => :put, :path => '/echo', :request_block => request_block)
+      response.body
+    end
+
+  end
 end
 
 def rackup_path(*parts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000Z
+date: 2012-03-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70247176859020 !ruby/object:Gem::Requirement
+  requirement: &8667500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247176859020
+  version_requirements: *8667500
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70247176858080 !ruby/object:Gem::Requirement
+  requirement: &8667270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247176858080
+  version_requirements: *8667270
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70247176857480 !ruby/object:Gem::Requirement
+  requirement: &8667060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247176857480
+  version_requirements: *8667060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70247176856760 !ruby/object:Gem::Requirement
+  requirement: &8666850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247176856760
+  version_requirements: *8666850
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70247176856120 !ruby/object:Gem::Requirement
+  requirement: &8666640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247176856120
+  version_requirements: *8666640
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70247176855480 !ruby/object:Gem::Requirement
+  requirement: &8666430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247176855480
+  version_requirements: *8666430
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70247176854820 !ruby/object:Gem::Requirement
+  requirement: &8666220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247176854820
+  version_requirements: *8666220
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -119,6 +119,7 @@ files:
 - benchmarks/strip_newline.rb
 - benchmarks/vs_stdlib.rb
 - changelog.txt
+- data/cacert.pem
 - excon.gemspec
 - lib/excon.rb
 - lib/excon/connection.rb
@@ -161,9 +162,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 584033928995793926
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: excon
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)