faraday 0.9.0.rc5 → 0.9.0.rc6

data/test/env_test.rb

@@ -98,6 +98,25 @@ class HeadersTest < Faraday::TestCase
     assert_equal 'application/xml', @headers['content-type']
   end
 
+  def test_fetch_key
+    @headers['Content-Type'] = 'application/json'
+    block_called = false
+    assert_equal 'application/json', @headers.fetch('content-type') { block_called = true }
+    assert_equal 'application/json', @headers.fetch('Content-Type')
+    assert_equal 'application/json', @headers.fetch('CONTENT-TYPE')
+    assert_equal 'application/json', @headers.fetch(:content_type)
+    assert_equal false, block_called
+
+    assert_equal 'default', @headers.fetch('invalid', 'default')
+    assert_equal false, @headers.fetch('invalid', false)
+    assert_nil   @headers.fetch('invalid', nil)
+
+    assert_equal 'Invalid key', @headers.fetch('Invalid') { |key| "#{key} key" }
+
+    expected_error = defined?(KeyError) ? KeyError : IndexError
+    assert_raises(expected_error) { @headers.fetch('invalid') }
+  end
+
   def test_delete_key
     @headers['Content-Type'] = 'application/json'
     assert_equal 1, @headers.size
@@ -189,4 +208,3 @@ class ResponseTest < Faraday::TestCase
     assert_equal hash[:body], @response.body
   end
 end
-

data/test/helper.rb

@@ -11,6 +11,7 @@ SimpleCov.start do
   add_filter '/bundle/'
 end
 
+gem 'minitest' if defined? Bundler
 require 'minitest/autorun'
 
 if ENV['LEFTRIGHT']
@@ -22,9 +23,6 @@ if ENV['LEFTRIGHT']
 end
 
 require File.expand_path('../../lib/faraday', __FILE__)
-Dir[File.expand_path('../../lib/faraday/r*/*', __FILE__)].each do |file|
-  require file
-end
 
 require 'stringio'
 require 'uri'
@@ -50,7 +48,7 @@ module Faraday
     end
   end
 
-  class TestCase < MiniTest::Unit::TestCase
+  class TestCase < MiniTest::Test
     extend LiveServerConfig
     self.live_server = ENV['LIVE']
 

data/test/live_server.rb

@@ -25,9 +25,11 @@ class LiveServer < Sinatra::Base
 
   post '/file' do
     if params[:uploaded_file].respond_to? :each_key
-      "file %s %s" % [
+      "file %s %s %d" % [
         params[:uploaded_file][:filename],
-        params[:uploaded_file][:type]]
+        params[:uploaded_file][:type],
+        params[:uploaded_file][:tempfile].size
+      ]
     else
       status 400
     end

data/test/middleware/instrumentation_test.rb

@@ -28,6 +28,19 @@ module Middleware
       assert_equal :boom, options(:instrumenter => :boom).instrumenter
     end
 
+    def test_instrumentation_with_default_name
+      assert_equal 0, @instrumenter.instrumentations.size
+
+      faraday = conn
+      res = faraday.get '/'
+      assert_equal 'ok', res.body
+
+      assert_equal 1, @instrumenter.instrumentations.size
+      name, env = @instrumenter.instrumentations.first
+      assert_equal 'request.faraday', name
+      assert_equal '/', env[:url].path
+    end
+
     def test_instrumentation
       assert_equal 0, @instrumenter.instrumentations.size
 

data/test/middleware/retry_test.rb

@@ -51,6 +51,53 @@ module Middleware
       assert_in_delta 0.2, Time.now - started, 0.03
     end
 
