diff options
author | danielsdeleo <dan@opscode.com> | 2013-10-03 19:16:26 -0700 |
---|---|---|
committer | danielsdeleo <dan@opscode.com> | 2013-10-08 15:01:47 -0700 |
commit | 1cf066b656daf8c0035d2f18ef5ffa33261d0ce9 (patch) | |
tree | ae522e7b47e2b6eb2d06d4b1dd8d1d6bdf89ea25 /lib/chef/rest.rb | |
parent | bd0e9fe142474944516bffdad625bb6bd9c34adc (diff) | |
download | chef-1cf066b656daf8c0035d2f18ef5ffa33261d0ce9.tar.gz |
Move HTTP components into chef/http
Diffstat (limited to 'lib/chef/rest.rb')
-rw-r--r-- | lib/chef/rest.rb | 16 |
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 |