faraday 0.5.7 → 0.6.0

data/test/middleware_stack_test.rb

@@ -0,0 +1,91 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class MiddlewareStackTest < Faraday::TestCase
+  # mock handler classes
+  class Handler < Struct.new(:app)
+    def call(env)
+      (env[:request_headers]['X-Middleware'] ||= '') << ":#{self.class.name.split('::').last}"
+      app.call(env)
+    end
+  end
+  class Apple < Handler; end
+  class Orange < Handler; end
+  class Banana < Handler; 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
+    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
+
+  def test_allows_extending
+    build_stack Apple
+    @conn.use Orange
+    assert_handlers %w[Apple Orange]
+  end
+
+  def test_builder_is_passed_to_new_faraday_connection
+    new_conn = Faraday::Connection.new :builder => @builder
+    assert_equal @builder, new_conn.builder
+  end
+
+  def test_insert_before
+    build_stack Apple, Orange
+    @builder.insert_before Apple, Banana
+    assert_handlers %w[Banana Apple Orange]
+  end
+
+  def test_insert_after
+    build_stack Apple, Orange
+    @builder.insert_after Apple, Banana
+    assert_handlers %w[Apple Banana Orange]
+  end
+
+  def test_swap_handlers
+    build_stack Apple, Orange
+    @builder.swap Apple, Banana
+    assert_handlers %w[Banana Orange]
+  end
+
+  def test_delete_handler
+    build_stack Apple, Orange
+    @builder.delete Apple
+    assert_handlers %w[Orange]
+  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) }
+
+      b.adapter :test do |stub|
+        stub.get '/' do |env|
+          # echo the "X-Middleware" request header in the body
+          [200, {}, env[:request_headers]['X-Middleware'].to_s]
+        end
+      end
+    end
+  end
+
+  def assert_handlers(list)
+    echoed_list = @conn.get('/').body.to_s.split(':')
+    echoed_list.shift if echoed_list.first == ''
+    assert_equal list, echoed_list
+  end
+end

data/test/request_middleware_test.rb

@@ -1,31 +1,85 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'rack/utils'
+
+Faraday::CompositeReadIO.send :attr_reader, :ios
 
 class RequestMiddlewareTest < Faraday::TestCase
-  [:yajl, :rails_json].each do |key|
-    encoder = Faraday::Request.lookup_module(key)
-    next if !encoder.loaded?
-
-    define_method "test_encodes_json_with_#{key}" do
-      resp = create_json_connection(encoder).post('echo_body', :a => 1)
-      raw_json = resp.body
-      raw_json.gsub! /: 1/, ':1' # sometimes rails_json adds a space
-      assert_equal %({"a":1}), raw_json
-      assert_match /json/, resp.headers['Content-Type']
+  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']
+          [200, {'Content-Type' => posted_as}, env[:body]]
+        end
+      end
     end
   end
 
-private
-  def create_json_connection(encoder)
-    Faraday.new do |b|
-      b.use encoder
-      b.adapter :test do |stub|
-        stub.post('echo_body') do |env|
-          [200,
-            {'Content-Type' => env[:request_headers]['Content-Type']},
-            env[:body]
-          ]
-        end
+  def test_does_nothing_without_payload
+    response = @conn.post('/echo')
+    assert_nil response.headers['Content-Type']
+    assert response.body.empty?
+  end
+
+  def test_ignores_custom_content_type
+    response = @conn.post('/echo', { :some => 'data' }, 'content-type' => 'application/x-foo')
+    assert_equal 'application/x-foo', response.headers['Content-Type']
+    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
+  end
+
+  def test_url_encoded_with_header
+    response = @conn.post('/echo', {'a'=>123}, 'content-type' => 'application/x-www-form-urlencoded')
+    assert_equal 'application/x-www-form-urlencoded', response.headers['Content-Type']
+    assert_equal 'a=123', response.body
+  end
+
+  def test_url_encoded_nested
+    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)
+  end
+
+  def test_multipart
+    # 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(&: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

@@ -1,44 +1,47 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class ResponseMiddlewareTest < Faraday::TestCase
-  [:yajl, :rails_json].each do |key|
-    encoder = Faraday::Response.lookup_module(key)
-    next if !encoder.loaded?
-
-    define_method "test_uses_#{key}_to_parse_json_content" do
-      response = create_json_connection(encoder).get('json')
-      assert response.success?
-      assert_equal [1,2,3], response.body
+  def setup
+    @conn = Faraday.new do |b|
+      b.response :raise_error
+      b.adapter :test do |stub|
+        stub.get('ok')        { [200, {'Content-Type' => 'text/html'}, '<body></body>'] }
+        stub.get('not-found') { [404, {'X-Reason' => 'because'}, 'keep looking'] }
+        stub.get('error')     { [500, {'X-Error' => 'bailout'}, 'fail'] }
+      end
     end
+  end
 
-    define_method "test_uses_#{key}_to_skip_blank_content" do
-      response = create_json_connection(encoder).get('blank')
-      assert response.success?
-      assert !response.body
+  class ResponseUpcaser < Faraday::Response::Middleware
+    def parse(body)
+      body.upcase
     end
