flor 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3016e8a2b0cf63ad1ccb0aa5a057bee3c4c99b6fd8889e5f4d5c9b8d84319295
-  data.tar.gz: 9bf212da214adefa0f413277d74f13cfc8b8c3585962378d4279f45324cff2d7
+  metadata.gz: 726f12169dd650e862f4fdcf7f08da2e08f9a06ccf9f9125b2ad0340b4003b1f
+  data.tar.gz: 4864b67e47ee79e8a9b220e2465d23343e554102fd8a8fbdac6dad16eef9327c
 SHA512:
-  metadata.gz: f17775b3282df1f8dfe02660422c14fad2c30815d80a1d242010d44715fad171543bd239371c43a3dcbdb2f9781eba2f3853a3dab0aa441e7cb0422cbdf1f06a
-  data.tar.gz: 74d3fec7573d8a1c7b80a5cd5c100516a71b2903f51635d7b22a4b644e3865528eea7e38a1c75d0ec4df1e45b88e8b404edae47f54c3697c886e06d502ae388f
+  metadata.gz: 82a526fd4cd0c6185e3778e4b1421c6f120fa3b0a3c3591a54fb7ddb2ddae7943302409a5b1fe1bec118882ebaf125cdd6b35895f442d58b32068c80e17497b4
+  data.tar.gz: 80ab4a60ca328565ce463459ee610face1f9d513da541392c1d6c7b8bf0906c9271120dd1dbd94ea66589eda8c3112233f817d1ef6a38eb931bece7eda1cac7a

data/CHANGELOG.md

@@ -2,7 +2,21 @@
 # CHANGELOG.md
 
 
-## flor 1.6.2  released 2012-12-03
+## flor 1.6.4  released 2025-09-18
+
+* Introduce `del` and `delf` to delete vars and fields
+* Fix cursor/move vs symbol target
+
+
+## flor 1.6.3  released 2025-05-29
+
+* Stop Scheduler#notify swallowing errors, gh-43
+* Rework max_execution_count conf and use, gh-41
+* Introduce Flor.pp(o, opts={}) and Flor.pp_to_s
+* Set skip_transaction: true when reimporting ptrs
+
+
+## flor 1.6.2  released 2023-12-03
 
 * Prevent djan failing on negative indent for hash keys
 

data/CREDITS.md

@@ -3,6 +3,7 @@
 
 ## Contributors
 
+* pscholze - https://github.com/pscholze
 * Olle Jonsson - https://github.com/olleolleolle
 * Ryan Scott - https://github.com/Subtletree
 * Jeffrey Hicks - https://github.com/jrhicks

data/LICENSE.txt

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

@@ -6,8 +6,10 @@
 
 Flor is a "Ruby workflow engine", if that makes any sense.
 
