We now can inflate blocks at runtime for the HTTP Request Message - closes CHEF-35

Author: adamhjk

chef/lib/chef/provider/http_request.rb

@@ -30,9 +30,10 @@ def load_current_resource
 
       # Send a GET request to @new_resource.url, with ?message=@new_resource.message
       def action_get  
+        message = check_message(@new_resource.message)
         body = @rest.run_request(
           :GET, 
-          @rest.create_url("#{@new_resource.url}?message=#{@new_resource.message}"),
+          @rest.create_url("#{@new_resource.url}?message=#{message}"),
           false,
           10,
           false
@@ -44,10 +45,11 @@ def action_get
 
       # Send a PUT request to @new_resource.url, with the message as the payload
       def action_put 
+        message = check_message(@new_resource.message)
         body = @rest.run_request(
           :PUT,
           @rest.create_url("#{@new_resource.url}"),
-          @new_resource.message,
+          message,
           10,
           false
         )
@@ -58,15 +60,16 @@ def action_put
 
       # Send a POST request to @new_resource.url, with the message as the payload
       def action_post
+        message = check_message(@new_resource.message)
         body = @rest.run_request(
           :POST,
           @rest.create_url("#{@new_resource.url}"),
-          @new_resource.message,
+          message,
           10,
           false
         )
         @new_resource.updated = true
-        Chef::Log.info("#{@new_resource} POST to #{@new_resource.url} message: #{@new_resource.message.inspect} successful")
+        Chef::Log.info("#{@new_resource} POST to #{@new_resource.url} message: #{message.inspect} successful")
         Chef::Log.debug("#{@new_resource} POST request response: #{body}")
       end
 
@@ -84,6 +87,16 @@ def action_delete
         Chef::Log.debug("#{@new_resource} DELETE request response: #{body}")
       end
 
+      private
+        
+        def check_message(message)
+          if message.kind_of?(Proc)
+            message.call
+          else
+            message
+          end
+        end
+      
     end
   end
 end

chef/spec/unit/provider/http_request_spec.rb

@@ -76,6 +76,12 @@
     @provider.action_get
   end
 
+  it "should inflate a message block at runtime" do
+    @new_resource.stub!(:message).and_return(lambda { "return" })
+    @rest.should_receive(:create_url).with("#{@new_resource.url}?message=return")
+    @provider.action_get
+  end
+  
   it "should run a GET request" do
     @rest.should_receive(:run_request).with(:GET, @rest.create_url, false, 10, false)
     @provider.action_get
@@ -115,6 +121,12 @@
     @provider.action_put
   end
 
+  it "should inflate a message block at runtime" do
+    @new_resource.stub!(:message).and_return(lambda { "return" })
+    @rest.should_receive(:run_request).with(:PUT, @rest.create_url, "return", 10, false)    
+    @provider.action_put
+  end
+  
   it "should update the resource" do
     @new_resource.should_receive(:updated=).with(true)
     @provider.action_put
@@ -149,6 +161,12 @@
     @provider.action_post
   end
 
+  it "should inflate a message block at runtime" do
+    @new_resource.stub!(:message).and_return(lambda { "return" })
+    @rest.should_receive(:run_request).with(:POST, @rest.create_url, "return", 10, false)    
+    @provider.action_post
+  end
+  
   it "should update the resource" do
     @new_resource.should_receive(:updated=).with(true)
     @provider.action_post