flor 1.5.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352d4347077550a9e577689e8b1f11ad90b7efb0d6fa14e99a228b634852c55f
-  data.tar.gz: 81015d54353ff68b48108e09fdfc8933cae2b20ed48ccba1679bebc1b67258da
+  metadata.gz: 162cdcdf2bca8c6f41feb24643e32306cd65183d30a3a6562b8a1d51b151192e
+  data.tar.gz: 48c5664d39b6efc8783121806cfd7faa24f26714e00a1a5af9694ca9dd68d09e
 SHA512:
-  metadata.gz: c322beec0f868fbf72c79678227cbf2a2fea34611fe340b1fdd680a7d6b1f5a09246af1a78f6923977a061772ef22fc8d20d2d13a0bad2145991f296b4cfd143
-  data.tar.gz: 3c3e2ce6a88acbaeeab0bb9d89f8c22e5dfd8fb1a81491f0d54983d21d692e3cd93262c842ed8dbc00e021b2fee1d5f3e3e791d8af72bfc6667c472d712d3541
+  metadata.gz: 94825467c26f7cb714bd0744979023164655eed579d19b6662a2e7b75d8fa7dc170f21c4ff5ce6e3d12fcd53b90a86999fcd10389481edf362a0c7ab4d469481
+  data.tar.gz: 8c4f9c54c2284f6fd72ecfc1d6f9f83e7a436f446ae2eec06efd8978aaf34e609f1a8d06f3320b384a01fe64c702abaf8c20c87080830f745ee0dfb7d12f4ec5

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 # CHANGELOG.md
 
 
+## flor 1.6.1  released 2023-10-20
+
+* Use djan in Flor.msg_to_detail_s(executor, message)
+* Accept --djan to flotojson.rb
+
+
+## flor 1.6.0  released 2023-01-13
+
+* Add #fei to Message, Pointer, Timer, Trace and Trap models
+* Allow for // comments in Flor language
+* Call post_task when tasker hands back task
+
+
 ## flor 1.5.0  released 2021-11-24
 
 * Add storage callbacks `on(:pointers, :any) { do_that }`

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2015-2021, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2015-2023, 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

@@ -1,10 +1,10 @@
 
 ## gem tasks ##
 
-NAME = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name")
-VERSION = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version")
+NAME != \
+  ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name"
+VERSION != \
+  ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version"
 
 count_lines:
 	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"

data/README.md

@@ -6,7 +6,6 @@
 
 Flor is a "Ruby workflow engine", if that makes any sense.
 
