faraday 0.9.1 → 0.17.0

data/lib/faraday/response.rb

@@ -37,6 +37,10 @@ module Faraday
       finished? ? env.status : nil
     end
 
+    def reason_phrase
+      finished? ? env.reason_phrase : nil
+    end
+
     def headers
       finished? ? env.response_headers : {}
     end
@@ -61,8 +65,8 @@ module Faraday
 
     def finish(env)
       raise "response already finished" if finished?
-      @on_complete_callbacks.each { |callback| callback.call(env) }
-      @env = Env.from(env)
+      @env = env.is_a?(Env) ? env : Env.from(env)
+      @on_complete_callbacks.each { |callback| callback.call(@env) }
       return self
     end
 

data/lib/faraday/utils.rb

@@ -1,5 +1,4 @@
 require 'thread'
-Faraday.require_libs 'parameters'
 
 module Faraday
   module Utils
@@ -11,12 +10,28 @@ module Faraday
         new(value)
       end
 
+      def self.allocate
+        new_self = super
+        new_self.initialize_names
+        new_self
+      end
+
       def initialize(hash = nil)
         super()
         @names = {}
         self.update(hash || {})
       end
 
+      def initialize_names
+        @names = {}
+      end
+
+      # on dup/clone, we need to duplicate @names hash
+      def initialize_copy(other)
+        super
+        @names = other.names.dup
+      end
+
       # need to synchronize concurrent writes to the shared KeyMap
       keymap_mutex = Mutex.new
 
@@ -81,6 +96,7 @@ module Faraday
 
       def replace(other)
         clear
+        @names.clear
         self.update other
         self
       end
@@ -89,9 +105,16 @@ module Faraday
 
       def parse(header_string)
         return unless header_string && !header_string.empty?
