faraday 0.8.0.rc2 → 0.8.0

data/test/adapters/net_http_persistent_test.rb

@@ -0,0 +1,11 @@
+require File.expand_path('../integration', __FILE__)
+
+module Adapters
+  class NetHttpPersistentTest < Faraday::TestCase
+
+    def adapter() :net_http_persistent end
+
+    Integration.apply(self, :NonParallel)
+
+  end
+end

data/test/adapters/net_http_test.rb

@@ -1,33 +1,49 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require File.expand_path('../integration', __FILE__)
 
 module Adapters
   class NetHttpTest < Faraday::TestCase
-    def setup
-      @connection = Faraday.new('http://disney.com') do |b|
+
+    def adapter() :net_http end
+
+    behaviors = [:NonParallel]
+    behaviors << :Compression if RUBY_VERSION >= '1.9'
+
+    Integration.apply(self, *behaviors)
+
+    def test_connection_errors_get_wrapped
+      connection = Faraday.new('http://disney.com') do |b|
         b.adapter :net_http
       end
-    end
 
-    def test_handles_compression_transparently_on_get
-      stub_request(:get, 'disney.com/hello').with { |request|
-        accept_encoding = request.headers['Accept-Encoding']
-        if RUBY_VERSION.index('1.8') == 0
-          # ruby 1.8 doesn't do any gzip/deflate automatically
-          accept_encoding == nil
-        else
-          # test for a value such as "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
-          accept_encoding =~ /gzip;.+\bdeflate\b/
-        end
-      }
-      @connection.get('/hello')
-    end
+      exceptions = [
+        EOFError,
+        Errno::ECONNABORTED,
+        Errno::ECONNREFUSED,
+        Errno::ECONNRESET,
+        Errno::EINVAL,
+        Net::HTTPBadResponse,
+        Net::HTTPHeaderSyntaxError,
+        Net::ProtocolError,
+        SocketError
+      ]
+
+      exceptions << OpenSSL::SSL::SSLError if defined?(OpenSSL)
 
-    def test_connect_error_gets_wrapped
-      stub_request(:get, 'disney.com/hello').to_raise(Errno::ECONNREFUSED)
+      exceptions.each do |exception_class|
+        stub_request(:get, 'disney.com/hello').to_raise(exception_class)
 
-      assert_raise Faraday::Error::ConnectionFailed do
-        @connection.get('/hello')
+        assert_raise(Faraday::Error::ConnectionFailed,
+                     "Failed to wrap #{exception_class} exceptions") do
+          connection.get('/hello')
+        end
       end
     end
+
+    def test_configure_ssl
+      http = Net::HTTP.new 'disney.com', 443
+      # this should not raise an error
+      Faraday::Adapter::NetHttp.new.configure_ssl(http, :ssl => {:verify => true})
+    end
+
   end
 end

data/test/adapters/patron_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path('../integration', __FILE__)
+
+module Adapters
+  class Patron < Faraday::TestCase
+
+    def adapter() :patron end
+
+    Integration.apply(self, :NonParallel) do
+      # https://github.com/toland/patron/issues/34
+      undef :test_PATCH_send_url_encoded_params
+
+      # https://github.com/toland/patron/issues/52
+      undef :test_GET_with_body
+    end
+
+  end unless defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE
+end

data/test/adapters/rack_test.rb

@@ -0,0 +1,26 @@
+require File.expand_path("../integration", __FILE__)
+require File.expand_path('../../live_server', __FILE__)
+
+module Adapters
+  class RackTest < Faraday::TestCase
+
+    def adapter() :rack end
+
+    def adapter_options
+      [FaradayTestServer]
+    end
+
+    # no Integration.apply because this doesn't require a server as a separate process
+    include Integration::Common
+    include Integration::NonParallel
+
+    # not using shared test because error is swallowed by Sinatra
+    def test_timeout
+      conn = create_connection(:request => {:timeout => 1, :open_timeout => 1})
+      begin
+        conn.get '/slow'
+      rescue Faraday::Error::ClientError
+      end
+    end
+  end
+end

data/test/adapters/typhoeus_test.rb

@@ -1,20 +1,14 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require File.expand_path('../integration', __FILE__)
 
 module Adapters
   class TyphoeusTest < Faraday::TestCase
-    def setup
-      @connection = Faraday.new('http://disney.com') do |b|
-        b.adapter :typhoeus
-      end
-    end
 
-    def test_handles_user_agent
-      # default typhoeus agent
-      stub_request(:get, 'disney.com/world').with(:headers => {'User-Agent'=>'Faraday Agent'}){ |request|
-        request.headers["User-Agent"] == 'Faraday Agent'
-      }
-      @connection.get('/world', nil, :user_agent => 'Faraday Agent')
+    def adapter() :typhoeus end
+
+    Integration.apply(self, :Parallel) do
+      # https://github.com/dbalatero/typhoeus/issues/75
+      undef :test_GET_with_body
     end
 
-  end if defined? ::Typhoeus
+  end unless defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE
 end

