flor 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5d8fca99889bde91b7433d98d674f44c810c041421ce61eef1857e80930e8cef
-  data.tar.gz: 7a06654dbe17ac06aa3afeab0a04b9958851bdaf393df0d48f994dae4681c072
+SHA1:
+  metadata.gz: b973449e80aa849aee7d3fade7ab13fe57a0b6a1
+  data.tar.gz: a09d4a0b88d453b42742bb8814d5cee1f957c2c2
 SHA512:
-  metadata.gz: 0a17e80b8bf6207bd3688f2c57172a51ac471c5f3beaf28803ff8ce41587dc6b181b5295b041dbfa586e6556ee045be56553164e6b09183745c0cfd2562d8c0c
-  data.tar.gz: fad82fa8619af8623b6312d6a4f234f5433d71edcbd05964367c8cde547be357f08d77e9c0e99078f2c71cbf74bfbf7691cae62025f53ce7537ad91cb0ef4d74
+  metadata.gz: 139a8cf68527edcdff12137a9ac831eee6fb9867a49ed9fe24d462efce7f3d53f9396de2302b449f963c1e74fe4e67b5590f04ad5605a6996bb35e6e0f7015ad
+  data.tar.gz: 9de9e3bb4f12f2cb1b48ae0aa4d024ce4ce557b380d5b476c03dae7a7db63480ec041269702102a40165a3ed8ecb290d7b2c77299f999fdf605071976c2f99ea

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 
-# flor CHANGELOG.md
+# CHANGELOG.md
+
+
+## flor 1.0.0  not yet released
+
+
+## flor 0.16.0  released 2019-02-04
+
+- Many many improvements
+- Include "undense" work ("_ref" and friends)
+- Include "undense" work (killing the dollar subsystem)
+- Fix dereserving delayed messages
+- allow for cancel behaviour when "cursor", "sequence", and "until"
+  node_status flavour is "on-error"
 
 
 ## flor 0.15.0  released 2018-06-15

data/CREDITS.md

@@ -3,6 +3,7 @@
 
 ## Contributors
 
+* Jeffrey Hicks - https://github.com/jrhicks
 * David Verrier - https://github.com/dverrier
 * Tsunehisa Doi - https://github.com/dmicky0419
 * Jean-François Rioux - https://github.com/jfrioux

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2015-2018, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2015-2019, John Mettraux, jmettraux+flor@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Makefile

@@ -13,12 +13,15 @@ cl: count_lines
 
 gemspec_validate:
 	@echo "---"
-	ruby -e "s = eval(File.read(Dir['*.gemspec'].first)); s.validate"
+	ruby -e "s = eval(File.read(Dir['*.gemspec'].first)); p s.validate"
 	@echo "---"
 
 name: gemspec_validate
 	@echo "$(NAME) $(VERSION)"
 
+cw:
+	find lib -name "*.rb" -exec ruby -cw {} \; | grep lib
+
 syncver:
 	sed -E -i '' "s/VERSION = ['0-9.]+/VERSION = '$(shell grep -E "$(NAME) ([0-9.]+)" CHANGELOG.md | head -1 | sed -E 's/[^0-9\.]//g')'/" lib/$(NAME).rb
 	bundle install
