faraday 0.8.11 → 0.9.0.rc1

data/lib/faraday/adapter.rb

@@ -1,32 +1,22 @@
 module Faraday
+  # Public: This is a base class for all Faraday adapters.  Adapters are
+  # responsible for fulfilling a Faraday request.
   class Adapter < Middleware
     CONTENT_LENGTH = 'Content-Length'.freeze
 
-    extend AutoloadHelper
-    extend MiddlewareRegistry
-
-    autoload_all 'faraday/adapter',
-      :NetHttp           => 'net_http',
-      :NetHttpPersistent => 'net_http_persistent',
-      :Typhoeus          => 'typhoeus',
-      :EMSynchrony       => 'em_synchrony',
-      :EMHttp            => 'em_http',
-      :Patron            => 'patron',
-      :Excon             => 'excon',
-      :Test              => 'test',
-      :Rack              => 'rack'
-
-    register_middleware \
-      :test                => :Test,
-      :net_http            => :NetHttp,
-      :net_http_persistent => :NetHttpPersistent,
-      :typhoeus            => :Typhoeus,
-      :patron              => :Patron,
-      :em_synchrony        => :EMSynchrony,
-      :em_http             => :EMHttp,
-      :excon               => :Excon,
-      :rack                => :Rack
-
+    register_middleware File.expand_path('../adapter', __FILE__),
+      :test => [:Test, 'test'],
+      :net_http => [:NetHttp, 'net_http'],
+      :net_http_persistent => [:NetHttpPersistent, 'net_http_persistent'],
+      :typhoeus => [:Typhoeus, 'typhoeus'],
+      :patron => [:Patron, 'patron'],
+      :em_synchrony => [:EMSynchrony, 'em_synchrony'],
+      :em_http => [:EMHttp, 'em_http'],
+      :excon => [:Excon, 'excon'],
+      :rack => [:Rack, 'rack'],
+      :httpclient => [:HTTPClient, 'httpclient']
+
+    # Public: This module marks an Adapter as supporting parallel requests.
     module Parallelism
       attr_writer :supports_parallel
       def supports_parallel?() @supports_parallel end
@@ -41,18 +31,13 @@ module Faraday
     self.supports_parallel = false
 
     def call(env)
-      if !env[:body] and Connection::METHODS_WITH_BODIES.include? env[:method]
-        # play nice and indicate we're sending an empty body
-        env[:request_headers][CONTENT_LENGTH] = "0"
-        # Typhoeus hangs on PUT requests if body is nil
-        env[:body] = ''
-      end
+      env.clear_body if env.needs_body?
     end
 
     def save_response(env, status, body, headers = nil)
-      env[:status] = status
-      env[:body] = body
-      env[:response_headers] = Utils::Headers.new.tap do |response_headers|
+      env.status = status
+      env.body = body
+      env.response_headers = Utils::Headers.new.tap do |response_headers|
         response_headers.update headers unless headers.nil?
         yield response_headers if block_given?
       end

data/lib/faraday/adapter/em_http.rb

@@ -7,8 +7,10 @@ module Faraday
       module Options
         def connection_config(env)
           options = {}
+          configure_ssl(options, env)
           configure_proxy(options, env)
           configure_timeout(options, env)
+          configure_socket(options, env)
           options
         end
 
@@ -20,6 +22,9 @@ module Faraday
             # :file => 'path/to/file', # stream data off disk
           }
           configure_compression(options, env)
+          # configure_proxy_auth
+          # :proxy => {:authorization => [user, pass]}
+          # proxy[:username] && proxy[:password]
           options
         end
 
@@ -28,12 +33,29 @@ module Faraday
           body.respond_to?(:read) ? body.read : body
         end
 
+        def configure_ssl(options, env)
+          if ssl = env[:ssl]
+            # :ssl => {
+            #   :private_key_file => '/tmp/server.key',
+            #   :cert_chain_file => '/tmp/server.crt',
+            #   :verify_peer => false
+          end
+        end
+
         def configure_proxy(options, env)
           if proxy = request_options(env)[:proxy]
             options[:proxy] = {
               :host => proxy[:uri].host,
-              :port => proxy[:uri].port,
-              :authorization => [proxy[:user], proxy[:password]]
+              :port => proxy[:uri].port
+            }
+          end
+        end
+
+        def configure_socket(options, env)
+          if bind = request_options(env)[:bind]
+            options[:bind] = {
+              :host => bind[:host],
+              :port => bind[:port]
             }
           end
         end
@@ -102,12 +124,6 @@ module Faraday
               }
           end
         end
-      rescue EventMachine::Connectify::CONNECTError => err
-        if err.message.include?("Proxy Authentication Required")
-          raise Error::ConnectionFailed, %{407 "Proxy Authentication Required "}
-        else
-          raise Error::ConnectionFailed, err
-        end
       end
 
       # TODO: reuse the connection to support pipelining
@@ -134,8 +150,6 @@ module Faraday
         elsif msg == Errno::ECONNREFUSED
           errklass = Faraday::Error::ConnectionFailed
           msg = "connection refused"
-        elsif msg == "connection closed by server"
-          errklass = Faraday::Error::ConnectionFailed
         end
         raise errklass, msg
       end

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(URI::parse(env[:url].to_s), connection_config(env))
 
         http_method = env[:method].to_s.downcase.to_sym
 
