faraday 0.8.11 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 431792ff21fb498eb658855f87503d2081869616
-  data.tar.gz: c6b3a7f9c1a9f7a4a60eff2236b882dbd812eab4
+  metadata.gz: 0e442daff424089e143751d7cb1d684c169bf4fc
+  data.tar.gz: ba1dd50171576d5064350e48b8869364c0710a26
 SHA512:
-  metadata.gz: 8855727969169984a104ba02c2ed27b4a86fb7d3a698fe6f5932c4858cb5e4f5eba9251d3742cb8d999b654f89ff2d073228738998f3199ae104e9e9883bd031
-  data.tar.gz: eda459cc1abe00450f0d48dab3b069544dd414001faf9be231e2215fa81efced7496a99a2baa6502f1d7bbe162f6b41f415cdef1cd9ce935a9de8752749997a3
+  metadata.gz: 80c7a955f7d0a2217fcde0be2760649b9e5fc2d950929b118383ba61ea7282410b224315e289b40fec12be13898b0b00551e441704462ac39269368a8f9d5931
+  data.tar.gz: cdef47ebdb9519d0e45e7511326ed1368fa520ad314a4055ea154187193c967f8821573705161e3bbca5d3cbbf40f219071223ba8d24821c5dd89e37ddd16a9e

data/.document

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

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Faraday Changelog
+
+## 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

@@ -0,0 +1,36 @@
+## 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 compatiblitity,
+note that so we can add it to the [Changelog][].
+
+[semver]:    http://semver.org/
+[changelog]: https://github.com/technoweenie/faraday/wiki/Changelog
+[faraday_middleware]: https://github.com/pengwynn/faraday_middleware/wiki

data/Gemfile

@@ -5,18 +5,25 @@ gem 'jruby-openssl', '~> 0.8.8', :platforms => :jruby
 gem 'rake'
 
 group :test do
-  gem 'test-unit'
+  gem 'coveralls', :require => false
   gem 'em-http-request', '>= 1.1', :require => 'em-http'
