flor 0.18.0 → 1.2.0

data/lib/flor/unit/taskers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -28,6 +29,29 @@ module Flor
     alias task_name taskname
 
     def vars; @message['vars']; end
+    alias variables vars
+
+    def set_payload(h)
+      fail TypeError.new("not a hash but a #{fs.class}") unless h.is_a?(Hash)
+      @message['payload'] = h
+    end
+    alias set_fields set_payload
+
+    def set_vars(h)
+      fail TypeError.new("not a hash but a #{fs.class}") unless h.is_a?(Hash)
+      @message['vars'] = h
+    end
+    alias set_variables set_vars
+
+    #def merge_into_payload(h)
+    #  @message['payload'].merge(h)
+    #end
+    #alias merge_into_fields merge_into_payload
+    #def merge_into_vars(h)
+    #  @message['vars'].merge(h)
+    #end
+      #
+      # no for now, payload.merge(h) and vars.merge(h) do suffice
 
     def execution
 
@@ -88,7 +112,7 @@ module Flor
       return m if Flor.is_exid?(exid) && Flor.is_nid?(nid) && pl.is_a?(Hash)
 
       m = Flor.to_string_keyed_hash(m)
-      h = Flor.dup(@message)
+      h = Flor.dup_message(@message)
       ks = m.keys
 
       if ks == [ 'payload' ]
@@ -111,5 +135,50 @@ module Flor
       h
     end
   end
+
+  # A BasicTasker with stages (pre / on / post)
+  #
+  class StagedBasicTasker < BasicTasker
+
+    def call_task
+
+      call_one_of(:pre_task)
+      call_one_of(:on_task, :task)
+    end
+
+    def call_detask
+
+      call_one_of(:pre_detask, :pre_cancel)
+      call_one_of(:on_detask, :on_cancel, :detask, :cancel)
+    end
+
+    protected
+
+    def call_one_of(*ms)
+
+      m = ms.flatten.find { |mm| respond_to?(mm) }
+
+      send(m) if m
+    end
+
+    def reply(message=@message, force=false)
+
+      fail ArgumentError.new(
+        "argument to reply must be a Hash but is #{message.class}"
+      ) unless message.is_a?(Hash)
+
+      pt = @message['point']
+
+      ms = [ "post_#{pt}" ]; ms << :post_cancel if pt == 'detask'
+        #
+      call_one_of(ms)
+
+      msg = derive_message(message)
+
+      @ganger.return(msg) if force || @ganger
+
+      [] # very important, return no further messages
+    end
+  end
 end
 

data/lib/flor/unit/waiter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -22,7 +23,7 @@ module Flor
       @executor = nil
     end
 
-    ROW_PSEUDO_POINTS = %w[ status tag tasker var variable ]
+    ROW_PSEUDO_POINTS = %w[ status tag tasker var variable ].freeze
       # "tasker", not "task", since "task" is already a message point
 
     def row_waiter?
@@ -52,7 +53,7 @@ module Flor
 
       @mutex.synchronize do
 
-        return false unless match?(message)
+        return false unless msg_match?(message)
 
         @serie.shift
         return false if @serie.any?
@@ -150,7 +151,7 @@ module Flor
 
     protected
 
-    def match?(message)
+    def msg_match?(message)
 
       mpoint = message['point']
 
@@ -209,7 +210,7 @@ module Flor
         (name == nil || ptr.name == name) &&
         (value == nil || ptr.value == value.to_s) }
     end
-    alias row_match_variable?  row_match_var?
+    alias row_match_variable? row_match_var?
 
     def row_match_tasker?(unit, rs, nid, (name, value))
 
@@ -246,15 +247,7 @@ module Flor
       end
     end
 
-    WAIT_REX =
-      %r{
-        \A
-        ([0-9_\-]+)?[ ]*
-        (
-          [a-z]+(?::[^:|;,\s]+){0,2}
-          (?:[|, ][a-z]+(:[^:|;,\s]+){0,2})*
-        )\z
-      }x
+    PT_REX = /[a-z]+(?::[^:|,\s]+){0,2}/.freeze
 
     def parse_serie(s)
 
