Avoid load path conflicts with savon

savonrb · Jun 29, 2012 · cc8b05f · cc8b05f
1 parent 20346d3
commit cc8b05f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/lib/savon-multipart.rb b/lib/savon-multipart.rb
@@ -1,6 +1,5 @@
 require "savon"
 require "savon/multipart/version"
-
-require File.expand_path("../savon/soap/request", __FILE__)
-require File.expand_path("../savon/soap/response", __FILE__)
-require File.expand_path("../savon/soap/xml", __FILE__)
+require "savon/multipart/soap/request"
+require "savon/multipart/soap/response"
+require "savon/multipart/soap/xml"
diff --git a/lib/savon/soap/part.rb → lib/savon/multipart/soap/part.rb b/lib/savon/soap/part.rb → lib/savon/multipart/soap/part.rb
diff --git a/lib/savon/soap/request.rb → lib/savon/multipart/soap/request.rb b/lib/savon/soap/request.rb → lib/savon/multipart/soap/request.rb
diff --git a/lib/savon/soap/response.rb → lib/savon/multipart/soap/response.rb b/lib/savon/soap/response.rb → lib/savon/multipart/soap/response.rb
@@ -1,4 +1,4 @@
-require "savon/soap/part"
+require "savon/multipart/soap/part"
 
 module Savon
  module SOAP

diff --git a/lib/savon/soap/xml.rb → lib/savon/multipart/soap/xml.rb b/lib/savon/soap/xml.rb → lib/savon/multipart/soap/xml.rb
@@ -1,4 +1,4 @@
-require "savon/soap/part"
+require "savon/multipart/soap/part"
 
 module Savon
  module SOAP