Move HTTP components into chef/http

1 files changed, 9 insertions, 7 deletions

diff --git a/lib/chef/rest.rb b/lib/chef/rest.rb
index f1ab9bb10e..03ebb99152 100644
--- a/lib/chef/rest.rb
+++ b/lib/chef/rest.rb
@@ -20,18 +20,16 @@
 # limitations under the License.
 #
 
+require 'tempfile'
+require 'chef/http'
 class Chef
-  # :nodoc:
-  # Ensure that we initialiaze Chef::REST with the right superclass.
   class HTTP; end
   class REST < HTTP; end
 end
 
-require 'tempfile'
-require 'chef/rest/http'
-require 'chef/rest/authenticator'
-require 'chef/rest/decompressor'
-require 'chef/rest/json_to_model_inflater'
+require 'chef/http/authenticator'
+require 'chef/http/decompressor'
+require 'chef/http/json_to_model_inflater'
 require 'chef/config'
 require 'chef/exceptions'
 require 'chef/platform/query_helpers'
@@ -42,6 +40,10 @@ class Chef
   # authentication.
   class REST < HTTP
 
+    # Backwards compatibility for things that use
+    # Chef::REST::RESTRequest or its constants
+    RESTRequest = HTTP::HTTPRequest
+
     attr_accessor :url, :cookies, :sign_on_redirect, :redirect_limit
 
     attr_reader :authenticator