Adding behaviors for Chef::REST with chunky downloading, a few changes to Chef::REST for readability, adding behaviors for Chef::Resource and supports[]

Author: adamhjk

chef/lib/chef/rest.rb

@@ -25,6 +25,8 @@
 class Chef
   class REST
 
+    attr_accessor :url, :cookies
+    
     def initialize(url)
       @url = url
       @cookies = Hash.new
@@ -89,7 +91,7 @@ def run_request(method, url, data=false, limit=10, raw=false)
           'Accept' => "application/json",
         }
       end
-      if @cookies["#{url.host}:#{url.port}"]
+      if @cookies.has_key?("#{url.host}:#{url.port}")
         headers['Cookie'] = @cookies["#{url.host}:#{url.port}"]
       end
       req = nil
@@ -124,7 +126,8 @@ def run_request(method, url, data=false, limit=10, raw=false)
           tf = Tempfile.new("chef-rest") 
           # Stolen from http://www.ruby-forum.com/topic/166423
           # Kudos to _why!
-          size, total = 0, response.header['Content-Length'].to_i
+          size = 0
+          total = response.header['Content-Length'].to_i
           response.read_body do |chunk|
             tf.write(chunk) 
             size += chunk.size

chef/spec/unit/resource_spec.rb

@@ -141,4 +141,13 @@
     serialized_node.name.should eql(@resource.name)
   end
 
+  it "should allow you to set what features this resource supports" do
+    support_hash = { :one => :two }
+    @resource.supports(support_hash)
+    @resource.supports.should eql(support_hash)
+  end
+  
+  it "should return the current value of supports" do
+    @resource.supports.should == {}
+  end
 end

chef/spec/unit/rest_spec.rb

@@ -104,6 +104,7 @@
     @http_response_mock.stub!(:kind_of?).with(Net::HTTPSuccess).and_return(true)
     @http_response_mock.stub!(:body).and_return("ninja")
     @http_response_mock.stub!(:error!).and_return(true)
+    @http_response_mock.stub!(:header).and_return({ 'Content-Length' => "5" })
     @http_mock = mock("Net::HTTP", :null_object => true)
     @http_mock.stub!(:verify_mode=).and_return(true)
     @http_mock.stub!(:read_timeout=).and_return(true)
@@ -115,7 +116,7 @@
     @request_mock.stub!(:method).and_return(true)
     @request_mock.stub!(:path).and_return(true)
     @http_mock.stub!(:request).and_return(@http_response_mock)
-    @tf_mock = mock(Tempfile, { :print => true, :close => true })
+    @tf_mock = mock(Tempfile, { :print => true, :close => true, :write => true })
     Tempfile.stub!(:new).with("chef-rest").and_return(@tf_mock)
   end
 
@@ -145,6 +146,14 @@ def do_run_request(method=:GET, data=false, limit=10, raw=false)
     do_run_request
   end
 
+  it "should set the cookie for this request if one exists for the given host:port" do
+    @r.cookies = { "#{@url_mock.host}:#{@url_mock.port}" => "cookie monster" }
+    Net::HTTP::Get.should_receive(:new).with("/?foo=bar", 
+      { 'Accept' => 'application/json', 'Cookie' => 'cookie monster' }
+    ).and_return(@request_mock)
+    do_run_request
+  end
+  
   it "should build a new HTTP GET request" do
     Net::HTTP::Get.should_receive(:new).with("/?foo=bar", 
       { 'Accept' => 'application/json' }
@@ -211,31 +220,49 @@ def do_run_request(method=:GET, data=false, limit=10, raw=false)
     do_run_request(:GET, false, 10, true)
   end
 
-  ###
-  # TODO - Figure out how to test the http.request(foo) do |response| block
-  ###
-  # it "should create a tempfile for the output of a raw request" do
-  #   fake_http = FakeHTTP.new
-  #   fake_http.response_object = @http_response_mock
-  #   Net::HTTP.stub!(:new).and_return(fake_http)
-  #   Tempfile.should_receive(:new).with("chef-rest").and_return(@tf_mock)
-  #   do_run_request(:GET, false, 10, true).should eql(@tf_mock)    
-  # end
-  # 
-  # it "should populate the tempfile with the value of the raw request" do
-  #   fake_http = FakeHTTP.new
-  #   fake_http.response_object = @http_response_mock
-  #   Net::HTTP.stub!(:new).and_return(fake_http)
-  #   @tf_mock.should_receive(:write, "ninja").once.and_return(true)
-  #   do_run_request(:GET, false, 10, true)
-  # end
-  # 
-  # it "should close the tempfile if we're doing a raw request" do
-  #   fake_http = FakeHTTP.new
-  #   fake_http.response_object = @http_response_mock
-  #   Net::HTTP.stub!(:new).and_return(fake_http)
-  #   @tf_mock.should_receive(:close).once.and_return(true)
-  #   do_run_request(:GET, false, 10, true)
-  # end
+  it "should create a tempfile for the output of a raw request" do
+    @http_mock.stub!(:request).and_yield(@http_response_mock).and_return(@http_response_mock)
+    Tempfile.should_receive(:new).with("chef-rest").and_return(@tf_mock)
+    do_run_request(:GET, false, 10, true).should eql(@tf_mock)    
+  end
+  
+  it "should read the body of the response in chunks on a raw request" do
+    @http_mock.stub!(:request).and_yield(@http_response_mock).and_return(@http_response_mock)
+    @http_response_mock.should_receive(:read_body).and_return(true)
+    do_run_request(:GET, false, 10, true)
+  end
+  
+  it "should populate the tempfile with the value of the raw request" do
+    @http_mock.stub!(:request).and_yield(@http_response_mock).and_return(@http_response_mock)
+    @http_response_mock.stub!(:read_body).and_yield("ninja")
+    @tf_mock.should_receive(:write, "ninja").once.and_return(true)
+    do_run_request(:GET, false, 10, true)
+  end
+  
+  it "should close the tempfile if we're doing a raw request" do
+    @http_mock.stub!(:request).and_yield(@http_response_mock).and_return(@http_response_mock)
+    @tf_mock.should_receive(:close).once.and_return(true)
+    do_run_request(:GET, false, 10, true)
+  end
+  
+  it "should not raise a divide by zero exception if the size is 0" do
+    @http_mock.stub!(:request).and_yield(@http_response_mock).and_return(@http_response_mock)
+    @http_response_mock.stub!(:header).and_return({ 'Content-Length' => "5" })
+    @http_response_mock.stub!(:read_body).and_yield('')
+    lambda { do_run_request(:GET, false, 10, true) }.should_not raise_error(ZeroDivisionError)
+  end
+  
+  it "should not raise a divide by zero exception if the Content-Length is 0" do
+    @http_mock.stub!(:request).and_yield(@http_response_mock).and_return(@http_response_mock)
+    @http_response_mock.stub!(:header).and_return({ 'Content-Length' => "0" })
+    @http_response_mock.stub!(:read_body).and_yield("ninja")
+    lambda { do_run_request(:GET, false, 10, true) }.should_not raise_error(ZeroDivisionError)
+  end
+  
+  it "should call read_body without a block if the request is not raw" do
+    @http_mock.stub!(:request).and_yield(@http_response_mock).and_return(@http_response_mock)
+    @http_response_mock.should_receive(:read_body)
+    do_run_request(:GET, false, 10, false)
+  end
 
 end

example-repository/cookbooks/fakefile/attributes/first.rb

@@ -1,2 +1,2 @@
 Chef::Log.debug("You are the first of fakefile's attributes")
-friends("you said we wuz visiting em") 
+friends("you said we wuz visiting em")