-* [![Join the chat at https://gitter.im/floraison/flor](https://badges.gitter.im/floraison/flor.svg)](https://gitter.im/floraison/flor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 * [floraison mailing list](https://groups.google.com/forum/#!forum/floraison)
 * [twitter.com/@flor_workflow](https://twitter.com/flor_workflow)
 
@@ -47,7 +46,7 @@ require 'flor/unit'
   # uncomment to see the flor activity
 
 sto_uri = 'sqlite://flor_qs.db'
-sto_uri = 'jdbc:sqlite://flor_qs.db' if RUBY_PLATFORM.match(/java/)
+sto_uri = 'jdbc:sqlite://flor_qs.db' if RUBY_PLATFORM.match?(/java/)
 
 flor = Flor::Unit.new(loader: Flor::HashLoader, sto_uri: sto_uri)
   # instantiate flor unit

data/lib/flor/colours.rb

@@ -27,7 +27,7 @@ module Flor
   class Colours
 
     Flor::COLS.each do |k, v|
-      if v.match(/\A\d/)
+      if v.match(/\A\d/) # Ruby 2.3 doesn't have String#match?
         class_eval(%{
           def #{k}(s=nil)
            s ? "[#{v}m" + s + "" : "[#{v}m"
@@ -42,7 +42,7 @@ module Flor
   class NoColours
 
     Flor::COLS.each do |k, v|
-      if v.match(/\A\d/)
+      if v.match(/\A\d/) # Ruby 2.3 doesn't have String#match?
         class_eval("def #{k}(s=''); s; end")
       else
         class_eval("alias #{k} #{v}")

data/lib/flor/flor.rb

@@ -199,7 +199,7 @@ module Flor
     def is_array_of_messages?(o)
 
       o.is_a?(Array) &&
-      o.all? { |e| is_message?(o) }
+      o.all? { |e| is_message?(e) }
     end
 
     def h_fetch(h, *keys)

data/lib/flor/log.rb

@@ -337,13 +337,18 @@ module Flor
       o.puts "#{_c.rs}#{_c.dg}<Flor.msg_to_detail_s>"
 
       o.puts "#{_c.dg}message:#{_c.yl}"
-      o.puts YAML.dump(m)
+      #o.puts YAML.dump(m)
+      o.puts(Flor.to_djan(m, indent: 2, width: true))
 
       o.puts "#{_c.dg}tree:#{_c.yl}"
       o.puts(tree_to_s(node.lookup_tree(nid), nid, out: o)) if node
 
       o.puts "#{_c.dg}node:#{_c.yl}"
-      o.puts n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil'
+      #o.puts n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil'
+      o.puts(
+        n ?
+        Flor.to_djan(n.merge('tree' => '(above)'), indent: 2, width: true) :
+        'nil')
 
       o.puts "#{_c.dg}nodes:#{_c.yl}"
       o.puts nods_to_s(executor, m, opts)

data/lib/flor/parser.rb

@@ -6,6 +6,9 @@ module Flor
 
 #Raabro.pp(Flor::Parser.parse(input, debug: 2), colours: true)
 #Raabro.pp(Flor::Parser.parse(input, debug: 3), colours: true)
+  #
+  # turn one or the other when debugging the parser...
+
     opts = fname if fname.is_a?(Hash) && opts.empty?
 
     if r = Flor::Parser.parse(input, opts)
@@ -49,7 +52,7 @@ module Flor
     def semicolon(i); str(nil, i, ';'); end
     def comma(i); str(nil, i, ','); end
     def dquote(i); str(nil, i, '"'); end
-    def slash(i); str(nil, i, '/'); end
+    def slash(i); rex(nil, i, /\/(?!\/)/); end
     def dollar(i); str(nil, i, '$'); end
     def pipepipe(i); str(nil, i, '||'); end
 
@@ -95,7 +98,11 @@ module Flor
       seq(nil, i, :dot, :rf_symbol)
     end
     def rf_index(i); alt(nil, i, :rf_dot_idx, :rf_sqa_idx); end
-    def rf_symbol(i); rex(:refsym, i, /[^.:;| \b\f\n\r\t"',()\[\]{}#\\]+/); end
+      #
+    def rf_symbol(i)
+      rex(:refsym, i, /([^.:;| \b\f\n\r\t"',()\[\]{}#\\\/]|\/(?!\/))+/)
+        # anything but... a slash is ok, but not a double slash...
+    end
       #
     def reference(i); seq(:ref, i, :rf_symbol, :rf_index, '*'); end
 
@@ -165,7 +172,7 @@ module Flor
       }x)
     end
 
-    def comment(i); rex(nil, i, /#[^\r\n]*/); end
+    def comment(i); rex(nil, i, /(#|\/\/)[^\r\n]*/); end
 
     def eol(i); seq(nil, i, :wstar, :comment, '?', :rnstar); end
     def eol_wstar(i); seq(nil, i, :wstar, :comment, '?', :rnstar, :wstar); end
@@ -210,7 +217,7 @@ module Flor
     #  %w[ equ == != <> ], %w[ lgt < > <= >= ], %w[ sum + - ], %w[ prd * / % ],
 
     def ssmod(i); str(:sop, i, /%/); end
-    def ssprd(i); rex(:sop, i, /[\*\/]/); end
+    def ssprd(i); rex(:sop, i, /(\*|\/(?!\/))/); end
     def sssum(i); rex(:sop, i, /[+-]/); end
     def sslgt(i); rex(:sop, i, /(<=?|>=?)/); end
     def ssequ(i); rex(:sop, i, /(==?|!=|<>)/); end

data/lib/flor/pcore/cursor.rb

@@ -62,6 +62,10 @@ class Flor::Pro::Cursor < Flor::Procedure
   #
   # ## cursor and start: / initial: attribute
   #
+  # Sometimes, it is necessary to enter a cursor not at its first child, but
+  # its second or third. Once such a cursor is entered and a `continue` is
+  # met it will "rewind" to the first child (not the "start" child).
+  #
   # ```
   # task 'create mandate'
   # cursor start: 'approve mandate'
@@ -71,6 +75,15 @@ class Flor::Pro::Cursor < Flor::Procedure
   # task 'activate mandate'
   # ```
   #
+  # The string passed to start:/initial: is looked up (down) in the cursor
+  # in the order: (example `cursor start: 'bravo'`)
+  #
+  # * tag (for example `push l 'b' tag: 'bravo'`)
+  # * string argument (for example `task 'toto' context: 'bravo'`)
+  # * string target (for example `task 'bravo'`)
+  # * name target (for example `bravo _`)
+  # * att target (for example `task 'toto' bravo: 'ok'`)
+  #
   # ## see also
   #
   # Break, continue, loop.

data/lib/flor/tools/flotojson.rb

@@ -22,7 +22,12 @@ if (ARGV & [ '-h', '--help']).any?
   puts "    --jp    pretty prints the JSON output"
   puts
   puts "    -y"
-  puts "    -yaml   dumps as YAML"
+  puts "    --yaml   dumps as YAML"
+  puts
+  puts "    -d"
+  puts "    --djan   dumps as djan"
+  puts
+  puts "    --json   dumps as JSON (it's the default)"
   puts
   puts "    -h"
   puts "    --help  prints this help message"
@@ -84,6 +89,10 @@ elsif flags['--jp'] || flags['--pj']
         )
 elsif flags['-y'] || flags['--yaml']
   puts YAML.dump(tree)
+elsif flags['-d'] || flags['--djan']
+  puts(Flor.to_djan(tree, indent: 2, width: true))
+elsif flags['--json']
+  puts JSON.dump(tree)
 else
   puts JSON.dump(tree)
 end

data/lib/flor/unit/caller.rb

@@ -110,10 +110,16 @@ module Flor
       pt = message['point']
 
       ms = [ "call_#{pt}", "on_#{pt}", :on_message, :on, pt ]
-      ms = ms + [ :on_cancel, :cancel ] if pt == 'detask'
+      case pt
+      when 'detask' then ms = ms + [ :on_cancel, :cancel ]
+      when 'return' then ms = [ :on_return, :return, :post_task ] # /!\
+      end
 
       m = ms.find { |mm| o.respond_to?(mm) }
 
+      return [ message ] if pt == 'return' && ! m
+        # don't call if :post_task not present
+
       fail(
         "#{k.class.to_s.downcase} #{k} doesn't respond to " +
         ms[0..-2].collect { |e| "##{e}" }.join(', ') + ", or ##{ms[-1]}"
@@ -316,10 +322,12 @@ module Flor
 
     def to_messages(o)
 
-      case o
-      when Hash then [ o ]
-      when Array then o
-      else []
+      if Flor.is_array_of_messages?(o)
+        o
+      elsif Flor.is_message?(o)
+        [ o ]
+      else
+        []
       end
     end
 

data/lib/flor/unit/executor.rb

@@ -48,7 +48,7 @@ module Flor
 
     protected
 
-    CLOSING_POINTS = %w[ task terminated ceased ]
+    CLOSING_POINTS = %w[ task terminated ceased ].freeze
       #
       # point for messages that, after consumption, are conserved
       # in the execution's "closing_messages" array
@@ -160,14 +160,18 @@ module Flor
     def return(message)
 
       n = @execution['nodes'][message['nid']] || {}
-      m = n['message'] || {}
-      c = m['cause']
+      c = (n['message'] || {})['cause']
 
-      rm = message.dup
-      rm['point'] = 'receive'
-      rm['cause'] = c if c # preserve 'cause' for routing
+      ms =
+        if n['task']
+          @unit.ganger.task(self, message)
+        else
+          [ message.dup ]
+        end
 
-      [ rm ]
+      ms.each { |m|
+        m['point'] = 'receive'
+        m['cause'] = c if c }
     end
 
     def schedule(message)

data/lib/flor/unit/ganger.rb

@@ -47,16 +47,14 @@ module Flor
     def task(executor, message)
 
       domain = message['exid'].split('-', 2).first
-      tname = message['tasker']
+      #tname = message['tasker']
+      tname = determine_tasker_name(executor, message)
 
       tconf =
         ( ! message['routed'] &&
          (@unit.loader.tasker(domain, 'ganger', message) ||
           @unit.loader.tasker(domain, 'tasker', message))) ||
         @unit.loader.tasker(domain, tname, message)
-#puts "=" * 80
-#pp tconf
-#puts "=" * 80
 
       fail ArgumentError.new(
         "tasker #{tname.inspect} not found"
@@ -66,6 +64,7 @@ module Flor
 
         points = [ nil, message['point'] ]
         points << 'detask' if points.include?('cancel')
+        points << 'task' if points.include?('return')
 
         tconf = tconf.find { |h| points.include?(h['point']) }
       end
@@ -154,6 +153,17 @@ module Flor
 
       vars
     end
+
+    def determine_tasker_name(executor, message)
+
+      tname = message['tasker']
+
+      return tname if tname
+
+      n = executor.node(message)
+
+      n['task']['tasker']
+    end
   end
 end
 

data/lib/flor/unit/models/message.rb

@@ -24,6 +24,8 @@ module Flor
     def nid; data['nid']; end
     def tasker; data['tasker']; end
     alias payload data
+
+    def fei; [ exid, nid ].join('-') rescue nil; end
   end
 end
 

data/lib/flor/unit/models/pointer.rb

@@ -29,6 +29,8 @@ module Flor
     #    # we don't care, pointers are cleaned anyway when the flow dies
     #end
 
+    def fei; [ exid, nid ].join('-'); end
+
     # If the pointer is a "var" pointer, returns the full value
     # for the variable, as found in the execution's node "0".
     #

data/lib/flor/unit/models/timer.rb

@@ -27,6 +27,8 @@ module Flor
     #  index [ :exid, :nid ]
     #end
 
+    def fei; [ exid, nid ].join('-'); end
+
     def to_trigger_message
 
       d = self.data(false)

data/lib/flor/unit/models/trace.rb

@@ -17,6 +17,8 @@ module Flor
     #
     #  index :exid
     #end
+
+    def fei; [ exid, nid ].join('-') rescue nil; end
   end
 end
 

data/lib/flor/unit/models/trap.rb

@@ -34,6 +34,8 @@ module Flor
     #  index [ :exid, :nid ]
     #end
 
+    def fei; [ exid, nid ].join('-') rescue nil; end
+
     def to_hook
 
       opts = {}

data/lib/flor/unit/storage.rb

@@ -908,11 +908,11 @@ module Flor
       fail ArgumentError.new("no 'sto_uri' conf, cannot connect to db") \
         unless uri
 
-      return Kernel.const_get(uri) \
-        if uri.is_a?(String) && uri.match(/\A[A-Z]+\z/)
-          # for cases where uri == 'DB'
-
-      Sequel.connect(uri)
+      begin
+        Kernel.const_get(uri)
+      rescue NameError
+        Sequel.connect(uri)
+      end
     end
 
     def connect

data/lib/flor/unit/taskers.rb

@@ -169,9 +169,12 @@ module Flor
 
       pt = @message['point']
 
-      ms = [ "post_#{pt}" ]; ms << :post_cancel if pt == 'detask'
+      #ms = [ "post_#{pt}" ]; ms << :post_cancel if pt == 'detask'
+      #call_one_of(ms)
         #
-      call_one_of(ms)
+        # :post_task is called by, well, the caller
+        #
+      call_one_of([ :post_detask, :post_cancel ]) if pt == 'detask'
 
       msg = derive_message(message)
 

data/lib/flor.rb

@@ -16,7 +16,7 @@ require 'dense'
 
 module Flor
 
-  VERSION = '1.5.0'
+  VERSION = '1.6.1'
 end
 
 require 'flor/colours'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - John Mettraux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -290,7 +290,7 @@ metadata:
   mailing_list_uri: https://groups.google.com/forum/#!forum/floraison
   homepage_uri: https://github.com/floraison/flor
   source_code_uri: https://github.com/floraison/flor
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -305,8 +305,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: A Ruby workflow engine
 test_files: []