flor 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89a3c4accc6ee1eca033031352f4c6d20c9b42ffbcb44aebe3cca04b59bc128
-  data.tar.gz: 30914f85dfb1f76de1877cdb60e977eff73cb1ee31d9dfa7b893160799b4c162
+  metadata.gz: f1dae0857de545986e18ad31a41f37a6ead6687b34d3c06de22aafa606369283
+  data.tar.gz: 9843d0124a2c3948ffc6846e7854854f5eda37d95bd02bfc02cecfefab0e5ea1
 SHA512:
-  metadata.gz: 91cbcbbebccc7209554f49645a43876bf7f2743a77eac4a64ab3daf7f5fbfb8f2e7d566f6ffc03c932222aa2daf82e5674fd52a653bddd8b390b27cbb4714e1c
-  data.tar.gz: 174730b60ab5366c9cae335644ace73722ff52dc34477754020817c630dfabe1f6710846e437bbb936cb76fb4922f04d1dc2ffd2fde64f4c80924bd3dd7a629f
+  metadata.gz: 185490e0054ffdfe7c078b71955834679a398266e613be5d8bb6b63bc626bf4727bd4fd45249e7dea14cdd91a85c5ad92a1f6b3b120117c7c274b41d5478ba31
+  data.tar.gz: e6dde7ae40f3ef6d2c7a620d6a07840c6591b745798962d039ac39fa426e4bcef51f3c67e97d9a367bb981918ec5fe98934393eec2cd7e87046b8d491b9a6511

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## flor 1.2.2  released 2021-03-29
+
+* Include data in flor_pointers
+* Ensure flor_pointers name is a string
+
+
 ## flor 1.2.1  released 2021-03-22
 
 * If conf sto_db_logger is false, do not attach a logger to the db connection

data/lib/flor.rb

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

data/lib/flor/unit/storage.rb

@@ -12,8 +12,9 @@ module Flor
       :status, :ctime, :mtime, :cunit, :munit
         ].freeze
     POINTER_COLUMNS = [
-      :domain, :exid, :nid, :type, :name, :value, :ctime, :cunit
-        ].freeze
+      :domain, :exid, :nid, :type, :name, :value, :ctime, :cunit,
+        :content
+          ].freeze
 
     attr_reader :unit, :db, :models
 
@@ -720,17 +721,17 @@ module Flor
           vs = nid == '0' ? node['vars'] : nil
           vs.each { |k, v|
             case v; when Numeric, String, TrueClass, FalseClass, NilClass
-              a << [ dom, exid, '0', 'var', k, v.to_s, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, v.to_s, now, u, v ]
             when Array, Hash
               s = '(array)'; s = '(object)' if v.is_a?(Hash)
-              a << [ dom, exid, '0', 'var', k, s, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, s, now, u, v ]
             else
-              a << [ dom, exid, '0', 'var', k, nil, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, nil, now, u, v ]
             end } if vs
 
           if ta = node['task']
             tasker = ta['tasker']
-            name = ta['name']
+            n = ta['name']; name = n.is_a?(String) ? n : JSON.dump(n)
             content = { message: node['message'], atts: node['atts'] }
             a << [ dom, exid, nid, 'tasker', tasker, name, now, u, content ]
           end
@@ -746,29 +747,30 @@ module Flor
           #
           # don't insert when already inserted
 
-      if pointer_columns.include?(:content)
-        pointers.each { |ptr|
-          c = ptr[8]; ptr[8] = to_blob(c) if c }
-      else
-        pointers.each { |ptr|
-          ptr.pop }
-      end
+      #if pointer_columns.include?(:content)
+      pointers.each { |ptr| c = ptr[8]; ptr[8] = to_blob(c) if c }
+      #else
+      #  pointers.each { |ptr| ptr.pop }
+      #end
 
+      #@db[:flor_pointers]
+      #  .import(
+      #    pointer_columns,
+      #    pointers)
       @db[:flor_pointers]
         .import(
-          pointer_columns,
+          POINTER_COLUMNS,
           pointers)
     end
 
-    def pointer_columns
-
-      @pointer_columns ||=
-        if @db[:flor_pointers].columns.include?(:content)
-          POINTER_COLUMNS + [ :content ]
-        else
-          POINTER_COLUMNS
-        end
-    end
+    #def pointer_columns
+    #  @pointer_columns ||=
+    #    if @db[:flor_pointers].columns.include?(:content)
+    #      POINTER_COLUMNS + [ :content ]
+    #    else
+    #      POINTER_COLUMNS
+    #    end
+    #end
 
     def determine_type_and_schedule(message)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo