excon 0.6.3 → 0.6.4

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.6.3'
-  s.date              = '2011-05-02'
+  s.version           = '0.6.4'
+  s.date              = '2011-07-05'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
     lib/excon/response.rb
     tests/basic_tests.rb
     tests/header_tests.rb
+    tests/idempotent_tests.rb
     tests/proxy_tests.rb
     tests/query_string_tests.rb
     tests/rackups/basic.ru

data/lib/excon.rb

@@ -13,7 +13,7 @@ require 'excon/response'
 
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.6.3'
+    VERSION = '0.6.4'
   end
 
   unless const_defined?(:CHUNK_SIZE)
@@ -28,7 +28,7 @@ module Excon
     attr_reader :ssl_verify_peer
 
     # setup ssl defaults based on platform
-    @ssl_verify_peer = Config::CONFIG['host_os'] !~ /mswin|win32|dos|cygwin|mingw/i
+    @ssl_verify_peer = RbConfig::CONFIG['host_os'] !~ /mswin|win32|dos|cygwin|mingw/i
 
     # default mocking to off
     @mock = false

data/lib/excon/connection.rb

@@ -76,8 +76,16 @@ module Excon
         if params[:mock]
           for stub, response in Excon.stubs
             # all specified non-headers params match and no headers were specified or all specified headers match
-            if [stub.keys - [:headers]].all? {|key| stub[key] == params[key] } &&
+            if (stub.keys - [:headers]).all? {|key| stub[key] == params[key] } &&
               (!stub.has_key?(:headers) || stub[:headers].keys.all? {|key| stub[:headers][key] == params[:headers][key]})
+              if block_given?
+                body = response.delete(:body)
+                i = 0
+                while i < body.length
+                  yield body[i, CHUNK_SIZE]
+                  i += CHUNK_SIZE
+                end
+              end
               case response
               when Proc
                 return Excon::Response.new(response.call(params))
@@ -182,7 +190,7 @@ module Excon
       end
 
     rescue => request_error
-      if params[:idempotent] && [Excon::Errors::SocketError, Excon::Errors::HTTPStatusError].include?(request_error)
+      if params[:idempotent] && [Excon::Errors::SocketError, Excon::Errors::HTTPStatusError].any? {|ex| request_error.kind_of? ex }
         retries_remaining ||= 4
         retries_remaining -= 1
         if retries_remaining > 0
@@ -255,7 +263,9 @@ module Excon
 
       new_socket.connect
       # verify connection
-      new_socket.post_connection_check(@connection[:host])
+      if Excon.ssl_verify_peer
+        new_socket.post_connection_check(@connection[:host])
+      end
       new_socket
     end
 

data/tests/header_tests.rb

@@ -8,15 +8,15 @@ Shindo.tests('Excon response header support') do
 
       tests('with variable header capitalization') do
         
-        tests('response.get_header("content-type")').returns('text/html') do
-          response.get_header("content-type")
+        tests('response.get_header("mixedcase-header")').returns('MixedCase') do
+          response.get_header("mixedcase-header")
         end
         
-        tests('response.get_header("custom-header")').returns('foo') do
-          response.get_header("custom-header")
+        tests('response.get_header("uppercase-header")').returns('UPPERCASE') do
+          response.get_header("uppercase-header")
         end
         
-        tests('response.get_header("lowercase-header")').returns('bar') do
+        tests('response.get_header("lowercase-header")').returns('lowercase') do
           response.get_header("lowercase-header")
         end
         
@@ -24,12 +24,12 @@ Shindo.tests('Excon response header support') do
       
       tests('when provided key capitalization varies') do
         
-        tests('response.get_header("CONTENT-TYPE")').returns('text/html') do
-          response.get_header("CONTENT-TYPE")
+        tests('response.get_header("MIXEDCASE-HEADER")').returns('MixedCase') do
+          response.get_header("MIXEDCASE-HEADER")
         end
         