-  gem 'em-synchrony', '>= 1.0', :require => ['em-synchrony', 'em-synchrony/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.5', :require => false
   gem 'patron', '>= 0.4.2', :platforms => :ruby
   gem 'rack-test', '>= 0.6', :require => 'rack/test'
   gem 'simplecov'
   gem 'sinatra', '~> 1.3'
-  gem 'typhoeus', '~> 0.3.3', :platforms => [:ruby_18, :ruby_19, :ruby_20, :ruby_21]
+  gem 'typhoeus', '~> 0.3.3', :platforms => :ruby
+end
+
+platforms :rbx do
+  gem 'rubinius-coverage'
+  gem 'rubysl'
 end
 
 gemspec

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2009 rick olson, zack hobson
+Copyright (c) 2009-2013 Rick Olson, Zack Hobson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -51,8 +51,8 @@ end
 
 conn.get do |req|
   req.url '/search'
-  req.options[:timeout] = 5           # open/read timeout in seconds
-  req.options[:open_timeout] = 2      # connection open timeout in seconds
+  req.options.timeout = 5           # open/read timeout in seconds
+  req.options.open_timeout = 2      # connection open timeout in seconds
 end
 ```
 
@@ -175,36 +175,6 @@ stubs.verify_stubbed_calls
 * support streaming requests/responses
 * better stubbing API
 
-## 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
-```
-
-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 compatiblitity,
-note that so we can add it to the [Changelog][].
-
 ## Supported Ruby versions
 
 This library aims to support and is [tested against][travis] the following Ruby
@@ -213,11 +183,12 @@ implementations:
 * MRI 1.8.7
 * MRI 1.9.2
 * MRI 1.9.3
+* MRI 2.0.0
+* MRI 2.1.0
 * [JRuby][]
 * [Rubinius][]
 
-If something doesn't work on one of these interpreters, it should be considered
-a bug.
+If something doesn't work on one of these Ruby versions, it's a bug.
 
 This library may inadvertently work (or seem to work) on other Ruby
 implementations, however support will only be provided for the versions listed
@@ -226,25 +197,20 @@ above.
 If you would like this library to support another Ruby version, you may
 volunteer to be a maintainer. Being a maintainer entails making sure all tests
 run and pass on that implementation. When something breaks on your
-implementation, you will be personally responsible for providing patches in a
-timely fashion. If critical issues for a particular implementation exist at the
-time of a major release, support for that Ruby version may be dropped.
+implementation, you will be responsible for providing patches in a timely
+fashion. If critical issues for a particular implementation exist at the time
+of a major release, support for that Ruby version may be dropped.
 
 ## Copyright
 
-Copyright (c) 2009-2012 [Rick Olson](mailto:technoweenie@gmail.com), zack hobson.
+Copyright (c) 2009-2013 [Rick Olson](mailto:technoweenie@gmail.com), Zack Hobson.
 See [LICENSE][] for details.
 
-
-  [license]:   https://github.com/technoweenie/faraday/blob/master/LICENSE.md
-  [travis]:    http://travis-ci.org/technoweenie/faraday
-  [jruby]:     http://jruby.org/
-  [rubinius]:  http://rubini.us/
-  [semver]:    http://semver.org/
-  [changelog]: https://github.com/technoweenie/faraday/wiki/Changelog
-  [excon]:     https://github.com/geemus/excon#readme
-  [typhoeus]:  https://github.com/typhoeus/typhoeus#readme
-  [patron]:    http://toland.github.com/patron/
-
-  [eventmachine]:       https://github.com/igrigorik/em-http-request#readme
-  [faraday_middleware]: https://github.com/pengwynn/faraday_middleware/wiki
+[travis]:    http://travis-ci.org/lostisland/faraday
+[excon]:     https://github.com/geemus/excon#readme
+[typhoeus]:  https://github.com/typhoeus/typhoeus#readme
+[patron]:    http://toland.github.com/patron/
+[eventmachine]: https://github.com/igrigorik/em-http-request#readme
+[jruby]:     http://jruby.org/
+[rubinius]:  http://rubini.us/
+[license]:   LICENSE.md

data/Rakefile

@@ -2,6 +2,8 @@ require 'date'
 require 'fileutils'
 require 'openssl'
 require 'rake/testtask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 task :default => :test
 
@@ -67,21 +69,3 @@ desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/#{name}.rb"
 end
-
-## release management tasks
-
-desc "Commit, create tag v#{version} and build and push #{gem_file} to Rubygems"
-task :release => :build do
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{gem_file}"
-end
-
-desc "Build #{gem_file} into the pkg directory"
-task :build do
-  FileUtils.mkdir_p 'pkg'
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end

data/faraday.gemspec

@@ -0,0 +1,34 @@
+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/lib/faraday/adapter/em_http.rb

@@ -9,6 +9,8 @@ module Faraday
           options = {}
           configure_proxy(options, env)
           configure_timeout(options, env)
+          configure_socket(options, env)
+          configure_ssl(options, env)
           options
         end
 
@@ -38,6 +40,24 @@ module Faraday
           end
         end
 
+        def configure_socket(options, env)
+          if bind = request_options(env)[:bind]
+            options[:bind] = {
+              :host => bind[:host],
+              :port => bind[:port]
+            }
+          end
+        end
+
+        def configure_ssl(options, env)
+          if env[:url].scheme == 'https' && env[:ssl]
+            options[:ssl] = {
+              :cert_chain_file => env[:ssl][:ca_file],
+              :verify_peer => env[:ssl].fetch(:verify, true)
+            }
+          end
+        end
+
         def configure_timeout(options, env)
           timeout, open_timeout = request_options(env).values_at(:timeout, :open_timeout)
           options[:connect_timeout] = options[:inactivity_timeout] = timeout
@@ -108,6 +128,12 @@ module Faraday
         else
           raise Error::ConnectionFailed, err
         end
+      rescue => err
+        if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
+          raise Faraday::SSLError, err
+        else
+          raise
+        end
       end
 
       # TODO: reuse the connection to support pipelining
@@ -201,3 +227,11 @@ module Faraday
     end
   end
 end
+
+begin
+  require 'openssl'
+rescue LoadError
+  warn "Warning: no such file to load -- openssl. Make sure it is installed if you want HTTPS support"
+else
+  require 'faraday/adapter/em_http_ssl_patch'
+end if Faraday::Adapter::EMHttp.loaded?

data/lib/faraday/adapter/em_http_ssl_patch.rb

@@ -0,0 +1,56 @@
+require 'openssl'
+require 'em-http'
+
+module EmHttpSslPatch
+  def ssl_verify_peer(cert_string)
+    cert = nil
+    begin
+      cert = OpenSSL::X509::Certificate.new(cert_string)
+    rescue OpenSSL::X509::CertificateError
+      return false
+    end
+
+    @last_seen_cert = cert
+
+    if certificate_store.verify(@last_seen_cert)
+      begin
+        certificate_store.add_cert(@last_seen_cert)
+      rescue OpenSSL::X509::StoreError => e
+        raise e unless e.message == 'cert already in hash table'
+      end
+      true
+    else
+      raise OpenSSL::SSL::SSLError.new(%(unable to verify the server certificate for "#{host}"))
+    end
+  end
+
+  def ssl_handshake_completed
+    return true unless verify_peer?
+
+    unless OpenSSL::SSL.verify_certificate_identity(@last_seen_cert, host)
+      raise OpenSSL::SSL::SSLError.new(%(host "#{host}" does not match the server certificate))
+    else
+      true
+    end
+  end
+
+  def verify_peer?
+    parent.connopts.tls[:verify_peer]
+  end
+
+  def host
+    parent.connopts.host
+  end
+
+  def certificate_store
+    @certificate_store ||= begin
+      store = OpenSSL::X509::Store.new
+      store.set_default_paths
+      ca_file = parent.connopts.tls[:cert_chain_file]
+      store.add_file(ca_file) if ca_file
+      store
+    end
+  end
+end
+
+EventMachine::HttpStubConnection.send(:include, EmHttpSslPatch)

data/lib/faraday/adapter/em_synchrony.rb

@@ -19,7 +19,7 @@ module Faraday
 
       def call(env)
         super
-        request = EventMachine::HttpRequest.new(URI::parse(env[:url].to_s), connection_config(env))        #   end
+        request = EventMachine::HttpRequest.new(Utils::URI(env[:url].to_s), connection_config(env))
 
         http_method = env[:method].to_s.downcase.to_sym
 
@@ -70,9 +70,9 @@ module Faraday
         else
           raise Error::ConnectionFailed, err
         end
-      rescue RuntimeError => err
-        if err.message == "connection closed by server"
-          raise Error::ConnectionFailed, err
+      rescue => err
+        if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
+          raise Faraday::SSLError, err
         else
           raise
         end
@@ -83,23 +83,10 @@ end
 
 require 'faraday/adapter/em_synchrony/parallel_manager'
 
-# add missing patch(), options() methods
-EventMachine::HTTPMethods.module_eval do
-  [:patch, :options].each do |type|
-    next if method_defined? :"a#{type}"
-    alias_method :"a#{type}", type if method_defined? type
-    module_eval %[
-      def #{type}(options = {}, &blk)
-        f = Fiber.current
-        conn = setup_request(:#{type}, options, &blk)
-        if conn.error.nil?
-          conn.callback { f.resume(conn) }
-          conn.errback  { f.resume(conn) }
-          Fiber.yield
-        else
-          conn
-        end
-      end
-    ]
-  end
-end
+begin
+  require 'openssl'
+rescue LoadError
+  warn "Warning: no such file to load -- openssl. Make sure it is installed if you want HTTPS support"
+else
+  require 'faraday/adapter/em_http_ssl_patch'
+end if Faraday::Adapter::EMSynchrony.loaded?

data/lib/faraday/adapter/excon.rb

@@ -3,6 +3,11 @@ module Faraday
     class Excon < Faraday::Adapter
       dependency 'excon'
 
+      def initialize(app, connection_options = {})
+        @connection_options = connection_options
+        super(app)
+      end
+
       def call(env)
         super
 
@@ -11,6 +16,10 @@ module Faraday
           opts[:ssl_verify_peer] = !!ssl.fetch(:verify, true)
           opts[:ssl_ca_path] = ssl[:ca_path] if ssl[:ca_path]
           opts[:ssl_ca_file] = ssl[:ca_file] if ssl[:ca_file]
+          opts[:client_cert] = ssl[:client_cert] if ssl[:client_cert]
+          opts[:client_key]  = ssl[:client_key]  if ssl[:client_key]
+          opts[:certificate] = ssl[:certificate] if ssl[:certificate]
+          opts[:private_key] = ssl[:private_key] if ssl[:private_key]
 
           # https://github.com/geemus/excon/issues/106
           # https://github.com/jruby/jruby-ossl/issues/19
@@ -32,7 +41,6 @@ module Faraday
           if req[:proxy]
             opts[:proxy] = {
               :host     => req[:proxy][:uri].host,
-              :hostname => req[:proxy][:uri].hostname,
               :port     => req[:proxy][:uri].port,
               :scheme   => req[:proxy][:uri].scheme,
               :user     => req[:proxy][:user],
@@ -41,7 +49,7 @@ module Faraday
           end
         end
 
-        conn = ::Excon.new(env[:url].to_s, opts)
+        conn = ::Excon.new(env[:url].to_s, opts.merge(@connection_options))
 
         resp = conn.request \
           :method  => env[:method].to_s.upcase,
@@ -54,6 +62,8 @@ module Faraday
       rescue ::Excon::Errors::SocketError => err
         if err.message =~ /\btimeout\b/
           raise Error::TimeoutError, err
+        elsif err.message =~ /\bcertificate\b/
+          raise Faraday::SSLError, err
         else
           raise Error::ConnectionFailed, err
         end

data/lib/faraday/adapter/httpclient.rb

@@ -0,0 +1,106 @@
+module Faraday
+  class Adapter
+    class HTTPClient < Faraday::Adapter
+      dependency 'httpclient'
+
+      def client
+        @client ||= ::HTTPClient.new
+      end
+
+      def call(env)
+        super
+
+        if req = env[:request]
+          if proxy = req[:proxy]
+            configure_proxy proxy
+          end
+
+          if bind = req[:bind]
+            configure_socket bind
+          end
+
+          configure_timeouts req
+        end
+
+        if env[:url].scheme == 'https' && ssl = env[:ssl]
+          configure_ssl ssl
+        end
+
+        # TODO Don't stream yet.
+        # https://github.com/nahi/httpclient/pull/90
+        env[:body] = env[:body].read if env[:body].respond_to? :read
+
+        resp = client.request env[:method], env[:url],
+          :body   => env[:body],
+          :header => env[:request_headers]
+
+        save_response env, resp.status, resp.body, resp.headers
+
+        @app.call env
+      rescue ::HTTPClient::TimeoutError
+        raise Faraday::Error::TimeoutError, $!
+      rescue ::HTTPClient::BadResponseError => err
+        if err.message.include?('status 407')
+          raise Faraday::Error::ConnectionFailed, %{407 "Proxy Authentication Required "}
+        else
+          raise Faraday::Error::ClientError, $!
+        end
+      rescue Errno::ECONNREFUSED, EOFError
+        raise Faraday::Error::ConnectionFailed, $!
+      rescue => err
+        if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
+          raise Faraday::SSLError, err
+        else
+          raise
+        end
+      end
+
+      def configure_socket(bind)
+        client.socket_local.host = bind[:host]
+        client.socket_local.port = bind[:port]
+      end
+
+      def configure_proxy(proxy)
+        client.proxy = proxy[:uri]
+        if proxy[:user] && proxy[:password]
+          client.set_proxy_auth proxy[:user], proxy[:password]
+        end
+      end
+
+      def configure_ssl(ssl)
+        ssl_config = client.ssl_config
+
+        ssl_config.add_trust_ca ssl[:ca_file]        if ssl[:ca_file]
+        ssl_config.add_trust_ca ssl[:ca_path]        if ssl[:ca_path]
+        ssl_config.cert_store   = ssl[:cert_store]   if ssl[:cert_store]
+        ssl_config.client_cert  = ssl[:client_cert]  if ssl[:client_cert]
+        ssl_config.client_key   = ssl[:client_key]   if ssl[:client_key]
+        ssl_config.verify_depth = ssl[:verify_depth] if ssl[:verify_depth]
+        ssl_config.verify_mode  = ssl_verify_mode(ssl)
+      end
+
+      def configure_timeouts(req)
+        if req[:timeout]
+          client.connect_timeout   = req[:timeout]
+          client.receive_timeout   = req[:timeout]
+          client.send_timeout      = req[:timeout]
+        end
+
+        if req[:open_timeout]
+          client.connect_timeout   = req[:open_timeout]
+          client.send_timeout      = req[:open_timeout]
+        end
+      end
+
+      def ssl_verify_mode(ssl)
+        ssl[:verify_mode] || begin
+          if ssl.fetch(:verify, true)
+            OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+          else
+            OpenSSL::SSL::VERIFY_NONE
+          end
+        end
+      end
+    end
+  end
+end

data/lib/faraday/adapter/net_http.rb

@@ -13,9 +13,10 @@ module Faraday
         EOFError,
         Errno::ECONNABORTED,
         Errno::ECONNREFUSED,
-        Errno::ENETUNREACH,
         Errno::ECONNRESET,
+        Errno::EHOSTUNREACH,
         Errno::EINVAL,
+        Errno::ENETUNREACH,
         Net::HTTPBadResponse,
         Net::HTTPHeaderSyntaxError,
         Net::ProtocolError,
@@ -24,7 +25,6 @@ module Faraday
       ]
 
       NET_HTTP_EXCEPTIONS << OpenSSL::SSL::SSLError if defined?(OpenSSL)
-      NET_HTTP_EXCEPTIONS << Net::OpenTimeout if defined?(Net::OpenTimeout)
 
       def call(env)
         super
@@ -37,11 +37,15 @@ module Faraday
 
         begin
           http_response = perform_request(http, env)
-        rescue *NET_HTTP_EXCEPTIONS
-          raise Error::ConnectionFailed, $!
+        rescue *NET_HTTP_EXCEPTIONS => err
+          if defined?(OpenSSL) && OpenSSL::SSL::SSLError === err
+            raise Faraday::SSLError, err
+          else
+            raise Error::ConnectionFailed, err
+          end
         end
 
-        save_response(env, http_response.code.to_i, http_response.body) do |response_headers|
+        save_response(env, http_response.code.to_i, http_response.body || '') do |response_headers|
           http_response.each_header do |key, value|
             response_headers[key] = value
           end
@@ -82,7 +86,7 @@ module Faraday
           Net::HTTP::Proxy(proxy[:uri].host, proxy[:uri].port, proxy[:user], proxy[:password])
         else
           Net::HTTP
-        end.new(env[:url].host, env[:url].port || (env[:url].scheme == 'https' ? 443 : 80))
+        end.new(env[:url].host, env[:url].port)
       end
 
       def configure_ssl(http, ssl)

data/lib/faraday/adapter/patron.rb

@@ -52,14 +52,8 @@ module Faraday
         # HAX: helps but doesn't work completely
         # https://github.com/toland/patron/issues/34
         ::Patron::Request::VALID_ACTIONS.tap do |actions|
-          if actions[0].is_a?(Symbol)
-            actions << :patch unless actions.include? :patch
-            actions << :options unless actions.include? :options
-          else
-            # Patron 0.4.20 and up
-            actions << "PATCH" unless actions.include? "PATCH"
-            actions << "OPTIONS" unless actions.include? "OPTIONS"
-          end
+          actions << :patch unless actions.include? :patch
+          actions << :options unless actions.include? :options
         end
       end
 

data/lib/faraday/adapter/rack.rb

@@ -1,5 +1,3 @@
-require 'timeout'
-
 module Faraday
   class Adapter
     # Sends requests to a Rack app.