flor 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1f76874a9957b7c15c59baf997e0e60ff4872b9109a7cd741692735a94565c
-  data.tar.gz: 7fd1552910609023dd8bce0de0d5b5fc1ebc5ae1674fc27f0d0cb932c4bab2a7
+  metadata.gz: 1e6d591b2767c85e10b697b1839fb9142b52d0409bca73da41baa571f4e3aa8b
+  data.tar.gz: 6e9b4d916ccf37ee6189aed18a9365b98e79f8b6329cce4f1b4ed89f0acd4230
 SHA512:
-  metadata.gz: cbca621e72efc0bdf1df26a4554590032f7a42d76ca19b361305f519071f1f026678c55c2980e74661ebcd5ac018d9e3e892376ee69a07c91ebb1d2d809cbb75
-  data.tar.gz: b2c7cbe0a13c12f0e9b935c3d675f583d93a4f78f921982e75eb9050c84d97914c63cf9280667b5be977280cda9de27a57972f3f0d72b097710a6b3b1e45d67b
+  metadata.gz: 1572f392ea4e391674b79b02d09992a3c27c64485c64132ac84c3d37a031436fec5090cf2e2932996c8ee7e2879ce5f502a7c037324d48cba505b15d3924a0bf
+  data.tar.gz: a8f1272f9b4a992fac31530d9e53b6e8c91fbd8032891087dd546c677fb1c9f8218a051eac9fe54c23c8bb8cdb6b3b727f269768f92fb62d8fb6cb1bdf1318f0

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 # CHANGELOG.md
 
 
-## flor 0.19.0  not yet released
+## flor 1.0.1  released 2020-11-23
+
+* Accept sto_uri strings pointing to constant like 'DB'
+
+
+## flor 1.0.0  released 2020-11-22
+
+* Lots of incremental improvements
 
 
 ## flor 0.18.0  released 2019-05-05

data/lib/flor.rb

@@ -15,7 +15,7 @@ require 'dense'
 
 module Flor
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end
 
 require 'flor/colours'

data/lib/flor/flor.rb

@@ -3,12 +3,11 @@
 module Flor
 
   NAME_REX = '[a-zA-Z0-9_]+'
-  UNIT_NAME_REX = /\A#{NAME_REX}\z/
-  DOMAIN_NAME_REX = /\A#{NAME_REX}(\.#{NAME_REX})*\z/
-  FLOW_NAME_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)\.([a-zA-Z0-9_-]+)\z/
+  UNIT_NAME_REX = /\A#{NAME_REX}\z/.freeze
+  DOMAIN_NAME_REX = /\A#{NAME_REX}(\.#{NAME_REX})*\z/.freeze
+  FLOW_NAME_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)\.([a-zA-Z0-9_-]+)\z/.freeze
 
-  #DOMAIN_UNIT_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)-(#{NAME_REX})[-\z]/
-  DOMAIN_UNIT_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)-(#{NAME_REX})[-$]/
+  DOMAIN_UNIT_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)-(#{NAME_REX})[-$]/.freeze
 
   SPLAT_REGEX = /\A(.*)__(_|\d+)\z/.freeze
 

data/lib/flor/id.rb

@@ -2,6 +2,9 @@
 
 module Flor
 
+  NID_REX = /\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?\z/.freeze
+  START_NID_REX = /\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?/.freeze
+
   class << self
 
     #
@@ -99,7 +102,7 @@ module Flor
 
     def is_nid?(s)
 
-      !! (s.is_a?(String) && s.match(/\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?\z/))
+      !! (s.is_a?(String) && s.match(NID_REX))
     end
 
     def split_exid(s)

data/lib/flor/punit/m_ram.rb

@@ -179,15 +179,15 @@ module Flor::Pro::ReceiveAndMerge
   # * ignore
   # * stack
 
-  STACK_REX = /\Astack(?::([-_a-zA-Z0-9]+))?\z/
+  STACK_REX = /\Astack(?::([-_a-zA-Z0-9]+))?\z/.freeze
 
-  TRANSLATORS = { STACK_REX => 'k', /\Atail\z/ => 'a' }
+  TRANSLATORS = { STACK_REX => 'k', /\Atail\z/ => 'a' }.freeze
 
   MORDERS = {
-    'f' => :first, 'l' => :last, /[tnh]/ => :north, /[bsa]/ => :south }
+    'f' => :first, 'l' => :last, /[tnh]/ => :north, /[bsa]/ => :south }.freeze
   MMERGERS = {
     'd' => :deep, /[mp]/ => :mix, 'o' => :override, 'i' => :ignore,
-    'k' => :stack }
+    'k' => :stack }.freeze
 
   def default_merger
 

data/lib/flor/unit/scheduler.rb

@@ -227,6 +227,9 @@ module Flor
       @last_queued_message_id =
         @storage.put_message(message)
 
+      # Nota bene:
+      # the #wait method is added to the Scheduler by Flor::WaitList
+
       if opts[:wait]
         wait(message['exid'], opts)
       else

data/lib/flor/unit/storage.rb

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

data/lib/flor/unit/waiter.rb

@@ -23,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?
@@ -247,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)
 
@@ -263,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

@@ -12,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo