lib/openwfe/expool/expool_pause_methods.rb in ruote-0.9.19 vs lib/openwfe/expool/expool_pause_methods.rb in ruote-0.9.20

@@ -1,62 +1,50 @@
-#
 #--
-# Copyright (c) 2006-2008, John Mettraux OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2006-2009, John Mettraux, [e-mail]
 #
-# 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
-#
 
-#
-# Gets included into the ExpressionPool class
-#
-module OpenWFE::ExpoolPauseMethods
+module OpenWFE
 
+  #
+  # Gets included into the ExpressionPool class
+  #
+  module ExpoolPauseMethods
+
     #
     # Pauses a process (sets its /__paused__ variable to true).
     #
     def pause_process (wfid)
 
-      wfid = extract_wfid wfid
+      wfid = extract_wfid(wfid)
 
-      root_expression = fetch_root wfid
+      root_expression = fetch_root(wfid)
 
       @paused_instances[wfid] = true
-      root_expression.set_variable OpenWFE::VAR_PAUSED, true
+      root_expression.set_variable(OpenWFE::VAR_PAUSED, true)
 
-      onotify :pause, root_expression.fei
+      onotify(:pause, root_expression.fei)
     end
 
     #
     # Restarts a process : removes its 'paused' flag (variable) and makes
     # sure to 'replay' events (replies) that came for it while it was
@@ -64,22 +52,22 @@
     #
     def resume_process (wfid)
 
       wfid = extract_wfid wfid
 
-      root_expression = fetch_root wfid
+      root_expression = fetch_root(wfid)
 
       #
       # remove 'paused' flag
 
-      @paused_instances.delete wfid
-      root_expression.unset_variable OpenWFE::VAR_PAUSED
+      @paused_instances.delete(wfid)
+      root_expression.unset_variable(OpenWFE::VAR_PAUSED)
 
       #
       # notify ...
 
-      onotify :resume, root_expression.fei
+      onotify(:resume, root_expression.fei)
 
       #
       # replay
       #
       # select PausedError instances in separate list
@@ -92,7 +80,8 @@
 
       # replay select PausedError instances
 
       paused_errors.each { |e| get_error_journal.replay_at_error e }
     end
+  end
 end