faraday 0.6.0 → 0.8.0

data/lib/faraday/adapter/action_dispatch.rb

@@ -1,30 +0,0 @@
-module Faraday
-  class Adapter
-    class ActionDispatch < Faraday::Adapter
-      attr_reader :session
-
-      # Initializes a new middleware instance for each request.  Instead of
-      # initiating an HTTP request with a web server, this adapter calls
-      # a Rails 3 app using integration tests.
-      #
-      # app     - The current Faraday request.
-      # session - An ActionDispatch::Integration::Session instance.
-      #
-      # Returns nothing.
-      def initialize(app, session)
-        super(app)
-        @session = session
-        @session.reset!
-      end
-
-      def call(env)
-        super
-        @session.__send__(env[:method], env[:url].request_uri, env[:body], env[:request_headers])
-        resp = @session.response
-        env.update :status => resp.status, :body => resp.body
-        response_headers(env).update resp.headers
-        @app.call env
-      end
-    end
-  end
-end

data/lib/faraday/request/json.rb

@@ -1,31 +0,0 @@
-module Faraday
-  class Request::JSON < Request::UrlEncoded
-    self.mime_type = 'application/json'.freeze
-
-    class << self
-      attr_accessor :adapter
-    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

data/test/adapters/live_test.rb

@@ -1,186 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
-
-if !Faraday::TestCase::LIVE_SERVER
-  warn "warning: test server is not up; skipping live server tests"
-else
-  module Adapters
-    class LiveTest < Faraday::TestCase
-      adapters = if ENV['ADAPTER']
-        ENV['ADAPTER'].split(':').map { |name| Faraday::Adapter.lookup_module name.to_sym }
-      else
-        loaded_adapters  = Faraday::Adapter.all_loaded_constants
-        loaded_adapters -= [Faraday::Adapter::ActionDispatch]
-        loaded_adapters << :default
-      end
-
-      adapters.each do |adapter|
-        define_method "test_#{adapter}_GET_retrieves_the_response_body" do
-          assert_equal 'hello world', create_connection(adapter).get('hello_world').body
-        end
-
-        define_method "test_#{adapter}_GET_send_url_encoded_params" do
-          resp = create_connection(adapter).get do |req|
-            req.url 'hello', 'name' => 'zack'
-          end
-          assert_equal('hello zack', resp.body)
-        end
-
-        define_method "test_#{adapter}_GET_retrieves_the_response_headers" do
-          response = create_connection(adapter).get('hello_world')
-          assert_match /text\/html/, response.headers['Content-Type'], 'original case fail'
-          assert_match /text\/html/, response.headers['content-type'], 'lowercase fail'
-        end
-
-        # https://github.com/geemus/excon/issues/10
-        unless %[Faraday::Adapter::Excon] == adapter.to_s
-          define_method "test_#{adapter}_GET_handles_headers_with_multiple_values" do
-            response = create_connection(adapter).get('multi')
-            assert_equal 'one, two', response.headers['set-cookie']
-          end
-        end
-
-        define_method "test_#{adapter}_POST_send_url_encoded_params" do
-          resp = create_connection(adapter).post do |req|
-            req.url 'echo_name'
-            req.body = {'name' => 'zack'}
-          end
-          assert_equal %("zack"), resp.body
-        end
-
-        define_method "test_#{adapter}_POST_send_url_encoded_nested_params" do
-          resp = create_connection(adapter).post do |req|
-            req.url 'echo_name'
-            req.body = {'name' => {'first' => 'zack'}}
-          end
-          assert_equal %({"first"=>"zack"}), resp.body
-        end
-
-        define_method "test_#{adapter}_POST_retrieves_the_response_headers" do
-          assert_match /text\/html/, create_connection(adapter).post('echo_name').headers['content-type']
-        end
-
-        define_method "test_#{adapter}_POST_sends_files" do
-          resp = create_connection(adapter).post do |req|
-            req.url 'file'
-            req.body = {'uploaded_file' => Faraday::UploadIO.new(__FILE__, 'text/x-ruby')}
-          end
-          assert_equal "file live_test.rb text/x-ruby", resp.body
-        end unless :default == adapter # isn't configured for multipart
-
-        # http://github.com/toland/patron/issues/#issue/9
-        if ENV['FORCE'] || adapter != Faraday::Adapter::Patron
-          define_method "test_#{adapter}_PUT_send_url_encoded_params" do
-            resp = create_connection(adapter).put do |req|
-              req.url 'echo_name'
-              req.body = {'name' => 'zack'}
-            end
-            assert_equal %("zack"), resp.body
-          end
-
-          define_method "test_#{adapter}_PUT_send_url_encoded_nested_params" do
-            resp = create_connection(adapter).put do |req|
-              req.url 'echo_name'
-              req.body = {'name' => {'first' => 'zack'}}
-            end
-            assert_equal %({"first"=>"zack"}), resp.body
-          end
-
-          define_method "test_#{adapter}_PUT_retrieves_the_response_headers" do
-            assert_match /text\/html/, create_connection(adapter).put('echo_name').headers['content-type']
-          end
-        end
-
-        define_method "test_#{adapter}_HEAD_send_url_encoded_params" do
-          resp = create_connection(adapter).head do |req|
-            req.url 'hello', 'name' => 'zack'
-          end
-          assert_match /text\/html/, resp.headers['content-type']
-        end
-
-        define_method "test_#{adapter}_HEAD_retrieves_no_response_body" do
-          assert_equal '', create_connection(adapter).head('hello_world').body.to_s
-        end
-
-        define_method "test_#{adapter}_HEAD_retrieves_the_response_headers" do
-          assert_match /text\/html/, create_connection(adapter).head('hello_world').headers['content-type']
-        end
-
-        define_method "test_#{adapter}_DELETE_retrieves_the_response_headers" do
-          assert_match /text\/html/, create_connection(adapter).delete('delete_with_json').headers['content-type']
-        end
-
-        define_method "test_#{adapter}_DELETE_retrieves_the_body" do
-          assert_match /deleted/, create_connection(adapter).delete('delete_with_json').body
-        end
-
-        define_method "test_#{adapter}_async_requests_clear_parallel_manager_after_running_a_single_request" do
-          connection = create_connection(adapter)
-          assert !connection.in_parallel?
-          resp = connection.get('hello_world')
-          assert !connection.in_parallel?
-          assert_equal 'hello world', connection.get('hello_world').body
-        end
-
-        define_method "test_#{adapter}_async_requests_uses_parallel_manager_to_run_multiple_json_requests" do
-          resp1, resp2 = nil, nil
-
-          connection = create_connection(adapter)
-          adapter    = real_adapter_for(adapter)
-
-          connection.in_parallel(adapter.setup_parallel_manager) do
-            resp1 = connection.get('json')
-            resp2 = connection.get('json')
-            if adapter.supports_parallel_requests?
-              assert connection.in_parallel?
-              assert_nil resp1.body
-              assert_nil resp2.body
-            end
-          end
-          assert !connection.in_parallel?
-          assert_equal '[1,2,3]', resp1.body
-          assert_equal '[1,2,3]', resp2.body
-        end
-
-        if adapter.to_s == "Faraday::Adapter::EMSynchrony"
-          instance_methods.grep(%r{Faraday::Adapter::EMSynchrony}).each do |method|
-            em = method.to_s.sub %r{^test_}, "test_under_em_"
-            define_method em do
-              EM.run do
-                Fiber.new do
-                  self.send method
-                  EM.stop
-                end.resume
-              end
-            end
-          end
-        end
-      end
-
-      def create_connection(adapter)
-        if adapter == :default
-          Faraday.default_connection.tap do |conn|
-            conn.url_prefix = LIVE_SERVER
-            conn.headers['X-Faraday-Adapter'] = adapter.to_s
-          end
-        else
-          Faraday::Connection.new LIVE_SERVER, :headers => {'X-Faraday-Adapter' => adapter.to_s} do |b|
-            b.request :multipart
-            b.request :url_encoded
-            b.use adapter
-          end
-        end.tap do |conn|
-          target = conn.builder.handlers.last
-          conn.builder.insert_before target, Faraday::Response::RaiseError
-        end
-      end
-
-      def real_adapter_for(adapter)
-        if adapter == :default
-          Faraday::Adapter.lookup_module(Faraday.default_adapter)
-        else
-          adapter
-        end
-      end
-    end
-  end
-end