faraday 0.7.5 → 0.7.6

data/Gemfile

@@ -9,8 +9,11 @@ group :test do
   gem 'em-synchrony', '~> 1.0', :require => ['em-synchrony', 'em-synchrony/em-http'], :platforms => :ruby_19
   gem 'excon', '~> 0.6'
   gem 'leftright', '~> 0.9', :require => false
+end
+
+platforms :ruby do
   gem 'patron', '~> 0.4'
-  gem 'typhoeus', '~> 0.2'
+  gem 'typhoeus', '~> 0.3'
   # ActiveSupport::JSON will be used in ruby 1.8 and Yajl in 1.9; this is to test against both adapters
   gem 'activesupport', '~> 2.3', :require => nil, :platforms => [:ruby_18, :jruby]
   gem 'yajl-ruby', '~> 1.0', :require => 'yajl', :platforms => :ruby_19

data/Rakefile

@@ -81,10 +81,6 @@ end
 
 desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
 task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"

data/faraday.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'faraday'
-  s.version           = '0.7.5'
-  s.date              = '2011-10-04'
+  s.version           = '0.7.6'
+  s.date              = '2012-01-21'
   s.rubyforge_project = 'faraday'
 
   ## Make sure your summary is short. The description may be as long
@@ -32,12 +32,12 @@ Gem::Specification.new do |s|
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
   s.require_paths = %w[lib]
 
-  s.add_dependency 'addressable', '~> 2.2.6'
-  s.add_dependency 'multipart-post', '~> 1.1.3'
-  s.add_dependency 'rack', ['>= 1.1.0', '< 2']
-  s.add_development_dependency 'rake', '~> 0.9'
-  s.add_development_dependency 'test-unit', '~> 2.4'
-  s.add_development_dependency 'webmock', '~> 1.7'
+  s.add_dependency 'addressable', '~> 2.2'
+  s.add_dependency 'multipart-post', '~> 1.1'
+  s.add_dependency 'rack', '~> 1.1'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'webmock'
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -76,6 +76,7 @@ Gem::Specification.new do |s|
     test/adapters/logger_test.rb
     test/adapters/net_http_test.rb
     test/adapters/test_middleware_test.rb
+    test/adapters/typhoeus_test.rb
     test/connection_test.rb
     test/env_test.rb
     test/helper.rb

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 
   class << self
     attr_accessor :default_adapter

data/lib/faraday/adapter/net_http.rb

@@ -17,8 +17,7 @@ module Faraday
 
         if http.use_ssl = (url.scheme == 'https' && (ssl = env[:ssl]) && true)
           http.verify_mode = ssl[:verify_mode] || begin
-            if ssl.fetch(:verify, true) 
-              OpenSSL::SSL::VERIFY_PEER
+            if ssl.fetch(:verify, true)
               # Use the default cert store by default, i.e. system ca certs
               store = OpenSSL::X509::Store.new
               store.set_default_paths
@@ -40,11 +39,11 @@ module Faraday
         http.read_timeout = http.open_timeout = req[:timeout] if req[:timeout]
         http.open_timeout = req[:open_timeout]                if req[:open_timeout]
 
-        if :get != env[:method]
+        if :get != env[:method] or env[:body]
           http_request = Net::HTTPGenericRequest.new \
             env[:method].to_s.upcase,    # request method
-            !!env[:body],                # is there data
-            true,                        # does net/http love you, true or false?
+            !!env[:body],                # is there request body
+            :head != env[:method],       # is there response body
             url.request_uri,             # request uri path
             env[:request_headers]        # request headers
 
@@ -55,7 +54,7 @@ module Faraday
         end
 
         begin
-          http_response = if :get == env[:method]
+          http_response = if :get == env[:method] and env[:body].nil?
             # prefer `get` to `request` because the former handles gzip (ruby 1.9)
             http.get url.request_uri, env[:request_headers]
           else
