lib/ruote/util/subprocess.rb in ruote-2.1.11 vs lib/ruote/util/subprocess.rb in ruote-2.2.0

@@ -1,7 +1,7 @@
 #--
-# Copyright (c) 2005-2010, John Mettraux, [e-mail]
+# Copyright (c) 2005-2011, John Mettraux, [e-mail]
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
@@ -30,39 +30,59 @@
   #++
 
   # This method is used by the 'subprocess' expression and by the
   # EngineParticipant.
   #
-  def self.lookup_subprocess (fexp, ref)
+  def self.lookup_subprocess(fexp, ref)
 
     val = fexp.lookup_variable(ref)
 
     # a classical subprocess stored in a variable ?
 
     return [ '0', val ] if is_tree?(val)
     return val if is_pos_tree?(val)
 
     # maybe subprocess :ref => 'uri'
 
-    subtree = fexp.context.parser.parse(ref) rescue nil
+    subtree = fexp.context.reader.read(ref) rescue nil
 
-    _, subtree = Ruote::Exp::DefineExpression.reorganize(subtree) \
-      if subtree && Ruote::Exp::DefineExpression.is_definition?(subtree)
+    if subtree && is_definition_tree?(subtree)
+      _, subtree = Ruote::Exp::DefineExpression.reorganize(subtree)
+    end
 
     return [ '0', subtree ] if is_tree?(subtree)
 
     # no luck ...
 
     raise "no subprocess named '#{ref}' found"
   end
 
-  def self.is_tree? (a)
+  # Returns true if the argument is a process definition tree (whose root
+  # is 'define', 'process_definition' or 'workflow_definition'.
+  #
+  def self.is_definition_tree?(arg)
 
-    a.is_a?(Array) && a[1].is_a?(Hash) && a.size == 3
+    Ruote::Exp::DefineExpression.is_definition?(arg) && is_tree?(arg)
   end
 
-  def self.is_pos_tree? (a)
+  # Returns true if the given argument is a process definition tree
+  # (its root doesn't need to be 'define' or 'process_definition' though).
+  #
+  def self.is_tree?(arg)
 
-    a.is_a?(Array) && a.size == 2 && a[0].is_a?(String) && is_tree?(a[1])
+    arg.is_a?(Array) && arg.size == 3 &&
+    arg[0].is_a?(String) && arg[1].is_a?(Hash) && arg[2].is_a?(Array) &&
+    (arg.last.empty? || arg.last.find { |e| ! is_tree?(e) }.nil?)
+  end
+
+  # Mainly used by Ruote.lookup_subprocess, returns true if the argument is
+  # is an array [ position, tree ].
+  #
+  def self.is_pos_tree?(arg)
+
+    arg.is_a?(Array) &&
+    arg.size == 2 &&
+    arg[0].is_a?(String) &&
+    is_tree?(arg[1])
   end
 end