@@ -262,11 +255,23 @@ module Flor
 
       (s.is_a?(String) ? s.split(';') : s)
         .collect { |ss|
-          m = ss.strip.match(WAIT_REX)
+
+          k = StringScanner.new(ss.strip)
+
+          ni = k.scan(Flor::START_NID_REX)
+
+          k.scan(/\s*/)
+
+          pts = []; loop do
+              pt = k.scan(PT_REX); break unless pt
+              pts << pt
+              k.scan(/\s*[|,]\s*/)
+            end
+
           fail ArgumentError.new(
-            "cannot parse #{ss.strip.inspect} wait directive") unless m
-          ni, pt = m[1, 2]
-          [ ni, pt.split(/[|,]/).collect(&:strip) ] }
+            "cannot parse #{ss.strip.inspect} wait directive") unless k.eos?
+
+          [ ni, pts ] }
     end
   end
 end

data/lib/flor/unit/wlist.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -11,6 +12,15 @@ module Flor
     # `wtl_row_frequency`:
     #   sleep time between row waiter checks, defaults to 1
 
+    # Regular waiters are message waiters, they wait for a message
+    # that matches a pattern
+    #
+    # Row waiters are waiting for the pattern to realize in the database
+    # a better name would probably have been "query waiter".
+    # Row waiters need their own thread for checking at interval.
+    # Row waiters can live in a different Ruby process from the Ruby process
+    # performing the executions.
+
     DEFAULT_TIMEOUT = Flor.env_i('FLOR_DEFAULT_TIMEOUT')
 
     def initialize(unit)
@@ -42,18 +52,19 @@ module Flor
 
     def notify(executor, message)
 
-      @mutex.synchronize do
+      return [] unless message['consumed']
+      return [] if @msg_waiters.empty?
 
-        to_remove = []
+      @mutex.synchronize do
 
-        @msg_waiters.each do |w|
-          remove = w.notify(executor, message)
-          to_remove << w if remove
-        end
+        to_remove =
+          @msg_waiters.each_with_object([]) do |w, a|
+            remove = w.notify(executor, message)
+            a << w if remove
+          end
 
         @msg_waiters -= to_remove
-
-      end if message['consumed']
+      end
 
       [] # no new messages
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 1.2.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -225,6 +225,7 @@ files:
 - lib/flor/pcore/twig.rb
 - lib/flor/pcore/type_of.rb
 - lib/flor/pcore/until.rb
+- lib/flor/punit/abort.rb
 - lib/flor/punit/c_collect.rb
 - lib/flor/punit/c_each.rb
 - lib/flor/punit/c_for_each.rb
@@ -236,7 +237,7 @@ files:
 - lib/flor/punit/do_trap.rb
 - lib/flor/punit/every.rb
 - lib/flor/punit/graft.rb
-- lib/flor/punit/m_ram.rb
+- lib/flor/punit/m_receive_and_merge.rb
 - lib/flor/punit/on_timeout.rb
 - lib/flor/punit/part.rb
 - lib/flor/punit/schedule.rb
@@ -247,12 +248,17 @@ files:
 - lib/flor/punit/trap.rb
 - lib/flor/to_string.rb
 - lib/flor/tools/env.rb
+- lib/flor/tools/firb.rb
 - lib/flor/tools/shell.rb
 - lib/flor/tools/shell_out.rb
+- lib/flor/tt.rb
 - lib/flor/unit.rb
 - lib/flor/unit/caller.rb
+- lib/flor/unit/caller_jruby.rb
+- lib/flor/unit/dump.rb
 - lib/flor/unit/executor.rb
 - lib/flor/unit/ganger.rb
+- lib/flor/unit/gangers.rb
 - lib/flor/unit/hloader.rb
 - lib/flor/unit/hook.rb
 - lib/flor/unit/hooker.rb
@@ -272,16 +278,16 @@ files:
 - lib/flor/unit/taskers.rb
 - lib/flor/unit/waiter.rb
 - lib/flor/unit/wlist.rb
-homepage: http://github.com/floraison
+homepage: https://github.com/floraison
 licenses:
 - MIT
 metadata:
-  changelog_uri: http://github.com/floraison/flor/blob/master/CHANGELOG.md
-  documentation_uri: http://github.com/floraison/flor/tree/master/doc
-  bug_tracker_uri: http://github.com/floraison/flor/issues
+  changelog_uri: https://github.com/floraison/flor/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/floraison/flor/tree/master/doc
+  bug_tracker_uri: https://github.com/floraison/flor/issues
   mailing_list_uri: https://groups.google.com/forum/#!forum/floraison
-  homepage_uri: http://github.com/floraison/flor
-  source_code_uri: http://github.com/floraison/flor
+  homepage_uri: https://github.com/floraison/flor
+  source_code_uri: https://github.com/floraison/flor
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -297,8 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby workflow engine