Merge pull request #1237 from puppetlabs/to_ruby-to_python-pcore

Convert data to Pcore before serialisation in to_ruby/to_python

Author: david22swan

lib/puppet/functions/to_python.rb

@@ -25,13 +25,18 @@
   # @return [String]
   #   The String representation of the object
   def to_python(object)
-    case object
+    serialized = Puppet::Pops::Serialization::ToDataConverter.convert(object, rich_data: true)
+    serialized_to_python(serialized)
+  end
+
+  def serialized_to_python(serialized)
+    case serialized
     when true then 'True'
     when false then 'False'
     when nil then 'None'
-    when Array then "[#{object.map { |x| to_python(x) }.join(', ')}]"
-    when Hash then "{#{object.map { |k, v| "#{to_python(k)}: #{to_python(v)}" }.join(', ')}}"
-    else object.inspect
+    when Array then "[#{serialized.map { |x| serialized_to_python(x) }.join(', ')}]"
+    when Hash then "{#{serialized.map { |k, v| "#{serialized_to_python(k)}: #{serialized_to_python(v)}" }.join(', ')}}"
+    else serialized.inspect
     end
   end
 end

lib/puppet/functions/to_ruby.rb

@@ -25,10 +25,15 @@
   # @return [String]
   #   The String representation of the object
   def to_ruby(object)
-    case object
-    when Array then "[#{object.map { |x| to_ruby(x) }.join(', ')}]"
-    when Hash then "{#{object.map { |k, v| "#{to_ruby(k)} => #{to_ruby(v)}" }.join(', ')}}"
-    else object.inspect
+    serialized = Puppet::Pops::Serialization::ToDataConverter.convert(object, rich_data: true)
+    serialized_to_ruby(serialized)
+  end
+
+  def serialized_to_ruby(serialized)
+    case serialized
+    when Array then "[#{serialized.map { |x| serialized_to_ruby(x) }.join(', ')}]"
+    when Hash then "{#{serialized.map { |k, v| "#{serialized_to_ruby(k)} => #{serialized_to_ruby(v)}" }.join(', ')}}"
+    else serialized.inspect
     end
   end
 end