The REST terminus now provides an Accept header with supported formats.

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 42 insertions, 8 deletions

diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb
index 77dd0538b..6dbdada4d 100644
--- a/lib/puppet/indirector/rest.rb
+++ b/lib/puppet/indirector/rest.rb
@@ -3,20 +3,25 @@ require 'uri'
 
 # Access objects via REST
 class Puppet::Indirector::REST < Puppet::Indirector::Terminus
+    # Provide appropriate headers.
+    def headers
+        {"Accept" => model.supported_formats.join(", ")}
+    end
+
     def rest_connection_details
         { :host => Puppet[:server], :port => Puppet[:masterport].to_i }
     end
 
     def network_fetch(path)
-        network.get("/#{path}").body
+        network.get("/#{path}", headers).body
     end
     
     def network_delete(path)
-        network.delete("/#{path}").body
+        network.delete("/#{path}", headers).body
     end
     
     def network_put(path, data)
-        network.put("/#{path}", data).body
+        network.put("/#{path}", data, headers).body
     end
     
     def find(request)
diff --git a/spec/unit/indirector/rest.rb b/spec/unit/indirector/rest.rb
index 1f802b603..4a3b9d2d0 100755
--- a/spec/unit/indirector/rest.rb
+++ b/spec/unit/indirector/rest.rb
@@ -39,7 +39,7 @@ end
 describe Puppet::Indirector::REST do
     before do
         Puppet::Indirector::Terminus.stubs(:register_terminus_class)
-        @model = stub('model')
+        @model = stub('model', :supported_formats => %w{})
         @instance = stub('model instance')
         @indirection = stub('indirection', :name => :mystuff, :register_terminus_type => nil, :model => @model)
         Puppet::Indirector::Indirection.stubs(:instance).returns(@indirection)
@@ -91,7 +91,17 @@ describe Puppet::Indirector::REST do
         it "should use the provided path" do
             @mock_result = stub('mock result', :body => 'result')
             @mock_connection = stub('mock http connection')
-            @mock_connection.expects(:get).with('/foo').returns(@mock_result)
+            @mock_connection.expects(:get).with { |path, args| path == '/foo' }.returns(@mock_result)
+            @searcher.stubs(:network).returns(@mock_connection)
+            @searcher.network_fetch('foo')
+        end
+
+        it "should provide an Accept header containing the list of supported formats joined with commas" do
+            @mock_result = stub('mock result', :body => 'result')
+            @mock_connection = stub('mock http connection')
+            @mock_connection.expects(:get).with { |path, args| args["Accept"] == "supported, formats" }.returns(@mock_result)
+
+            @searcher.model.expects(:supported_formats).returns %w{supported formats}
             @searcher.stubs(:network).returns(@mock_connection)
             @searcher.network_fetch('foo')
         end
@@ -111,10 +121,20 @@ describe Puppet::Indirector::REST do
 
         it "should use the DELETE http method" do
             @mock_result = stub('mock result', :body => 'result')
-            @mock_connection = mock('mock http connection', :delete => @mock_result)
+            @mock_connection = mock('mock http connection')
+            @mock_connection.expects(:delete).with { |path, args| path == '/foo' }.returns @mock_result
             @searcher.stubs(:network).returns(@mock_connection)
             @searcher.network_delete('foo')
         end
+
+        it "should provide an Accept header containing the list of supported formats joined with commas" do
+            @mock_result = stub('mock result', :body => 'result')
+            @mock_connection = mock('mock http connection')
+            @mock_connection.expects(:delete).with { |path, args| args['Accept'] == "supported, formats" }.returns @mock_result
+            @searcher.stubs(:network).returns(@mock_connection)
+            @searcher.model.expects(:supported_formats).returns %w{supported formats}
+            @searcher.network_delete('foo')
+        end
     end
 
     describe "when doing a network put" do
@@ -140,7 +160,7 @@ describe Puppet::Indirector::REST do
         it "should use the provided path" do
             @mock_result = stub('mock result', :body => 'result')
             @mock_connection = stub('mock http connection')
-            @mock_connection.expects(:put).with {|path, data| path == '/foo' }.returns(@mock_result)
+            @mock_connection.expects(:put).with {|path, data, args| path == '/foo' }.returns(@mock_result)
             @searcher.stubs(:network).returns(@mock_connection)
             @searcher.network_put('foo', @data)                
         end
@@ -148,10 +168,19 @@ describe Puppet::Indirector::REST do
         it "should use the provided data" do
             @mock_result = stub('mock result', :body => 'result')
             @mock_connection = stub('mock http connection')
-            @mock_connection.expects(:put).with {|path, data| data == @data }.returns(@mock_result)
+            @mock_connection.expects(:put).with {|path, data, args| data == @data }.returns(@mock_result)
             @searcher.stubs(:network).returns(@mock_connection)
             @searcher.network_put('foo', @data)                                
         end
+
+        it "should provide an Accept header containing the list of supported formats joined with commas" do
+            @mock_result = stub('mock result', :body => 'result')
+            @mock_connection = mock('mock http connection')
+            @mock_connection.expects(:put).with { |path, data, args| args['Accept'] == "supported, formats" }.returns @mock_result
+            @searcher.stubs(:network).returns(@mock_connection)
+            @searcher.model.expects(:supported_formats).returns %w{supported formats}
+            @searcher.network_put('foo', @data)
+        end
     end
 
     describe "when doing a find" do