Adding explicit optional attribute to indirection requests

Previously, any option that had a setter was treated
as an attribute, but now we're specifying the list of
attributes settable via options.

We also have a to_hash method that will take all of the
options and all of those attributes and join them
back into a hash.  This method is used by the REST Handler
module, since it uses the indirection request internally.

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

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/unit/indirector/request.rb b/spec/unit/indirector/request.rb
index e2a871a5f..47ffc319c 100755
--- a/spec/unit/indirector/request.rb
+++ b/spec/unit/indirector/request.rb
@@ -80,6 +80,14 @@ describe Puppet::Indirector::Request do
             Puppet::Indirector::Request.new(:ind, :method, :key, :foo => "bar").options.should be_instance_of(Hash)
         end
 
+        it "should treat options other than :ip, :node, and :authenticated as options rather than attributes" do
+            Puppet::Indirector::Request.new(:ind, :method, :key, :server => "bar").options[:server].should == "bar"
+        end
+
+        it "should normalize options to use symbols as keys" do
+            Puppet::Indirector::Request.new(:ind, :method, :key, "foo" => "bar").options[:foo].should == "bar"
+        end
+
         describe "and the request key is a URI" do
             describe "and the URI is a 'file' URI" do
                 before do
@@ -216,6 +224,14 @@ describe Puppet::Indirector::Request do
         Puppet::Indirector::Request.new(:myind, :find, "my key" ).environment.should equal(Puppet::Node::Environment.new)
     end
 
+    it "should support converting its options to a hash" do
+        Puppet::Indirector::Request.new(:myind, :find, "my key" ).should respond_to(:to_hash)
+    end
+
+    it "should include all of its attributes when its options are converted to a hash" do
+        Puppet::Indirector::Request.new(:myind, :find, "my key", :node => 'foo').to_hash[:node].should == 'foo'
+    end
+
     describe "when building a query string from its options" do
         before do
             @request = Puppet::Indirector::Request.new(:myind, :find, "my key")