excon 0.9.4 → 0.9.5

data/Gemfile

@@ -2,6 +2,8 @@ source "http://rubygems.org"
 
 gemspec
 
+gem 'jruby-openssl', :platform => :jruby
+
 group :benchmark do
   gem 'em-http-request'
   gem 'httparty'

data/{README.rdoc → README.md}

@@ -1,23 +1,26 @@
-= excon
+excon
+=====
 
 Http(s) EXtended CONnections
 
-{<img src="https://secure.travis-ci.org/geemus/excon.png" />}[http://travis-ci.org/geemus/excon]
+[![Build Status](https://secure.travis-ci.org/geemus/excon.png)](http://travis-ci.org/geemus/excon)
+[![Dependency Status](https://gemnasium.com/geemus/excon.png)](https://gemnasium.com/geemus/excon)
 
-== Getting Started
+Getting Started
+---------------
 
 Install the gem.
 
-  $ sudo gem install excon
+    $ sudo gem install excon
 
 Require with rubygems.
 
-  require 'rubygems'
-  require 'excon'
+    require 'rubygems'
+    require 'excon'
 
 The simplest way to use excon is with one-off requests:
 
-  response = Excon.get('http://geemus.com')
+    response = Excon.get('http://geemus.com')
 
 Supported one-off request methods are #connect, #delete, #get, #head, #options, #post, #put, and #trace.
 
@@ -25,97 +28,102 @@ 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!).
 
-  connection = Excon.new('http://geemus.com')
-  response_one = connection.get
-  response_two = connection.post(:path => '/foo')
-  response_three = connection.delete(:path => '/bar')
+    connection = Excon.new('http://geemus.com')
+    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')
+    response_four = connection.request(:method => :get, :path => '/more')
 
 Both one-off and persistent connections support many other options. Here are a few common examples:
 
-  # Custom headers
-  Excon.get('http://geemus.com', :headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
-  connection.get(:headers => {'Authorization' => 'Basic 0123456789ABCDEF'})
+    # 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'})
+    # 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')
+    # 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')
+    # request accepts either symbols or strings
+    connection.request(:method => :get)
+    connection.request(:method => 'GET')
 
 These options can be combined to make pretty much any request you might need.
 
-== Streaming Responses
+Streaming Responses
+-------------------
 
 You can stream responses by passing a block that will receive each chunk.
 
-  Excon.get('http://geemus.com') do |chunk, remaining_bytes, total_bytes|
-    puts chunk
-    puts "Remaining: #{remaining_bytes.to_f / total_bytes}%"
-  end
+    Excon.get('http://geemus.com') do |chunk, remaining_bytes, total_bytes|
+      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
+Proxy Support
+-------------
 
 You can specify a proxy URL that Excon will use with both HTTP and HTTPS connections:
 
-  connection = Excon.new('http://geemus.com', :proxy => 'http://my.proxy:3128')
-  connection.request(:method => 'GET')
+    connection = Excon.new('http://geemus.com', :proxy => 'http://my.proxy:3128')
+    connection.request(:method => 'GET')
 
 The proxy URL must be fully specified, including scheme (e.g. "http://") and port. 
 
 Proxy support must be set when establishing a connection object and cannot be overridden in individual requests. Because of this it is unavailable in one-off requests (Excon.get, etc.)
 
-NOTE: Excon will use the environment variables "http_proxy" and "https_proxy" if they are present. If these variables are set they will take precedence over a :proxy option specified in code. If "https_proxy" is not set, the value of "http_proxy" will be used for both HTTP and HTTPS connections.
+NOTE: Excon will use the environment variables `http_proxy` and `https_proxy` if they are present. If these variables are set they will take precedence over a :proxy option specified in code. If "https_proxy" is not set, the value of "http_proxy" will be used for both HTTP and HTTPS connections.
 
-== Stubs
+Stubs
+-----
 
 You can stub out requests for testing purposes by enabling mock mode on a connection.
 
-  connection = Excon.new('http://example.com', :mock => true)
+    connection = Excon.new('http://example.com', :mock => true)
 
 Or by enabling mock mode for a request.
 
-  connection.request(:method => :get, :path => 'example', :mock => true)
+    connection.request(:method => :get, :path => 'example', :mock => true)
 
 Then you can add stubs, for instance:
 
-  # Excon.stub(request_attributes, response_attributes)
-  Excon.stub({:method => :get}, {:body => 'body', :status => 200})
+    # Excon.stub(request_attributes, response_attributes)
+    Excon.stub({:method => :get}, {:body => 'body', :status => 200})
 
 Omitted attributes are assumed to match, so this stub will match any get request and return an Excon::Response with a body of 'body' and status of 200.  You can add whatever stubs you might like this way and they will be checked against in the order they were added, if none of them match then excon will raise an error to let you know.
 
-Alternatively you can pass a block instead of response_attributes and it will be called with the request params.  For example, you could create a stub that echoes the body given to it like this:
+Alternatively you can pass a block instead of `response_attributes` and it will be called with the request params.  For example, you could create a stub that echoes the body given to it like this:
 
-  # Excon.stub(request_attributes, &response_block)
-  Excon.stub({:method => :put}) do |params|
-    {:body => params[:body], :status => 200}
-  end
+    # Excon.stub(request_attributes, &response_block)
+    Excon.stub({:method => :put}) do |params|
+      {:body => params[:body], :status => 200}
+    end
 
-== HTTPS/SSL Issues
+HTTPS/SSL Issues
+----------------
 
-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 ..."
+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. If you have certificates but they aren't being auto-discovered, you can specify the path to your certificates:
 
-  Excon.ssl_ca_path = '/path/to/certs'
+    Excon.ssl_ca_path = '/path/to/certs'
 
 Failing that, you can turn off peer verification (less secure):
 
-  Excon.ssl_verify_peer = false
+    Excon.ssl_verify_peer = false
 
 Either of these should allow you to work around the socket error and continue with your work.
 
-== Copyright
+Copyright
+---------
 
 (The MIT License)
 

data/changelog.txt

@@ -1,3 +1,10 @@
+0.9.5 01/16/12
+==============
+
+* fix getaddrinfo usage for rbx
+* fix mock handling when a block in passed
+* add jruby to ci
+
 0.9.4 12/21/11
 ==============
 

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.9.4'
-  s.date              = '2011-12-21'
+  s.version           = '0.9.5'
+  s.date              = '2012-01-16'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   ## Specify any RDoc options here. You'll want to add your README and
   ## LICENSE files to the extra_rdoc_files list.
   s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.rdoc]
+  s.extra_rdoc_files = %w[README.md]
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('open4')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('shindo', '0.2.0')
+  s.add_development_dependency('shindo')
   s.add_development_dependency('sinatra')
 
   ## Leave this section as-is. It will be automatically generated from the
@@ -67,7 +67,7 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    README.rdoc
+    README.md
     Rakefile
     benchmarks/class_vs_lambda.rb
     benchmarks/concat_vs_insert.rb

data/lib/excon/connection.rb

@@ -236,6 +236,7 @@ module Excon
     end
 
     def invoke_stub(params)
+      block_given = block_given?
       params[:captures] = {:headers => {}} # setup data to hold captures
       for stub, response in Excon.stubs
         headers_match = !stub.has_key?(:headers) || stub[:headers].keys.all? do |key|
@@ -267,7 +268,13 @@ module Excon
           else
             response
           end
-          if block_given? && response_attributes.has_key?(:body)
+
+          # don't pass stuff into a block if there was an error
+          if params[:expects] && ![*params[:expects]].include?(response_attributes[:status])
+            block_given = false
+          end
+
+          if block_given && response_attributes.has_key?(:body)
             body = response_attributes.delete(:body)
             content_length = remaining = body.bytesize
             i = 0

data/lib/excon/constants.rb

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

data/lib/excon/socket.rb

@@ -21,9 +21,9 @@ module Excon
       exception = nil
 
       addrinfo = if @proxy
-        ::Socket.getaddrinfo(@proxy[:host], @proxy[:port].to_i, nil, ::Socket::Constants::SOCK_STREAM)
+        ::Socket.getaddrinfo(@proxy[:host], @proxy[:port].to_i, ::Socket::Constants::AF_UNSPEC, ::Socket::Constants::SOCK_STREAM)
       else
-        ::Socket.getaddrinfo(@params[:host], @params[:port].to_i, nil, ::Socket::Constants::SOCK_STREAM)
+        ::Socket.getaddrinfo(@params[:host], @params[:port].to_i, ::Socket::Constants::AF_UNSPEC, ::Socket::Constants::SOCK_STREAM)
       end
 
       addrinfo.each do |_, port, _, ip, a_family, s_type|

data/tests/rackups/thread_safety.ru

@@ -1,7 +1,5 @@
 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)
@@ -9,4 +7,7 @@ class App < Sinatra::Base
   end
 end
 
+# get everything autoloaded, mainly for rbx
+App.new
+
 run App

data/tests/stub_tests.rb

@@ -125,15 +125,26 @@ Shindo.tests('Excon stubs') do
 
   Excon.stubs.clear
 
-  tests("stub({}, {:status => 404}") do
+  tests("stub({}, {:status => 404, :body => 'Not Found'}") do
 
     connection = Excon.new('http://127.0.0.1:9292', :mock => true)
-    Excon.stub({}, {:status => 404})
+    Excon.stub({}, {:status => 404, :body => 'Not Found'})
 
     tests("request(:expects => 200, :method => :get, :path => '/')").raises(Excon::Errors::NotFound) do
       connection.request(:expects => 200, :method => :get, :path => '/')
     end
 
+    test("request(:expects => 200, :method => :get, :path => '/') with block does not invoke the block since it raises an error") do
+      block_called = false
+      begin
+        connection.request(:expects => 200, :method => :get, :path => '/') do |_, _, _|
+          block_called = true
+        end
+      rescue Excon::Errors::NotFound
+      end
+      !block_called
+    end
+
     Excon.stubs.clear
 
   end

data/tests/test_helper.rb

@@ -54,7 +54,7 @@ def basic_tests(url = 'http://127.0.0.1:9292')
   tests('POST /body-sink') do
 
     connection = Excon.new(url)
-    response = connection.request(:method => :post, :path => '/body-sink', :body => 'x' * 5_000_000)
+    response = connection.request(:method => :post, :path => '/body-sink', :headers => { 'Content-Type' => 'text/plain' }, :body => 'x' * 5_000_000)
 
     tests('response.body').returns("5000000") do
       response.body
@@ -67,13 +67,20 @@ def rackup_path(*parts)
 end
 
 def with_rackup(name)
-  GC.disable
-  pid, w, r, e = Open4.popen4("rackup #{rackup_path(name)}")
+  unless RUBY_PLATFORM == 'java'
+    GC.disable
+    pid, w, r, e = Open4.popen4("rackup", rackup_path(name))
+  else
+    pid, w, r, e = IO.popen4("rackup", rackup_path(name))
+  end
   until e.gets =~ /HTTPServer#start:/; end
   yield
 ensure
-  GC.enable
   Process.kill(9, pid)
+  unless RUBY_PLATFORM == 'java'
+    GC.enable
+    Process.wait(pid)
+  end
 end
 
 def server_path(*parts)
@@ -81,11 +88,18 @@ def server_path(*parts)
 end
 
 def with_server(name)
-  GC.disable
-  pid, w, r, e = Open4.popen4(server_path("#{name}.rb"))
+  unless RUBY_PLATFORM == 'java'
+    GC.disable
+    pid, w, r, e = Open4.popen4(server_path("#{name}.rb"))
+  else
+    pid, w, r, e = IO.popen4(server_path("#{name}.rb"))
+  end
   until e.gets =~ /ready/; end
   yield
 ensure
-  GC.enable
   Process.kill(9, pid)
+  unless RUBY_PLATFORM == 'java'
+    GC.enable
+    Process.wait(pid)
+  end
 end

metadata

@@ -1,123 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: excon
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 4
-  version: 0.9.4
+version: !ruby/object:Gem::Version
+  version: 0.9.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - dpiddy (Dan Peterson)
 - geemus (Wesley Beary)
 - nextmat (Matt Sanders)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-21 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: &70238243324360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 3
+      - !ruby/object:Gem::Version
         version: 3.1.3
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: delorean
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70238243324360
+- !ruby/object:Gem::Dependency
+  name: delorean
+  requirement: &70238243323780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70238243323780
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70238243322680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70238243322680
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70238243322040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70238243322040
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70238243321160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: shindo
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+  version_requirements: *70238243321160
+- !ruby/object:Gem::Dependency
+  name: shindo
+  requirement: &70238243320420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70238243320420
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70238243319760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70238243319760
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files:
+- README.md
+files:
 - Gemfile
-- README.rdoc
+- README.md
 - Rakefile
 - benchmarks/class_vs_lambda.rb
 - benchmarks/concat_vs_insert.rb
@@ -164,35 +145,32 @@ files:
 - tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
-has_rdoc: true
 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 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1843710619352471147
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: excon
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)
 test_files: []
-