faraday 0.6.0 → 0.8.0

data/test/live_server.rb

@@ -1,41 +1,50 @@
-require 'sinatra'
-set :logging, false
+require 'sinatra/base'
 
-get '/hello_world' do
-  'hello world'
-end
+class FaradayTestServer < Sinatra::Base
+  set :logging => false,
+      :show_exceptions => false
 
-get '/json' do
-  content_type 'application/json'
-  "[1,2,3]"
-end
+  [: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?
 
-post '/file' do
-  if params[:uploaded_file].respond_to? :each_key
-    "file %s %s" % [
-      params[:uploaded_file][:filename],
-      params[:uploaded_file][:type]]
-  else
-    status 400
+      content_type 'text/plain'
+      return out
+    end
   end
-end
 
-%w[get post].each do |method|
-  send(method, '/hello') do
-    "hello #{params[:name]}"
+  get '/echo_header' do
+    header = "HTTP_#{params[:name].tr('-', '_').upcase}"
+    request.env.fetch(header) { 'NONE' }
   end
-end
 
-%w[post put].each do |method|
-  send(method, '/echo_name') do
-    params[:name].inspect
+  post '/file' do
+    if params[:uploaded_file].respond_to? :each_key
+      "file %s %s" % [
+        params[:uploaded_file][:filename],
+        params[:uploaded_file][:type]]
+    else
+      status 400
+    end
   end
-end
 
-delete '/delete_with_json' do
-  %/{"deleted":true}/
+  get '/multi' do
+    [200, { 'Set-Cookie' => 'one, two' }, '']
+  end
+
+  get '/slow' do
+    sleep 10
+    [200, {}, 'ok']
+  end
+
+  error do |e|
+    "#{e.class}\n#{e.to_s}\n#{e.backtrace.join("\n")}"
+  end
 end
 
-get '/multi' do
-  [200, { 'Set-Cookie' => %w[ one two ] }, '']
+if $0 == __FILE__
+  FaradayTestServer.run!
 end

data/test/middleware/retry_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "helper"))
+
+module Middleware
+  class RetryTest < Faraday::TestCase
+    def setup
+      @stubs = Faraday::Adapter::Test::Stubs.new
+      @conn = Faraday.new do |b|
+        b.request :retry, 2
+        b.adapter :test, @stubs
+      end
+    end
+
+    def test_retries
+      times_called = 0
+
+      @stubs.post("/echo") do
+        times_called += 1
+        raise "Error occurred"
+      end
+
+      @conn.post("/echo") rescue nil
+      assert_equal times_called, 3
+    end
+  end
+end

data/test/middleware_stack_test.rb

@@ -12,22 +12,24 @@ class MiddlewareStackTest < Faraday::TestCase
   class Orange < Handler; end
   class Banana < Handler; end
 
+  class Broken < Faraday::Middleware
+    dependency 'zomg/i_dont/exist'
+  end
+
   def setup
     @conn = Faraday::Connection.new
     @builder = @conn.builder
   end
 
   def test_sets_default_adapter_if_none_set
-    default_middleware = Faraday::Request.lookup_module :url_encoded
-    default_adapter_klass = Faraday::Adapter.lookup_module Faraday.default_adapter
+    default_middleware = Faraday::Request.lookup_middleware :url_encoded
+    default_adapter_klass = Faraday::Adapter.lookup_middleware Faraday.default_adapter
     assert @builder[0] == default_middleware
     assert @builder[1] == default_adapter_klass
   end
 
   def test_allows_rebuilding
     build_stack Apple
-    assert_handlers %w[Apple]
-
     build_stack Orange
     assert_handlers %w[Orange]
   end
@@ -67,12 +69,86 @@ class MiddlewareStackTest < Faraday::TestCase
     assert_handlers %w[Orange]
   end
 
+  def test_stack_is_locked_after_making_requests
+    build_stack Apple
+    assert !@builder.locked?
+    @conn.get('/')
+    assert @builder.locked?
+
+    assert_raises Faraday::Builder::StackLocked do
+      @conn.use Orange
+    end
+  end
+
+  def test_duped_stack_is_unlocked
+    build_stack Apple
+    assert !@builder.locked?
+    @builder.lock!
+    assert @builder.locked?
+
+    duped_connection = @conn.dup
+    assert_equal @builder, duped_connection.builder
+    assert !duped_connection.builder.locked?
+  end
+
+  def test_handler_comparison
+    build_stack Apple
+    assert_equal @builder.handlers.first, Apple
+    assert_equal @builder.handlers[0,1], [Apple]
+    assert_equal @builder.handlers.first, Faraday::Builder::Handler.new(Apple)
+  end
+
+  def test_unregistered_symbol
+    err = assert_raise(RuntimeError) { build_stack :apple }
+    assert_equal ":apple is not registered on Faraday::Middleware", err.message
+  end
+
+  def test_registered_symbol
+    Faraday.register_middleware :apple => Apple
+    begin
+      build_stack :apple
+      assert_handlers %w[Apple]
+    ensure
+      unregister_middleware Faraday::Middleware, :apple
+    end
+  end
+
+  def test_registered_symbol_with_proc
+    Faraday.register_middleware :apple => lambda { Apple }
+    begin
+      build_stack :apple
+      assert_handlers %w[Apple]
+    ensure
+      unregister_middleware Faraday::Middleware, :apple
+    end
+  end
+
+  def test_registered_symbol_with_type
+    Faraday.register_middleware :request, :orange => Orange
+    begin
+      build_stack {|b| b.request :orange }
+      assert_handlers %w[Orange]
+    ensure
+      unregister_middleware Faraday::Request, :orange
+    end
+  end
+
+  def test_missing_dependencies
+    build_stack Broken
+    err = assert_raises RuntimeError do
+      @conn.get('/')
+    end
+    assert_match "missing dependency for MiddlewareStackTest::Broken: ", err.message
+    assert_match "zomg/i_dont/exist", err.message
+  end
+
   private
 
   # make a stack with test adapter that reflects the order of middleware
   def build_stack(*handlers)
     @builder.build do |b|
       handlers.each { |handler| b.use(*handler) }
+      yield b if block_given?
 
       b.adapter :test do |stub|
         stub.get '/' do |env|
@@ -88,4 +164,9 @@ class MiddlewareStackTest < Faraday::TestCase
     echoed_list.shift if echoed_list.first == ''
     assert_equal list, echoed_list
   end
+
+  def unregister_middleware(component, key)
+    # TODO: unregister API?
+    component.instance_variable_get('@registered_middleware').delete(key)
+  end
 end

data/test/request_middleware_test.rb

@@ -1,14 +1,13 @@
+# 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
     @conn = Faraday.new do |b|
       b.request :multipart
       b.request :url_encoded
-      b.request :json
       b.adapter :test do |stub|
         stub.post('/echo') do |env|
           posted_as = env[:request_headers]['Content-Type']
@@ -30,22 +29,10 @@ class RequestMiddlewareTest < Faraday::TestCase
     assert_equal({ :some => 'data' }, response.body)
   end
 
-  def test_json_encodes_hash
-    response = @conn.post('/echo', { :fruit => %w[apples oranges] }, 'content-type' => 'application/json')
-    assert_equal 'application/json', response.headers['Content-Type']
-    assert_equal '{"fruit":["apples","oranges"]}', response.body
-  end
-
-  def test_json_skips_encoding_for_strings
-    response = @conn.post('/echo', '{"a":"b"}', 'content-type' => 'application/json')
-    assert_equal 'application/json', response.headers['Content-Type']
-    assert_equal '{"a":"b"}', response.body
-  end
-
   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
@@ -58,7 +45,20 @@ class RequestMiddlewareTest < Faraday::TestCase
     response = @conn.post('/echo', { :user => {:name => 'Mislav', :web => 'mislav.net'} })
     assert_equal 'application/x-www-form-urlencoded', response.headers['Content-Type']
     expected = { 'user' => {'name' => 'Mislav', 'web' => 'mislav.net'} }
