excon 0.7.6 → 0.7.7

data/README.rdoc

@@ -2,6 +2,8 @@
 
 Http(s) EXtended CONnections
 
+{<img src="https://secure.travis-ci.org/geemus/excon.png" />}[http://travis-ci.org/geemus/excon]
+
 == Getting Started
 
 Install the gem.
@@ -17,9 +19,9 @@ The simplest way to use excon is with one-off requests:
 
   response = Excon.get('http://geemus.com')
 
-Supported one-off request methods are #connect, #delete, #get, #head, #options, #post, #put, and #trace. 
+Supported one-off request methods are #connect, #delete, #get, #head, #options, #post, #put, and #trace.
 
-The returned response object has #body, #headers and #status attributes. 
+The returned response object has #body, #headers and #status attributes.
 
 Alternately you can create a connection object which is reusable across multiple requests (more performant!).
 
@@ -27,7 +29,7 @@ Alternately you can create a connection object which is reusable across multiple
   response_one = connection.get
   response_two = connection.post(:path => '/foo')
   response_three = connection.delete(:path => '/bar')
-  
+
 Sometimes it is more convenient to specify the request type as an argument:
 
   response_four = connection.request(:method => :get, :path => '/more')
@@ -37,14 +39,14 @@ Both one-off and persistent connections support many other options. Here are a f
   # Custom headers
   Excon.get('http://geemus.com', :headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
   connection.get(:headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
-  
+
   # Changing query strings
   connection = Excon.new('http://geemus.com/')
   connection.get(:query => {:foo => 'bar'})
-  
+
   # POST body
   Excon.post('http://geemus.com', :body => 'language=ruby&class=fog')
-  
+
   # request accepts either symbols or strings
   connection.request(:method => :get)
   connection.request(:method => 'GET')
@@ -59,7 +61,7 @@ You can stream responses by passing a block that will receive each chunk.
     puts chunk
     puts "Remaining: #{remaining_bytes.to_f / total_bytes}%"
   end
-  
+
 Iterating over each chunk will allow you to do work on the response incrementally without buffering the entire response first. For very large responses this can lead to significant memory savings.
 
 == Proxy Support
@@ -71,7 +73,7 @@ You can specify a proxy URL that Excon will use with both HTTP and HTTPS connect
 
 The proxy URL must be fully specified, including scheme (e.g. "http://") and port.
 
-Excon will also use the environment variables "http_proxy" and "https_proxy" if they are present. 
+Excon will also use the environment variables "http_proxy" and "https_proxy" if they are present.
 
 If "https_proxy" is not set, the value of "http_proxy" will be used for both HTTP and HTTPS connections.
 

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.7.6'
-  s.date              = '2011-10-04'
+  s.version           = '0.7.7'
+  s.date              = '2011-11-24'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -92,6 +92,7 @@ Gem::Specification.new do |s|
     lib/excon/response.rb
     lib/excon/socket.rb
     lib/excon/ssl_socket.rb
+    tests/bad_tests.rb
     tests/basic_tests.rb
     tests/header_tests.rb
     tests/idempotent_tests.rb
@@ -105,6 +106,7 @@ Gem::Specification.new do |s|
     tests/rackups/ssl.ru
     tests/rackups/thread_safety.ru
     tests/request_method_tests.rb
+    tests/servers/bad.rb
     tests/stub_tests.rb
     tests/test_helper.rb
     tests/thread_safety_tests.rb

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.7.6'
+    VERSION = '0.7.7'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/errors.rb

@@ -76,7 +76,7 @@ module Excon
 
     # Messages for nicer exceptions, from rfc2616
     def self.status_error(request, response)
-      @errors ||= { 
+      @errors ||= {
         100 => [Excon::Errors::Continue, 'Continue'],
         101 => [Excon::Errors::SwitchingProtocols, 'Switching Protocols'],
         200 => [Excon::Errors::OK, 'OK'],

data/lib/excon/socket.rb

@@ -8,17 +8,22 @@ module Excon
     def_delegators(:@socket, :close,    :close)
     def_delegators(:@socket, :readline, :readline)
 
-    def initialize(params = {}, proxy = {})
+    def initialize(params = {}, proxy = nil)
       @params, @proxy = params, proxy
       @read_buffer, @write_buffer = '', ''
+      @eof = false
 
-      @sockaddr = if @proxy
-        ::Socket.sockaddr_in(@proxy[:port].to_i, @proxy[:host])
+      addrinfo = if @proxy
+        ::Socket.getaddrinfo(@proxy[:host], @proxy[:port].to_i, nil, ::Socket::Constants::SOCK_STREAM)
       else
-        ::Socket.sockaddr_in(@params[:port].to_i, @params[:host])
-      end
+        ::Socket.getaddrinfo(@params[:host], @params[:port].to_i, nil, ::Socket::Constants::SOCK_STREAM)
+      end.first
+
+      _, port, _, ip, a_family, s_type = addrinfo
 
-      @socket = ::Socket.new(::Socket::Constants::AF_INET, ::Socket::Constants::SOCK_STREAM, 0)
+      @sockaddr = ::Socket.sockaddr_in(port, ip)
+
+      @socket = ::Socket.new(a_family, s_type, 0)
 
       connect
 
@@ -39,6 +44,8 @@ module Excon
     end
 
     def read(max_length=nil)
+      return nil if @eof
+
       begin
         if max_length
           until @read_buffer.length >= max_length
@@ -64,6 +71,7 @@ module Excon
           raise(Excon::Errors::Timeout.new("read timeout reached"))
         end
       rescue EOFError
+        @eof = true
       end
       if max_length
         @read_buffer.slice!(0, max_length)

data/tests/bad_tests.rb

@@ -0,0 +1,35 @@
+Shindo.tests('Excon bad server interaction') do
+
+  with_server('bad') do
+
+    tests('bad server: causes EOFError') do
+
+      tests('with no content length and no chunking') do
+        tests('without a block') do
+          tests('response.body').returns('hello') do
+            connection = Excon.new('http://127.0.0.1:9292')
+
+            connection.request(:method => :get, :path => '/eof/no_content_length_and_no_chunking').body
+          end
+        end
+
+        tests('with a block') do
+          tests('body from chunks').returns('hello') do
+            connection = Excon.new('http://127.0.0.1:9292')
+
+            body = ""
+            block = lambda {|chunk, remaining, total| body << chunk }
+
+            connection.request(:method => :get, :path => '/eof/no_content_length_and_no_chunking', &block)
+
+            body
+          end
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/tests/header_tests.rb

@@ -3,45 +3,45 @@ Shindo.tests('Excon response header support') do
   with_rackup('response_header.ru') do
 
     tests('Response#get_header') do
-      connection = Excon.new('http://foo.com:8080', :proxy => 'http://localhost:9292')
+      connection = Excon.new('http://foo.com:8080', :proxy => 'http://127.0.0.1:9292')
       response = connection.request(:method => :get, :path => '/foo')
 
       tests('with variable header capitalization') do
-        
+
         tests('response.get_header("mixedcase-header")').returns('MixedCase') do
           response.get_header("mixedcase-header")
         end
-        
+
         tests('response.get_header("uppercase-header")').returns('UPPERCASE') do
           response.get_header("uppercase-header")
         end
-        
+
         tests('response.get_header("lowercase-header")').returns('lowercase') do
           response.get_header("lowercase-header")
         end
-        
+
       end
-      
+
       tests('when provided key capitalization varies') do
-        
+
         tests('response.get_header("MIXEDCASE-HEADER")').returns('MixedCase') do
           response.get_header("MIXEDCASE-HEADER")
         end
-        
+
         tests('response.get_header("MiXeDcAsE-hEaDeR")').returns('MixedCase') do
           response.get_header("MiXeDcAsE-hEaDeR")
         end
-        
+
       end
-      
+
       tests('when header is unavailable') do
-        
+
         tests('response.get_header("missing")').returns(nil) do
           response.get_header("missing")
         end
-        
+
       end
-      
+
     end
 
   end

data/tests/idempotent_tests.rb

@@ -1,7 +1,13 @@
 Shindo.tests('Excon request idempotencey') do
   Excon.mock = true
 
+  after do
+    # flush any existing stubs after each test
+    Excon.stubs.clear
+  end
+
   tests("Non-idempotent call with an erroring socket").raises(Excon::Errors::SocketError) do
+    run_count = 0
     Excon.stub({:method => :get}) { |params|
       run_count += 1
       if run_count < 4 # First 3 calls fail.
@@ -15,8 +21,6 @@ Shindo.tests('Excon request idempotencey') do
     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|
@@ -33,8 +37,6 @@ Shindo.tests('Excon request idempotencey') do
     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|
@@ -51,6 +53,5 @@ Shindo.tests('Excon request idempotencey') do
     response.status
   end
 
-  Excon.stubs.pop
   Excon.mock = false
 end

data/tests/rackups/thread_safety.ru

@@ -1,5 +1,7 @@
 require 'sinatra'
 
+require 'rack/head' # workaround for rbx thread safety issue (most likely autoload related)
+
 class App < Sinatra::Base
   get('/id/:id/wait/:wait') do |id, wait|
     sleep(wait.to_i)

data/tests/request_method_tests.rb

@@ -3,29 +3,29 @@ Shindo.tests('Excon request methods') do
   with_rackup('request_methods.ru') do
 
     tests 'one-offs' do
-      
+
       tests('Excon.get').returns('GET') do
         Excon.get('http://127.0.0.1:9292').body
       end
-      
+
       tests('Excon.post').returns('POST') do
         Excon.post('http://127.0.0.1:9292').body
       end
-      
+
     end
-    
+
     tests 'with a connection object' do
-      
+
       connection = Excon.new('http://127.0.0.1:9292')
-      
+
       tests('connection.get').returns('GET') do
         connection.get.body
       end
-      
+
       tests('connection.post').returns('POST') do
         connection.post.body
       end
-      
+
     end
 
   end

data/tests/servers/bad.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require "eventmachine"
+
+module BadServer
+  def receive_data(data)
+    case data
+    when %r{^GET /eof/no_content_length_and_no_chunking\s}
+      send_data "HTTP/1.1 200 OK\r\n"
+      send_data "\r\n"
+      send_data "hello"
+      close_connection(true)
+    end
+  end
+end
+
+EM.run do
+  EM.start_server("127.0.0.1", 9292, BadServer)
+  $stderr.puts "ready"
+end

data/tests/stub_tests.rb

@@ -94,6 +94,7 @@ Shindo.tests('Excon stubs') do
     end
   end
 
+  Excon.stubs.clear
   Excon.mock = false
 
   tests('mock = false') do

data/tests/test_helper.rb

@@ -73,3 +73,17 @@ def with_rackup(name)
 ensure
   Process.kill(9, pid)
 end
+
+def server_path(*parts)
+  File.expand_path(File.join(File.dirname(__FILE__), 'servers', *parts))
+end
+
+def with_server(name)
+  GC.disable
+  pid, w, r, e = Open4.popen4(server_path("#{name}.rb"))
+  until e.gets =~ /ready/; end
+  yield
+ensure
+  GC.enable
+  Process.kill(9, pid)
+end

metadata

@@ -1,89 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: excon
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.7.7
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 6
-  version: 0.7.6
 platform: ruby
-authors: 
+authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: open4
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70352462409660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70352462409660
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70352462407680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shindo
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70352462407680
+- !ruby/object:Gem::Dependency
+  name: shindo
+  requirement: &70352462405960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70352462405960
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70352462404780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70352462404780
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -113,6 +91,7 @@ files:
 - lib/excon/response.rb
 - lib/excon/socket.rb
 - lib/excon/ssl_socket.rb
+- tests/bad_tests.rb
 - tests/basic_tests.rb
 - tests/header_tests.rb
 - tests/idempotent_tests.rb
@@ -126,41 +105,33 @@ files:
 - tests/rackups/ssl.ru
 - tests/rackups/thread_safety.ru
 - tests/request_method_tests.rb
+- tests/servers/bad.rb
 - tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
 homepage: https://github.com/geemus/excon
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: excon
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)
 test_files: []
-