ruote 0.9.18 → 0.9.19

data/lib/openwfe/util/dollar.rb

@@ -2,31 +2,31 @@
 #--
 # Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.  
-# 
-# . Redistributions in binary form must reproduce the above copyright notice, 
-#   this list of conditions and the following disclaimer in the documentation 
+#   list of conditions and the following disclaimer.
+#
+# . Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
 #   and/or other materials provided with the distribution.
-# 
+#
 # . Neither the name of the "OpenWFE" nor the names of its contributors may be
 #   used to endorse or promote products derived from this software without
 #   specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #++
 #
@@ -38,180 +38,166 @@
 #
 
 require 'rufus/dollar' # gem 'rufus-dollar'
-require 'rufus/eval' # gem 'rufus-eval'
 
 require 'openwfe/utils'
+require 'openwfe/util/treechecker'
 
-#
-# 'dollar notation' implementation in Ruby
-#
 
 module OpenWFE
 
-    DSUB_SAFETY_LEVEL = 4
-        #
-        # Ruby code ${ruby:...} will be evaluated with this
-        # safety level.
-        # (see http://www.rubycentral.com/book/taint.html )
-
-    #
-    # Performs 'dollar substitution' on a piece of text with as input
-    # a flow expression and a workitem (fields and variables).
-    #
-    def OpenWFE.dosub (text, flow_expression, workitem)
+  #
+  # Performs 'dollar substitution' on a piece of text with as input
+  # a flow expression and a workitem (fields and variables).
+  #
+  def OpenWFE.dosub (text, flow_expression, workitem)
 
-        #
-        # patch by Nick Petrella (2008/03/20)
-        #
+  #
+  # patch by Nick Petrella (2008/03/20)
+  #
 
-        if text.is_a?(String)
+  if text.is_a?(String)
 
-            Rufus::dsub(text, FlowDict.new(flow_expression, workitem))
+    Rufus::dsub(text, FlowDict.new(flow_expression, workitem))
 
-        elsif text.is_a?(Array)
+  elsif text.is_a?(Array)
 
-            text.collect { |e| dosub(e, flow_expression, workitem) }
+    text.collect { |e| dosub(e, flow_expression, workitem) }
 
-        elsif text.is_a?(Hash)
+  elsif text.is_a?(Hash)
 
-            text.inject({}) do |r, (k, v)|
+    text.inject({}) do |r, (k, v)|
 
-                r[dosub(k, flow_expression, workitem)] = 
-                    dosub(v, flow_expression, workitem)
-                r
-            end
-
-        else
-
-            text
-        end
+    r[dosub(k, flow_expression, workitem)] =
+      dosub(v, flow_expression, workitem)
+    r
     end
 
-    #
-    # Wrapping a process expression and the current workitem as a
-    # Hash object ready for lookup at substitution time.
-    #
-    class FlowDict
+  else
+
+    text
+  end
+  end
 
-        def initialize (flow_expression, workitem, default_prefix='v')
+  #
+  # Wrapping a process expression and the current workitem as a
+  # Hash object ready for lookup at substitution time.
+  #
+  class FlowDict
 
-            @flow_expression = flow_expression
-            @workitem = workitem
-            @default_prefix = default_prefix
-        end
+  def initialize (flow_expression, workitem, default_prefix='v')
 
-        def [] (key)
+    @flow_expression = flow_expression
+    @workitem = workitem
+    @default_prefix = default_prefix
+  end
 
-            pr, k = extract_prefix key
+  def [] (key)
 
-            # stage 0
+    pr, k = extract_prefix key
 
-            v = lookup(pr[0, 1], k)
-            return v if v != nil
+    # stage 0
 
-            # stage 1
+    v = lookup(pr[0, 1], k)
+    return v if v != nil
 
-            return "" if pr.size < 2
+    # stage 1
 
-            lookup(pr[1, 1], k)
-        end
+    return '' if pr.size < 2
 
-        def []= (key, value)
+    lookup(pr[1, 1], k)
+  end
 
-            pr, k = extract_prefix key
-            pr = pr[0, 1]
+  def []= (key, value)
 
-            if pr == 'f'
+    pr, k = extract_prefix key
+    pr = pr[0, 1]
 
-                @workitem.set_attribute k, value
+    if pr == 'f'
 
-            elsif @flow_expression
+    @workitem.set_attribute k, value
 
-                @flow_expression.set_variable k, value
-            end
-        end
+    elsif @flow_expression
 
-        def has_key? (key)
+    @flow_expression.set_variable k, value
+    end
+  end
 
-            pr, k = extract_prefix key
+  def has_key? (key)
 
-            return true if pr == 'r'
+    pr, k = extract_prefix key
 
-            (self[key] != nil)
-        end
+    return true if pr == 'r'
 
-        protected
+    (self[key] != nil)
+  end
 
-            def lookup (pr, key)
+  protected
 
-                case pr
-                    when 'v' then @flow_expression.lookup_variable(key)
-                    when 'f' then @workitem.lookup_attribute(key)
-                    when 'r' then call_ruby(key)
-                    else nil
-                end
-            end
+    def lookup (pr, key)
 
-            def extract_prefix (key)
+    case pr
+      when 'v' then @flow_expression.lookup_variable(key)
+      when 'f' then @workitem.lookup_attribute(key)
+      when 'r' then call_ruby(key)
+      else nil
+    end
+    end
 
-                i = key.index(':')
+    def extract_prefix (key)
 
-                return [ @default_prefix, key ] if not i
+    i = key.index(':')
 