data/test/authentication_middleware_test.rb

@@ -37,7 +37,9 @@ class AuthenticationMiddlewareTest < Faraday::TestCase
     response = conn { |b|
       b.request :token_auth, 'baz', :foo => 42
     }.get('/auth-echo')
-    assert_equal "Token token=\"baz\",\n                     foo=\"42\"", response.body
+    assert_match /^Token /, response.body
+    assert_match /token="baz"/, response.body
+    assert_match /foo="42"/, response.body
   end
 
   def test_token_middleware_does_not_interfere_with_existing_authorization
@@ -45,4 +47,19 @@ class AuthenticationMiddlewareTest < Faraday::TestCase
       get('/auth-echo', nil, :authorization => 'Token token="bar"')
     assert_equal 'Token token="bar"', response.body
   end
+
+  def test_authorization_middleware_with_string
+    response = conn { |b|
+      b.request :authorization, 'custom', 'abc def'
+    }.get('/auth-echo')
+    assert_match /^custom abc def$/, response.body
+  end
+
+  def test_authorization_middleware_with_hash
+    response = conn { |b|
+      b.request :authorization, 'baz', :foo => 42
+    }.get('/auth-echo')
+    assert_match /^baz /, response.body
+    assert_match /foo="42"/, response.body
+  end
 end

data/test/connection_test.rb

@@ -68,24 +68,30 @@ class TestConnection < Faraday::TestCase
     assert_equal 'Faraday', conn.headers['User-agent']
   end
 
-  def test_basic_auth_prepends_basic_auth_middleware
+  def test_basic_auth_sets_header
     conn = Faraday::Connection.new
+    assert_nil conn.headers['Authorization']
+
     conn.basic_auth 'Aladdin', 'open sesame'
-    assert_equal Faraday::Request::BasicAuthentication, conn.builder[0].klass
-    assert_equal ['Aladdin', 'open sesame'], conn.builder[0].instance_eval { @args }
+    assert auth = conn.headers['Authorization']
+    assert_equal 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==', auth
   end
 
   def test_auto_parses_basic_auth_from_url_and_unescapes
     conn = Faraday::Connection.new :url => "http://foo%40bar.com:pass%20word@sushi.com/fish"
-    assert_equal Faraday::Request::BasicAuthentication, conn.builder[0].klass
-    assert_equal ['foo@bar.com', 'pass word'], conn.builder[0].instance_eval { @args }
+    assert auth = conn.headers['Authorization']
+    assert_equal Faraday::Request::BasicAuthentication.header("foo@bar.com", "pass word"), auth
   end
 
-  def test_token_auth_prepends_token_auth_middleware
+  def test_token_auth_sets_header
     conn = Faraday::Connection.new
+    assert_nil conn.headers['Authorization']
+
     conn.token_auth 'abcdef', :nonce => 'abc'
-    assert_equal Faraday::Request::TokenAuthentication, conn.builder[0].klass
-    assert_equal ['abcdef', { :nonce => 'abc' }], conn.builder[0].instance_eval { @args }
+    assert auth = conn.headers['Authorization']
+    assert_match /^Token /, auth
+    assert_match /token="abcdef"/, auth
+    assert_match /nonce="abc"/, auth
   end
 
   def test_build_url_uses_connection_host_as_default_uri_host
@@ -268,7 +274,7 @@ class TestConnection < Faraday::TestCase
     other.headers['content-length'] = 12
     other.params['b'] = '2'
 
-    assert_equal 3, other.builder.handlers.size
+    assert_equal 2, other.builder.handlers.size
     assert_equal 2, conn.builder.handlers.size
     assert !conn.headers.key?('content-length')
     assert !conn.params.key?('b')

data/test/helper.rb

@@ -1,3 +1,11 @@
+unless ENV['CI']
+  begin
+    require 'simplecov'
+    SimpleCov.start
+  rescue LoadError
+  end
+end
+
 require 'test/unit'
 require 'stringio'
 

data/test/live_server.rb

@@ -1,62 +1,50 @@
-require 'sinatra'
-set :logging, false
-
-[:get, :post, :put, :patch, :delete, :options].each do |method|
-  send(method, '/echo') do
-    kind = request.request_method.downcase
-    out = kind.dup
-    out << ' ?' << request.GET.inspect if request.GET.any?
-    out << ' ' << request.POST.inspect if request.POST.any?
-
-    content_type 'text/plain'
-    return out
+require 'sinatra/base'
+
+class FaradayTestServer < Sinatra::Base
+  set :logging => false,
+      :show_exceptions => false
+
+  [:get, :post, :put, :patch, :delete, :options].each do |method|
+    send(method, '/echo') do
+      kind = request.request_method.downcase
+      out = kind.dup
+      out << ' ?' << request.GET.inspect if request.GET.any?
+      out << ' ' << request.POST.inspect if request.POST.any?
+
+      content_type 'text/plain'
+      return out
+    end
   end