@@ -72,6 +71,8 @@ module Faraday
         end
 
         @app.call env
+      rescue Timeout::Error => err
+        raise Faraday::Error::TimeoutError, err
       end
 
       def net_http_class(env)

data/lib/faraday/adapter/patron.rb

@@ -11,8 +11,13 @@ module Faraday
 
         session = ::Patron::Session.new
 
+        if req = env[:request]
+          session.timeout = session.connect_timeout = req[:timeout] if req[:timeout]
+          session.connect_timeout = req[:open_timeout]              if req[:open_timeout]
+        end
+
         response = begin
-          data = Connection::METHODS_WITH_BODIES.include?(env[:method]) ? env[:body].to_s : nil
+          data = env[:body] ? env[:body].to_s : nil
           session.request(env[:method], env[:url].to_s, env[:request_headers], :data => data)
         rescue Errno::ECONNREFUSED
           raise Error::ConnectionFailed, $!
@@ -21,6 +26,8 @@ module Faraday
         save_response(env, response.status, response.body, response.headers)
 
         @app.call env
+      rescue ::Patron::TimeoutError => err
+        raise Faraday::Error::TimeoutError, err
       end
 
       if loaded? && defined?(::Patron::Request::VALID_ACTIONS)

data/lib/faraday/adapter/test.rb

@@ -59,10 +59,18 @@ module Faraday
           new_stub(:put, path, body, &block)
         end
 
+        def patch(path, body=nil, &block)
+          new_stub(:patch, path, body, &block)
+        end
+
         def delete(path, &block)
           new_stub(:delete, path, &block)
         end
 
+        def options(path, &block)
+          new_stub(:options, path, &block)
+        end
+
         # Raises an error if any of the stubbed calls have not been made.
         def verify_stubbed_calls
           failed_stubs = []

data/lib/faraday/adapter/typhoeus.rb

@@ -29,16 +29,16 @@ module Faraday
         end
 
         env_req = env[:request]
-        
+
         if proxy = env_req[:proxy]
           req.proxy = "#{proxy[:uri].host}:#{proxy[:uri].port}"
-          
+
           if proxy[:username] && proxy[:password]
             req.proxy_username = proxy[:username]
             req.proxy_password = proxy[:password]
           end
         end
-        
+
         req.timeout = req.connect_timeout = (env_req[:timeout] * 1000) if env_req[:timeout]
         req.connect_timeout = (env_req[:open_timeout] * 1000)          if env_req[:open_timeout]
 

data/lib/faraday/connection.rb

@@ -1,5 +1,6 @@
 require 'addressable/uri'
 require 'base64'
+require 'cgi'
 require 'set'
 require 'faraday/builder'
 require 'faraday/request'
@@ -32,7 +33,10 @@ module Faraday
       @ssl              = options[:ssl]     || {}
       @parallel_manager = options[:parallel]
 
+      @path_prefix = @host = @port = @scheme = nil
       self.url_prefix = url if url
+
+      @proxy = nil
       proxy(options[:proxy])
 
       @params.update options[:params]   if options[:params]
@@ -145,17 +149,14 @@ module Faraday
     def proxy(arg = nil)
       return @proxy if arg.nil?
 
-      @proxy =
-        case arg
-          when String then {:uri => proxy_arg_to_uri(arg)}
-          when URI    then {:uri => arg}
-          when Hash
-            if arg[:uri] = proxy_arg_to_uri(arg[:uri])
-              arg
-            else
-              raise ArgumentError, "no :uri option."
-            end
-        end
+      @proxy = if arg.is_a? Hash
+        uri = arg.fetch(:uri) { raise ArgumentError, "no :uri option" }
+        arg.merge :uri => URI.parse(uri)
+      else
+        {:uri => URI.parse(arg)}
+      end
+    rescue TypeError
+      raise ArgumentError, "bad uri"
     end
 
     # Parses the giving url with Addressable::URI and stores the individual
