faraday 0.7.6 → 0.8.0.rc2

data/test/helper.rb

@@ -9,7 +9,7 @@ if ENV['LEFTRIGHT']
   end
 end
 
-require 'faraday'
+require File.expand_path('../../lib/faraday', __FILE__)
 
 begin
   require 'ruby-debug'

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,14 +12,18 @@ 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
@@ -94,12 +98,57 @@ class MiddlewareStackTest < Faraday::TestCase
     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|
@@ -115,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,6 +1,5 @@
 # encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-require 'rack/utils'
 
 Faraday::CompositeReadIO.class_eval { attr_reader :ios }
 
@@ -9,7 +8,6 @@ class RequestMiddlewareTest < Faraday::TestCase
     @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']
@@ -31,49 +29,6 @@ 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_json_fails_with_useful_message_when_no_json_adapter_available
-    without_json_adapter do
-      expected_msg = "No JSON adapter available. Install either activesupport or yajl-ruby."
-      # assert_raise doesn't work to check the message (at least on 1.8.7)
-      begin
-        @conn.post('/echo', { :fruit => %w[apples oranges] }, 'content-type' => 'application/json')
-        fail "Exception not raised"
-      rescue Faraday::Error::MissingDependency => e
-        assert_equal expected_msg, e.message
-      end
-    end
-  end
-
-  def test_url_encoded_does_not_fail_when_no_json_adapter_available
-    without_json_adapter do
-      assert_nothing_raised {
-        @conn.post('/echo', { :fruit => %w[apples oranges] })
-      }
-    end
-  end
-
-  def without_json_adapter
-    original_adapter = Faraday::Request::JSON.adapter
-    Faraday::Request::JSON.adapter = nil
-    begin
-      yield
-    ensure
-      Faraday::Request::JSON.adapter = original_adapter
-    end
-  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']
@@ -90,13 +45,13 @@ 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%20c%C3%A7%20a%C3%A3%20a%C3%A2", response.body
+      assert_equal "str=e%C3%A9+c%C3%A7+a%C3%A3+a%C3%A2", response.body
     }
     assert err.empty?
   end

data/test/response_middleware_test.rb

@@ -51,8 +51,8 @@ class ResponseNoBodyMiddleWareTest < Faraday::TestCase
     @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] }
+        stub.get('not_modified') { [304, nil, nil] }
+        stub.get('no_content') { [204, nil, nil] }
       end
     end
     @conn.builder.insert(0, NotCalled)
@@ -65,10 +65,10 @@ class ResponseNoBodyMiddleWareTest < Faraday::TestCase
   end
 
   def test_204
-    assert_equal nil, @conn.get('no content').body
+    assert_equal nil, @conn.get('no_content').body
   end
 
   def test_304
-    assert_equal nil, @conn.get('not modified').body
+    assert_equal nil, @conn.get('not_modified').body
   end
 end

metadata

@@ -1,41 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.7.6
-  prerelease: 
+  version: 0.8.0.rc2
+  prerelease: 6
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000 Z
+date: 2012-01-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: &70207313872560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70207313872560
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70207313884640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70207313884640
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &70207313889320 !ruby/object:Gem::Requirement
+  requirement: &70137915346940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70207313889320
+  version_requirements: *70137915346940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70207313910400 !ruby/object:Gem::Requirement
+  requirement: &70137915345760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207313910400
+  version_requirements: *70137915345760
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70207313926400 !ruby/object:Gem::Requirement
+  requirement: &70137915343760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207313926400
+  version_requirements: *70137915343760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70207313936720 !ruby/object:Gem::Requirement
+  requirement: &70137915292660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,8 +54,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207313936720
-description: HTTP/REST API client library.
+  version_requirements: *70137915292660
+description: 
 email: technoweenie@gmail.com
 executables: []
 extensions: []
@@ -92,7 +70,9 @@ files:
 - 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/patron.rb
@@ -103,8 +83,10 @@ files:
 - lib/faraday/error.rb
 - lib/faraday/middleware.rb
 - lib/faraday/request.rb
-- lib/faraday/request/json.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
@@ -116,14 +98,16 @@ files:
 - test/adapters/net_http_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
-homepage: http://github.com/technoweenie/faraday
+homepage: https://github.com/technoweenie/faraday
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -138,11 +122,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: 1.3.5
+      version: 1.3.1
 requirements: []
-rubyforge_project: faraday
+rubyforge_project: 
 rubygems_version: 1.8.12
 signing_key: 
 specification_version: 2
@@ -153,10 +137,12 @@ test_files:
 - test/adapters/net_http_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

data/lib/faraday/request/json.rb

@@ -1,35 +0,0 @@
-module Faraday
-  class Request::JSON < Request::UrlEncoded
-    self.mime_type = 'application/json'.freeze
-
-    class << self
-      attr_writer :adapter
-
-      def adapter
-        @adapter or raise Error::MissingDependency, "No JSON adapter available. Install either activesupport or yajl-ruby."
-      end
-    end
-
-    # loads the JSON encoder either from yajl-ruby or activesupport
-    dependency do
-      begin
-        require 'yajl'
-        self.adapter = Yajl::Encoder
-      rescue LoadError, NameError
-        require 'active_support/core_ext/module/attribute_accessors' # AS 2.3.11
-        require 'active_support/core_ext/kernel/reporting'           # AS 2.3.11
-        require 'active_support/json/encoding'
-        require 'active_support/ordered_hash' # AS 3.0.4
-        self.adapter = ActiveSupport::JSON
-      end
-    end
-
-    def call(env)
-      match_content_type(env) do |data|
-        # encode with the first successfully loaded adapter
-        env[:body] = self.class.adapter.encode data
-      end
-      @app.call env
-    end
-  end
-end