+<!--
 * [floraison mailing list](https://groups.google.com/forum/#!forum/floraison)
 * [twitter.com/@flor_workflow](https://twitter.com/flor_workflow)
+-->
 
 
 ## use
@@ -36,7 +38,7 @@ Using flor in your Ruby project requires you to clearly separate business proces
 
 ## quickstart
 
-This quickstart sets up a flor unit tied to a SQLite database, resets the databse, binds two taskers and then launches a flow execution involving the two taskers. Finally, it prints out the resulting workitem as the execution has just terminated.
+This quickstart sets up a flor unit tied to a SQLite database, resets the database, binds two taskers and then launches a flow execution involving the two taskers. Finally, it prints out the resulting workitem as the execution has just terminated.
 
 ```ruby
 require 'flor/unit'
@@ -94,7 +96,7 @@ p r['payload']['log']
 
 This quickstart is at [doc/quickstart0/](doc/quickstart0/), it's a minimal, one-file Ruby quickstart.
 
-There is also [doc/quickstart1/](doc/quickstart1/), a more complex example, that shows a flor setup, where taskers and flows are layed out in a flor directory tree.
+There is also [doc/quickstart1/](doc/quickstart1/), a more complex example, that shows a flor setup, where taskers and flows are laid out in a flor directory tree.
 
 
 ## documentation
@@ -114,6 +116,8 @@ See [doc/](doc/).
 * [floraison/flack](https://github.com/floraison/flack) - a flor wrapping [Rack](https://github.com/rack/rack) app
 * [floraison/fugit](https://github.com/floraison/fugit) - a time library for flor and [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler)
 * [floraison/raabro](https://github.com/floraison/raabro) - the PEG library flor uses for its parsing needs
+* [kiebor81/flor-language-service](https://github.com/kiebor81/flor-language-service) - a Visual Studio Code language service for the Flor language
+* [flor.vim](https://github.com/floraison/flor/blob/master/misc/flor.vim) - a Vim syntax file for flor
 
 
 ## blog posts and presentations
@@ -138,10 +142,13 @@ There are various other Ruby and Ruby on Rails projects about workflows and busi
 * [Petri Flow](https://github.com/hooopo/petri_flow) - "Petri Net Workflow Engine for Ruby" (Rails)
 * [Pallets](https://github.com/linkyndy/pallets) - "Simple and reliable workflow engine, written in Ruby"
 * [Gush](https://github.com/chaps-io/gush) - "Fast and distributed workflow runner using ActiveJob and Redis"
+* [Rukawa](https://github.com/joker1007/rukawa) - Hyper simple workflow engine powered by concurrent-ruby
+* [ChronoForge](https://github.com/radioactive-labs/chrono_forge) - durable workflow engine for Ruby on Rails that provides reliable state management, error recovery, and workflow orchestration through ActiveJob
+* [StepperMotor](https://github.com/stepper-motor/stepper_motor) - Effortless step workflows for Rails
 
 There is a [workflow engine](https://ruby.libhunt.com/categories/5786-workflow-engine) category on [Awesome Ruby](https://ruby.libhunt.com/).
 
-If you want your engine/library to be added in this list, don't hesitate to ask me on [Gitter](https://gitter.im/floraison/flor) or via a pull request.
+If you want your engine/library to be added in this list, don't hesitate to ask me on via an [issue](https://github.com/floraison/flor/issues) or a pull request.
 
 It's not limited to Ruby, but there is a wider list at [meirwah/awesome-workflow-engines](https://github.com/meirwah/awesome-workflow-engines).
 

data/flor.gemspec

@@ -40,7 +40,7 @@ A Ruby workflow engine (ruote next generation)
   #s.add_runtime_dependency 'rufus-lru', '~> 1.1'
   s.add_runtime_dependency 'munemo', '~> 1.0' # >= 1.0 and < 2
   s.add_runtime_dependency 'raabro', '~> 1.1' # >= 1.1 and < 2
-  s.add_runtime_dependency 'fugit', '~> 1.2' # >= 1.2 and < 2
+  s.add_runtime_dependency 'fugit', '~> 1.10', '>= 1.11.1' # >= 1.2 and < 2
   s.add_runtime_dependency 'dense', '~> 1.1' # >= 1.1 and < 2
 
   s.add_runtime_dependency 'sequel', '~> 5.0' # >= 5.0 and < 6

data/lib/flor/colours.rb

@@ -53,78 +53,78 @@ module Flor
   @colours = Colours.new
   @no_colours = NoColours.new
 
-  def self.no_colours
+  class << self
 
-    @no_colours
-  end
+    def no_colours
 
-  def self.colours(opts={})
+      @no_colours
+    end
 
-    #opts =
-    #  case opts
-    #  when Hash then opts
-    #  when Colours, NoColours then { color: opts }
-    #  else { out: opts }
-    #  end
+    def colours(opts={})
 
-    c = nil;
-      [ :color, :colour, :colors, :colours ].each do |k|
-        if opts.has_key?(k); c = opts[k]; break; end
-      end
+      #opts =
+      #  case opts
+      #  when Hash then opts
+      #  when Colours, NoColours then { color: opts }
+      #  else { out: opts }
+      #  end
 
-    return @colours if c == true
-    return @no_colours if c == false
+      c = nil;
+        [ :color, :colour, :colors, :colours ].each do |k|
+          if opts.has_key?(k); c = opts[k]; break; end
+        end
 
-    o = opts[:out] || $stdout
+      return @colours if c == true
+      return @no_colours if c == false
 
-    return @colours if (
-      (o.respond_to?(:log_colours?) ? o.log_colours? : o.tty?) ||
-      ($0[-6..-1] == '/rspec' &&
-        (ARGV.include?('--tty') || ARGV.include?('--color'))))
+      o = opts[:out] || $stdout
 
-    @no_colours
-  end
+      return @colours if (
+        (o.respond_to?(:log_colours?) ? o.log_colours? : o.tty?) ||
+        ($0[-6..-1] == '/rspec' &&
+          (ARGV.include?('--tty') || ARGV.include?('--color'))))
 
-  def self.decolour(s)
+      @no_colours
+    end
 
-    s.gsub(/\x1b\[\d+(;\d+)?m/, '')
-  end
+    def decolour(s)
 
-  def self.no_colour_length(s)
+      s.gsub(/\x1b\[\d+(;\d+)?m/, '')
+    end
 
-    decolour(s).length
-  end
+    def no_colour_length(s)
 
-  def self.truncate_string(s, maxlen, post='...')
+      decolour(s).length
+    end
 
-    ncl = no_colour_length(s)
-    r = StringIO.new
-    l = 0
+    def truncate_string(s, maxlen, post='...')
 
-    s.scan(/(\x1b\[\d+(?:;\d+)?m|[^\x1b]+)/) do |ss, _|
-      if ss[0, 1] == ""
-        r << ss
-      else
+      ncl = no_colour_length(s)
+      r = StringIO.new
+      l = 0
+
+      s.scan(/(\x1b\[\d+(?:;\d+)?m|[^\x1b]+)/) do |ss, _|
+        if ss[0, 1] == ""
+          r << ss
+        else
 #p({ r: r.string, l: l, ssl: ss.length, maxlen: maxlen, reml: maxlen - l })
-        ss = ss[0, maxlen - l]
-        r << ss
-        l += ss.length
-        break if l >= maxlen
+          ss = ss[0, maxlen - l]
+          r << ss
+          l += ss.length
+          break if l >= maxlen
+        end
       end
-    end
 
-    return r.string if l < maxlen
-
-    if post.is_a?(String)
-      r << post
-    elsif post.is_a?(Proc)
-      r << post.call(ncl, maxlen, s)
-    end
+      return r.string if l < maxlen
 
-    r.string
-  end
+      if post.is_a?(String)
+        r << post
+      elsif post.is_a?(Proc)
+        r << post.call(ncl, maxlen, s)
+      end
 
-  class << self
+      r.string
+    end
 
     alias decolor decolour
 

data/lib/flor/conf.rb

@@ -30,8 +30,8 @@ module Flor
     #   reload/resync with db after how much time? (defaults to 60 (seconds))
     #   minimizes communication with db in idle periods
     #
-    # * :sch_max_executors
-    #   How many executor thread at most? (defaults to 7, 1 is OK in certain
+    # * :sch_max_executors or :sch_max_executor_count
+    #   How many executor threads at most? (defaults to 7, 1 is OK in certain
     #   environments)
     #
     # * :exe_max_messages
@@ -101,7 +101,7 @@ module Flor
           c.merge!(interpret_env)
         end
 
-        c.merge!(over_conf)
+        c.merge!(Flor.to_string_keyed_hash(over_conf))
       end
 
       def get_class(conf, key)

data/lib/flor/core/executor.rb

@@ -156,7 +156,7 @@ module Flor
       end
         #
         # vars: variables
-        # vdomain: variable domain (used in conjuction with the loader)
+        # vdomain: variable domain (used in conjunction with the loader)
         # cnid: closure nid
         # dbg: used to debug messages (useful @node['dbg'] when 'receive')
 

data/lib/flor/core/procedure.rb

@@ -737,23 +737,28 @@ class Flor::Procedure < Flor::Node
       node = lookup_var_node(@node, mode, path)
       node = lookup_var_node(@node, 'l', path) if node.nil? && mode == ''
 
-      return Dense.set(node['vars'], path, v) if node
+      if node
+        return Dense.unset(node['vars'], path) if v == :UNSET
+        return Dense.set(node['vars'], path, v)
+      end
 
     rescue IndexError
     end
 
     fail IndexError.new(
-      "couldn't set var #{Flor.path_to_s([ "#{mode}v" ] + path)}")
+      "couldn't #{v == :UNSET ? 'un' : ''}set var " +
+      "#{Flor.path_to_s([ "#{mode}v" ] + path)}")
   end
 
   def set_field(path, v)
 
+    return Dense.unset(payload.copy, path) if v == :UNSET
     Dense.set(payload.copy, path, v)
 
   rescue IndexError
 
     fail IndexError.new(
-      "couldn't set field #{Flor.path_to_s(path)}")
+      "couldn't #{v == :UNSET ? 'un' : ''}set field #{Flor.path_to_s(path)}")
   end
 
   def set_value(path, value)
@@ -775,6 +780,11 @@ class Flor::Procedure < Flor::Node
     end
   end
 
+  def unset_value(path)
+
+    set_value(path, :UNSET)
+  end
+
   def splat_value(paths, value)
 
     val = value.dup
@@ -872,7 +882,7 @@ class Flor::Procedure < Flor::Node
   end
 
   # Called by the executor, in turns call cancel and cancel_when_ methods
-  # which may be overriden.
+  # which may be overridden.
   #
   def do_cancel
 
@@ -908,7 +918,7 @@ class Flor::Procedure < Flor::Node
   end
 
   # Called by the executor, in turns call kill and kill_when_ methods
-  # which may be overriden.
+  # which may be overridden.
   #
   def do_kill
 
@@ -941,7 +951,7 @@ class Flor::Procedure < Flor::Node
     [] # no effect
   end
 
-  # The core cancel work, is overriden by some procedure implementations.
+  # The core cancel work, is overridden by some procedure implementations.
   #
   def cancel
 

data/lib/flor/core/texecutor.rb

@@ -20,12 +20,12 @@ module Flor
         @archive = nil
       end
 
-      def notify(executor, msg)
+      def notify(executor, message)
 
-        return [] if msg['consumed']
+        return [] if message['consumed']
 
-        @logger.notify(executor, msg)
-        @journal << msg
+        @logger.notify(executor, message)
+        @journal << message
 
         []
       end

data/lib/flor/core.rb

@@ -2,80 +2,93 @@
 
 module Flor
 
-  def self.generate_exid(domain, unit)
+  class << self
 
-    @exid_counter ||= 0
-    @exid_mutex ||= Mutex.new
+    def generate_exid(domain, unit)
 
-    t = Time.now.utc
+      @exid_counter ||= 0
+      @exid_mutex ||= Mutex.new
 
-    sus =
-      @exid_mutex.synchronize do
+      t = Time.now.utc
 
-        sus = t.sec * 100000000 + t.usec * 100 + @exid_counter
+      sus =
+        @exid_mutex.synchronize do
 
-        @exid_counter = @exid_counter + 1
-        @exid_counter = 0 if @exid_counter > 99
+          sus = t.sec * 100000000 + t.usec * 100 + @exid_counter
 
-        Munemo.to_s(sus)
-      end
+          @exid_counter = @exid_counter + 1
+          @exid_counter = 0 if @exid_counter > 99
 
-    t = t.strftime('%Y%m%d.%H%M')
+          Munemo.to_s(sus)
+        end
 
-    "#{domain}-#{unit}-#{t}.#{sus}"
-  end
+      t = t.strftime('%Y%m%d.%H%M')
 
-  def self.make_launch_msg(exid, tree, opts)
+      "#{domain}-#{unit}-#{t}.#{sus}"
+    end
 
-    t =
-      tree.is_a?(String) ?
-      Flor.parse(tree, opts[:fname] || opts[:path], opts) :
-      tree
+    def make_launch_msg(exid, tree, opts)
 
-    unless t
+      t =
+        tree.is_a?(String) ?
+        Flor.parse(tree, opts[:fname] || opts[:path], opts) :
+        tree
 
-      #h = opts.merge(prune: false, rewrite: false, debug: 0)
-      #Raabro.pp(Flor.parse(tree, h[:fname], h))
-        # TODO re-parse and indicate what went wrong...
+      unless t
+
+        #h = opts.merge(prune: false, rewrite: false, debug: 0)
+        #Raabro.pp(Flor.parse(tree, h[:fname], h))
+          # TODO re-parse and indicate what went wrong...
+
+        fail ArgumentError.new(
+          "flow parsing failed: " + tree.inspect[0, 35] + '...')
+      end
+
+      pl = opts[:payload] || opts[:fields] || {}
+      vs = opts[:variables] || opts[:vars] || {}
 
       fail ArgumentError.new(
-        "flow parsing failed: " + tree.inspect[0, 35] + '...')
-    end
+        "given launch payload should be a Hash, but it's a #{pl.class}"
+      ) unless pl.is_a?(Hash)
+      fail ArgumentError.new(
+        "given launch variables should come in a Hash, but it's a #{vs.class}"
+      ) unless vs.is_a?(Hash)
 
-    pl = opts[:payload] || opts[:fields] || {}
-    vs = opts[:variables] || opts[:vars] || {}
+      msg = {
+        'point' => 'execute',
+        'exid' => exid,
+        'nid' => '0',
+        'tree' => t,
+        'payload' => pl,
+        'vars' => vs }
 
-    fail ArgumentError.new(
-      "given launch payload should be a Hash, but it's a #{pl.class}"
-    ) unless pl.is_a?(Hash)
-    fail ArgumentError.new(
-      "given launch variables should come in a Hash, but it's a #{vs.class}"
-    ) unless vs.is_a?(Hash)
+      msg['vdomain'] = opts[:vdomain] \
+        if opts.has_key?(:vdomain)
 
-    msg = {
-      'point' => 'execute',
-      'exid' => exid,
-      'nid' => '0',
-      'tree' => t,
-      'payload' => pl,
-      'vars' => vs }
+      msg
+    end
 
-    msg['vdomain'] = opts[:vdomain] \
-      if opts.has_key?(:vdomain)
+    def load_procedures(dir)
 
-    msg
-  end
+      dirpath =
+        if dir.match(/\A[.\/]/)
+          File.join(dir, '*.rb')
+        else
+          File.join(File.dirname(__FILE__), dir, '*.rb')
+        end
 
-  def self.load_procedures(dir)
+      Dir[dirpath].sort.each { |path| require(path) }
+    end
 
-    dirpath =
-      if dir.match(/\A[.\/]/)
-        File.join(dir, '*.rb')
-      else
-        File.join(File.dirname(__FILE__), dir, '*.rb')
-      end
+    def pp(o, opts={})
 
-    Dir[dirpath].sort.each { |path| require(path) }
+      puts Flor.to_djan(o, { indent: 2, width: true }.merge(opts))
+    end
+
+    def pp_to_s(o, opts={})
+
+      Flor.to_djan(o, { indent: 2, width: true }.merge(opts))
+    end
   end
 end
 

data/lib/flor/parser.rb

@@ -697,42 +697,45 @@ fail "don't know how to invert #{operation.inspect}" # FIXME
     alias rewrite_panode rewrite_flor
   end # module Parser
 
-  def self.unescape_u(cs)
+  class << self
 
-    s = ''; 4.times { s << cs.next }
+    def unescape_u(cs)
 
-    [ s.to_i(16) ].pack('U*')
-  end
+      s = ''; 4.times { s << cs.next }
+
+      [ s.to_i(16) ].pack('U*')
+    end
 
-  def self.unescape(s)
+    def unescape(s)
 
-    sio = StringIO.new
+      sio = StringIO.new
 
-    cs = s.each_char
+      cs = s.each_char
 
-    loop do
+      loop do
 
-      c = cs.next
+        c = cs.next
 
-      break unless c
+        break unless c
 
-      if c == '\\'
-        case cn = cs.next
-        when 'u' then sio.print(unescape_u(cs))
-        when '\\', '"', '\'' then sio.print(cn)
-        when 'b' then sio.print("\b")
-        when 'f' then sio.print("\f")
-        when 'n' then sio.print("\n")
-        when 'r' then sio.print("\r")
-        when 't' then sio.print("\t")
-        else sio.print("\\#{cn}")
+        if c == '\\'
+          case cn = cs.next
+          when 'u' then sio.print(unescape_u(cs))
+          when '\\', '"', '\'' then sio.print(cn)
+          when 'b' then sio.print("\b")
+          when 'f' then sio.print("\f")
+          when 'n' then sio.print("\n")
+          when 'r' then sio.print("\r")
+          when 't' then sio.print("\t")
+          else sio.print("\\#{cn}")
+          end
+        else
+          sio.print(c)
         end
-      else
-        sio.print(c)
       end
-    end
 
-    sio.string
+      sio.string
+    end
   end
 end
 

data/lib/flor/pcore/andor.rb

@@ -11,7 +11,7 @@ class Flor::Pro::Andor < Flor::Procedure
   # and
   #   false
   #   true
-  #     # => evalutes to false
+  #     # => evaluates to false
   # ```
   #
   # ```

data/lib/flor/pcore/apply.rb

@@ -13,7 +13,7 @@ class Flor::Pro::Apply < Flor::Procedure
   #   apply sum 1 2
   # ```
   #
-  # It is usually used implicitely, as in
+  # It is usually used implicitly, as in
   # ```
   # sequence
   #   define sum a b

data/lib/flor/pcore/break.rb

@@ -7,8 +7,8 @@ class Flor::Pro::Break < Flor::Procedure
   # ```
   # until false
   #   # do something
-  #   continue if f.x == 0
-  #   break if f.x == 1
+  #   continue _ if f.x == 0
+  #   break _ if f.x == 1
   #   # do something more
   # ```
   #
@@ -50,7 +50,7 @@ class Flor::Pro::Break < Flor::Procedure
   #
   # While, until, loop and cursor.
 
-  name 'break', 'continue'
+  names %w[ break continue ]
 
   def pre_execute
 

data/lib/flor/pcore/case.rb

@@ -88,7 +88,7 @@ class Flor::Pro::Case < Flor::Procedure
   #
   # ### defaulting to f.ret
   #
-  # When nothing is explicitely provided for consideration by "case", the
+  # When nothing is explicitly provided for consideration by "case", the
   # incoming `f.ret` is used.
   #
   # ```

data/lib/flor/pcore/cursor.rb

@@ -191,6 +191,7 @@ class Flor::Pro::Cursor < Flor::Procedure
     find_string_target(to) ||
     find_name_target(to) ||
     find_att_target(to) ||
+    #find_att_value_target(to) ||
     fail(Flor::FlorError.new("move target #{to.inspect} not found", self))
   end
 
@@ -246,7 +247,16 @@ class Flor::Pro::Cursor < Flor::Procedure
         c[1].find { |cc|
           cc[0] == '_att' &&
           cc[1].is_a?(Array) &&
-          cc[1][0][0, 2] == [ 'here', [] ] } } # FIXME hardcoded...
+          cc[1][0][0, 2] == [ to, [] ] } }
   end
+
+  #def find_att_value_target(to)
+  #  tree[1]
+  #    .index { |c|
+  #      c[1].find { |cc|
+  #        cc[1].length == 2 &&
+  #        cc[1][0][0] != 'to' &&
+  #        Flor.is_string_tree?(cc[1][1], to) } }
+  #end
 end