@@ -177,7 +178,9 @@ module Faraday
       self.path_prefix = uri.path
 
       @params.merge_query(uri.query)
-      basic_auth(uri.user, uri.password) if uri.user && uri.password
+      if uri.user && uri.password
+        basic_auth(CGI.unescape(uri.user), CGI.unescape(uri.password))
+      end
 
       uri
     end
@@ -239,12 +242,5 @@ module Faraday
     def dup
       self.class.new(build_url(''), :headers => headers.dup, :params => params.dup, :builder => builder.dup, :ssl => ssl.dup)
     end
-
-    def proxy_arg_to_uri(arg)
-      case arg
-        when String then URI.parse(arg)
-        when URI    then arg
-      end
-    end
   end
 end

data/lib/faraday/error.rb

@@ -3,9 +3,9 @@ module Faraday
     class ClientError < StandardError
       attr_reader :response
 
-      def initialize(ex)
+      def initialize(ex, response = nil)
         @wrapped_exception = nil
-        @response = nil
+        @response = response
 
         if ex.respond_to?(:backtrace)
           super(ex.message)
@@ -34,7 +34,7 @@ module Faraday
     class ConnectionFailed < ClientError;   end
     class ResourceNotFound < ClientError;   end
     class ParsingError     < ClientError;   end
-
+    class TimeoutError < ClientError; end
     class MissingDependency < StandardError; end
   end
 end

data/lib/faraday/middleware.rb

@@ -19,11 +19,11 @@ module Faraday
     end
 
     def self.loaded?
-      @load_error.nil?
+      !defined? @load_error or @load_error.nil?
     end
 
     def initialize(app = nil)
       @app = app
     end
   end
-end
+end

data/lib/faraday/request/multipart.rb

@@ -21,12 +21,11 @@ module Faraday
       )
     end
 
-    def has_multipart?(body)
-      body.values.each do |val|
-        if val.respond_to?(:content_type)
-          return true
-        elsif val.respond_to?(:values)
-          return true if has_multipart?(val)
+    def has_multipart?(obj)
+      # string is an enum in 1.8, returning list of itself
+      if obj.respond_to?(:each) && !obj.is_a?(String)
+        (obj.respond_to?(:values) ? obj.values : obj).each do |val|
+          return true if (val.respond_to?(:content_type) || has_multipart?(val))
         end
       end
       false

data/lib/faraday/request/url_encoded.rb

@@ -13,10 +13,8 @@ module Faraday
       end
       @app.call env
     end
-    
+
     def match_content_type(env)
-      type = request_type(env)
-      
       if process_request?(env)
         env[:request_headers][CONTENT_TYPE] ||= self.class.mime_type
         yield env[:body] unless env[:body].respond_to?(:to_str)

data/lib/faraday/response.rb

@@ -5,8 +5,8 @@ module Faraday
     # Used for simple response middleware.
     class Middleware < Faraday::Middleware
       def call(env)
-        @app.call(env).on_complete do |env|
-          on_complete(env)
+        @app.call(env).on_complete do |environment|
+          on_complete(environment)
         end
       end
 

data/lib/faraday/response/raise_error.rb

@@ -8,7 +8,7 @@ module Faraday
         raise Faraday::Error::ClientError, response_values(env)
       end
     end
-    
+
     def response_values(env)
       {:status => env[:status], :headers => env[:response_headers], :body => env[:body]}
     end

data/lib/faraday/upload_io.rb

@@ -10,7 +10,7 @@ end
 module Faraday
   class CompositeReadIO < ::CompositeReadIO
     attr_reader :length
-    
+
     def initialize(parts)
       @length = parts.inject(0) { |sum, part| sum + part.length }
       ios = parts.map{ |part| part.to_io }

data/lib/faraday/utils.rb

@@ -35,7 +35,7 @@ module Faraday
         return unless header_string && !header_string.empty?
         header_string.split(/\r\n/).
           tap  { |a| a.shift if a.first.index('HTTP/') == 0 }. # drop the HTTP status line
