faraday 0.8.11 → 0.9.0.rc1

data/test/adapters/em_http_test.rb

@@ -8,8 +8,13 @@ module Adapters
     Integration.apply(self, :Parallel) do
       # https://github.com/eventmachine/eventmachine/pull/289
       undef :test_timeout
+
+      def test_binds_local_socket
+        host = '1.2.3.4'
+        conn = create_connection :request => { :bind => { :host => host } }
+        assert_equal host, conn.options[:bind][:host]
+      end
     end unless jruby? and ssl_mode?
     # https://github.com/eventmachine/eventmachine/issues/180
-
   end
 end

data/test/adapters/em_synchrony_test.rb

@@ -8,7 +8,13 @@ module Adapters
     Integration.apply(self, :Parallel) do
       # https://github.com/eventmachine/eventmachine/pull/289
       undef :test_timeout
-    end unless RUBY_VERSION < '1.9' or jruby?
 
+      def test_binds_local_socket
+        host = '1.2.3.4'
+        conn = create_connection :request => { :bind => { :host => host } }
+        #put conn.get('/who-am-i').body
+        assert_equal host, conn.options[:bind][:host]
+      end
+    end unless RUBY_VERSION < '1.9' or jruby?
   end
 end

data/test/adapters/excon_test.rb

@@ -8,13 +8,6 @@ module Adapters
     Integration.apply(self, :NonParallel) do
       # https://github.com/geemus/excon/issues/126 ?
       undef :test_timeout if ssl_mode?
-
-      # Excon lets OpenSSL::SSL::SSLError be raised without any way to
-      # distinguish whether it happened because of a 407 proxy response
-      undef :test_proxy_auth_fail if ssl_mode?
-
-      # https://github.com/geemus/excon/issues/358
-      undef :test_connection_error if RUBY_VERSION >= '2.1.0'
     end
   end
 end

data/test/adapters/httpclient_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../integration', __FILE__)
+
+module Adapters
+  class HttpclientTest < Faraday::TestCase
+
+    def adapter() :httpclient end
+
+    Integration.apply(self, :NonParallel) do
+      def test_binds_local_socket
+        host = '1.2.3.4'
+        conn = create_connection :request => { :bind => { :host => host } }
+        assert_equal host, conn.options[:bind][:host]
+      end
+    end
+  end
+end

data/test/adapters/integration.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
 require File.expand_path("../../helper", __FILE__)
+Faraday.require_lib 'autoload'
 
 module Adapters
   # Adapter integration tests. To use, implement two methods:
@@ -57,7 +58,7 @@ module Adapters
     module Compression
       def test_GET_handles_compression
         res = get('echo_header', :name => 'accept-encoding')
-        assert_match(/gzip;.+\bdeflate\b/, res.body)
+        assert_match /gzip;.+\bdeflate\b/, res.body
       end
     end
 
@@ -117,7 +118,7 @@ module Adapters
         resp = post('file') do |req|
           req.body = {'uploaded_file' => Faraday::UploadIO.new(__FILE__, 'text/x-ruby')}
         end
-        assert_equal "file integration.rb text/x-ruby #{File.size(__FILE__)}", resp.body
+        assert_equal "file integration.rb text/x-ruby", resp.body
       end
 
       def test_PUT_send_url_encoded_params
@@ -143,8 +144,7 @@ module Adapters
       end
 
       def test_HEAD_retrieves_no_response_body
-        # FIXME: some adapters return empty string, some nil
-        assert_equal '', head('echo').body.to_s
+        assert_equal '', head('echo').body
       end
 
       def test_HEAD_retrieves_the_response_headers
@@ -161,45 +161,14 @@ module Adapters
 
       def test_timeout
         conn = create_connection(:request => {:timeout => 1, :open_timeout => 1})
-        assert_raise Faraday::Error::TimeoutError do
+        assert_raises Faraday::Error::TimeoutError do
           conn.get '/slow'
         end
       end
 
