lib/openwfe/util/dollar.rb in ruote-0.9.19 vs lib/openwfe/util/dollar.rb in ruote-0.9.20
- old
+ new
@@ -1,43 +1,29 @@
-#
#--
-# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# 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
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
#
-# . Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
#
-# . 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.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
#
-# . 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
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
#++
-#
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
require 'rufus/dollar' # gem 'rufus-dollar'
require 'openwfe/utils'
require 'openwfe/util/treechecker'
@@ -49,36 +35,36 @@
# 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 |h, (k, v)|
- r[dosub(k, flow_expression, workitem)] =
- dosub(v, flow_expression, workitem)
- r
- end
+ h[dosub(k, flow_expression, workitem)] =
+ dosub(v, flow_expression, workitem)
+ h
+ end
- else
+ else
- text
+ text
+ end
end
- end
#
# Wrapping a process expression and the current workitem as a
# Hash object ready for lookup at substitution time.
#
@@ -96,10 +82,11 @@
pr, k = extract_prefix key
# stage 0
v = lookup(pr[0, 1], k)
+
return v if v != nil
# stage 1
return '' if pr.size < 2
@@ -112,15 +99,15 @@
pr, k = extract_prefix key
pr = pr[0, 1]
if pr == 'f'
- @workitem.set_attribute k, value
+ @workitem.set_attribute(k, value)
elsif @flow_expression
- @flow_expression.set_variable k, value
+ @flow_expression.set_variable(k, value)
end
end
def has_key? (key)
@@ -133,29 +120,29 @@
protected
def lookup (pr, 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
+ 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
- end
def extract_prefix (key)
- i = key.index(':')
+ i = key.index(':')
- return [ @default_prefix, key ] if not i
+ return [ @default_prefix, key ] if not i
- pr = key[0..i-1] # until ':'
- pr = pr[0, 2] # the first two chars
+ pr = key[0..i-1] # until ':'
+ pr = pr[0, 2] # the first two chars
- pr = pr[0, 1] unless (pr == 'vf') or (pr == 'fv')
+ pr = pr[0, 1] unless (pr == 'vf') or (pr == 'fv')
- [ pr, key[i+1..-1] ]
+ [ pr, key[i+1..-1] ]
end
#--
#def call_function (function_name)
# #"function '#{function_name}' is not implemented"