faraday 0.5.7 → 0.6.0

data/lib/faraday/request/yajl.rb

@@ -1,18 +0,0 @@
-module Faraday
-  class Request::Yajl < Faraday::Middleware
-    begin
-      require 'yajl'
-
-    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] = Yajl::Encoder.encode(env[:body])
-      end
-      @app.call env
-    end
-  end
-end

data/lib/faraday/response/active_support_json.rb

@@ -1,30 +0,0 @@
-module Faraday
-  class Response::ActiveSupportJson < Response::Middleware
-    begin
-      if !defined?(ActiveSupport::JSON)
-        require 'active_support'
-        ActiveSupport::JSON
-      end
-
-      def self.register_on_complete(env)
-        env[:response].on_complete do |finished_env|
-          finished_env[:body] = parse(finished_env[:body])
-
-        end
-      end
-    rescue LoadError, NameError => e
-      self.load_error = e
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-
-    def self.parse(body)
-      ActiveSupport::JSON.decode(body)
-    rescue Object
-      raise Faraday::Error::ParsingError, $!
-    end
-  end
-end

data/lib/faraday/response/yajl.rb

@@ -1,26 +0,0 @@
-module Faraday
-  class Response::Yajl < Response::Middleware
-    begin
-      require 'yajl'
-
-      def self.register_on_complete(env)
-        env[:response].on_complete do |finished_env|
-          finished_env[:body] = parse(finished_env[:body])
-        end
-      end
-    rescue LoadError, NameError => e
-      self.load_error = e
-    end
-
-    def initialize(app)
-      super
-      @parser = nil
-    end
-
-    def self.parse(body)
-      Yajl::Parser.parse(body)
-    rescue Object
-      raise Faraday::Error::ParsingError, $!
-    end
-  end
-end

data/test/adapters/typhoeus_test.rb

@@ -1,31 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
-
-if Faraday::Adapter::Typhoeus.loaded?
-  module Adapters
-    class TestTyphoeus < Faraday::TestCase
-      def setup
-        @adapter = Faraday::Adapter::Typhoeus.new
-      end
-
-      def test_parse_response_headers_leaves_http_status_line_out
-        headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n")
-        assert_equal %w(content-type), headers.keys
-      end
-
-      def test_parse_response_headers_parses_lower_cased_header_name_and_value
-        headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n")
-        assert_equal 'text/html', headers['content-type']
-      end
-
-      def test_parse_response_headers_parses_lower_cased_header_name_and_value_with_colon
-        headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nLocation: http://sushi.com/\r\n\r\n")
-        assert_equal 'http://sushi.com/', headers['location']
-      end
-
-      def test_parse_response_headers_parses_blank_lines
-        headers = @adapter.parse_response_headers("HTTP/1.1 200 OK\r\n\r\nContent-Type: text/html\r\n\r\n")
-        assert_equal 'text/html', headers['content-type']
-      end
-    end
-  end
-end

data/test/connection_app_test.rb

@@ -1,60 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-class TestConnectionApps < Faraday::TestCase
-  class TestAdapter
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      [200, {}, env[:test]]
-    end
-  end
-
-  class TestMiddleWare
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      env[:test] = 'hi'
-      @app.call(env)
-    end
-  end
-
-  def setup
-    @conn = Faraday.new do |b|
-      b.use TestMiddleWare
-      b.use TestAdapter
-    end
-  end
-
-  def test_builder_is_built_from_faraday_connection
-    assert_kind_of Faraday::Builder, @conn.builder
-    assert_equal 3, @conn.builder.handlers.size
-  end
-
-  def test_builder_adds_middleware_to_builder_stack
-    assert_kind_of TestMiddleWare, @conn.builder[0].call(nil)
-    assert_kind_of TestAdapter,    @conn.builder[1].call(nil)
-  end
-
-  def test_to_app_returns_rack_object
-    assert @conn.to_app.respond_to?(:call)
-  end
-
-  def test_builder_is_passed_to_new_faraday_connection
-    new_conn = Faraday::Connection.new :builder => @conn.builder
-    assert_equal @conn.builder, new_conn.builder
-  end
-
-  def test_builder_is_built_on_new_faraday_connection
-    new_conn = Faraday::Connection.new
-    new_conn.build do |b|
-      b.run @conn.builder[0]
-      b.run @conn.builder[1]
-    end
-    assert_kind_of TestMiddleWare, new_conn.builder[0].call(nil)
-    assert_kind_of TestAdapter,    new_conn.builder[1].call(nil)
-  end
-end

