Removing unnecessary parser variables when yaml-dumping

Also working around a YAML bug in Ruby.

And fixing tests that were broken in a previous commit
in this rebase but not caught earlier.

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

6 files changed, 27 insertions, 6 deletions

diff --git a/lib/puppet/indirector/catalog/active_record.rb b/lib/puppet/indirector/catalog/active_record.rb
index a76606535..ad2dc742b 100644
--- a/lib/puppet/indirector/catalog/active_record.rb
+++ b/lib/puppet/indirector/catalog/active_record.rb
@@ -1,8 +1,8 @@
 require 'puppet/rails/host'
 require 'puppet/indirector/active_record'
-require 'puppet/node/catalog'
+require 'puppet/resource/catalog'
 
-class Puppet::Node::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord
+class Puppet::Resource::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord
     use_ar_model Puppet::Rails::Host
 
     # If we can find the host, then return a catalog with the host's resources
@@ -11,7 +11,7 @@ class Puppet::Node::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord
         return nil unless request.options[:cache_integration_hack]
         return nil unless host = ar_model.find_by_name(request.key)
 
-        catalog = Puppet::Node::Catalog.new(host.name)
+        catalog = Puppet::Resource::Catalog.new(host.name)
         
         host.resources.each do |resource|
             catalog.add_resource resource.to_transportable
diff --git a/lib/puppet/indirector/catalog/queue.rb b/lib/puppet/indirector/catalog/queue.rb
index 85d2f8df5..581382e9e 100644
--- a/lib/puppet/indirector/catalog/queue.rb
+++ b/lib/puppet/indirector/catalog/queue.rb
@@ -1,5 +1,5 @@
-require 'puppet/node/catalog'
+require 'puppet/resource/catalog'
 require 'puppet/indirector/queue'
 
-class Puppet::Node::Catalog::Queue < Puppet::Indirector::Queue
+class Puppet::Resource::Catalog::Queue < Puppet::Indirector::Queue
 end
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index 23df1c624..8d5e5a359 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -5,6 +5,7 @@ class Puppet::Parser::Resource
     require 'puppet/parser/resource/reference'
     require 'puppet/util/tagging'
     require 'puppet/file_collection/lookup'
+    require 'puppet/parser/yaml_trimmer'
 
     include Puppet::FileCollection::Lookup
 
@@ -13,6 +14,7 @@ class Puppet::Parser::Resource
     include Puppet::Util::Errors
     include Puppet::Util::Logging
     include Puppet::Util::Tagging
+    include Puppet::Parser::YamlTrimmer
 
     attr_accessor :source, :scope, :rails_id
     attr_accessor :virtual, :override, :translated
diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb
index 6e22d3e17..0f791ecc5 100644
--- a/lib/puppet/parser/resource/param.rb
+++ b/lib/puppet/parser/resource/param.rb
@@ -1,4 +1,5 @@
 require 'puppet/file_collection/lookup'
+require 'puppet/parser/yaml_trimmer'
 
  # The parameters we stick in Resources.
 class Puppet::Parser::Resource::Param
@@ -8,6 +9,7 @@ class Puppet::Parser::Resource::Param
     include Puppet::Util::MethodHelper
 
     include Puppet::FileCollection::Lookup
+    include Puppet::Parser::YamlTrimmer
 
     def initialize(hash)
         set_options(hash)
@@ -16,7 +18,7 @@ class Puppet::Parser::Resource::Param
     end
 
     def inspect
-        "#<#{self.class} @name => #{name}, @value => #{value}, @source => #{source.name}, @line => #{line}>"
+        "#<#{self.class} @name => #{name}, @value => #{value}, @source => #{source.name if source}, @line => #{line}>"
     end
 
     def line_to_i
diff --git a/lib/puppet/parser/resource/reference.rb b/lib/puppet/parser/resource/reference.rb
index 0c28cf0df..cacd0707e 100644
--- a/lib/puppet/parser/resource/reference.rb
+++ b/lib/puppet/parser/resource/reference.rb
@@ -1,9 +1,11 @@
 # A reference to a resource.  Mostly just the type and title.
 require 'puppet/resource/reference'
 require 'puppet/file_collection/lookup'
+require 'puppet/parser/yaml_trimmer'
 
 # A reference to a resource.  Mostly just the type and title.
 class Puppet::Parser::Resource::Reference < Puppet::Resource::Reference
+    include Puppet::Parser::YamlTrimmer
     include Puppet::FileCollection::Lookup
     include Puppet::Util::MethodHelper
     include Puppet::Util::Errors
@@ -69,6 +71,10 @@ class Puppet::Parser::Resource::Reference < Puppet::Resource::Reference
         requiredopts(:type, :title)
     end
 
+    def skip_for_yaml
+        %w{@typeclass @definedtype}
+    end
+
     def to_ref
         # We have to return different cases to provide backward compatibility
         # from 0.24.x to 0.23.x.
diff --git a/lib/puppet/parser/yaml_trimmer.rb b/lib/puppet/parser/yaml_trimmer.rb
new file mode 100644
index 000000000..14064c8e6
--- /dev/null
+++ b/lib/puppet/parser/yaml_trimmer.rb
@@ -0,0 +1,11 @@
+module Puppet::Parser::YamlTrimmer
+    REMOVE = %w{@scope @source}
+
+    def to_yaml_properties
+        r = instance_variables - REMOVE
+        if respond_to?(:skip_for_yaml)
+            r -= skip_for_yaml()
+        end
+        r
+    end
+end