lib/delorean/engine.rb in delorean_lang-1.1.0 vs lib/delorean/engine.rb in delorean_lang-2.0.0

@@ -376,26 +376,28 @@
         klass = node
       else
         raise "bad node '#{node}'" unless node =~ /^[A-Z][a-zA-Z0-9_]*$/
 
         begin
-          klass = @m.module_eval(node)
+          klass = @m.const_get(node)
         rescue NameError
           err(UndefinedNodeError, "node #{node} is undefined")
         end
       end
 
       params[:_engine] = self
 
-      type_arr = attrs.is_a?(Array)
-      attrs = [attrs] unless type_arr
+      if attrs.is_a?(Array)
+        attrs.map do |attr|
+          raise "bad attribute '#{attr}'" unless attr =~ /^[a-z][A-Za-z0-9_]*$/
 
-      res = attrs.map do |attr|
-        raise "bad attribute '#{attr}'" unless attr =~ /^[a-z][A-Za-z0-9_]*$/
+          klass.send("#{attr}#{POST}".to_sym, params)
+        end
+      else
+        raise "bad attribute '#{attrs}'" unless attrs =~ /^[a-z][A-Za-z0-9_]*$/
 
-        klass.send("#{attr}#{POST}".to_sym, params)
+        klass.send("#{attrs}#{POST}".to_sym, params)
       end
-      type_arr ? res : res[0]
     end
 
     def eval_to_hash(node, attrs, params = {})
       res = evaluate(node, attrs, params)
       Hash[* attrs.zip(res).flatten(1)]