-          map  { |h| h.split(/:\s+/, 2) }.reject { |(k, v)| k.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] then self[key] << ', ' << value
@@ -109,10 +109,10 @@ module Faraday
     def build_nested_query(value, prefix = nil)
       case value
       when Array
-        value.map { |v| build_nested_query(v, "#{prefix}[]") }.join("&")
+        value.map { |v| build_nested_query(v, "#{prefix}%5B%5D") }.join("&")
       when Hash
         value.map { |k, v|
-          build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
+          build_nested_query(v, prefix ? "#{prefix}%5B#{escape(k)}%5D" : escape(k))
         }.join("&")
       when NilClass
         prefix
@@ -125,8 +125,10 @@ module Faraday
     # Be sure to URI escape '+' symbols to %2B. Otherwise, they get interpreted
     # as spaces.
     def escape(s)
-      s.to_s.gsub(/([^a-zA-Z0-9_.-]+)/n) do
-        '%' << $1.unpack('H2'*bytesize($1)).join('%').tap { |c| c.upcase! }
+      s = s.to_s
+      s = s.dup.force_encoding('binary') if s.respond_to? :force_encoding
+      s.gsub(/([^a-zA-Z0-9_.-]+)/n) do |match|
+        '%' << match.unpack('H2'*bytesize(match)).join('%').tap { |c| c.upcase! }
       end
     end
 

data/test/adapters/live_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require File.expand_path("../../helper", __FILE__)
 
 if !Faraday::TestCase::LIVE_SERVER
   warn "warning: test server not specified; skipping live server tests"
@@ -10,6 +10,8 @@ else
       else
         loaded_adapters  = Faraday::Adapter.all_loaded_constants
         loaded_adapters -= [Faraday::Adapter::ActionDispatch]
+        # https://github.com/geemus/excon/issues/98
+        loaded_adapters -= [Faraday::Adapter::Excon] if defined? RUBY_ENGINE and "rbx" == RUBY_ENGINE
         loaded_adapters << :default
       end
 
@@ -27,8 +29,8 @@ else
 
         define_method "test_#{adapter}_GET_retrieves_the_response_headers" do
           response = create_connection(adapter).get('hello_world')
-          assert_match /text\/html/, response.headers['Content-Type'], 'original case fail'
-          assert_match /text\/html/, response.headers['content-type'], 'lowercase fail'
+          assert_match(/text\/html/, response.headers['Content-Type'], 'original case fail')
+          assert_match(/text\/html/, response.headers['content-type'], 'lowercase fail')
         end
 
         # https://github.com/geemus/excon/issues/10
@@ -39,6 +41,17 @@ else
           end
         end
 
+        # https://github.com/dbalatero/typhoeus/issues/75
+        # https://github.com/toland/patron/issues/52
+        unless %[Faraday::Adapter::Typhoeus Faraday::Adapter::Patron].include? adapter.to_s
+          define_method "test_#{adapter}_GET_with_body" do
+            response = create_connection(adapter).get('echo') do |req|
+              req.body = {'bodyrock' => true}
+            end
+            assert_equal %(get {"bodyrock"=>"true"}), response.body
+          end
+        end
+
         define_method "test_#{adapter}_POST_send_url_encoded_params" do
           resp = create_connection(adapter).post do |req|
             req.url 'echo_name'
@@ -56,7 +69,7 @@ else
         end
 
         define_method "test_#{adapter}_POST_retrieves_the_response_headers" do
-          assert_match /text\/html/, create_connection(adapter).post('echo_name').headers['content-type']
+          assert_match(/text\/html/, create_connection(adapter).post('echo_name').headers['content-type'])
         end
 
         define_method "test_#{adapter}_POST_sends_files" do
@@ -90,7 +103,7 @@ else
         # https://github.com/dbalatero/typhoeus/issues/84
         if ENV['FORCE'] || !%w[Faraday::Adapter::Patron Faraday::Adapter::Typhoeus].include?(adapter.to_s)
           define_method "test_#{adapter}_PUT_retrieves_the_response_headers" do