@@ -52,8 +52,6 @@ module Faraday
             client = block.call
           end
 
-          raise client.error if client.error
-
           save_response(env, client.response_header.status, client.response) do |resp_headers|
             client.response_header.each do |name, value|
               resp_headers[name.to_sym] = value
@@ -64,18 +62,6 @@ module Faraday
         @app.call env
       rescue Errno::ECONNREFUSED
         raise Error::ConnectionFailed, $!
-      rescue EventMachine::Connectify::CONNECTError => err
-        if err.message.include?("Proxy Authentication Required")
-          raise Error::ConnectionFailed, %{407 "Proxy Authentication Required "}
-        else
-          raise Error::ConnectionFailed, err
-        end
-      rescue RuntimeError => err
-        if err.message == "connection closed by server"
-          raise Error::ConnectionFailed, err
-        else
-          raise
-        end
       end
     end
   end

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
 
@@ -28,20 +33,9 @@ module Faraday
             opts[:connect_timeout]   = req[:open_timeout]
             opts[:write_timeout]     = req[:open_timeout]
           end
-
-          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],
-              :password => req[:proxy][:password]
-            }
-          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,

data/lib/faraday/adapter/httpclient.rb

@@ -0,0 +1,92 @@
+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, $!
+      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

@@ -24,7 +24,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
@@ -41,7 +40,7 @@ module Faraday
           raise Error::ConnectionFailed, $!
         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 +81,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/net_http_persistent.rb

@@ -1,6 +1,4 @@
-# Rely on autoloading instead of explicit require; helps avoid the "already
-# initialized constant" warning on Ruby 1.8.7 when NetHttp is refereced below.
-# require 'faraday/adapter/net_http'
+require 'faraday/adapter/net_http'
 
 module Faraday
   class Adapter
@@ -9,16 +7,8 @@ module Faraday
       dependency 'net/http/persistent'
 
       def net_http_connection(env)
-        if proxy = env[:request][:proxy]
-          proxy_uri = ::URI::HTTP === proxy[:uri] ? proxy[:uri].dup : ::URI.parse(proxy[:uri].to_s)
-          proxy_uri.user = proxy_uri.password = nil
-          # awful patch for net-http-persistent 2.8 not unescaping user/password
-          (class << proxy_uri; self; end).class_eval do
-            define_method(:user) { proxy[:user] }
-            define_method(:password) { proxy[:password] }
-          end if proxy[:user]
-        end
-        Net::HTTP::Persistent.new 'Faraday', proxy_uri
+        Net::HTTP::Persistent.new 'Faraday',
+          env[:request][:proxy] ? env[:request][:proxy][:uri] : nil
       end
 
       def perform_request(http, env)
@@ -26,8 +16,6 @@ module Faraday
       rescue Net::HTTP::Persistent::Error => error
         if error.message.include? 'Timeout'
           raise Faraday::Error::TimeoutError, error
-        elsif error.message.include? 'connection refused'
-          raise Faraday::Error::ConnectionFailed, error
         else
           raise
         end

data/lib/faraday/adapter/patron.rb

@@ -5,7 +5,7 @@ module Faraday
 
       def initialize(app, &block)
         super(app)
-        @block = block
+        @block = block if block_given?
       end
 
       def call(env)
@@ -19,19 +19,19 @@ module Faraday
         if req = env[:request]
           session.timeout = session.connect_timeout = req[:timeout] if req[:timeout]
           session.connect_timeout = req[:open_timeout]              if req[:open_timeout]
-
+                    
           if proxy = req[:proxy]
-            proxy_uri = proxy[:uri].dup
-            proxy_uri.user = proxy[:user] && Utils.escape(proxy[:user]).gsub('+', '%20')
-            proxy_uri.password = proxy[:password] && Utils.escape(proxy[:password]).gsub('+', '%20')
-            session.proxy = proxy_uri.to_s
+            session.proxy = proxy[:uri].to_s
+            if proxy[:user] && proxy[:password]
+              prepend_proxy_auth_string(proxy, session)
+            end
           end
         end
 
         response = begin
           data = env[:body] ? env[:body].to_s : nil
           session.request(env[:method], env[:url].to_s, env[:request_headers], :data => data)
-        rescue Errno::ECONNREFUSED, ::Patron::ConnectionFailed
+        rescue Errno::ECONNREFUSED
           raise Error::ConnectionFailed, $!
         end
 
@@ -40,26 +40,14 @@ module Faraday
         @app.call env
       rescue ::Patron::TimeoutError => err
         raise Faraday::Error::TimeoutError, err
-      rescue ::Patron::Error => err
-        if err.message.include?("code 407")
-          raise Error::ConnectionFailed, %{407 "Proxy Authentication Required "}
-        else
-          raise Error::ConnectionFailed, err
-        end
       end
 
       if loaded? && defined?(::Patron::Request::VALID_ACTIONS)
         # 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
 
@@ -70,5 +58,9 @@ module Faraday
         session
       end
     end
+    
+    def prepend_proxy_auth_string(proxy, session)
+      session.proxy.insert(7, "#{proxy[:user]}:#{proxy[:password]}@")
+    end
   end
 end

data/lib/faraday/adapter/rack.rb

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