From 1f6808e61d6b0c71eda3e446212c75b856243bc7 Mon Sep 17 00:00:00 2001 From: technoweenie Date: Sat, 20 Oct 2012 18:03:24 -0600 Subject: [PATCH] ruby 1.8.7 will require the same file multiple times --- lib/faraday/adapter.rb | 2 +- lib/faraday/request.rb | 2 +- lib/faraday/response.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/faraday/adapter.rb b/lib/faraday/adapter.rb index 2417d83eb..c640b6867 100644 --- a/lib/faraday/adapter.rb +++ b/lib/faraday/adapter.rb @@ -6,7 +6,7 @@ class Adapter < Middleware extend MiddlewareRegistry - register_middleware 'faraday/adapter', + register_middleware File.expand_path('../adapter', __FILE__), :test => [:Test, 'test'], :net_http => [:NetHttp, 'net_http'], :net_http_persistent => [:NetHttpPersistent, 'net_http_persistent'], diff --git a/lib/faraday/request.rb b/lib/faraday/request.rb index 2440a4208..8a00d12ce 100644 --- a/lib/faraday/request.rb +++ b/lib/faraday/request.rb @@ -12,7 +12,7 @@ module Faraday class Request < Struct.new(:method, :path, :params, :headers, :body, :options) extend MiddlewareRegistry - register_middleware 'faraday/request', + register_middleware File.expand_path('../request', __FILE__), :url_encoded => [:UrlEncoded, 'url_encoded'], :multipart => [:Multipart, 'multipart'], :retry => [:Retry, 'retry'], diff --git a/lib/faraday/response.rb b/lib/faraday/response.rb index cad267d09..cbf346033 100644 --- a/lib/faraday/response.rb +++ b/lib/faraday/response.rb @@ -22,7 +22,7 @@ def on_complete(env) extend Forwardable extend MiddlewareRegistry - register_middleware 'faraday/response', + register_middleware File.expand_path('../response', __FILE__), :raise_error => [:RaiseError, 'raise_error'], :logger => [:Logger, 'logger']