faraday 0.9.1 → 0.11.0

data/script/test

@@ -1,172 +0,0 @@
-#!/usr/bin/env bash
-# Usage: script/test [file] [adapter]... -- [test/unit options]
-# Runs the test suite against a local server spawned automatically in a
-# thread. After tests are done, the server is shut down.
-#
-# If filename arguments are given, only those files are run. If arguments given
-# are not filenames, they are taken as words that filter the list of files to run.
-#
-# Examples:
-#
-#   $ script/test
-#   $ script/test test/env_test.rb
-#   $ script/test excon typhoeus
-#
-#   # Run only tests matching /ssl/ for the net_http adapter, with SSL enabled.
-#   $ SSL=yes script/test net_http -- -n /ssl/
-#
-#   # Run against multiple rbenv versions
-#   $ RBENV_VERSIONS="1.9.3-p194 ree-1.8.7-2012.02" script/test
-set -e
-
-if [[ "$RUBYOPT" != *"bundler/setup"* ]]; then
-  export RUBYOPT="-rbundler/setup $RUBYOPT"
-fi
-
-port=3999
-proxy_port=3998
-scheme=http
-
-if [ "$SSL" = "yes" ]; then
-  scheme=https
-  if [ -z "$SSL_KEY" ] || [ -z "$SSL_FILE" ]; then
-    eval "$(script/generate_certs -s)"
-  fi
-fi
-
-find_test_files() {
-  find "$1" -name '*_test.rb'
-}
-
-filter_matching() {
-  pattern="$1"
-  shift
-  for line in "$@"; do
-    [[ $line == *"$pattern"* ]] && echo "$line"
-  done
-}
-
-start_server() {
-  mkdir -p log
-  script/server -p $port >log/test.log 2>&1 &
-  echo $!
-}
-
-start_proxy() {
-  mkdir -p log
-  script/proxy-server -p $proxy_port -u "faraday@test.local:there is cake" >log/proxy.log 2>&1 &
-  echo $!
-}
-
-server_started() {
-  lsof -i :${1?} >/dev/null
-}
-
-timestamp() {
-  date +%s
-}
-
-wait_for_server() {
-  timeout=$(( `timestamp` + $1 ))
-  while true; do
-    if server_started "$2"; then
-      break
-    elif [ `timestamp` -gt "$timeout" ]; then
-      echo "timed out after $1 seconds" >&2
-      return 1
-    fi
-  done
-}
-
-filtered=
-IFS=$'\n' test_files=($(find_test_files "test"))
-declare -a explicit_files
-
-# Process filter arguments:
-# - test filenames as taken as-is
-# - other words are taken as pattern to match the list of known files against
-# - arguments after "--" are forwarded to the ruby process
-while [ $# -gt 0 ]; do
-  arg="$1"
-  shift
-  if [ "$arg" = "--" ]; then
-    break
-  elif [ -f "$arg" ]; then
-    filtered=true
-    explicit_files[${#explicit_files[@]}+1]="$arg"
-  else
-    filtered=true
-    IFS=$'\n' explicit_files=(
-      ${explicit_files[@]}
-      $(filter_matching "$arg" "${test_files[@]}" || true)
-    )
-  fi
-done
-
-# If there were filter args, replace test files list with the results
-if [ -n "$filtered" ]; then
-  if [ ${#explicit_files[@]} -eq 0 ]; then
-    echo "Error: no test files match" >&2
-    exit 1
-  else
-    test_files=(${explicit_files[@]})
-    echo running "${test_files[@]}"
-  fi
-fi
-
-# If there are any adapter tests, spin up the HTTP server
-if [ -n "$(filter_matching "adapters" "${test_files[@]}")" ]; then
-  if server_started $port; then
-    echo "aborted: another instance of server running on $port" >&2
-    exit 1
-  fi
-  server_pid=$(start_server)
-  proxy_pid=$(start_proxy)
-  wait_for_server 30 $port || {
-    cat log/test.log
-    kill "$server_pid"
-    kill "$proxy_pid"
-    exit 1
-  }
-  wait_for_server 5 $proxy_port
-  cleanup() {
-    if [ $? -ne 0 ] && [ -n "$TRAVIS" ]; then
-      cat log/test.log
-    fi
-    kill "$server_pid"
-    kill "$proxy_pid"
-  }
-  trap cleanup INT EXIT
-  export LIVE="${scheme}://localhost:${port}"
-  export LIVE_PROXY="http://faraday%40test.local:there%20is%20cake@localhost:${proxy_port}"
-fi
-
-warnings="${TMPDIR:-/tmp}/faraday-warnings.$$"
-
-run_test_files() {
-  # Save warnings on stderr to a separate file
-  RUBYOPT="$RUBYOPT -w" ruby -e 'while f=ARGV.shift and f!="--"; load f; end' "${test_files[@]}" -- "$@" \
-    2> >(tee >(grep 'warning:' >"$warnings") | grep -v 'warning:')
-}
-
-check_warnings() {
-  # Display Ruby warnings from this project's source files. Abort if any were found.
-  num="$(grep -F "$PWD" "$warnings" | grep -v "${PWD}/bundle" | sort | uniq -c | sort -rn | tee /dev/stderr | wc -l)"
-  rm -f "$warnings"
-  if [ "$num" -gt 0 ]; then
-    echo "FAILED: this test suite doesn't tolerate Ruby syntax warnings!" >&2
-    exit 1
-  fi
-}
-
-if [ -n "$RBENV_VERSIONS" ]; then
-  IFS=' ' versions=($RBENV_VERSIONS)
-  for version in "${versions[@]}"; do
-    echo "[${version}]"
-    RBENV_VERSION="$version" run_test_files "$@"
-  done
-else
-  run_test_files "$@"
-fi
-
-check_warnings

data/test/adapters/default_test.rb

@@ -1,14 +0,0 @@
-require File.expand_path('../integration', __FILE__)
-
-module Adapters
-  class DefaultTest < Faraday::TestCase
-
-    def adapter() :default end
-
-    Integration.apply(self, :NonParallel) do
-      # default stack is not configured with Multipart
-      undef :test_POST_sends_files
-    end
-
-  end
-end

data/test/adapters/em_http_test.rb

@@ -1,20 +0,0 @@
-require File.expand_path('../integration', __FILE__)
-
-module Adapters
-  class EMHttpTest < Faraday::TestCase
-
-    def adapter() :em_http end
-
-    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

@@ -1,20 +0,0 @@
-require File.expand_path('../integration', __FILE__)
-
-module Adapters
-  class EMSynchronyTest < Faraday::TestCase
-
-    def adapter() :em_synchrony end
-
-    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 } }
-        #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

@@ -1,20 +0,0 @@
-require File.expand_path('../integration', __FILE__)
-
-module Adapters
-  class ExconTest < Faraday::TestCase
-
-    def adapter() :excon end
-
-    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

@@ -1,21 +0,0 @@
-require File.expand_path('../integration', __FILE__)
-
-module Adapters
-  class HttpclientTest < Faraday::TestCase
-
-    def adapter() :httpclient end
-
-    Integration.apply(self, :NonParallel) do
-      def setup
-        require 'httpclient' unless defined?(HTTPClient)
-        HTTPClient::NO_PROXY_HOSTS.delete('localhost')
-      end
-
-      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,254 +0,0 @@
-require 'forwardable'
-require File.expand_path("../../helper", __FILE__)
-Faraday.require_lib 'autoload'
-
-module Adapters
-  # Adapter integration tests. To use, implement two methods:
-  #
-  # `#adapter` required. returns a symbol for the adapter middleware name
-  # `#adapter_options` optional. extra arguments for building an adapter
-  module Integration
-    def self.apply(base, *extra_features)
-      if base.live_server?
-        features = [:Common]
-        features.concat extra_features
-        features << :SSL if base.ssl_mode?
-        features.each {|name| base.send(:include, self.const_get(name)) }
-        yield if block_given?
-      elsif !defined? @warned
-        warn "Warning: Not running integration tests against a live server."
-        warn "Start the server `ruby test/live_server.rb` and set the LIVE=1 env variable."
-        @warned = true
-      end
-    end
-
-    module Parallel
-      def test_in_parallel
-        resp1, resp2 = nil, nil
-
-        connection = create_connection
-        connection.in_parallel do
-          resp1 = connection.get('echo?a=1')
-          resp2 = connection.get('echo?b=2')
-          assert connection.in_parallel?
-          assert_nil resp1.body
-          assert_nil resp2.body
-        end
-        assert !connection.in_parallel?
-        assert_equal 'get ?{"a"=>"1"}', resp1.body
-        assert_equal 'get ?{"b"=>"2"}', resp2.body
-      end
-    end
-
-    module NonParallel
-      def test_no_parallel_support
-        connection = create_connection
-        response = nil
-
-        err = capture_warnings do
-          connection.in_parallel do
-            response = connection.get('echo').body
-          end
-        end
-        assert response
-        assert_match "no parallel-capable adapter on Faraday stack", err
-        assert_match __FILE__, err
-      end
-    end
-
-    module Compression
-      def test_GET_handles_compression
-        res = get('echo_header', :name => 'accept-encoding')
-        assert_match(/gzip;.+\bdeflate\b/, res.body)
-      end
-    end
-
-    module SSL
-      def test_GET_ssl_fails_with_bad_cert
-        ca_file = 'tmp/faraday-different-ca-cert.crt'
-        conn = create_connection(:ssl => {:ca_file => ca_file})
-        err = assert_raises Faraday::SSLError do
-          conn.get('/ssl')
-        end
-        assert_includes err.message, "certificate"
-      end
-    end
-
-    module Common
-      extend Forwardable
-      def_delegators :create_connection, :get, :head, :put, :post, :patch, :delete, :run_request
-
-      def test_GET_retrieves_the_response_body
-        assert_equal 'get', get('echo').body
-      end
-
-      def test_GET_send_url_encoded_params
-        assert_equal %(get ?{"name"=>"zack"}), get('echo', :name => 'zack').body
-      end
-
-      def test_GET_retrieves_the_response_headers
-        response = get('echo')
-        assert_match(/text\/plain/, response.headers['Content-Type'], 'original case fail')
-        assert_match(/text\/plain/, response.headers['content-type'], 'lowercase fail')
-      end
-
-      def test_GET_handles_headers_with_multiple_values
-        assert_equal 'one, two', get('multi').headers['set-cookie']
-      end
-
-      def test_GET_with_body
-        response = get('echo') do |req|
-          req.body = {'bodyrock' => true}
-        end
-        assert_equal %(get {"bodyrock"=>"true"}), response.body
-      end
-
-      def test_GET_sends_user_agent
-        response = get('echo_header', {:name => 'user-agent'}, :user_agent => 'Agent Faraday')
-        assert_equal 'Agent Faraday', response.body
-      end
-
-      def test_GET_ssl
-        expected = self.class.ssl_mode?.to_s
-        assert_equal expected, get('ssl').body
-      end
-
-      def test_POST_send_url_encoded_params
-        assert_equal %(post {"name"=>"zack"}), post('echo', :name => 'zack').body
-      end
-
-      def test_POST_send_url_encoded_nested_params
-        resp = post('echo', 'name' => {'first' => 'zack'})
-        assert_equal %(post {"name"=>{"first"=>"zack"}}), resp.body
-      end
-
-      def test_POST_retrieves_the_response_headers
-        assert_match(/text\/plain/, post('echo').headers['content-type'])
-      end
-
-      def test_POST_sends_files
-        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
-      end
-
-      def test_PUT_send_url_encoded_params
-        assert_equal %(put {"name"=>"zack"}), put('echo', :name => 'zack').body
-      end
-
-      def test_PUT_send_url_encoded_nested_params
-        resp = put('echo', 'name' => {'first' => 'zack'})
-        assert_equal %(put {"name"=>{"first"=>"zack"}}), resp.body
-      end
-
-      def test_PUT_retrieves_the_response_headers
-        assert_match(/text\/plain/, put('echo').headers['content-type'])
-      end
-
-      def test_PATCH_send_url_encoded_params
-        assert_equal %(patch {"name"=>"zack"}), patch('echo', :name => 'zack').body
-      end
-
-      def test_OPTIONS
-        resp = run_request(:options, 'echo', nil, {})
-        assert_equal 'options', resp.body
-      end
-
-      def test_HEAD_retrieves_no_response_body
-        assert_equal '', head('echo').body
-      end
-
-      def test_HEAD_retrieves_the_response_headers
-        assert_match(/text\/plain/, head('echo').headers['content-type'])
-      end
-
-      def test_DELETE_retrieves_the_response_headers
-        assert_match(/text\/plain/, delete('echo').headers['content-type'])
-      end
-
-      def test_DELETE_retrieves_the_body
-        assert_equal %(delete), delete('echo').body
-      end
-
-      def test_timeout
-        conn = create_connection(:request => {:timeout => 1, :open_timeout => 1})
-        assert_raises Faraday::Error::TimeoutError do
-          conn.get '/slow'
-        end
-      end
-
-      def test_connection_error
-        assert_raises 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_raises Faraday::Error::ConnectionFailed do
-          conn.get '/echo'
-        end
-
-        unless self.class.ssl_mode? && self.class.jruby?
-          # JRuby raises "End of file reached" which cannot be distinguished from a 407
-          assert_equal %{407 "Proxy Authentication Required "}, err.message
-        end
-      end
-
-      def test_empty_body_response_represented_as_blank_string
-        response = get('204')
-        assert_equal '', response.body
-      end
-
-      def adapter
-        raise NotImplementedError.new("Need to override #adapter")
-      end
-
-      # extra options to pass when building the adapter
-      def adapter_options
-        []
-      end
-
-      def create_connection(options = {})
-        if adapter == :default
-          builder_block = nil
-        else
-          builder_block = Proc.new do |b|
-            b.request :multipart
-            b.request :url_encoded
-            b.adapter adapter, *adapter_options
-          end
-        end
-
-        server = self.class.live_server
-        url = '%s://%s:%d' % [server.scheme, server.host, server.port]
-
-        options[:ssl] ||= {}
-        options[:ssl][:ca_file] ||= ENV['SSL_FILE']
-
-        Faraday::Connection.new(url, options, &builder_block).tap do |conn|
-          conn.headers['X-Faraday-Adapter'] = adapter.to_s
-          adapter_handler = conn.builder.handlers.last
-          conn.builder.insert_before adapter_handler, Faraday::Response::RaiseError
-        end
-      end
-    end
-  end
-end

data/test/adapters/logger_test.rb

@@ -1,82 +0,0 @@
-require File.expand_path('../../helper', __FILE__)
-require 'stringio'
-require 'logger'
-
-module Adapters
-  class LoggerTest < Faraday::TestCase
-    def conn(logger, logger_options={})
-      rubbles = ['Barney', 'Betty', 'Bam Bam']
-
-      Faraday.new do |b|
-        b.response :logger, logger, logger_options
-        b.adapter :test do |stubs|
-          stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }
-          stubs.post('/ohai') { [200, {'Content-Type' => 'text/html'}, 'fred'] }
-          stubs.get('/ohno') { [200, {'Content-Type' => 'text/html'}, 'wilma'] }
-          stubs.post('/ohyes') { [200, {'Content-Type' => 'text/html'}, 'pebbles'] }
-          stubs.get('/rubbles') { [200, {'Content-Type' => 'application/json'}, rubbles] }
-        end
-      end
-    end
-
-    def setup
-      @io     = StringIO.new
-      @logger = Logger.new(@io)
-      @logger.level = Logger::DEBUG
-
-      @conn = conn(@logger)
-      @resp = @conn.get '/hello', nil, :accept => 'text/html'
-    end
-
-    def test_still_returns_output
-      assert_equal 'hello', @resp.body
-    end
-
-    def test_logs_method_and_url
-      assert_match "get http:/hello", @io.string
-    end
-
-    def test_logs_request_headers
-      assert_match %(Accept: "text/html), @io.string
-    end
-
-    def test_logs_response_headers
-      assert_match %(Content-Type: "text/html), @io.string
-    end
-
-    def test_does_not_log_request_body_by_default
-      @conn.post '/ohai', 'name=Unagi', :accept => 'text/html'
-      refute_match %(name=Unagi), @io.string
-    end
-
-    def test_does_not_log_response_body_by_default
-      @conn.post '/ohai', 'name=Toro', :accept => 'text/html'
-      refute_match %(fred), @io.string
-    end
-
-    def test_log_request_body
-      app = conn(@logger, :bodies => { :request => true })
-      app.post '/ohyes', 'name=Tamago', :accept => 'text/html'
-      assert_match %(name=Tamago), @io.string
-    end
-
-    def test_log_response_body
-      app = conn(@logger, :bodies => { :response => true })
-      app.get '/ohno', :accept => 'text/html'
-      assert_match %(wilma), @io.string
-    end
-
-    def test_log_request_and_response_body
-      app = conn(@logger, :bodies => true)
-      app.post '/ohyes', 'name=Ebi', :accept => 'text/html'
-      assert_match %(name=Ebi), @io.string
-      assert_match %(pebbles), @io.string
-    end
-
-    def test_log_response_body_object
-      app = conn(@logger, :bodies => true)
-      app.get '/rubbles', nil, :accept => 'text/html'
-      assert_match %([\"Barney\", \"Betty\", \"Bam Bam\"]\n), @io.string
-    end
-  end
-end

data/test/adapters/net_http_persistent_test.rb

@@ -1,20 +0,0 @@
-require File.expand_path('../integration', __FILE__)
-
-module Adapters
-  class NetHttpPersistentTest < Faraday::TestCase
-
-    def adapter() :net_http_persistent end
-
-    Integration.apply(self, :NonParallel) do
-      def setup
-        if defined?(Net::HTTP::Persistent)
-          # work around problems with mixed SSL certificates
-          # https://github.com/drbrain/net-http-persistent/issues/45
-          http = Net::HTTP::Persistent.new('Faraday')
-          http.ssl_cleanup(4)
-        end
-      end if ssl_mode?
-    end
-
-  end
-end

data/test/adapters/net_http_test.rb

@@ -1,14 +0,0 @@
-require File.expand_path('../integration', __FILE__)
-
-module Adapters
-  class NetHttpTest < Faraday::TestCase
-
-    def adapter() :net_http end
-
-    behaviors = [:NonParallel]
-    behaviors << :Compression if RUBY_VERSION >= '1.9'
-
-    Integration.apply(self, *behaviors)
-
-  end
-end

data/test/adapters/patron_test.rb

@@ -1,20 +0,0 @@
-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
-
-      # no support for SSL peer verification
-      undef :test_GET_ssl_fails_with_bad_cert if ssl_mode?
-    end unless jruby?
-
-  end
-end

data/test/adapters/rack_test.rb

@@ -1,31 +0,0 @@
-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
-      [Faraday::LiveServer]
-    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
-
-    # test not applicable
-    undef test_connection_error
-    undef test_proxy
-    undef test_proxy_auth_fail
-  end
-end