data/test/form_post_test.rb

@@ -1,58 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-class FormPostTest < Faraday::TestCase
-  def setup
-    @app = Faraday::Adapter.new nil
-    @env = {:request_headers => {}}
-  end
-
-  def test_processes_nested_body
-    @env[:body] = {:a => 1, :b => {:c => 2}}
-    @app.process_body_for_request @env
-    assert_match /^|\&a=1/,      @env[:body]
-    assert_match /^|\&b\[c\]=2/, @env[:body]
-    assert_equal Faraday::Adapter::FORM_TYPE, @env[:request_headers]['Content-Type']
-  end
-
-  def test_processes_with_custom_type
-    @env[:body] = {:a => 1}
-    @env[:request_headers]['Content-Type'] = 'test/type'
-    @app.process_body_for_request @env
-    assert_equal 'a=1', @env[:body]
-    assert_equal 'test/type', @env[:request_headers]['Content-Type']
-  end
-
-  def test_processes_nil_body
-    @env[:body] = nil
-    @app.process_body_for_request @env
-    assert_nil @env[:body]
-  end
-
-  def test_processes_empty_body
-    @env[:body] = ''
-    @app.process_body_for_request @env
-    assert_equal '', @env[:body]
-  end
-
-  def test_processes_string_body
-    @env[:body] = 'abc'
-    @app.process_body_for_request @env
-    assert_equal 'abc', @env[:body]
-  end
-
-  def test_processes_array_values
-    @env[:body] = {:a => [:b, 1]}
-    @app.process_body_for_request @env
-    assert_equal 'a[]=b&a[]=1', @env[:body]
-  end
-
-  def test_processes_nested_array_values
-    @env[:body] = {:a => [:b, {:c => :d}, [:e]]}
-    @app.process_body_for_request @env
-
-    # a[]=b&a[][c]=d&a[][]=e
-    assert_match /a\[\]=b/,      @env[:body]
-    assert_match /a\[\]\[c\]=d/, @env[:body]
-    assert_match /a\[\]\[\]=e/,  @env[:body]
-  end
-end

data/test/multipart_test.rb

@@ -1,48 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-Faraday::CompositeReadIO.send :attr_reader, :ios
-
-class MultipartTest < Faraday::TestCase
-  def setup
-    @app = Faraday::Adapter.new nil
-    @env = {:request_headers => {}}
-  end
-
-  def test_processes_nested_body
-    # assume params are out of order
-    regexes = [
-      /name\=\"a\"/,
-      /name=\"b\[c\]\"\; filename\=\"multipart_test\.rb\"/,
-      /name=\"b\[d\]\"/]
-    @env[:body] = {:a => 1, :b => {:c => Faraday::UploadIO.new(__FILE__, 'text/x-ruby'), :d => 2}}
-    @app.process_body_for_request @env
-    @env[:body].send(:ios).map(&:read).each do |io|
-      if re = regexes.detect { |r| io =~ r }
-        regexes.delete re
-      end
-    end
-    assert_equal [], regexes
-    assert_kind_of CompositeReadIO, @env[:body]
-    assert_equal "%s;boundary=%s" %
-      [Faraday::Adapter::MULTIPART_TYPE, Faraday::Adapter::DEFAULT_BOUNDARY],
-      @env[:request_headers]['Content-Type']
-  end
-
-  def test_processes_nil_body
-    @env[:body] = nil
-    @app.process_body_for_request @env
-    assert_nil @env[:body]
-  end
-
-  def test_processes_empty_body
-    @env[:body] = ''
-    @app.process_body_for_request @env
-    assert_equal '', @env[:body]
-  end
-
-  def test_processes_string_body
-    @env[:body] = 'abc'
-    @app.process_body_for_request @env
-    assert_equal 'abc', @env[:body]
-  end
-end