-            assert_match /text\/html/, create_connection(adapter).put('echo_name').headers['content-type']
+            assert_match(/text\/html/, create_connection(adapter).put('echo_name').headers['content-type'])
           end
         end
 
@@ -113,7 +126,7 @@ else
           resp = create_connection(adapter).head do |req|
             req.url 'hello', 'name' => 'zack'
           end
-          assert_match /text\/html/, resp.headers['content-type']
+          assert_match(/text\/html/, resp.headers['content-type'])
         end
 
         define_method "test_#{adapter}_HEAD_retrieves_no_response_body" do
@@ -121,21 +134,21 @@ else
         end
 
         define_method "test_#{adapter}_HEAD_retrieves_the_response_headers" do
-          assert_match /text\/html/, create_connection(adapter).head('hello_world').headers['content-type']
+          assert_match(/text\/html/, create_connection(adapter).head('hello_world').headers['content-type'])
         end
 
         define_method "test_#{adapter}_DELETE_retrieves_the_response_headers" do
-          assert_match /text\/html/, create_connection(adapter).delete('delete_with_json').headers['content-type']
+          assert_match(/text\/html/, create_connection(adapter).delete('delete_with_json').headers['content-type'])
         end
 
         define_method "test_#{adapter}_DELETE_retrieves_the_body" do
-          assert_match /deleted/, create_connection(adapter).delete('delete_with_json').body
+          assert_match(/deleted/, create_connection(adapter).delete('delete_with_json').body)
         end
 
         define_method "test_#{adapter}_async_requests_clear_parallel_manager_after_running_a_single_request" do
           connection = create_connection(adapter)
           assert !connection.in_parallel?
-          resp = connection.get('hello_world')
+          connection.get('hello_world')
           assert !connection.in_parallel?
           assert_equal 'hello world', connection.get('hello_world').body
         end
@@ -173,9 +186,18 @@ else
             end
           end
         end
+
+        if %w[Faraday::Adapter::Patron Faraday::Adapter::NetHttp].include?(adapter.to_s)
+          define_method "test_#{adapter}_timeout" do
+            conn = create_connection(adapter, :request => {:timeout => 1, :read_timeout => 1})
+            assert_raise Faraday::Error::TimeoutError do
+              conn.get '/slow'
+            end
+          end
+        end
       end
 
-      def create_connection(adapter)
+      def create_connection(adapter, options = {})
         if adapter == :default
           builder_block = nil
         else
@@ -185,8 +207,8 @@ else
             b.use adapter
           end
         end