-        header_string.split(/\r\n/).
+
+        headers = header_string.split(/\r\n/)
+
+        # Find the last set of response headers.
+        start_index = headers.rindex { |x| x.match(/^HTTP\//) } || 0
+        last_response = headers.slice(start_index, headers.size)
+
+        last_response.
           tap  { |a| a.shift if a.first.index('HTTP/') == 0 }. # drop the HTTP status line
-          map  { |h| h.split(/:\s+/, 2) }.reject { |p| p[0].nil? }. # split key and value, ignore blank lines
+          map  { |h| h.split(/:\s*/, 2) }.reject { |p| p[0].nil? }. # split key and value, ignore blank lines
           each { |key, value|
             # join multiple values with a comma
             if self[key]
@@ -101,6 +124,12 @@ module Faraday
             end
           }
       end
+
+      protected
+
+      def names
+        @names
+      end
     end
 
     # hash with stringified keys

data/lib/faraday.rb

@@ -14,7 +14,7 @@ require 'forwardable'
 #   conn.get '/'
 #
 module Faraday
-  VERSION = "0.9.1"
+  VERSION = "0.17.0"
 
   class << self
     # Public: Gets or sets the root path that Faraday is being loaded from.
@@ -34,8 +34,8 @@ module Faraday
     #     Faraday.get "https://faraday.com"
     attr_writer :default_connection
 
-    # Public: Sets the default options used when calling Faraday#new.
-    attr_writer :default_connection_options
+    # Public: Tells faraday to ignore the environment proxy (http_proxy).
+    attr_accessor :ignore_env_proxy
 
     # Public: Initializes a new Faraday::Connection.
     #
@@ -66,7 +66,7 @@ module Faraday
     # Returns a Faraday::Connection.
     def new(url = nil, options = nil)
       block = block_given? ? Proc.new : nil
-      options = options ? default_connection_options.merge(options) : default_connection_options.dup
+      options = options ? default_connection_options.merge(options) : default_connection_options
       Faraday::Connection.new(url, options, &block)
     end
 
@@ -92,6 +92,10 @@ module Faraday
 
     alias require_lib require_libs
 
+    def respond_to?(symbol, include_private = false)
+      default_connection.respond_to?(symbol, include_private) || super
+    end
+
   private
     # Internal: Proxies method calls on the Faraday constant to
     # #default_connection.
@@ -100,6 +104,7 @@ module Faraday
     end
   end
 
+  self.ignore_env_proxy = false
   self.root_path = File.expand_path "..", __FILE__
   self.lib_path = File.expand_path "../faraday", __FILE__
   self.default_adapter = :net_http
@@ -108,7 +113,7 @@ module Faraday
   #
   # Returns a Faraday::Connection, configured with the #default_adapter.
   def self.default_connection
-    @default_connection ||= Connection.new
+    @default_connection ||= Connection.new(default_connection_options)
   end
 
   # Gets the default connection options used when calling Faraday#new.
@@ -118,13 +123,10 @@ module Faraday
     @default_connection_options ||= ConnectionOptions.new
   end
 
-  if (!defined?(RUBY_ENGINE) || "ruby" == RUBY_ENGINE) && RUBY_VERSION < '1.9'
-    begin
-      require 'system_timer'
-      Timer = SystemTimer
-    rescue LoadError
-      warn "Faraday: you may want to install system_timer for reliable timeouts"
-    end
+  # Public: Sets the default options used when calling Faraday#new.
+  def self.default_connection_options=(options)
+    @default_connection = nil
+    @default_connection_options = ConnectionOptions.from(options)
   end
 
   unless const_defined? :Timer
@@ -244,25 +246,3 @@ module Faraday
     require_lib 'autoload'
   end
 end
-
-# not pulling in active-support JUST for this method.  And I love this method.
-class Object
-  # The primary purpose of this method is to "tap into" a method chain,
-  # in order to perform operations on intermediate results within the chain.
-  #
-  # Examples
-  #
-  #   (1..10).tap { |x| puts "original: #{x.inspect}" }.to_a.
-  #     tap    { |x| puts "array: #{x.inspect}" }.
-  #     select { |x| x%2 == 0 }.
-  #     tap    { |x| puts "evens: #{x.inspect}" }.
-  #     map    { |x| x*x }.
-  #     tap    { |x| puts "squares: #{x.inspect}" }
-  #
-  # Yields self.
-  # Returns self.
-  def tap
-    yield(self)
-    self
-  end unless Object.respond_to?(:tap)
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2019-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -30,34 +30,14 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: 
 email: technoweenie@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE.md
 - README.md
-- Rakefile
-- faraday.gemspec
 - lib/faraday.rb
 - lib/faraday/adapter.rb
 - lib/faraday/adapter/em_http.rb
@@ -92,44 +72,6 @@ files:
 - lib/faraday/response/raise_error.rb
 - lib/faraday/upload_io.rb
 - lib/faraday/utils.rb
-- script/cached-bundle
-- script/console
-- script/generate_certs
-- script/package
-- script/proxy-server
-- script/release
-- script/s3-put
-- script/server
-- script/test
-- test/adapters/default_test.rb
-- test/adapters/em_http_test.rb
-- test/adapters/em_synchrony_test.rb
-- test/adapters/excon_test.rb
-- test/adapters/httpclient_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
-- test/composite_read_io_test.rb
-- test/connection_test.rb
-- test/env_test.rb
-- test/helper.rb
-- test/live_server.rb
-- test/middleware/instrumentation_test.rb
-- test/middleware/retry_test.rb
-- test/middleware_stack_test.rb
-- test/multibyte.txt
-- test/options_test.rb
-- test/parameters_test.rb
-- test/request_middleware_test.rb
-- test/response_middleware_test.rb
-- test/strawberry.rb
-- test/utils_test.rb
 homepage: https://github.com/lostisland/faraday
 licenses:
 - MIT
@@ -142,44 +84,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.5
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: HTTP/REST API client library.
-test_files:
-- test/adapters/default_test.rb
-- test/adapters/em_http_test.rb
-- test/adapters/em_synchrony_test.rb
-- test/adapters/excon_test.rb
-- test/adapters/httpclient_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
-- test/composite_read_io_test.rb
-- test/connection_test.rb
-- test/env_test.rb
-- test/helper.rb
-- test/live_server.rb
-- test/middleware/instrumentation_test.rb
-- test/middleware/retry_test.rb
-- test/middleware_stack_test.rb
-- test/options_test.rb
-- test/parameters_test.rb
-- test/request_middleware_test.rb
-- test/response_middleware_test.rb
-- test/strawberry.rb
-- test/utils_test.rb
+test_files: []

data/.document

@@ -1,6 +0,0 @@
-CONTRIBUTING.md
-LICENSE.md
-README.md
-bin/*
-lib/**/*.rb
-test/**/*.rb

data/CHANGELOG.md

@@ -1,20 +0,0 @@
-# Faraday Changelog
-
-## v0.9.1
-
-* Refactor Net:HTTP adapter so that with_net_http_connection can be overridden to allow pooled connections. (@Ben-M)
-* Add configurable methods that bypass `retry_if` in the Retry request middleware.  (@mike-bourgeous)
-
-## v0.9.0
-
-* Add HTTPClient adapter (@hakanensari)
-* Improve Retry handler (@mislav)
-* Remove autoloading by default (@technoweenie)
-* Improve internal docs (@technoweenie, @mislav)
-* Respect user/password in http proxy string (@mislav)
-* Adapter options are structs.  Reinforces consistent options across adapters
-  (@technoweenie)
-* Stop stripping trailing / off base URLs in a Faraday::Connection. (@technoweenie)
-* Add a configurable URI parser. (@technoweenie)
-* Remove need to manually autoload when using the authorization header helpers on `Faraday::Connection`. (@technoweenie)
-* `Faraday::Adapter::Test` respects the `Faraday::RequestOptions#params_encoder` option. (@technoweenie)

data/CONTRIBUTING.md

@@ -1,36 +0,0 @@
-## Contributing
-
-You can run the test suite against a live server by running `script/test`. It
-automatically starts a test server in background. Only tests in
-`test/adapters/*_test.rb` require a server, though.
-
-``` sh
-# run the whole suite
-$ script/test
-
-# run only specific files
-$ script/test excon typhoeus
-
-# run tests using SSL
-$ SSL=yes script/test
-```
-
-We will accept middleware that:
-
-1. is useful to a broader audience, but can be implemented relatively
-   simple; and
-2. which isn't already present in [faraday_middleware][] project.
-
-We will accept adapters that:
-
-1. support SSL & streaming;
-1. are proven and may have better performance than existing ones; or
-2. if they have features not present in included adapters.
-
-We are pushing towards a 1.0 release, when we will have to follow [Semantic
-Versioning][semver].  If your patch includes changes to break compatibility,
-note that so we can add it to the [Changelog][].
-
-[semver]:    http://semver.org/
-[changelog]: https://github.com/lostisland/faraday/wiki/Changelog
-[faraday_middleware]: https://github.com/lostisland/faraday_middleware/wiki

data/Gemfile

@@ -1,25 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'ffi-ncurses', '~> 0.3', :platforms => :jruby
-gem 'jruby-openssl', '~> 0.8.8', :platforms => :jruby
-gem 'rake'
-
-group :test do
-  gem 'coveralls', :require => false
-  gem 'em-http-request', '>= 1.1', :require => 'em-http'
-  gem 'em-synchrony', '>= 1.0.3', :require => ['em-synchrony', 'em-synchrony/em-http']
-  gem 'excon', '>= 0.27.4'
-  gem 'httpclient', '>= 2.2'
-  gem 'leftright', '>= 0.9', :require => false
-  gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
-  gem 'minitest', '>= 5.0.5'
-  gem 'net-http-persistent', '>= 2.9.4'
-  gem 'patron', '>= 0.4.2', :platforms => :ruby
-  gem 'rack-test', '>= 0.6', :require => 'rack/test'
-  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
-  gem 'simplecov'
-  gem 'sinatra', '~> 1.3'
-  gem 'typhoeus', '~> 0.3.3', :platforms => :ruby
-end
-
-gemspec

data/Rakefile

@@ -1,71 +0,0 @@
-require 'date'
-require 'fileutils'
-require 'openssl'
-require 'rake/testtask'
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-task :default => :test
-
-## helper functions
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-# Adapted from WEBrick::Utils. Skips cert extensions so it
-# can be used as a CA bundle
-def create_self_signed_cert(bits, cn, comment)
-  rsa = OpenSSL::PKey::RSA.new(bits)
-  cert = OpenSSL::X509::Certificate.new
-  cert.version = 2
-  cert.serial = 1
-  name = OpenSSL::X509::Name.new(cn)
-  cert.subject = name
-  cert.issuer = name
-  cert.not_before = Time.now
-  cert.not_after = Time.now + (365*24*60*60)
-  cert.public_key = rsa.public_key
-  cert.sign(rsa, OpenSSL::Digest::SHA1.new)
-  return [cert, rsa]
-end
-
-## standard tasks
-
-desc "Run all tests"
-task :test do
-  exec 'script/test'
-end
-
-desc "Generate certificates for SSL tests"
-task :'test:generate_certs' do
-  cert, key = create_self_signed_cert(1024, [['CN', 'localhost']], 'Faraday Test CA')
-  FileUtils.mkdir_p 'tmp'
-  File.open('tmp/faraday-cert.key', 'w') {|f| f.puts(key) }
-  File.open('tmp/faraday-cert.crt', 'w') {|f| f.puts(cert.to_s) }
-end
-
-file 'tmp/faraday-cert.key' => :'test:generate_certs'
-file 'tmp/faraday-cert.crt' => :'test:generate_certs'
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end

data/faraday.gemspec

@@ -1,34 +0,0 @@
-lib = "faraday"
-lib_file = File.expand_path("../lib/#{lib}.rb", __FILE__)
-File.read(lib_file) =~ /\bVERSION\s*=\s*["'](.+?)["']/
-version = $1
-
-Gem::Specification.new do |spec|
-  spec.specification_version = 2 if spec.respond_to? :specification_version=
-  spec.required_rubygems_version = '>= 1.3.5'
-
-  spec.name    = lib
-  spec.version = version
-
-  spec.summary = "HTTP/REST API client library."
-
-  spec.authors  = ["Rick Olson"]
-  spec.email    = 'technoweenie@gmail.com'
-  spec.homepage = 'https://github.com/lostisland/faraday'
-  spec.licenses = ['MIT']
-
-  spec.add_dependency 'multipart-post', '>= 1.2', '< 3'
-  spec.add_development_dependency 'bundler', '~> 1.0'
-
-  spec.files = %w(.document CHANGELOG.md CONTRIBUTING.md Gemfile LICENSE.md README.md Rakefile)
-  spec.files << "#{lib}.gemspec"
-  spec.files += Dir.glob("lib/**/*.rb")
-  spec.files += Dir.glob("test/**/*.{rb,txt}")
-  spec.files += Dir.glob("script/*")
-
-  dev_null    = File.exist?('/dev/null') ? '/dev/null' : 'NUL'
-  git_files   = `git ls-files -z 2>#{dev_null}`
-  spec.files &= git_files.split("\0") if $?.success?
-
-  spec.test_files = Dir.glob("test/**/*.rb")
-end

data/script/cached-bundle

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# Usage: cached-bundle install --deployment
-#
-# After running `bundle`, caches the `./bundle` directory to S3.
-# On the next run, restores the cached directory before running `bundle`.
-# When `Gemfile` changes, the cache gets rebuilt.
-#
-# Requirements:
-# - Gemfile
-# - TRAVIS_REPO_SLUG
-# - TRAVIS_RUBY_VERSION
-# - AMAZON_S3_BUCKET
-# - script/s3-put
-# - bundle
-# - curl
-#
-# Author: Mislav Marohnić
-
-set -e
-
-compute_md5() {
-  local output="$(openssl md5)"
-  echo "${output##* }"
-}
-
-download() {
-  curl --tcp-nodelay -qsfL "$1" -o "$2"
-}
-
-bundle_path="bundle"
-gemfile_hash="$(compute_md5 <"${BUNDLE_GEMFILE:-Gemfile}")"
-cache_name="${TRAVIS_RUBY_VERSION}-${gemfile_hash}.tgz"
-fetch_url="http://${AMAZON_S3_BUCKET}.s3.amazonaws.com/${TRAVIS_REPO_SLUG}/${cache_name}"
-
-if download "$fetch_url" "$cache_name"; then
-  echo "Reusing cached bundle ${cache_name}"
-  tar xzf "$cache_name"
-fi
-
-bundle "$@"
-
-if [ ! -f "$cache_name" ] && [ -n "$AMAZON_SECRET_ACCESS_KEY" ]; then
-  echo "Caching \`${bundle_path}' to S3"
-  tar czf "$cache_name" "$bundle_path"
-  script/s3-put "$cache_name" "${AMAZON_S3_BUCKET}:${TRAVIS_REPO_SLUG}/${cache_name}"
-fi

data/script/console

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Usage: script/console
-# Starts an IRB console with this library loaded.
-
-gemspec="$(ls *.gemspec | head -1)"
-
-exec bundle exec irb -r "${gemspec%.*}"

data/script/generate_certs

@@ -1,42 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: generate_certs
-# Generate test certs for testing Faraday with SSL
-
-require 'openssl'
-require 'fileutils'
-
-$shell = ARGV.include? '-s'
-
-# Adapted from WEBrick::Utils. Skips cert extensions so it
-# can be used as a CA bundle
-def create_self_signed_cert(bits, cn, comment)
-  rsa = OpenSSL::PKey::RSA.new(bits)
-  cert = OpenSSL::X509::Certificate.new
-  cert.version = 2
-  cert.serial = 1
-  name = OpenSSL::X509::Name.new(cn)
-  cert.subject = name
-  cert.issuer = name
-  cert.not_before = Time.now
-  cert.not_after = Time.now + (365*24*60*60)
-  cert.public_key = rsa.public_key
-  cert.sign(rsa, OpenSSL::Digest::SHA1.new)
-  return [cert, rsa]
-end
-
-def write(file, contents, env_var)
-  FileUtils.mkdir_p(File.dirname(file))
-  File.open(file, 'w') {|f| f.puts(contents) }
-  puts %(export #{env_var}="#{file}") if $shell
-end
-
-
-# One cert / CA for ease of testing when ignoring verification
-cert, key = create_self_signed_cert(1024, [['CN', 'localhost']], 'Faraday Test CA')
-write 'tmp/faraday-cert.key', key,  'SSL_KEY'
-write 'tmp/faraday-cert.crt', cert, 'SSL_FILE'
-
-# And a second CA to prove that verification can fail
-cert, key = create_self_signed_cert(1024, [['CN', 'real-ca.com']], 'A different CA')
-write 'tmp/faraday-different-ca-cert.key', key,  'SSL_KEY_ALT'
-write 'tmp/faraday-different-ca-cert.crt', cert, 'SSL_FILE_ALT'

data/script/package

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Usage: script/gem
-# Updates the gemspec and builds a new gem in the pkg directory.
-
-mkdir -p pkg
-gem build *.gemspec
-mv *.gem pkg

data/script/proxy-server

@@ -1,42 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: script/proxy-server [-p PORT] [-u USER:PASSWORD]
-require 'webrick'
-require 'webrick/httpproxy'
-
-port = 4001
-
-if found = ARGV.index('-p')
-  port = ARGV[found + 1].to_i
-end
-if found = ARGV.index('-u')
-  username, password = ARGV[found + 1].split(':', 2)
-end
-
-match_credentials = lambda { |credentials|
-  got_username, got_password = credentials.to_s.unpack("m*")[0].split(":", 2)
-  got_username == username && got_password == password
-}
-
-log_io = $stdout
-log_io.sync = true
-
-webrick_opts = {
-  :Port => port, :Logger => WEBrick::Log::new(log_io),
-  :AccessLog => [[log_io, "[%{X-Faraday-Adapter}i] %m  %U  ->  %s %b"]],
-  :ProxyAuthProc => lambda { |req, res|
-    if username
-      type, credentials = req.header['proxy-authorization'].first.to_s.split(/\s+/, 2)
-      unless "Basic" == type && match_credentials.call(credentials)
-        res['proxy-authenticate'] = %{Basic realm="testing"}
-        raise WEBrick::HTTPStatus::ProxyAuthenticationRequired
-      end
-    end
-  }
-}
-
-proxy = WEBrick::HTTPProxyServer.new(webrick_opts)
-
-trap(:TERM) { proxy.shutdown }
-trap(:INT) { proxy.shutdown }
-
-proxy.start