-        tests('response.get_header("CoNtEnT-TyPe")').returns('text/html') do
-          response.get_header("CoNtEnT-TyPe")
+        tests('response.get_header("MiXeDcAsE-hEaDeR")').returns('MixedCase') do
+          response.get_header("MiXeDcAsE-hEaDeR")
         end
         
       end

data/tests/idempotent_tests.rb

@@ -0,0 +1,56 @@
+Shindo.tests('Excon request idempotencey') do
+  Excon.mock = true
+
+  tests("Non-idempotent call with an erroring socket").raises(Excon::Errors::SocketError) do
+    Excon.stub({:method => :get}) { |params|
+      run_count += 1
+      if run_count < 4 # First 3 calls fail.
+        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    connection = Excon.new('http://127.0.0.1:9292')
+    response = connection.request(:method => :get, :path => '/some-path')
+  end
+
+  Excon.stubs.pop
+
+  tests("Idempotent request with socket erroring first 3 times").returns(200) do
+    run_count = 0
+    Excon.stub({:method => :get}) { |params|
+      run_count += 1
+      if run_count <= 3 # First 3 calls fail.
+        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    connection = Excon.new('http://127.0.0.1:9292')
+    response = connection.request(:method => :get, :idempotent => true, :path => '/some-path')
+    response.status
+  end
+
+  Excon.stubs.pop
+
+  tests("Idempotent request with socket erroring first 5 times").raises(Excon::Errors::SocketError) do
+    run_count = 0
+    Excon.stub({:method => :get}) { |params|
+      run_count += 1
+      if run_count <= 5 # First 5 calls fail.
+        raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
+      else
+        {:body => params[:body], :headers => params[:headers], :status => 200}
+      end
+    }
+
+    connection = Excon.new('http://127.0.0.1:9292')
+    response = connection.request(:method => :get, :idempotent => true, :path => '/some-path')
+    response.status
+  end
+
+  Excon.stubs.pop
+  Excon.mock = false
+end

data/tests/rackups/response_header.ru

@@ -3,9 +3,9 @@ require 'sinatra'
 class App < Sinatra::Base
   get('/foo') do
     headers(
-      "Content-Type" => 'text/html',
-      "CUSTOM-HEADER" => 'foo',
-      "lowercase-header" => 'bar'
+      "MixedCase-Header" => 'MixedCase',
+      "UPPERCASE-HEADER" => 'UPPERCASE',
+      "lowercase-header" => 'lowercase'
     )
     'primary content'
   end

data/tests/stub_tests.rb

@@ -60,6 +60,24 @@ Shindo.tests('Excon stubs') do
 
   end
 
+  tests("mismatched stub").raises(Excon::Errors::StubNotFound) do
+    Excon.stub({:method => :post}, {:body => 'body'})
+    Excon.get('http://127.0.0.1:9292/')
+  end
+
+  tests("stub({}, {:body => 'x' * (Excon::CHUNK_SIZE + 1)})") do
+    connection = Excon.new('http://127.0.0.1:9292')
+    Excon.stub({}, {:body => 'x' * (Excon::CHUNK_SIZE + 1)})
+
+    test("with block") do
+      chunks = []
+      response = connection.request(:method => :get, :path => '/content-length/100') do |chunk|
+        chunks << chunk
+      end
+      chunks == ['x' * Excon::CHUNK_SIZE, 'x']
+    end
+  end
+
   Excon.mock = false
 
   tests('mock = false') do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 Z
+date: 2011-07-05 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -112,6 +113,7 @@ files:
 - lib/excon/response.rb
 - tests/basic_tests.rb
 - tests/header_tests.rb
+- tests/idempotent_tests.rb
 - tests/proxy_tests.rb
 - tests/query_string_tests.rb
 - tests/rackups/basic.ru
@@ -122,6 +124,7 @@ files:
 - tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
+has_rdoc: true
 homepage: https://github.com/geemus/excon
 licenses: []
 
@@ -151,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: excon
-rubygems_version: 1.7.2
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)