-      def test_connection_error
-        assert_raise Faraday::Error::ConnectionFailed do
-          get 'http://localhost:4'
-        end
-      end
-
-      def test_proxy
-        proxy_uri = URI(ENV['LIVE_PROXY'])
-        conn = create_connection(:proxy => proxy_uri)
-
-        res = conn.get '/echo'
-        assert_equal 'get', res.body
-
-        unless self.class.ssl_mode?
-          # proxy can't append "Via" header for HTTPS responses
-          assert_match(/:#{proxy_uri.port}$/, res['via'])
-        end
-      end
-
-      def test_proxy_auth_fail
-        proxy_uri = URI(ENV['LIVE_PROXY'])
-        proxy_uri.password = 'WRONG'
-        conn = create_connection(:proxy => proxy_uri)
-
-        err = assert_raise Faraday::Error::ConnectionFailed do
-          conn.get '/echo'
-        end
-
-        unless self.class.ssl_mode? && (self.class.jruby? ||
-            adapter == :em_http || adapter == :em_synchrony)
-          # JRuby raises "End of file reached" which cannot be distinguished from a 407
-          # EM raises "connection closed by server" due to https://github.com/igrigorik/em-socksify/pull/19
-          assert_equal %{407 "Proxy Authentication Required "}, err.message
-        end
+      def test_empty_body_response_represented_as_blank_string
+        response = get('204')
+        assert_equal '', response.body
       end
 
       def adapter

data/test/adapters/logger_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require File.expand_path('../../helper', __FILE__)
 require 'stringio'
 require 'logger'
 

data/test/adapters/net_http_test.rb

@@ -1,6 +1,4 @@
 require File.expand_path('../integration', __FILE__)
-require 'ostruct'
-require 'uri'
 
 module Adapters
   class NetHttpTest < Faraday::TestCase
@@ -12,34 +10,5 @@ module Adapters
 
     Integration.apply(self, *behaviors)
 
-    def test_no_explicit_http_port_number
-      url = URI('http://example.com')
-      url.port = nil
-
-      adapter = Faraday::Adapter::NetHttp.new
-      http = adapter.net_http_connection(:url => url, :request => {})
-
-      assert_equal 80, http.port
-    end
-
-    def test_no_explicit_https_port_number
-      url = URI('https://example.com')
-      url.port = nil
-
-      adapter = Faraday::Adapter::NetHttp.new
-      http = adapter.net_http_connection(:url => url, :request => {})
-
-      assert_equal 443, http.port
-    end
-
-    def test_explicit_port_number
-      url = URI('https://example.com:1234')
-
-      adapter = Faraday::Adapter::NetHttp.new
-      http = adapter.net_http_connection(:url => url, :request => {})
-
-      assert_equal 1234, http.port
-    end
-
   end
 end

data/test/adapters/patron_test.rb

@@ -11,7 +11,7 @@ module Adapters
 
       # https://github.com/toland/patron/issues/52
       undef :test_GET_with_body
-    end unless RUBY_VERSION < '1.9' or jruby?
+    end unless jruby?
 
   end
 end

data/test/adapters/rack_test.rb

@@ -22,10 +22,5 @@ module Adapters
       rescue Faraday::Error::ClientError
       end
     end
-
-    # test not applicable
-    undef test_connection_error
-    undef test_proxy
-    undef test_proxy_auth_fail
   end
 end

data/test/adapters/test_middleware_test.rb

@@ -1,9 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require File.expand_path('../../helper', __FILE__)
 
 module Adapters
   class TestMiddleware < Faraday::TestCase
+    Stubs = Faraday::Adapter.lookup_middleware(:test)::Stubs
     def setup
-      @stubs = Faraday::Adapter::Test::Stubs.new
+      @stubs = Stubs.new
       @conn  = Faraday.new do |builder|
         builder.adapter :test, @stubs
       end
@@ -36,11 +37,18 @@ module Adapters
       @stubs.get('/optional?a=1') { [200, {}, 'a'] }
       assert_equal 'a', @conn.get('/optional?a=1&b=1').body
       assert_equal 'a', @conn.get('/optional?a=1').body
-      assert_raise Faraday::Adapter::Test::Stubs::NotFound do
+      assert_raises Faraday::Adapter::Test::Stubs::NotFound do
         @conn.get('/optional')
       end
     end
 
+    def test_middleware_with_http_headers
+      @stubs.get('/yo', { 'X-HELLO' => 'hello' }) { [200, {}, 'a'] }
+      @stubs.get('/yo') { [200, {}, 'b'] }
+      assert_equal 'a', @conn.get('/yo') { |env| env.headers['X-HELLO'] = 'hello' }.body
+      assert_equal 'b', @conn.get('/yo').body
+    end
+
     def test_middleware_allow_different_outcomes_for_the_same_request
       @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }
       @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'world'] }
@@ -62,9 +70,16 @@ module Adapters
     end
 
     def test_raises_an_error_if_no_stub_is_found_for_request
-      assert_raise Faraday::Adapter::Test::Stubs::NotFound do
+      assert_raises Stubs::NotFound do
         @conn.get('/invalid'){ [200, {}, []] }
       end
     end
+
+    def test_raises_an_error_if_no_stub_is_found_for_request_without_this_header
+      @stubs.get('/yo', { 'X-HELLO' => 'hello' }) { [200, {}, 'a'] }
+      assert_raises Faraday::Adapter::Test::Stubs::NotFound do
+        @conn.get('/yo')
+      end
+    end
   end
 end

data/test/adapters/typhoeus_test.rb

@@ -13,9 +13,26 @@ module Adapters
       # which libcurl seems to generate for this particular request:
       undef :test_POST_sends_files
 
