diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/util/zaml.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/util/zaml.rb b/lib/puppet/util/zaml.rb index dcf0e1921..b0e22a3ff 100644 --- a/lib/puppet/util/zaml.rb +++ b/lib/puppet/util/zaml.rb @@ -121,7 +121,8 @@ class Object instance_variables.sort # Default YAML behavior end def zamlized_class_name(root) - "!ruby/#{root.name.downcase}#{self.class == root ? '' : ":#{self.class.name}"}" + cls = self.class + "!ruby/#{root.name.downcase}#{cls == root ? '' : ":#{cls.respond_to?(:name) ? cls.name : cls}"}" end def to_zaml(z) z.first_time_only(self) { @@ -231,7 +232,7 @@ class String when ( (self =~ /\A(true|false|yes|no|on|null|off|#{num}(:#{num})*|!|=|~)$/i) or (self =~ /\A\n* /) or - (self =~ /\s$/) or + (self =~ /[\s:]$/) or (self =~ /^[>|][-+\d]*\s/i) or (self[-1..-1] =~ /\s/) or (self =~ /[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\xFF]/) or |