-end
-
-get '/hello_world' do
-  'hello world'
-end
 
-get '/json' do
-  content_type 'application/json'
-  "[1,2,3]"
-end
-
-post '/file' do
-  if params[:uploaded_file].respond_to? :each_key
-    "file %s %s" % [
-      params[:uploaded_file][:filename],
-      params[:uploaded_file][:type]]
-  else
-    status 400
+  get '/echo_header' do
+    header = "HTTP_#{params[:name].tr('-', '_').upcase}"
+    request.env.fetch(header) { 'NONE' }
   end
-end
 
-[:get, :post].each do |method|
-  send(method, '/hello') do
-    "hello #{params[:name]}"
+  post '/file' do
+    if params[:uploaded_file].respond_to? :each_key
+      "file %s %s" % [
+        params[:uploaded_file][:filename],
+        params[:uploaded_file][:type]]
+    else
+      status 400
+    end
   end
-end
 
-%w[POST PUT PATCH].each do |http_method|
-  settings.send(:route, http_method, '/echo_name') do
-    params[:name].inspect
+  get '/multi' do
+    [200, { 'Set-Cookie' => 'one, two' }, '']
   end
-end
-
-options '/options' do
-  'hi'
-end
 
-delete '/delete_with_json' do
-  %/{"deleted":true}/
-end
+  get '/slow' do
+    sleep 10
+    [200, {}, 'ok']
+  end
 
-get '/multi' do
-  [200, { 'Set-Cookie' => 'one, two' }, '']
+  error do |e|
+    "#{e.class}\n#{e.to_s}\n#{e.backtrace.join("\n")}"
+  end
 end
 
-get '/slow' do
-  sleep 10
-  [200, {}, 'ok']
+if $0 == __FILE__
+  FaradayTestServer.run!
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.8.0.rc2
-  prerelease: 6
+  version: 0.8.0
+  prerelease: 
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70137915346940 !ruby/object:Gem::Requirement
+  requirement: &70331771782880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70137915346940
+  version_requirements: *70331771782880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70137915345760 !ruby/object:Gem::Requirement
+  requirement: &70331771781000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137915345760
+  version_requirements: *70331771781000
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70331771779420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70331771779420
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70137915343760 !ruby/object:Gem::Requirement
+  requirement: &70331771778040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137915343760
+  version_requirements: *70331771778040
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70137915292660 !ruby/object:Gem::Requirement
+  requirement: &70331771775860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137915292660
+  version_requirements: *70331771775860
 description: 
 email: technoweenie@gmail.com
 executables: []
@@ -69,13 +80,14 @@ files:
 - faraday.gemspec
 - lib/faraday.rb
 - lib/faraday/adapter.rb
-- lib/faraday/adapter/action_dispatch.rb
 - lib/faraday/adapter/em_http.rb
 - lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/em_synchrony/parallel_manager.rb
 - lib/faraday/adapter/excon.rb
 - lib/faraday/adapter/net_http.rb
+- lib/faraday/adapter/net_http_persistent.rb
 - lib/faraday/adapter/patron.rb
+- lib/faraday/adapter/rack.rb
 - lib/faraday/adapter/test.rb
 - lib/faraday/adapter/typhoeus.rb
 - lib/faraday/builder.rb
@@ -83,6 +95,7 @@ files:
 - lib/faraday/error.rb
 - lib/faraday/middleware.rb
 - lib/faraday/request.rb
+- lib/faraday/request/authorization.rb
 - lib/faraday/request/basic_authentication.rb
 - lib/faraday/request/multipart.rb
 - lib/faraday/request/retry.rb
@@ -93,9 +106,16 @@ files:
 - lib/faraday/response/raise_error.rb
 - lib/faraday/upload_io.rb
 - lib/faraday/utils.rb
-- test/adapters/live_test.rb
+- test/adapters/default_test.rb
+- test/adapters/em_http_test.rb
+- test/adapters/em_synchrony_test.rb
+- test/adapters/excon_test.rb
+- test/adapters/integration.rb
 - test/adapters/logger_test.rb
+- test/adapters/net_http_persistent_test.rb
 - test/adapters/net_http_test.rb
+- test/adapters/patron_test.rb
+- test/adapters/rack_test.rb
 - test/adapters/test_middleware_test.rb
 - test/adapters/typhoeus_test.rb
 - test/authentication_middleware_test.rb
@@ -122,19 +142,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
 test_files:
-- test/adapters/live_test.rb
+- test/adapters/default_test.rb
+- test/adapters/em_http_test.rb
+- test/adapters/em_synchrony_test.rb
+- test/adapters/excon_test.rb
+- test/adapters/integration.rb
 - test/adapters/logger_test.rb
+- test/adapters/net_http_persistent_test.rb
 - test/adapters/net_http_test.rb
+- test/adapters/patron_test.rb
+- test/adapters/rack_test.rb
 - test/adapters/test_middleware_test.rb
 - test/adapters/typhoeus_test.rb
 - test/authentication_middleware_test.rb