flor 0.18.0 → 1.0.0

data/lib/flor/unit/spooler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 

data/lib/flor/unit/storage.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'zlib'
 
@@ -30,9 +31,11 @@ module Flor
 #p [ :disconnected, @db.object_id ]
     end
 
-    def db_version
+    def db_version(opts={})
 
-      (@db[:schema_info].first rescue {})[:version]
+      table, column = migration_table_and_column(opts)
+
+      (@db[table].first rescue {})[column]
     end
 
     def migration_version
@@ -79,34 +82,27 @@ module Flor
       opts[:target] ||= to if to.is_a?(Integer)
       opts[:current] ||= from if from.is_a?(Integer)
 
-      opts[:table] = (
-        @unit.conf['db_migration_table'] ||
-        @unit.conf['sto_migration_table'] ||
-        :schema_info).to_sym
-      opts[:column] = (
-        @unit.conf['db_migration_column'] ||
-        @unit.conf['sto_migration_column'] ||
-        :version).to_sym
-          #
-          # defaults for the migration version table:
-          # { table: :schema_info,
-          #   column: :version }
+      opts[:table], opts[:column] = migration_table_and_column(opts)
+        #
+        # defaults for the migration version table:
+        # { table: :schema_info,
+        #   column: :version }
 
       skip =
+        opts[:sparse_migrations] ||
         @unit.conf['db_sparse_migrations'] ||
-        @unit.conf['sto_sparse_migrations'] ||
-        opts[:sparse_migrations]
+        @unit.conf['sto_sparse_migrations']
       if skip && ! opts.has_key?(:allow_missing_migration_files)
         opts[:allow_missing_migration_files] = true
       end
 
       dir =
+        opts[:migrations] ||
+        opts[:migration_dir] ||
         @unit.conf['db_migrations'] ||
         @unit.conf['db_migration_dir'] ||
         @unit.conf['sto_migrations'] ||
         @unit.conf['sto_migration_dir'] ||
-        opts[:migrations] ||
-        opts[:migration_dir] ||
         Flor.migration_dir
 
       synchronize do
@@ -336,35 +332,40 @@ module Flor
       n = Flor.tstamp
       u = @unit.identifier
 
-      synchronize(syn) do
+      id =
+        synchronize(syn) do
 
-        stored, unstored = ms.partition { |m| m['mid'] }
+          stored, unstored = ms.partition { |m| m['mid'] }
 
-        #
-        # de-reserve any previously stored message, might happen
-        # for "terminated" messages that got queued back to let
-        # other messages get processed
+          #
+          # de-reserve any previously stored message, might happen
+          # for "terminated" messages that got queued back to let
+          # other messages get processed
 
-        @db[:flor_messages]
-          .where(id: stored.collect { |m| m['mid'] })
-          .update(status: 'created', mtime: n, munit: u) \
-            if stored.any?
+          @db[:flor_messages]
+            .where(id: stored.collect { |m| m['mid'] })
+            .update(status: 'created', mtime: n, munit: u) \
+              if stored.any?
 
-        #
-        # store new messages
+          #
+          # store new messages
 
-        @db[:flor_messages]
-          .import(
-            [ :domain, :exid, :point, :content,
-              :status, :ctime, :mtime, :cunit, :munit ],
-            unstored.map { |m|
-              [ Flor.domain(m['exid']), m['exid'], m['point'], to_blob(m),
-                'created', n, n, u, u ] }) \
-                  if unstored.any?
-      end
+          @db[:flor_messages]
+            .import(
+              [ :domain, :exid, :point, :content,
+                :status, :ctime, :mtime, :cunit, :munit ],
+              unstored.map { |m|
+                [ Flor.domain(m['exid']), m['exid'], m['point'], to_blob(m),
+                  'created', n, n, u, u ] }) \
+                    if unstored.any?
+
+          @db[:flor_messages].max(:id)
+        end
 
       @unit.wake_up
 
+      id
+
     rescue => err
 
       Thread.current[:sto_errored_items] = ms
@@ -557,6 +558,18 @@ module Flor
 
     protected
 
+    def migration_table_and_column(opts={})
+
+      [ (opts[:migration_table] ||
+         @unit.conf['db_migration_table'] ||
+         @unit.conf['sto_migration_table'] ||
+         :schema_info).to_sym,
+        (opts[:migration_column] ||
+          @unit.conf['db_migration_column'] ||
+          @unit.conf['sto_migration_column'] ||
+          :version).to_sym ]
+    end
+
     def _commaify(o)
 
       if Flor.is_regex_tree?(o)
@@ -798,15 +811,26 @@ module Flor
       def error(msg); @unit.logger.db_log(:error, msg); end
     end
 
-    def connect
+    def derive_db
+
+      db = @unit.conf['sto_db']
+
+      return db if db
 
       uri = @unit.conf['sto_uri']
 
-      #uri = DB.uri if uri == 'DB' && defined?(DB)
-      uri = (Kernel.const_get(uri).uri rescue uri) if uri.match(/\A[A-Z]+\z/)
-        # for cases where `sto_uri: "DB"`
+      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/)
+
+      Sequel.connect(uri)
+    end
+
+    def connect
 
-      @db = Sequel.connect(uri)
+      @db = derive_db
 
       class << @db; attr_accessor :flor_unit; end
       @db.flor_unit = @unit

data/lib/flor/unit/taskers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -88,7 +89,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' ]

data/lib/flor/unit/waiter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -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))
 

data/lib/flor/unit/wlist.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -42,18 +43,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.0.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2020-11-22 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
@@ -249,8 +250,11 @@ files:
 - lib/flor/tools/env.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/hloader.rb
@@ -272,16 +276,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 +301,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