+    def test_calls_sleep_amount
+      explode_app = MiniTest::Mock.new
+      explode_app.expect(:call, nil, [{:body=>nil}])
+      def explode_app.call(env)
+        raise Errno::ETIMEDOUT
+      end
+
+      retry_middleware = Faraday::Request::Retry.new(explode_app)
+      class << retry_middleware
+        attr_accessor :sleep_amount_retries
+
+        def sleep_amount(retries)
+          self.sleep_amount_retries.delete(retries)
+          0
+        end
+      end
+      retry_middleware.sleep_amount_retries = [2, 1]
+
+      assert_raises(Errno::ETIMEDOUT) {
+        retry_middleware.call({})
+      }
+
+      assert_empty retry_middleware.sleep_amount_retries
+    end
+
+    def test_exponential_backoff
+      middleware = Faraday::Request::Retry.new(nil, :max => 5, :interval => 0.1, :backoff_factor => 2)
+      assert_equal middleware.sleep_amount(5), 0.1
+      assert_equal middleware.sleep_amount(4), 0.2
+      assert_equal middleware.sleep_amount(3), 0.4
+    end
+
+    def test_random_additional_interval_amount
+      middleware = Faraday::Request::Retry.new(nil, :max => 2, :interval => 0.1, :interval_randomness => 1.0)
+      sleep_amount = middleware.sleep_amount(2)
+      assert_operator sleep_amount, :>=, 0.1
+      assert_operator sleep_amount, :<=, 0.2
+      middleware = Faraday::Request::Retry.new(nil, :max => 2, :interval => 0.1, :interval_randomness => 0.5)
+      sleep_amount = middleware.sleep_amount(2)
+      assert_operator sleep_amount, :>=, 0.1
+      assert_operator sleep_amount, :<=, 0.15
+      middleware = Faraday::Request::Retry.new(nil, :max => 2, :interval => 0.1, :interval_randomness => 0.25)
+      sleep_amount = middleware.sleep_amount(2)
+      assert_operator sleep_amount, :>=, 0.1
+      assert_operator sleep_amount, :<=, 0.125
+    end
+
     def test_custom_exceptions
       @explode = lambda {|n| raise "boom!" }
       assert_raises(RuntimeError) {

data/test/multibyte.txt

@@ -0,0 +1 @@
+ファイル

data/test/options_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../helper', __FILE__)
 
 class OptionsTest < Faraday::TestCase
   class SubOptions < Faraday::Options.new(:sub); end
-  class Options < Faraday::Options.new(:a, :b, :c)
+  class ParentOptions < Faraday::Options.new(:a, :b, :c)
     options :c => SubOptions
   end
 
@@ -33,18 +33,32 @@ class OptionsTest < Faraday::TestCase
     assert_equal 'http', options.scheme
   end
 
+  def test_proxy_options_hash_access
+    proxy = Faraday::ProxyOptions.from 'http://a%40b:pw%20d@example.org'
+    assert_equal 'a@b', proxy[:user]
+    assert_equal 'a@b', proxy.user
+    assert_equal 'pw d', proxy[:password]
+    assert_equal 'pw d', proxy.password
+  end
+
+  def test_proxy_options_no_auth
+    proxy = Faraday::ProxyOptions.from 'http://example.org'
+    assert_nil proxy.user
+    assert_nil proxy.password
+  end
+
   def test_from_options
-    options = Options.new 1
+    options = ParentOptions.new 1
 
-    value = Options.from(options)
+    value = ParentOptions.from(options)
     assert_equal 1, value.a
     assert_nil value.b
   end
 
   def test_from_options_with_sub_object
     sub = SubOptions.new 1
-    options = Options.from :a => 1, :c => sub
-    assert_kind_of Options, options
+    options = ParentOptions.from :a => 1, :c => sub
+    assert_kind_of ParentOptions, options
     assert_equal 1, options.a
     assert_nil options.b
     assert_kind_of SubOptions, options.c
@@ -52,24 +66,31 @@ class OptionsTest < Faraday::TestCase
   end
 
   def test_from_hash
-    options = Options.from :a => 1
-    assert_kind_of Options, options
+    options = ParentOptions.from :a => 1
+    assert_kind_of ParentOptions, options
     assert_equal 1, options.a
     assert_nil options.b
   end
 
   def test_from_hash_with_sub_object
-    options = Options.from :a => 1, :c => {:sub => 1}
-    assert_kind_of Options, options
+    options = ParentOptions.from :a => 1, :c => {:sub => 1}
+    assert_kind_of ParentOptions, options
     assert_equal 1, options.a
     assert_nil options.b
     assert_kind_of SubOptions, options.c
     assert_equal 1, options.c.sub
   end
 
+  def test_inheritance
+    subclass = Class.new(ParentOptions)
+    options = subclass.from(:c => {:sub => 'hello'})
+    assert_kind_of SubOptions, options.c
+    assert_equal 'hello', options.c.sub
+  end
+
   def test_from_deep_hash
     hash = {:b => 1}
-    options = Options.from :a => hash
+    options = ParentOptions.from :a => hash
     assert_equal 1, options.a[:b]
 
     hash[:b] = 2
@@ -81,20 +102,20 @@ class OptionsTest < Faraday::TestCase
   end
 
   def test_from_nil
-    options = Options.from(nil)
-    assert_kind_of Options, options
+    options = ParentOptions.from(nil)
+    assert_kind_of ParentOptions, options
     assert_nil options.a
     assert_nil options.b
   end
 
   def test_invalid_key
     assert_raises NoMethodError do
-      Options.from :invalid => 1
+      ParentOptions.from :invalid => 1
     end
   end
 
   def test_update
-    options = Options.new 1
+    options = ParentOptions.new 1
     assert_equal 1, options.a
     assert_nil options.b
 
@@ -105,14 +126,14 @@ class OptionsTest < Faraday::TestCase
   end
 
   def test_delete
-    options = Options.new 1
+    options = ParentOptions.new 1
     assert_equal 1, options.a
     assert_equal 1, options.delete(:a)
     assert_nil options.a
   end
 
   def test_merge
-    options = Options.new 1
+    options = ParentOptions.new 1
     assert_equal 1, options.a
     assert_nil options.b
 
@@ -122,5 +143,60 @@ class OptionsTest < Faraday::TestCase
     assert_equal 1, options.a
     assert_nil options.b
   end
-end
 
+  def test_env_access_member
+    e = Faraday::Env.new
+    assert_nil e.method
+    e.method = :get
+    assert_equal :get, e.method
+  end
+
+  def test_env_access_symbol_non_member
+    e = Faraday::Env.new
+    assert_nil e[:custom]
+    e[:custom] = :boom
+    assert_equal :boom, e[:custom]
+  end
+
+  def test_env_access_string_non_member
+    e = Faraday::Env.new
+    assert_nil e["custom"]
+    e["custom"] = :boom
+    assert_equal :boom, e["custom"]
+  end
+
+  def test_env_fetch_ignores_false
+    ssl = Faraday::SSLOptions.new
+    ssl.verify = false
+    assert !ssl.fetch(:verify, true)
+  end
+
+  def test_fetch_grabs_value
+    opt = Faraday::SSLOptions.new
+    opt.verify = 1
+    assert_equal 1, opt.fetch(:verify, false) { |k| :blah }
+  end
+
+  def test_fetch_uses_falsey_default
+    opt = Faraday::SSLOptions.new
+    assert_equal false, opt.fetch(:verify, false) { |k| :blah }
+  end
+
+  def test_fetch_accepts_block
+    opt = Faraday::SSLOptions.new
+    assert_equal "yo :verify", opt.fetch(:verify) { |k| "yo #{k.inspect}"}
+  end
+
+  def test_fetch_needs_a_default_if_key_is_missing
+    opt = Faraday::SSLOptions.new
+    assert_raises Faraday::Options.fetch_error_class do
+      opt.fetch :verify
+    end
+  end
+
+  def test_fetch_works_with_key
+    opt = Faraday::SSLOptions.new
+    opt.verify = 1
+    assert_equal 1, opt.fetch(:verify)
+  end
+end

data/test/request_middleware_test.rb

@@ -77,7 +77,7 @@ class RequestMiddlewareTest < Faraday::TestCase
       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?
+    assert err.empty?, "stderr did include: #{err}"
   end
 
   def test_url_encoded_unicode_with_kcode_set
@@ -86,7 +86,7 @@ class RequestMiddlewareTest < Faraday::TestCase
         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?
+      assert err.empty?, "stderr did include: #{err}"
     end
   end
 
@@ -106,7 +106,7 @@ class RequestMiddlewareTest < Faraday::TestCase
     response = @conn.post('/echo', payload)
 
     assert_kind_of Faraday::CompositeReadIO, response.body
-    assert_equal "multipart/form-data;boundary=%s" % Faraday::Request::Multipart::DEFAULT_BOUNDARY,
+    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|
@@ -116,7 +116,7 @@ class RequestMiddlewareTest < Faraday::TestCase
     end
     assert_equal [], regexes
   end
-  
+
   def test_multipart_with_arrays
     # assume params are out of order
     regexes = [
@@ -128,7 +128,7 @@ class RequestMiddlewareTest < Faraday::TestCase
     response = @conn.post('/echo', payload)
 
     assert_kind_of Faraday::CompositeReadIO, response.body
-    assert_equal "multipart/form-data;boundary=%s" % Faraday::Request::Multipart::DEFAULT_BOUNDARY,
+    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|
@@ -138,5 +138,5 @@ class RequestMiddlewareTest < Faraday::TestCase
     end
     assert_equal [], regexes
   end
-  
+
 end

data/test/utils_test.rb

@@ -5,33 +5,54 @@ class TestUtils < Faraday::TestCase
     @url = "http://example.com/abc"
   end
 
-  def teardown
-    Faraday::Utils.default_uri_parser = nil
+  # emulates ActiveSupport::SafeBuffer#gsub
+  FakeSafeBuffer = Struct.new(:string) do
+    def to_s() self end
+    def gsub(regex)
+      string.gsub(regex) {
+        match, = $&, '' =~ /a/
+        yield match
+      }
+    end
+  end
+
+  def test_escaping_safe_buffer
+    str = FakeSafeBuffer.new('$32,000.00')
+    assert_equal '%2432%2C000.00', Faraday::Utils.escape(str)
   end
 
   def test_parses_with_default
-    assert_equal %(#<Method: Kernel.URI>), Faraday::Utils.default_uri_parser.to_s
-    uri = normalize(@url)
-    assert_equal 'example.com', uri.host
+    with_default_uri_parser(nil) do
+      uri = normalize(@url)
+      assert_equal 'example.com', uri.host
+    end
   end
 
   def test_parses_with_URI
-    Faraday::Utils.default_uri_parser = ::URI
-    assert_equal %(#<Method: URI.parse>), Faraday::Utils.default_uri_parser.to_s
-    uri = normalize(@url)
-    assert_equal 'example.com', uri.host
+    with_default_uri_parser(::URI) do
+      uri = normalize(@url)
+      assert_equal 'example.com', uri.host
+    end
   end
 
   def test_parses_with_block
-    Faraday::Utils.default_uri_parser = lambda do |uri|
-      "booya#{"!" * uri.size}"
+    with_default_uri_parser(lambda {|u| "booya#{"!" * u.size}" }) do
+      assert_equal 'booya!!!!!!!!!!!!!!!!!!!!!!', normalize(@url)
     end
-
-    assert_equal 'booya!!!!!!!!!!!!!!!!!!!!!!', normalize(@url)
   end
 
   def normalize(url)
     Faraday::Utils::URI(url)
   end
+
+  def with_default_uri_parser(parser)
+    old_parser = Faraday::Utils.default_uri_parser
+    begin
+      Faraday::Utils.default_uri_parser = parser
+      yield
+    ensure
+      Faraday::Utils.default_uri_parser = old_parser
+    end
+  end
 end