-                pr = key[0..i-1] # until ':'
-                pr = pr[0, 2] # the first two chars
+    return [ @default_prefix, key ] if not i
 
-                pr = pr[0, 1] unless (pr == 'vf') or (pr == 'fv')
+    pr = key[0..i-1] # until ':'
+    pr = pr[0, 2] # the first two chars
 
-                [ pr, key[i+1..-1] ]
-            end
+    pr = pr[0, 1] unless (pr == 'vf') or (pr == 'fv')
 
-            #--
-            #def call_function (function_name)
-            #    #"function '#{function_name}' is not implemented"
-            #    "functions are not yet implemented"
-            #        #
-            #        # no need for them... we have Ruby :)
-            #end
-            #++
+    [ pr, key[i+1..-1] ]
+    end
 
-            #
-            # The ${r:1+2} stuff. ("3").
-            #
-            def call_ruby (ruby_code)
+    #--
+    #def call_function (function_name)
+    #  #"function '#{function_name}' is not implemented"
+    #  "functions are not yet implemented"
+    #  #
+    #  # no need for them... we have Ruby :)
+    #end
+    #++
 
-                if @flow_expression
-                    return "" \
-                        if @flow_expression.ac[:ruby_eval_allowed] != true
-                end
+    #
+    # The ${r:1+2} stuff. ("3").
+    #
+    def call_ruby (ruby_code)
 
-                #binding = nil
-                #binding = @flow_expression.get_binding if @flow_expression
-                #eval(ruby_code, binding).to_s
+      #if @flow_expression and @flow_expression.ac[:ruby_eval_allowed] != true
+      #  return ''
+      #end
+      return '' if @flow_expression.ac[:ruby_eval_allowed] != true
 
-                wi = @workitem
-                workitem = @workitem
+      wi = @workitem
+      workitem = @workitem
 
-                fexp = nil
-                flow_expression = nil
-                fei = nil
+      #fexp = nil
+      #flow_expression = nil
+      #fei = nil
 
-                if @flow_expression
-                    fexp = @flow_expression
-                    flow_expression = @flow_expression
-                    fei = @flow_expression.fei
-                end
-                    #
-                    # some simple notations made available to ${ruby:...}
-                    # notations
+      #if @flow_expression
+      fexp = @flow_expression
+      flow_expression = @flow_expression
+      fei = @flow_expression.fei
+      #end
+        #
+        # some simple notations made available to ${ruby:...}
+        # notations
 
-                #eval(ruby_code, binding).to_s
-                #eval(ruby_code).to_s
+      #TreeChecker.check ruby_code
+      fexp.ac[:s_tree_checker].check(ruby_code)
 
-                Rufus::eval_safely(
-                    ruby_code, DSUB_SAFETY_LEVEL, binding()).to_s
-            end
+      eval(ruby_code, binding()).to_s
     end
+  end
 
 end
 

data/lib/openwfe/util/irb.rb

@@ -2,31 +2,31 @@
 #--
 # Copyright (c) 2007, John Mettraux, OpenWFE.org
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.  
-# 
-# . Redistributions in binary form must reproduce the above copyright notice, 
-#   this list of conditions and the following disclaimer in the documentation 
+#   list of conditions and the following disclaimer.
+#
+# . Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
 #   and/or other materials provided with the distribution.
-# 
+#
 # . Neither the name of the "OpenWFE" nor the names of its contributors may be
 #   used to endorse or promote products derived from this software without
 #   specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #++
 #
@@ -43,44 +43,44 @@ require 'irb'
 require 'irb/completion'
 
 #
-# borrowing ideas from 
+# borrowing ideas from
 #
 # http://groups.google.com/group/ruby-talk-google/browse_frm/thread/60ef4f8cff701e14/26ae883a7cc1da7f
 
 
 module OpenWFE
 
-    #
-    # Binds the SIGINT signal so that a console is opened with the bindings
-    # specified in 'args'.
-    #
-    def OpenWFE.trap_int_irb (*args)
-        trap 'INT' do
-            OpenWFE.start_irb_session(*args)
-            #OpenWFE.trap_int_irb(*args) if $openwfe_irb
-            OpenWFE.trap_int_irb(*args)
-        end
+  #
+  # Binds the SIGINT signal so that a console is opened with the bindings
+  # specified in 'args'.
+  #
+  def OpenWFE.trap_int_irb (*args)
+    trap 'INT' do
+      OpenWFE.start_irb_session(*args)
+      #OpenWFE.trap_int_irb(*args) if $openwfe_irb
+      OpenWFE.trap_int_irb(*args)
     end
+  end
 
-    protected
+  protected
 
-        def OpenWFE.start_irb_session (*args)
+    def OpenWFE.start_irb_session (*args)
 
-            IRB::setup nil unless $openwfe_irb
+      IRB::setup nil unless $openwfe_irb
 
-            ws = IRB::WorkSpace.new *args
+      ws = IRB::WorkSpace.new *args
 
-            $openwfe_irb = IRB::Irb.new ws
+      $openwfe_irb = IRB::Irb.new ws
 
-            IRB::conf[:MAIN_CONTEXT] = $openwfe_irb.context
+      IRB::conf[:MAIN_CONTEXT] = $openwfe_irb.context
 
-            trap 'INT' do
-                $openwfe_irb.signal_handle
-            end
+      trap 'INT' do
+        $openwfe_irb.signal_handle
+      end
 
-            $openwfe_irb.eval_input
+      $openwfe_irb.eval_input
 
-            puts "\nbye!"
-        end
+      puts "\nbye!"
+    end
 end