-        
-        Faraday::Connection.new(LIVE_SERVER, &builder_block).tap do |conn|
+
+        Faraday::Connection.new(LIVE_SERVER, 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

data/test/adapters/typhoeus_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+
+module Adapters
+  class TyphoeusTest < Faraday::TestCase
+    def setup
+      @connection = Faraday.new('http://disney.com') do |b|
+        b.adapter :typhoeus
+      end
+    end
+
+    def test_handles_user_agent
+      # default typhoeus agent
+      stub_request(:get, 'disney.com/world').with(:headers => {'User-Agent'=>'Faraday Agent'}){ |request|
+        request.headers["User-Agent"] == 'Faraday Agent'
+      }
+      @connection.get('/world', :user_agent => 'Faraday Agent')
+    end
+
+  end if defined? ::Typhoeus
+end

data/test/connection_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'uri'
 
 class TestConnection < Faraday::TestCase
   def test_initialize_parses_host_out_of_given_url
@@ -73,6 +74,11 @@ class TestConnection < Faraday::TestCase
     assert_equal 'Basic YWxhZGRpbjpvcGVuc2VzYW1l', conn.headers['Authorization']
   end
 
+  def test_auto_parses_basic_auth_from_url_and_unescapes
+    conn = Faraday::Connection.new :url => "http://foo%40bar.com:pass%20word@sushi.com/fish"
+    assert_equal 'Basic Zm9vQGJhci5jb206cGFzcyB3b3Jk', conn.headers['Authorization']
+  end
+
   def test_token_auth_sets_authorization_header
     conn = Faraday::Connection.new
     conn.token_auth 'abcdef'
@@ -147,13 +153,20 @@ class TestConnection < Faraday::TestCase
     assert_equal '/sake.html', uri.path
   end
 
-  def test_build_url_doesnt_add_ending_slash
+  def test_build_url_doesnt_add_ending_slash_given_nil_url
     conn = Faraday::Connection.new
     conn.url_prefix = "http://sushi.com/nigiri"
     uri = conn.build_url(nil)
     assert_equal "/nigiri", uri.path
   end
 
+  def test_build_url_doesnt_add_ending_slash_given_empty_url
+    conn = Faraday::Connection.new
+    conn.url_prefix = "http://sushi.com/nigiri"
+    uri = conn.build_url('')
+    assert_equal "/nigiri", uri.path
+  end
+
   def test_build_url_parses_url_params_into_query
     conn = Faraday::Connection.new
     uri = conn.build_url("http://sushi.com/sake.html", 'a[b]' => '1 + 2')
@@ -196,6 +209,12 @@ class TestConnection < Faraday::TestCase
     assert_equal 'https://sushi.com/sushi/sake.html', uri.to_s
   end
 
+  def test_build_url_handles_uri_instances
+    conn = Faraday::Connection.new
+    uri = conn.build_url(URI('/sake.html'))
+    assert_equal '/sake.html', uri.path
+  end
+
   def test_proxy_accepts_string
     conn = Faraday::Connection.new
     conn.proxy 'http://proxy.com'
@@ -203,13 +222,20 @@ class TestConnection < Faraday::TestCase
     assert_equal [:uri],      conn.proxy.keys
   end
 
-  def test_proxy_accepts_uri
+  def test_proxy_accepts_addressable_uri
     conn = Faraday::Connection.new
     conn.proxy Addressable::URI.parse('http://proxy.com')
     assert_equal 'proxy.com', conn.proxy[:uri].host
     assert_equal [:uri],      conn.proxy.keys
   end
 
+  def test_proxy_accepts_stdlib_uri
+    conn = Faraday::Connection.new
+    conn.proxy URI('http://proxy.com')
+    assert_equal 'proxy.com', conn.proxy[:uri].host
+    assert_equal [:uri],      conn.proxy.keys
+  end
+
   def test_proxy_accepts_hash_with_string_uri
     conn = Faraday::Connection.new
     conn.proxy :uri => 'http://proxy.com', :user => 'rick'

data/test/env_test.rb

@@ -112,45 +112,45 @@ class ResponseTest < Faraday::TestCase
     }
     @response = Faraday::Response.new @env
   end
-  
+
   def test_finished
     assert @response.finished?
   end
-  
+
   def test_error_on_finish
     assert_raises RuntimeError do
       @response.finish({})
     end
   end
-  
+
   def test_not_success
     assert !@response.success?
   end
-  
+
   def test_status
     assert_equal 404, @response.status
   end
-  
+
   def test_body
     assert_equal 'yikes', @response.body
   end
-  
+
   def test_headers
     assert_equal 'text/plain', @response.headers['Content-Type']
     assert_equal 'text/plain', @response['content-type']
   end
-  
+
   def test_apply_request
     @response.apply_request :body => 'a=b', :method => :post
     assert_equal 'yikes', @response.body
     assert_equal :post, @response.env[:method]
   end
-  
+
   def test_marshal
     @response = Faraday::Response.new
     @response.on_complete { }
     @response.finish @env.merge(:custom => 'moo')