-      # inconsistent outcomes ranging from successful response to connection error
-      undef :test_proxy_auth_fail if ssl_mode?
-    end unless jruby? or ruby_22_plus?
+      def test_binds_local_socket
+        host = '1.2.3.4'
+        conn = create_connection :request => { :bind => { :host => host } }
+        assert_equal host, conn.options[:bind][:host]
+      end
 
+      def test_GET_ssl_rejects_bad_hosts
+        original_ssl_file = ENV['SSL_FILE']
+        begin
+          ENV['SSL_FILE'] = 'tmp/faraday-different-ca-cert.crt'
+          conn = create_connection
+          expected = ''
+          response = conn.get('/ssl')
+          assert_equal expected, response.body
+        ensure
+          ENV['SSL_FILE'] = original_ssl_file
+        end
+      end if ssl_mode?
+
+    end unless jruby?
   end
 end
+

data/test/authentication_middleware_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path('../helper', __FILE__)
 
 class AuthenticationMiddlewareTest < Faraday::TestCase
   def conn
@@ -37,9 +37,9 @@ class AuthenticationMiddlewareTest < Faraday::TestCase
     response = conn { |b|
       b.request :token_auth, 'baz', :foo => 42
     }.get('/auth-echo')
-    assert_match(/^Token /, response.body)
-    assert_match(/token="baz"/, response.body)
-    assert_match(/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
@@ -52,14 +52,14 @@ class AuthenticationMiddlewareTest < Faraday::TestCase
     response = conn { |b|
       b.request :authorization, 'custom', 'abc def'
     }.get('/auth-echo')
-    assert_match(/^custom abc def$/, response.body)
+    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)
+    assert_match /^baz /, response.body
+    assert_match /foo="42"/, response.body
   end
 end

data/test/connection_test.rb

@@ -1,8 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path('../helper', __FILE__)
 require 'uri'
 
 class TestConnection < Faraday::TestCase
 
+  def teardown
+    Faraday::Utils.default_params_encoder = nil
+  end
+
   def with_env(key, proxy)
     old_value = ENV.fetch(key, false)
     ENV[key] = proxy
@@ -191,6 +195,19 @@ class TestConnection < Faraday::TestCase
     assert_equal "a%5Bb%5D=c", uri.query
   end
 
+  def test_build_url_bracketizes_repeated_params_in_query
+    conn = Faraday::Connection.new
+    uri = conn.build_url("http://sushi.com/sake.html", 'a' => [1, 2])
+    assert_equal "a%5B%5D=1&a%5B%5D=2", uri.query
+  end
+
+  def test_build_url_without_braketizing_repeated_params_in_query
+    conn = Faraday::Connection.new
+    conn.options.params_encoder = Faraday::FlatParamsEncoder
+    uri = conn.build_url("http://sushi.com/sake.html", 'a' => [1, 2])
+    assert_equal "a=1&a=2", uri.query
+  end
+
   def test_build_url_parses_url
     conn = Faraday::Connection.new
     uri = conn.build_url("http://sushi.com/sake.html")
@@ -212,26 +229,11 @@ class TestConnection < Faraday::TestCase
     assert_equal '/sake.html', uri.path
   end
 
-  def test_request_header_change_does_not_modify_connection_header
-    connection = Faraday.new(:url => "https://asushi.com/sake.html")
-    connection.headers = { "Authorization"=>"token abc123" }
-
-    request = connection.build_request(:get)
-    request.headers.delete("Authorization")
-
-    assert_equal connection.headers.keys.sort, ["Authorization"]
-    assert connection.headers.include?("Authorization")
-
-    assert_equal request.headers.keys.sort, []
-    assert !request.headers.include?("Authorization")
-  end
-
   def test_proxy_accepts_string
     with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       conn.proxy 'http://proxy.com'
-      assert_equal 'proxy.com', conn.proxy[:uri].host
-      assert_equal [:uri],      conn.proxy.keys
+      assert_equal 'proxy.com', conn.proxy.host
     end
   end
 
@@ -239,8 +241,7 @@ class TestConnection < Faraday::TestCase
     with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       conn.proxy URI.parse('http://proxy.com')
-      assert_equal 'proxy.com', conn.proxy[:uri].host
-      assert_equal [:uri],      conn.proxy.keys
+      assert_equal 'proxy.com', conn.proxy.host
     end
   end
 
@@ -248,8 +249,8 @@ class TestConnection < Faraday::TestCase
     with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       conn.proxy :uri => 'http://proxy.com', :user => 'rick'
-      assert_equal 'proxy.com', conn.proxy[:uri].host
-      assert_equal 'rick',      conn.proxy[:user]
+      assert_equal 'proxy.com', conn.proxy.host
+      assert_equal 'rick',      conn.proxy.user
     end
   end
 
@@ -257,59 +258,23 @@ class TestConnection < Faraday::TestCase
     with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
       conn.proxy :uri => URI.parse('http://proxy.com'), :user => 'rick'
-      assert_equal 'proxy.com', conn.proxy[:uri].host
-      assert_equal 'rick',      conn.proxy[:user]
+      assert_equal 'proxy.com', conn.proxy.host
+      assert_equal 'rick',      conn.proxy.user
     end
   end
 
   def test_proxy_accepts_http_env
     with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
-      assert_equal 'duncan.proxy.com', conn.proxy[:uri].host
+      assert_equal 'duncan.proxy.com', conn.proxy.host
     end
   end
 
   def test_proxy_accepts_http_env_with_auth
     with_env 'http_proxy', "http://a%40b:my%20pass@duncan.proxy.com:80" do
       conn = Faraday::Connection.new
-      assert_equal 'a@b',     conn.proxy[:user]
-      assert_equal 'my pass', conn.proxy[:password]
-    end
-  end
-
-  def test_proxy_accepts_env_without_scheme
-    with_env 'http_proxy', "localhost:8888" do
-      uri = Faraday::Connection.new.proxy[:uri]
-      assert_equal 'localhost', uri.host
-      assert_equal 8888, uri.port
-    end
-  end
-
-  def test_no_proxy_from_env
-    with_env 'http_proxy', nil do
-      conn = Faraday::Connection.new
-      assert_equal nil, conn.proxy
-    end
-  end
-
-  def test_no_proxy_from_blank_env
-    with_env 'http_proxy', '' do
-      conn = Faraday::Connection.new
-      assert_equal nil, conn.proxy
-    end
-  end
-
-  def test_proxy_doesnt_accept_uppercase_env
-    with_env 'HTTP_PROXY', "http://localhost:8888/" do
-      conn = Faraday::Connection.new
-      assert_nil conn.proxy
-    end
-  end
-
-  def test_proxy_requires_uri
-    conn = Faraday::Connection.new
-    assert_raises ArgumentError do
-      conn.proxy :uri => :bad_uri, :user => 'rick'
+      assert_equal 'a@b',     conn.proxy.user
+      assert_equal 'my pass', conn.proxy.password
     end
   end
 
@@ -317,8 +282,7 @@ class TestConnection < Faraday::TestCase
     conn = Faraday::Connection.new 'http://sushi.com/foo',
       :ssl => { :verify => :none },
       :headers => {'content-type' => 'text/plain'},
-      :params => {'a'=>'1'},
-      :request => {:timeout => 5}
+      :params => {'a'=>'1'}
 
     other = conn.dup
 
@@ -329,14 +293,11 @@ class TestConnection < Faraday::TestCase
     other.basic_auth('', '')
     other.headers['content-length'] = 12
     other.params['b'] = '2'
-    other.options[:open_timeout] = 10
 
     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')
-    assert_equal 5, other.options[:timeout]
-    assert_nil conn.options[:open_timeout]
   end
 
   def test_init_with_block
@@ -359,20 +320,13 @@ class TestRequestParams < Faraday::TestCase
   def create_connection(*args)
     @conn = Faraday::Connection.new(*args) do |conn|
       yield conn if block_given?
-      class << conn
+      class << conn.builder
         undef app
         def app() lambda { |env| env } end
       end
     end
   end
 
-  def get(*args)
-    env = @conn.get(*args) do |req|
-      yield req if block_given?
-    end
-    env[:url].query
-  end
-
   def assert_query_equal(expected, query)
     assert_equal expected, query.split('&').sort
   end
@@ -433,14 +387,37 @@ class TestRequestParams < Faraday::TestCase
   end
 
   def test_array_params_in_url
+    Faraday::Utils.default_params_encoder = nil
     create_connection 'http://a.co/page1?color[]=red&color[]=blue'
     query = get
     assert_equal "color%5B%5D=red&color%5B%5D=blue", query
   end
 
   def test_array_params_in_params
+    Faraday::Utils.default_params_encoder = nil
     create_connection 'http://a.co/page1', :params => {:color => ['red', 'blue']}
     query = get
     assert_equal "color%5B%5D=red&color%5B%5D=blue", query
   end
+
+  def test_array_params_in_url_with_flat_params
+    Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
+    create_connection 'http://a.co/page1?color=red&color=blue'
+    query = get
+    assert_equal "color=red&color=blue", query
+  end
+
+  def test_array_params_in_params_with_flat_params
+    Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
+    create_connection 'http://a.co/page1', :params => {:color => ['red', 'blue']}
+    query = get
+    assert_equal "color=red&color=blue", query
+  end
+
+  def get(*args)
+    env = @conn.get(*args) do |req|
+      yield req if block_given?
+    end
+    env[:url].query
+  end
 end