+  end
 
-    define_method "test_uses_#{key}_to_skip_nil_content" do
-      response = create_json_connection(encoder).get('nil')
-      assert response.success?
-      assert !response.body
+  def test_success
+    assert_nothing_raised do
+      @conn.get('ok')
     end
-
-    define_method "test_use_#{key}_to_raise_Faraday_Error_Parsing_with_no_json_content" do
-      assert_raises Faraday::Error::ParsingError do
-        create_json_connection(encoder).get('bad_json')
-      end
+  end
+  
+  def test_raises_not_found
+    error = assert_raises Faraday::Error::ResourceNotFound do
+      @conn.get('not-found')
     end
+    assert_equal 'the server responded with status 404', error.message
+    assert_equal 'because', error.response[:headers]['X-Reason']
   end
-
-  def create_json_connection(encoder)
-    Faraday.new do |b|
-      b.adapter :test do |stub|
-        stub.get('json')  { [200, {'Content-Type' => 'text/html'}, "[1,2,3]"] }
-        stub.get('blank') { [200, {'Content-Type' => 'text/html'}, ''] }
-        stub.get('nil')   { [200, {'Content-Type' => 'text/html'}, nil] }
-        stub.get("bad_json") {[200, {'Content-Type' => 'text/html'}, '<body></body>']}
-      end
-      b.use encoder
+  
+  def test_raises_error
+    error = assert_raises Faraday::Error::ClientError do
+      @conn.get('error')
     end
+    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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 7
-  version: 0.5.7
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Rick Olson
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 -08:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 8
@@ -39,6 +41,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 2
@@ -54,6 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -69,6 +73,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -76,6 +81,7 @@ dependencies:
         version: 1.1.0
     - - <
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         version: "2"
@@ -100,7 +106,6 @@ files:
 - lib/faraday/adapter/action_dispatch.rb
 - lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/excon.rb
-- lib/faraday/adapter/logger.rb
 - lib/faraday/adapter/net_http.rb
 - lib/faraday/adapter/patron.rb
 - lib/faraday/adapter/test.rb
@@ -110,24 +115,23 @@ files:
 - lib/faraday/error.rb
 - lib/faraday/middleware.rb
 - lib/faraday/request.rb
-- lib/faraday/request/active_support_json.rb
-- lib/faraday/request/yajl.rb
+- lib/faraday/request/json.rb
+- lib/faraday/request/multipart.rb
+- lib/faraday/request/url_encoded.rb
 - lib/faraday/response.rb
-- lib/faraday/response/active_support_json.rb
-- lib/faraday/response/yajl.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/logger_test.rb
+- test/adapters/net_http_test.rb
 - test/adapters/test_middleware_test.rb
-- test/adapters/typhoeus_test.rb
-- test/connection_app_test.rb
 - test/connection_test.rb
 - test/env_test.rb
-- test/form_post_test.rb
 - test/helper.rb
 - test/live_server.rb
-- test/multipart_test.rb
+- test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
 has_rdoc: true
@@ -144,6 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -152,6 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 17
       segments: 
       - 1
       - 3
@@ -167,12 +173,10 @@ summary: HTTP/REST API client library.
 test_files: 
 - test/adapters/live_test.rb
 - test/adapters/logger_test.rb
+- test/adapters/net_http_test.rb
 - test/adapters/test_middleware_test.rb
-- test/adapters/typhoeus_test.rb
-- test/connection_app_test.rb
 - test/connection_test.rb
 - test/env_test.rb
-- test/form_post_test.rb
-- test/multipart_test.rb
+- test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb

data/lib/faraday/adapter/logger.rb

@@ -1,32 +0,0 @@
-module Faraday
-  class Adapter
-    class Logger < Faraday::Adapter
-      def self.loaded?() false end
-
-      def initialize(app = nil, logger = nil)
-        super(app)
-        @logger = logger || begin
-          require 'logger'
-          ::Logger.new(STDOUT)
-        end
-      end
-
-      def call(env)
-        super
-        @logger.info "#{env[:method]} #{env[:url].to_s}"
-        @logger.debug("request") do
-          env[:request_headers].map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
-        end
-
-        env[:response].on_complete do |resp_env|
-          @logger.info("Status") { env[:status].to_s }
-          @logger.debug("response") do
-            resp_env[:response_headers].map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
-          end
-        end
-
-        @app.call(env)
-      end
-    end
-  end
-end

data/lib/faraday/request/active_support_json.rb

@@ -1,21 +0,0 @@
-module Faraday
-  class Request::ActiveSupportJson < Faraday::Middleware
-    begin
-      if !defined?(ActiveSupport::JSON)
-        require 'active_support'
-        ActiveSupport::JSON
-      end
-
-    rescue LoadError, NameError => e
-      self.load_error = e
-    end
-
-    def call(env)
-      env[:request_headers]['Content-Type'] = 'application/json'
-      if env[:body] && !env[:body].respond_to?(:to_str)
-        env[:body] = ActiveSupport::JSON.encode(env[:body])
-      end
-      @app.call env
-    end
-  end
-end