-    
+
     loaded = Marshal.load Marshal.dump(@response)
     assert_nil loaded.env[:custom]
     assert_equal %w[body response_headers status], loaded.env.keys.map { |k| k.to_s }.sort

data/test/helper.rb

@@ -1,5 +1,5 @@
-require 'rubygems'
 require 'test/unit'
+require 'stringio'
 
 if ENV['LEFTRIGHT']
   begin
@@ -9,10 +9,6 @@ if ENV['LEFTRIGHT']
   end
 end
 
-unless $LOAD_PATH.include? 'lib'
-  $LOAD_PATH.unshift(File.dirname(__FILE__))
-  $LOAD_PATH.unshift(File.join($LOAD_PATH.first, '..', 'lib'))
-end
 require 'faraday'
 
 begin
@@ -28,12 +24,22 @@ module Faraday
     LIVE_SERVER = case ENV['LIVE']
       when /^http/ then ENV['LIVE']
       when nil     then nil
-      else 'http://localhost:4567'
+      else 'http://127.0.0.1:4567'
     end
 
     def test_default
       assert true
     end unless defined? ::MiniTest
+
+    def capture_warnings
+      old, $stderr = $stderr, StringIO.new
+      begin
+        yield
+        $stderr.string
+      ensure
+        $stderr = old
+      end
+    end
   end
 end
 

data/test/live_server.rb

@@ -1,6 +1,18 @@
 require 'sinatra'
 set :logging, false
 
+[:get, :post, :put, :patch, :delete, :options].each do |method|
+  send(method, '/echo') do
+    kind = request.request_method.downcase
+    out = kind.dup
+    out << ' ?' << request.GET.inspect if request.GET.any?
+    out << ' ' << request.POST.inspect if request.POST.any?
+
+    content_type 'text/plain'
+    return out
+  end
+end
+
 get '/hello_world' do
   'hello world'
 end
@@ -41,5 +53,10 @@ delete '/delete_with_json' do
 end
 
 get '/multi' do
-  [200, { 'Set-Cookie' => %w[ one two ] }, '']
+  [200, { 'Set-Cookie' => 'one, two' }, '']
+end
+
+get '/slow' do
+  sleep 10
+  [200, {}, 'ok']
 end

data/test/request_middleware_test.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 require 'rack/utils'
 
-Faraday::CompositeReadIO.send :attr_reader, :ios
+Faraday::CompositeReadIO.class_eval { attr_reader :ios }
 
 class RequestMiddlewareTest < Faraday::TestCase
   def setup
@@ -76,7 +77,7 @@ class RequestMiddlewareTest < Faraday::TestCase
   def test_url_encoded_no_header
     response = @conn.post('/echo', { :fruit => %w[apples oranges] })
     assert_equal 'application/x-www-form-urlencoded', response.headers['Content-Type']
-    assert_equal 'fruit[]=apples&fruit[]=oranges', response.body
+    assert_equal 'fruit%5B%5D=apples&fruit%5B%5D=oranges', response.body
   end
 
   def test_url_encoded_with_header
@@ -92,6 +93,19 @@ class RequestMiddlewareTest < Faraday::TestCase
     assert_equal expected, Rack::Utils.parse_nested_query(response.body)
   end
 
+  def test_url_encoded_unicode
+    err = capture_warnings {
+      response = @conn.post('/echo', {:str => "eé cç aã aâ"})
+      assert_equal "str=e%C3%A9%20c%C3%A7%20a%C3%A3%20a%C3%A2", response.body
+    }
+    assert err.empty?
+  end
+
+  def test_url_encoded_nested_keys
+    response = @conn.post('/echo', {'a'=>{'b'=>{'c'=>['d']}}})
+    assert_equal "a%5Bb%5D%5Bc%5D%5B%5D=d", response.body
+  end
+
   def test_multipart
     # assume params are out of order
     regexes = [
@@ -113,4 +127,27 @@ class RequestMiddlewareTest < Faraday::TestCase
     end
     assert_equal [], regexes
   end
+  
+  def test_multipart_with_arrays
+    # assume params are out of order
+    regexes = [
+      /name\=\"a\"/,
+      /name=\"b\[\]\[c\]\"\; filename\=\"request_middleware_test\.rb\"/,
+      /name=\"b\[\]\[d\]\"/]
+
+    payload = {:a => 1, :b =>[{:c => Faraday::UploadIO.new(__FILE__, 'text/x-ruby'), :d => 2}]}
+    response = @conn.post('/echo', payload)
+
+    assert_kind_of Faraday::CompositeReadIO, response.body
+    assert_equal "multipart/form-data;boundary=%s" % Faraday::Request::Multipart::DEFAULT_BOUNDARY,
+      response.headers['Content-Type']
+
+    response.body.send(:ios).map{|io| io.read}.each do |io|
+      if re = regexes.detect { |r| io =~ r }
+        regexes.delete re
+      end
+    end
+    assert_equal [], regexes
+  end
+  
 end

data/test/response_middleware_test.rb

@@ -23,7 +23,7 @@ class ResponseMiddlewareTest < Faraday::TestCase
       @conn.get('ok')
     end
   end
-  
+
   def test_raises_not_found
     error = assert_raises Faraday::Error::ResourceNotFound do
       @conn.get('not-found')
@@ -31,7 +31,7 @@ class ResponseMiddlewareTest < Faraday::TestCase
     assert_equal 'the server responded with status 404', error.message
     assert_equal 'because', error.response[:headers]['X-Reason']
   end
-  
+
   def test_raises_error
     error = assert_raises Faraday::Error::ClientError do
       @conn.get('error')
@@ -39,7 +39,7 @@ class ResponseMiddlewareTest < Faraday::TestCase
     assert_equal 'the server responded with status 500', error.message
     assert_equal 'bailout', error.response[:headers]['X-Error']
   end
-  
+
   def test_upcase
     @conn.builder.insert(0, ResponseUpcaser)
     assert_equal '<BODY></BODY>', @conn.get('ok').body
@@ -71,4 +71,4 @@ class ResponseNoBodyMiddleWareTest < Faraday::TestCase
   def test_304
     assert_equal nil, @conn.get('not modified').body
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,77 +9,74 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2012-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70213347338660 !ruby/object:Gem::Requirement
+  requirement: &70207313872560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70213347338660
+  version_requirements: *70207313872560
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70213347338000 !ruby/object:Gem::Requirement
+  requirement: &70207313884640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70213347338000
+  version_requirements: *70207313884640
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70213347336580 !ruby/object:Gem::Requirement
+  requirement: &70207313889320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70213347336580
+  version_requirements: *70207313889320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70213347335860 !ruby/object:Gem::Requirement
+  requirement: &70207313910400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213347335860
+  version_requirements: *70207313910400
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70213347335220 !ruby/object:Gem::Requirement
+  requirement: &70207313926400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213347335220
+  version_requirements: *70207313926400
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70213347334540 !ruby/object:Gem::Requirement
+  requirement: &70207313936720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213347334540
+  version_requirements: *70207313936720
 description: HTTP/REST API client library.
 email: technoweenie@gmail.com
 executables: []
@@ -118,6 +115,7 @@ files:
 - test/adapters/logger_test.rb
 - test/adapters/net_http_test.rb
 - test/adapters/test_middleware_test.rb
+- test/adapters/typhoeus_test.rb
 - test/connection_test.rb
 - test/env_test.rb
 - test/helper.rb
@@ -145,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: faraday
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
@@ -154,6 +152,7 @@ test_files:
 - test/adapters/logger_test.rb
 - test/adapters/net_http_test.rb
 - test/adapters/test_middleware_test.rb
+- test/adapters/typhoeus_test.rb
 - test/connection_test.rb
 - test/env_test.rb
 - test/helper.rb
@@ -161,3 +160,4 @@ test_files:
 - test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
+has_rdoc: