ruby 1.8.7 will require the same file multiple times

technoweenie · Oct 21, 2012 · 1f6808e · 1f6808e
1 parent 9befdfa
commit 1f6808e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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']