@@ -81,5 +84,6 @@ cleanshell:
 	rm -fR envs/shell/var/tasks/*
 	rm -f .log.txt
 
-.PHONY: doc shell cleanshell
+.PHONY: \
+  count_lines gemspec_validate name cw build push spec doc shell cleanshell
 

data/README.md

@@ -32,8 +32,9 @@ See [doc/](doc/).
 
 ## blog posts and presentations
 
+* [the flor language](http://jmettraux.skepti.ch/20180927.html?t=the_flor_language) - on the flor workflow definition language itself
 * [Flor, hubristic interpreter](http://rubykaigi.org/2017/presentations/jmettraux.html) - RubyKaigi 2017, Hiroshima - presentation
-* [flor design 0](http://jmettraux.skepti.ch/20171021.html?t=flor_design_0) - running a simple execution, what happens - blog post
+* [flor design 0](http://jmettraux.skepti.ch/20171021.html?t=flor_design_0&f=readme) - running a simple execution, what happens - blog post
 * [flor, branch to branch](https://speakerdeck.com/jmettraux/flor-branch-to-branch) - q1 2017 - very dry deck
 * [flor 2017](https://speakerdeck.com/jmettraux/flor-2017) - q1 2017 - very dry deck
 

data/flor.gemspec

@@ -15,6 +15,16 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
   s.summary = 'A Ruby workflow engine'
 
+  s.metadata = {
+    'changelog_uri' => s.homepage + '/flor/blob/master/CHANGELOG.md',
+    'documentation_uri' => s.homepage + '/flor/tree/master/doc',
+    'bug_tracker_uri' => s.homepage + '/flor/issues',
+    'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/floraison',
+    'homepage_uri' =>  s.homepage + '/flor',
+    'source_code_uri' => s.homepage + '/flor',
+    #'wiki_uri' => s.homepage + '/flor/wiki',
+  }
+
   s.description = %{
 A Ruby workflow engine (ruote next generation)
   }.strip
@@ -31,8 +41,8 @@ A Ruby workflow engine (ruote next generation)
   s.add_runtime_dependency 'munemo', '~> 1.0', '>= 1.0.1'
   s.add_runtime_dependency 'raabro', '~> 1.1', '>= 1.1.5'
   #s.add_runtime_dependency 'rufus-lru', '~> 1.1'
-  s.add_runtime_dependency 'fugit', '~> 1.1'
-  s.add_runtime_dependency 'dense', '~> 1.1', '>= 1.1.1'
+  s.add_runtime_dependency 'fugit', '~> 1.1', '>= 1.1.8'
+  s.add_runtime_dependency 'dense', '~> 1.1', '>= 1.1.6'
 
   s.add_runtime_dependency 'sequel', '~> 4'
 

data/lib/flor.rb

@@ -5,6 +5,7 @@ require 'logger'
 require 'thread'
 require 'digest'
 require 'socket'
+require 'forwardable'
 
 require 'munemo'
 require 'raabro'
@@ -13,7 +14,8 @@ require 'dense'
 
 module Flor
 
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
+  #VERSION = '1.0.0'
 end
 
 require 'flor/colours'
@@ -22,11 +24,9 @@ require 'flor/djan'
 require 'flor/id'
 require 'flor/log'
 require 'flor/flor'
-require 'flor/dollar'
 require 'flor/errors'
 require 'flor/parser'
 require 'flor/conf'
-require 'flor/changes'
 require 'flor/to_string'
 
 require 'flor/core'

data/lib/flor/colours.rb

@@ -28,7 +28,7 @@ module Flor
       if v.match(/\A\d/)
         class_eval(%{
           def #{k}(s=nil)
-           s ? "[#{v}m" + s + "": "[#{v}m"
+           s ? "[#{v}m" + s + "" : "[#{v}m"
            end })
       else
         class_eval(

data/lib/flor/conf.rb

@@ -114,13 +114,12 @@ module Flor
         a = plus - minus
 
         h =
-          a.inject({}) { |h, kv|
+          a.inject({}) { |hh, kv|
             k, v = kv.split(':')
             k = 'sto' if k == 'db'
             k = "log_#{k}" if LOG_ALL_KEYS.include?(k)
-            h[k] = v ? JSON.parse(v) : true
-            h
-          }
+            hh[k] = v ? JSON.parse(v) : true
+            hh }
         LOG_ALL_KEYS.each { |k| h["log_#{k}"] = 1 } if h['log_all']
         LOG_DBG_KEYS.each { |k| h["log_#{k}"] = 1 } if h['log_dbg']
 

data/lib/flor/core/executor.rb

@@ -15,6 +15,8 @@ module Flor
 
       @hooks = hooks # raw hooks if any, fresh from the loader
       @traps = traps # array of Trap instances
+
+      @htraps = nil
     end
 
     def conf; @unit.conf; end
@@ -144,6 +146,10 @@ module Flor
         # cnid: closure nid
         # dbg: used to debug messages (useful @node['dbg'] when 'receive')
 
+      if oeh = message['on_error_handler']
+        node['on_error'] = [ [ [ '*' ], oeh ] ]
+      end
+
       @execution['nodes'][nid] = node
     end
 
@@ -158,9 +164,7 @@ module Flor
         make_node(message) :
         @execution['nodes'][nid]
 
-      return unless node
-
-      return if node['heat']
+      return if node.nil? || node['heat']
 
       n = Flor::Node.new(self, node, message)
 
@@ -173,34 +177,33 @@ module Flor
       node['tree'] = mt if mt && (mt != nt)
       tree = node['tree'] || nt
 
-      t0 = tree[0]
-      t0 = (t0.is_a?(Array) && t0[0] == '_dqs') ? n.expand(t0[1]) : t0
-
-      node['heat0'] = tree[0]
+      node['heat0'] = t0 = tree[0]
       node['heat'] = heat = n.deref(t0)
-      node['heap'] = heap = n.reheap(tree, heat)
 
-      # "exceptions"
+      if heat == nil && ! message['accept_symbol']
 
-      if heat == nil && tree[0].index('.') && tree[1].empty?
-        #
-        # a field reference that points to nothing returns null
+        node['heat'] = '(none)'
 
-        node['heat0'] = '_nul'
-        node['heat'] = '_nul'
-        node['heap'] = '_nul'
+        fail FlorError.new("cannot find #{t0.inspect}", n) if tree[1].empty?
+        fail FlorError.new("don't know how to apply #{t0.inspect}", n)
+# TODO how about _ref and letting that procedure fail
+      end
 
-      elsif message['accept_symbol'] && heat == nil
+      node['heap'] = heap = n.reheap(tree, heat)
+
+      # "exceptions"
+
+      if heat == nil #&& message['accept_symbol']
         #
         # tag: et al
 
-        node['tree'] = message['tree'] = t = [ '_dqs', tree[0], tree[2] ]
+        node['tree'] = message['tree'] = t = [ '_sqs', tree[0], tree[2] ]
 
         node['heat0'] = t[0]
         node['heat'] = h = n.deref(t[0])
         node['heap'] = n.reheap(t, h)
 
-      elsif heap == 'task' && heat[0] == '_task'
+      elsif heap == 'task' && heat[0] == '_tasker'
         #
         # rewrite `alpha` into `task alpha`
 
@@ -211,7 +214,7 @@ module Flor
         message['tree'][0] =
           'task'
         message['tree'][1].unshift(
-          [ '_att', [ [ '_sqs', heat[1]['task'], l ] ], l ])
+          [ '_att', [ [ '_sqs', heat[1]['tasker'], l ] ], l ])
       end
     end
 
@@ -222,16 +225,7 @@ module Flor
 
     def apply(node, message)
 
-      heap =
-        if node['heat']
-          node['heap']
-        else
-          node['failure'] ? '_err' : nil
-        end
-
-      return error_reply(
-        node, message, "don't know how to apply #{node['heat0'].inspect}"
-      ) if heap == nil
+      heap = node['heap']
 
       heac = Flor::Procedure[heap]
       fail NameError.new("unknown procedure #{heap.inspect}") unless heac
@@ -283,11 +277,11 @@ module Flor
 
     def leave_node(message)
 
+      return [] if %w[ flank part ].include?(message['flavour'])
+
       fnid = message['from']; return [] unless fnid
       fnode = @execution['nodes'][fnid]; return [] unless fnode
 
-      return [] if message['flavour'] == 'flank'
-
       remove_node(message, fnode) +
       leave_tags(message, fnode)
     end
@@ -380,36 +374,6 @@ module Flor
       [ m ]
     end
 
-    def task(message)
-
-      return error_reply(
-        node(message['nid']),
-        message,
-        "don't know how to apply #{message['tasker'].inspect}"
-      ) if message['routed'] == false
-
-      @execution['tasks'][message['nid']] =
-        { 'tasker' => message['tasker'], 'name' => message['taskname'] }
-          #
-          # FIXME is it in use???
-
-      @unit.ganger.task(self, message)
-    end
-    alias detask task
-
-    def return(message)
-
-      @execution['tasks'].delete(message['nid'])
-        #
-        # FIXME is it in use???
-
-      [ { 'point' => 'receive',
-          'exid' => message['exid'],
-          'nid' => message['nid'],
-          'payload' => message['payload'],
-          'tasker' => message['tasker'] } ]
-    end
-
     def cancel(message)
 
       n = @execution['nodes'][message['nid']]
@@ -444,6 +408,11 @@ module Flor
 
     def process(message)
 
+      fail ArgumentError.new("incoming message has non nil or Hash payload") \
+        unless message['payload'] == nil || message['payload'].is_a?(Hash)
+          #
+          # weed out messages with non-conforming payloads
+
       begin
 
         message['m'] = counter_next('msgs') # number messages
@@ -516,6 +485,7 @@ module Flor
         # with its 'on_error' turned on.
         #
         oep.trigger_on_error
+        #
       else
         #
         # Simply log and don't add further messages ([]) to execute

data/lib/flor/core/node.rb

@@ -2,10 +2,12 @@
 class Flor::Node
 
   class Payload
+
     def initialize(node, type=:node)
       @node = node
       @type = type
     end
+
     def has_key?(k)
       current.has_key?(k)
     end
@@ -33,7 +35,16 @@ class Flor::Node
     def merge(h)
       current.merge(h)
     end
+
+    def ret
+      self['ret']
+    end
+    def ret=(v)
+      self['ret'] = v
+    end
+
     protected
+
     def container
       @type == :node ? @node.h : @node.message
     end
@@ -71,6 +82,8 @@ class Flor::Node
   def nid; @node['nid']; end
   def parent; @node['parent']; end
 
+  def child_id; Flor.child_id(@node['nid']); end
+
   def domain; Flor.domain(@execution['exid']); end
 
   def point; @message['point']; end
@@ -78,6 +91,7 @@ class Flor::Node
 
   def cnodes; @node['cnodes']; end
   def cnodes_any?; cnodes && cnodes.any?; end
+  def cnodes_empty?; cnodes.nil? || cnodes.empty?; end
 
   def payload
     @message_payload ||= Payload.new(self, :message)
@@ -106,6 +120,10 @@ class Flor::Node
     Flor.dup(node_payload['ret'])
   end
 
+  def payload_ret
+    message['payload']['ret']
+  end
+
   def message_or_node_payload
     payload.current ? payload : node_payload
   end
@@ -151,89 +169,86 @@ class Flor::Node
     #
     # that might be the way...
 
-  def lookup(name, silence_index_error=false)
+  def lookup_value(path)
+
+    original_path = path
 
-    cat, mod, key_and_path = key_split(name)
-    key, pth = key_and_path.split('.', 2)
+    path =
+      case path
+      when '*' then [ path ]
+      when String then Dense::Path.make(path).to_a
+      else path
+      end
 
-    if [ cat, mod, key ] == [ 'v', '', 'node' ]
-      lookup_in_node(pth)
-    elsif cat == 'v'
-      lookup_var(@node, mod, key, pth)
-    elsif cat == 't'
-      lookup_tag(mod, key)
+    path.unshift('v') \
+      if path.length < 2
+
+    case path.first
+    when /\Af(?:ld|ield)?\z/
+      lookup_field(nil, path[1..-1]) # mod -> nil...
+    when /\At(?:ag)?\z/
+      lookup_tag(nil, path[1])
+    when /\A([lgd]?)v(?:ar|ariable)?\z/
+      return @message['__head'][1] if path[1] == '__head'
+      lookup_var(@node, $1, path[1], path[2..-1])
+    when 'node'
+      lookup_in_node(path[1..-1])
+    when 'exe', 'execution'
+      lookup_in_execution(path[1..-1])
     else
-      lookup_field(mod, key_and_path)
+      lookup_var(@node, '', path[0], path[1..-1])
     end
 
-  rescue KeyError, TypeError
-
-    raise unless silence_index_error
-    nil
-  end
-
-  class Expander < Flor::Dollar
-
-    def initialize(n); @node = n; end
-
-    def lookup(k)
+  rescue KeyError => ke
 
-      return @node.nid if k == 'nid'
-      return @node.exid if k == 'exid'
-      return Flor.domain(@node.exid) if k == 'domain'
-      return Flor.tstamp if k == 'tstamp'
+    class << ke; attr_accessor :original_path, :work_path; end
+    ke.original_path = original_path
+    ke.work_path = path
 
-      r = @node.lookup(k, true)
-      r.is_a?(Symbol) ? nil : r
-    end
+    raise
   end
 
-  def expand(s)
+  # Returns the referenced tree.
+  # Returns nil if not found.
+  #
+  def deref(s)
 
-    return s unless s.is_a?(String)
+    v = lookup_value(s)
 
-    Expander.new(self).expand(s)
-  end
+    if Flor.is_tree?(v)
 
-  def deref(o)
+      ref =
+        case v[0]
+        when '_func' then true
+        when '_proc' then v[1]['proc'] != s
+        when '_tasker' then v[1]['tasker'] != s
+        else false
+        end
 
-    return o unless o.is_a?(String)
+      v[1]['oref'] ||= v[1]['ref'] if ref && v[1]['ref']
+      v[1]['ref'] = s if ref
 
-    v = lookup(o)
+      v
 
-    return v unless Flor.is_tree?(v)
-    return v unless v[1].is_a?(Hash)
-
-    return v unless %w[ _proc _task _func ].include?(v[0])
+    else
 
-    ref =
-      case v[0]
-      when '_func' then true
-      when '_proc' then v[1]['proc'] != o
-      when '_task' then v[1]['task'] != o
-      else false
-      end
+      [ '_val', v, tree[2] ]
+    end
 
-    v[1]['oref'] ||= v[1]['ref'] if ref && v[1]['ref']
-    v[1]['ref'] = o if ref
+  rescue KeyError => ke
 
-    v
+    nil
   end
 
   def reheap(tree, heat)
 
-    if ! heat.is_a?(Array)
-      '_val'
-    elsif tree && tree[1] == []
-      '_val'
-    elsif heat[0] == '_proc'
-      heat[1]['proc']
-    elsif heat[0] == '_func'
-      'apply'
-    elsif heat[0] == '_task'
-      'task'
-    else
-      '_val'
+    case
+    when ! heat.is_a?(Array) then '_val'
+    when tree && tree[1] == [] then '_val'
+    when heat[0] == '_proc' then heat[1]['proc']
+    when heat[0] == '_func' then 'apply'
+    when heat[0] == '_tasker' then 'task'
+    else '_val'
     end
   end
 
@@ -247,17 +262,6 @@ class Flor::Node
     "#{exid}-#{nid}"
   end
 
-  def on_error_parent
-
-    oe = @node['on_error']
-    return self if oe && oe.any?
-
-    pn = parent_node
-    return Flor::Node.new(@executor, pn, @message).on_error_parent if pn
-
-    nil
-  end
-
   def to_procedure_node
 
     Flor::Procedure.new(@executor, @node, @message)
@@ -279,6 +283,24 @@ class Flor::Node
     false
   end
 
+  def on_error_parent(skip=false)
+
+    if @node['in_on_error'] # prevent loop when error in on_error:
+      skip = true
+    end
+
+    if (@node['on_error'] || []).find { |criteria, _| match_on?(criteria) }
+      return self unless skip
+      skip = false
+    end
+
+    if pn = parent_node
+      return Flor::Node.new(@executor, pn, @message).on_error_parent(skip)
+    end
+
+    nil
+  end
+
   protected
 
   def subtree(tree, pnid, nid)
@@ -294,7 +316,7 @@ class Flor::Node
     return nil unless cid
       # maybe failing would be better
 
-    cid.split('_').each { |cid| tree = tree[1][cid.to_i] }
+    cid.split('_').each { |id| tree = tree[1][id.to_i] }
 
     tree
   end
@@ -309,7 +331,21 @@ class Flor::Node
     lookup_tree(node['parent'])
   end
 
-  def is_ancestor_node?(nid, node=@node)
+  def parent_node_procedure(node=@node)
+
+    Flor::Procedure.make(@executor, parent_node(node), @message)
+  end
+
+  # Returns true if the current node has the node identified with nid as
+  # an ancestor. Returns false else.
+  #
+  def is_ancestor_node?(node_or_nid, node=@node)
+
+    nid = node_or_nid
+
+    return false unless nid
+
+    nid = node_or_nid['nid'] unless nid.is_a?(String)
 
     return false unless node
     return true if node['nid'] == nid
@@ -321,9 +357,18 @@ class Flor::Node
   #  @execution['nodes'][node['cnid']]
   #end
 
-  def lookup_in_node(pth)
+  def lookup_in_node(path)
 
-    Dense.fetch(@node, pth)
+    Dense.fetch(@node, path)
+  end
+
+  def lookup_in_execution(path)
+
+    if path == %w[ domain ]
+      Flor.domain(@execution['exid'])
+    else
+      Dense.fetch(@execution, path)
+    end
   end
 
   class PseudoVarContainer < Hash
@@ -336,7 +381,7 @@ class Flor::Node
   end
     #
   PROC_VAR_CONTAINER = PseudoVarContainer.new('proc')
-  TASKER_VAR_CONTAINER = PseudoVarContainer.new('task')
+  TASKER_VAR_CONTAINER = PseudoVarContainer.new('tasker')
 
   def escape(k)
 
@@ -357,19 +402,53 @@ class Flor::Node
 
   rescue KeyError => ke
 
-    return nil if ke.miss[4].empty?
-
     m = "variable #{ke.miss[3].inspect} not found"
     m += " at #{Dense::Path.make(ke.miss[1]).to_s.inspect}" if ke.miss[1].any?
 
     raise ke.relabel(m)
 
+  rescue IndexError => ie
+
+    m =
+      if ie.miss[1] == [ ie.miss[2] ]
+         "variable #{ie.miss[2].inspect} not found"
+      else
+        pa = Dense::Path.make(ie.miss[1]).to_s.inspect
+        ty = Flor.type(ie.miss[2])
+        ke = ie.miss[3].inspect
+        "variable at #{pa} is a #{ty}, it has no key #{ke}"
+      end
+
+    raise ie.relabel(m)
+
   #rescue TypeError => te # leave as is
   end
 
+  def var_match?(vs, key)
+
+    vs.each do |v|
+      return true if v == key
+      return true if v.is_a?(Regexp) && v =~ key
+      # TODO fun call
+    end
+
+    false
+  end
+
   def lookup_var_container(node, mod, key)
 
-    return lookup_dvar_container(mod, key) if node == nil || mod == 'd'
+    return lookup_dvar_container(mod, key) \
+      if node == nil || mod == 'd'
+
+    return lookup_arg_container(key) \
+      if mod == '' && %w[ args argv argh ].include?(key)
+
+    if vwl = node['vwlist']
+      return lookup_dvar_container(mod, key) unless var_match?(vwl, key)
+    end
+    if vbl = node['vblist']
+      return lookup_dvar_container(mod, key) if var_match?(vbl, key)
+    end
 
     pnode = parent_node(node)
     vars = node['vars']
@@ -413,15 +492,21 @@ class Flor::Node
     {}
   end
 
-  def lookup_var_name(node, val)
+  def lookup_arg_container(key)
 
-    return nil unless node
+    vars = lookup_var_container(@node, '', 'arguments')
+    return {} unless vars
 
-    vars = node['vars']
-    k, _ = vars && vars.find { |k, v| v == val }
-    return k if k
+    args = vars['arguments']
+    return {} unless args
 
-    lookup_var_name(parent_node(node), val)
+    val =
+      case key
+      when 'args', 'argv' then args.collect(&:last)
+      else args.inject({}) { |h, (k, v)| h[k] = v if k; h }
+      end
+
+    { key => val }
   end
 
   def lookup_tag(mod, key)
@@ -432,28 +517,60 @@ class Flor::Node
         a
       end
 
-    nids.empty? ? [ '_nul', nil, -1 ] : nids
+    nids.any? ? nids : nil
   end
 
   def lookup_field(mod, key_and_path)
 
     Dense.fetch(payload.current, key_and_path)
+  end
 
-  rescue IndexError
+  # Return true if the current @message matches on the given array of
+  # criteria.
+  #
+  def match_on?(criteria)
 
-    nil
+    # AND, not OR, hence the true at the bottom
+
+    criteria
+      .each { |c|
+        next if c == '*'
+        return false unless send("match_on_#{c[0]}?", c) }
+
+    true
   end
 
-  def key_split(key) # => category, mode, key
+  def extract_on_info
+
+    kla = @message['error']['kla']
+    msg = @message['error']['msg']
+    la = kla.split('::').last
+
+    [ kla, la, msg ]
+  end
+
+  def match_on_class?(criterion)
+
+    c1 = criterion[1]
+    kla, la, _ = extract_on_info
+
+    kla == c1 || la == c1
+  end
+
+  def match_on_string?(criterion)
+
+    c1 = criterion[1]
+    kla, la, msg = extract_on_info
+
+    msg == c1 || kla == c1 || la == c1
+  end
 
-    m = key.match(
-      /\A(?:([lgd]?)((?:v|var|variable)|w|f|fld|field|t|tag)\.)?(.+)\z/)
+  def match_on_regex?(criterion)
 
-    ca = (m[2] || 'v')[0, 1]
-    mo = m[1] || ''
-    ke = m[3]
+    c1 = Flor.to_regex(criterion)
+    kla, _, msg = extract_on_info
 
-    [ ca, mo, ke ]
+    msg =~ c1 || kla =~ c1
   end
 end