Rework conf at the end of ConfExecutor, gh-36

lib/flor/core/texecutor.rb

@@ -254,7 +254,7 @@ def has_key?(k)
           o.each { |ee| ee['_path'] = path if ee.is_a?(Hash) }
         end
 
-        o
+        rework_conf(o)
       end
 
       def interpret_path(path, context=nil)
@@ -299,6 +299,31 @@ def determine_root(path)
 
         ps.last == 'etc' ? File.absolute_path(File.join(dir, '..')) : dir
       end
+
+      protected
+
+      # For now, only the return procedure has to be marshalled back
+      # to the "return" string, gh-36
+      #
+      def rework_conf(o)
+
+        case o
+        when Array
+          o.collect { |e|
+            rework_conf(e) }
+        when Hash
+          o.inject({}) { |h, (k, v)|
+            h[k] =
+              if Flor.is_proc_tree?(v) && v[1]['proc'] == 'return'
+                'return'
+              else
+                rework_conf(v)
+              end
+            h }
+        else
+          o
+        end
+      end
     end
   end
 end

lib/flor/flor.rb

@@ -20,7 +20,7 @@ module Flor
     signal cancel
     terminated failed ceased
     idle
-  ]
+      ].freeze
 
   class << self
 

spec/conf_spec.rb

@@ -22,6 +22,7 @@
             version: '3.2.1'
             count: 7
             blah: [ 'a', 'b', 2 ]
+            point: return
           },
           {})
 
@@ -32,7 +33,8 @@
         'count' => 7,
         'blah' => [ 'a', 'b', 2 ],
         '_path' => '.',
-        'root' => '.'
+        'root' => '.',
+        'point' => 'return'
       })
     end