Adding the first top-level terminus (yaml). It works

and is tested, so now it is time to migrate the
Facts YAML Terminus to use the <terminus>/<indirection>
file structure instead of <indirection>/<terminus>.

In this case, that means that I am moving the functionality
in lib/puppet/indirector/facts/yaml.rb to
lib/puppet/indirector/yaml/facts.rb, and the class in that
new file will subclass Puppet::Indirector::Yaml.

3 files changed, 166 insertions, 10 deletions

diff --git a/spec/unit/indirector/indirection.rb b/spec/unit/indirector/indirection.rb
index 2aead4abf..cd5379ee6 100755
--- a/spec/unit/indirector/indirection.rb
+++ b/spec/unit/indirector/indirection.rb
@@ -20,6 +20,21 @@ describe Puppet::Indirector::Indirection, " when initializing" do
     end
 end
 
+describe Puppet::Indirector::Indirection, " when managing indirection instances" do
+    it "should allow an indirection to be retrieved by name" do
+        @indirection = Puppet::Indirector::Indirection.new(:test)
+        Puppet::Indirector::Indirection.instance(:test).should equal(@indirection)
+    end
+
+    it "should return nil when the named indirection has not been created" do
+        Puppet::Indirector::Indirection.instance(:test).should be_nil
+    end
+
+    after do
+        @indirection.delete if defined? @indirection
+    end
+end
+
 describe Puppet::Indirector::Indirection, " when choosing terminus types" do
     before do
         @indirection = Puppet::Indirector::Indirection.new(:test)
diff --git a/spec/unit/indirector/terminus.rb b/spec/unit/indirector/terminus.rb
index 9632aa22f..1660315ca 100755
--- a/spec/unit/indirector/terminus.rb
+++ b/spec/unit/indirector/terminus.rb
@@ -3,29 +3,52 @@ require 'puppet/defaults'
 require 'puppet/indirector'
 
 describe Puppet::Indirector::Terminus do
+    before do
+        @terminus = Class.new(Puppet::Indirector::Terminus)
+    end
+
     it "should support the documentation methods" do
-        Puppet::Indirector::Terminus.should respond_to(:desc)
+        @terminus.should respond_to(:desc)
     end
 
     # LAK:FIXME I don't really know the best way to test this kind of
     # requirement.
     it "should support a class-level name attribute" do
-        Puppet::Indirector::Terminus.should respond_to(:name)
-        Puppet::Indirector::Terminus.should respond_to(:name=)
+        @terminus.should respond_to(:name)
+        @terminus.should respond_to(:name=)
     end
 
     it "should support a class-level indirection attribute" do
-        Puppet::Indirector::Terminus.should respond_to(:indirection)
-        Puppet::Indirector::Terminus.should respond_to(:indirection=)
+        @terminus.should respond_to(:indirection)
+        @terminus.should respond_to(:indirection=)
+    end
+
+    it "should accept indirection instances as its indirection" do
+        indirection = stub 'indirection', :is_a? => true
+        proc { @terminus.indirection = indirection }.should_not raise_error
+        @terminus.indirection.should equal(indirection)
+    end
+
+    it "should look up indirection instances when only a name has been provided" do
+        indirection = mock 'indirection'
+        Puppet::Indirector::Indirection.expects(:instance).with(:myind).returns(indirection)
+        @terminus.indirection = :myind
+        @terminus.indirection.should equal(indirection)
+    end
+
+    it "should fail when provided a name that does not resolve to an indirection" do
+        Puppet::Indirector::Indirection.expects(:instance).with(:myind).returns(nil)
+        proc { @terminus.indirection = :myind }.should raise_error(ArgumentError)
+        @terminus.indirection.should be_nil
     end
 end
 
 describe Puppet::Indirector::Terminus, " when a terminus instance" do
     before do
-        @terminus_class = Class.new(Puppet::Indirector::Terminus) do
-            @name = :test
-            @indirection = :whatever
-        end
+        @indirection = stub 'indirection', :name => :myyaml
+        @terminus_class = Class.new(Puppet::Indirector::Terminus)
+        @terminus_class.name = :test
+        @terminus_class.stubs(:indirection).returns(@indirection)
         @terminus = @terminus_class.new
     end
 
@@ -34,6 +57,11 @@ describe Puppet::Indirector::Terminus, " when a terminus instance" do
     end
 
     it "should return the class's indirection as its indirection" do
-        @terminus.indirection.should == :whatever
+        @terminus.indirection.should equal(@indirection)
+    end
+
+    it "should require an associated indirection" do
+        @terminus_class.expects(:indirection).returns(nil)
+        proc { @terminus_class.new }.should raise_error(Puppet::DevError)
     end
 end
diff --git a/spec/unit/indirector/yaml.rb b/spec/unit/indirector/yaml.rb
new file mode 100755
index 000000000..93af048f9
--- /dev/null
+++ b/spec/unit/indirector/yaml.rb
@@ -0,0 +1,113 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet/indirector/yaml'
+
+module YamlTesting
+    def setup
+        @store_class = Class.new(Puppet::Indirector::Yaml)
+        @indirection = stub 'indirection', :name => :myyaml
+        @store_class.stubs(:indirection).returns(@indirection)
+        @store = @store_class.new
+
+        @subject = Object.new
+        @subject.metaclass.send(:attr_accessor, :name)
+        @subject.name = :me
+
+        @dir = "/what/ever"
+        Puppet.config.stubs(:use)
+        Puppet.config.stubs(:value).with(:yamldir).returns(@dir)
+    end
+end
+
+describe Puppet::Indirector::Yaml, " when initializing" do
+    before do
+        @store_class = Class.new(Puppet::Indirector::Yaml)
+    end
+
+    # The superclass tests for the same thing, but it doesn't hurt to
+    # leave this in the spec.
+    it "should require an associated indirection" do
+        @store_class.expects(:indirection).returns(nil)
+        proc { @store_class.new }.should raise_error(Puppet::DevError)
+    end
+end
+
+describe Puppet::Indirector::Yaml, " when choosing file location" do
+    include YamlTesting
+
+    it "should store all files in a single file root set in the Puppet defaults" do
+        @store.send(:path, :me).should =~ %r{^#{@dir}}
+    end
+
+    it "should use the indirection name for choosing the subdirectory" do
+        @store.send(:path, :me).should =~ %r{^#{@dir}/myyaml}
+    end
+
+    it "should use the object's name to determine the file name" do
+        @store.send(:path, :me).should =~ %r{me.yaml$}
+    end
+end
+
+describe Puppet::Indirector::Yaml, " when storing objects as YAML" do
+    include YamlTesting
+
+    it "should only store objects that respond to :name" do
+        proc { @store.save(Object.new) }.should raise_error(ArgumentError)
+    end
+
+    it "should convert Ruby objects to YAML and write them to disk" do
+        yaml = @subject.to_yaml
+        file = mock 'file'
+        path = @store.send(:path, @subject.name)
+        FileTest.expects(:exist?).with(File.dirname(path)).returns(true)
+        File.expects(:open).with(path, "w", 0660).yields(file)
+        file.expects(:print).with(yaml)
+
+        @store.save(@subject)
+    end
+
+    it "should create the indirection subdirectory if it does not exist" do
+        yaml = @subject.to_yaml
+        file = mock 'file'
+        path = @store.send(:path, @subject.name)
+        dir = File.dirname(path)
+        FileTest.expects(:exist?).with(dir).returns(false)
+        Dir.expects(:mkdir).with(dir)
+        File.expects(:open).with(path, "w", 0660).yields(file)
+        file.expects(:print).with(yaml)
+
+        @store.save(@subject)
+    end
+end
+
+describe Puppet::Indirector::Yaml, " when retrieving YAML" do
+    include YamlTesting
+
+    it "should require the name of the object to retrieve" do
+        proc { @store.find(nil) }.should raise_error(ArgumentError)
+    end
+
+    it "should read YAML in from disk and convert it to Ruby objects" do
+        path = @store.send(:path, @subject.name)
+
+        yaml = @subject.to_yaml
+        FileTest.expects(:exist?).with(path).returns(true)
+        File.expects(:read).with(path).returns(yaml)
+
+        @store.find(@subject.name).instance_variable_get("@name").should == :me
+    end
+
+    it "should fail coherently when the stored YAML is invalid" do
+        path = @store.send(:path, @subject.name)
+
+        # Something that will fail in yaml
+        yaml = "--- !ruby/object:Hash"
+
+        FileTest.expects(:exist?).with(path).returns(true)
+        File.expects(:read).with(path).returns(yaml)
+
+        proc { @store.find(@subject.name) }.should raise_error(Puppet::Error)
+    end
+end