-    assert_equal expected, Rack::Utils.parse_nested_query(response.body)
+    assert_equal expected, Faraday::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+c%C3%A7+a%C3%A3+a%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
@@ -74,12 +74,35 @@ class RequestMiddlewareTest < Faraday::TestCase
     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(&:read).each do |io|
+
+    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
+  
+  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,9 +39,36 @@ 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
   end
 end
+
+class ResponseNoBodyMiddleWareTest < Faraday::TestCase
+  def setup
+    @conn = Faraday.new do |b|
+      b.response :raise_error
+      b.adapter :test do |stub|
+        stub.get('not_modified') { [304, nil, nil] }
+        stub.get('no_content') { [204, nil, nil] }
+      end
+    end
+    @conn.builder.insert(0, NotCalled)
+  end
+
+  class NotCalled < Faraday::Response::Middleware
+    def parse(body)
+      raise "this should not be called"
+    end
+  end
+
+  def test_204
+    assert_equal nil, @conn.get('no_content').body
+  end
+
+  def test_304
+    assert_equal nil, @conn.get('not_modified').body
+  end
+end

metadata

@@ -1,113 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: faraday
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+version: !ruby/object:Gem::Version
+  version: 0.8.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-31 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: &70331771782880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70331771782880
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70331771781000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70331771781000
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70331771779420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 2
-        - 4
-        version: 2.2.4
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multipart-post
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70331771779420
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70331771778040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70331771778040
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70331771775860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  type: :runtime
-  version_requirements: *id004
-description: HTTP/REST API client library.
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70331771775860
+description: 
 email: technoweenie@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
+- config.ru
 - faraday.gemspec
 - lib/faraday.rb
 - lib/faraday/adapter.rb
-- lib/faraday/adapter/action_dispatch.rb
+- lib/faraday/adapter/em_http.rb
 - lib/faraday/adapter/em_synchrony.rb
+- lib/faraday/adapter/em_synchrony/parallel_manager.rb
 - lib/faraday/adapter/excon.rb
 - lib/faraday/adapter/net_http.rb
+- lib/faraday/adapter/net_http_persistent.rb
 - lib/faraday/adapter/patron.rb
+- lib/faraday/adapter/rack.rb
 - lib/faraday/adapter/test.rb
 - lib/faraday/adapter/typhoeus.rb
 - lib/faraday/builder.rb
@@ -115,68 +95,82 @@ files:
 - lib/faraday/error.rb
 - lib/faraday/middleware.rb
 - lib/faraday/request.rb
-- lib/faraday/request/json.rb
+- lib/faraday/request/authorization.rb
+- lib/faraday/request/basic_authentication.rb
 - lib/faraday/request/multipart.rb
+- lib/faraday/request/retry.rb
+- lib/faraday/request/token_authentication.rb
 - lib/faraday/request/url_encoded.rb
 - lib/faraday/response.rb
 - lib/faraday/response/logger.rb
 - lib/faraday/response/raise_error.rb
 - lib/faraday/upload_io.rb
 - lib/faraday/utils.rb
-- test/adapters/live_test.rb
+- test/adapters/default_test.rb
+- test/adapters/em_http_test.rb
+- test/adapters/em_synchrony_test.rb
+- test/adapters/excon_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/connection_test.rb
 - test/env_test.rb
 - test/helper.rb
 - test/live_server.rb
+- test/middleware/retry_test.rb
 - test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
-has_rdoc: true
-homepage: http://github.com/technoweenie/faraday
+homepage: https://github.com/technoweenie/faraday
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
-rubyforge_project: faraday
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
-test_files: 
-- test/adapters/live_test.rb
+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/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/connection_test.rb
 - test/env_test.rb
+- test/helper.rb
+- test/live_server.rb
+- test/middleware/retry_test.rb
 - test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
+has_rdoc: