workmesh 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e93016a2c4975149768794a4084eb3fb2b86af9752278ff780044d6ade7707
-  data.tar.gz: 81a01ab4e3d12ccab133853f6acd1233b300be0bfed817f74f53bc258224c86c
+  metadata.gz: 440c98bcca1d0df1215bae66c24f01caaf14921a51f31a1765f8f9779d9525c8
+  data.tar.gz: 42824bd2a9f6e6d9849956987f00e2987949a735bb3c4e4971a47ebe35c0124b
 SHA512:
-  metadata.gz: cd19ed6730ccee45fd47eec84326b34ca506610ebf3cbabadf8cc5da8acc2a15baac5665140122116233c8d0569943983a2be495677e345789fe98407987d3f7
-  data.tar.gz: b1868444351445b73e1fbe87397873e40a545cb3bd1be2f697cfc9d719fde1800902cd37a63c332f0d05dc00c962e2bbc513d57c4949f6703c69bd5eed5a4f9c
+  metadata.gz: 8ac434b798d8e2ce317136bd3af1146279a2215317087deef184d0933eb6c1895f7415c069f96bf515ae7caa7164f30bb9ff7be99803f74478237c3979b833c9
+  data.tar.gz: a45ecb1a637b90a358e139702c97d6816b20c93a08edb28e1c7c4db90638644188427b58d90e5228e56d2a6e03bab99a98fcae6f1518efe7228482c6eb68f816

data/lib/workmesh.rb

@@ -1,5 +1,6 @@
 require 'colorize'
 require 'sequel'
+require 'blackstack-db'
 require 'blackstack-core'
 require 'blackstack-nodes'
 require 'simple_command_line_parser'
@@ -8,27 +9,6 @@ require 'simple_cloud_logging'
 require_relative '../deployment-routines/update-config'
 require_relative '../deployment-routines/update-source'
 
-=begin
-# TODO: Move this to a gem with the CRDB module
-#
-# return a postgresql uuid
-#
-def guid()
-  DB['SELECT gen_random_uuid() AS id'].first[:id]
-end
-=end
-
-# TODO: Move new() to a gem with the CRDB module
-#
-# return current datetime with format `%Y-%m-%d %H:%M:%S %Z`, using the timezone of the database (`select current_setting('TIMEZONE')`)
-# TODO: I am hardcoding the value of `tz` because for any reason `SELECT current_setting('TIMEZONE')` returns `UTC` instead of 
-# `America/Argentina/Buenos_Aires` when I run it from Ruby. Be sure your database is ALWAYS configured with the correct timezone.
-#
-def now()
-  tz = 'America/Argentina/Buenos_Aires' #DB["SELECT current_setting('TIMEZONE') AS tz"].first[:tz]
-  DB["SELECT current_timestamp() at TIME ZONE '#{tz}' AS now"].first[:now]
-end
-
 module BlackStack
   module Workmesh
     # stub node class
@@ -82,7 +62,7 @@ module BlackStack
       attr_accessor :entity_table, :entity_field_id, :entity_field_sort
       attr_accessor :push_function, :entity_field_push_time, :entity_field_push_success, :entity_field_push_error_description
       attr_accessor :pull_status_access_point
-      attr_accessor :pull_function, :enttity_field_pull_time, :entity_field_pull_success, :entity_field_pull_error_description 
+      attr_accessor :pull_function #, :enttity_field_pull_time, :entity_field_pull_success, :entity_field_pull_error_description 
 
       def self.descriptor_errors(h)
         errors = []
@@ -109,14 +89,14 @@ module BlackStack
         errors << "The key :entity_field_push_error_description is missing" if h[:push_function] && h[:entity_field_push_error_description].nil?
 
         # valiudate: if :pull_function exists, the key :pull_status_access_point exists and it is a string
-        errors << "The key :pull_status_access_point is missing" if h[:pull_function] && h[:pull_status_access_point].nil?
-        errors << "The key :pull_status_access_point must be an String" unless h[:pull_function].nil? || h[:pull_status_access_point].is_a?(String)
+        #errors << "The key :pull_status_access_point is missing" if h[:pull_function] && h[:pull_status_access_point].nil?
+        #errors << "The key :pull_status_access_point must be an String" unless h[:pull_function].nil? || h[:pull_status_access_point].is_a?(String)
         # validate: if :pull_function exists, the key :entity_field_pull_time exists and it is a symbol
-        errors << "The key :entity_field_pull_time is missing" if h[:pull_function] && h[:entity_field_pull_time].nil?
+        #errors << "The key :entity_field_pull_time is missing" if h[:pull_function] && h[:entity_field_pull_time].nil?
         # validate: if :pull_function exists, the key :entity_field_pull_success exists and it is a symbol
-        errors << "The key :entity_field_pull_success is missing" if h[:pull_function] && h[:entity_field_pull_success].nil?
+        #errors << "The key :entity_field_pull_success is missing" if h[:pull_function] && h[:entity_field_pull_success].nil?
         # validate: if :pull_function exists, the key :entity_field_pull_error_description exists and it is a symbol
-        errors << "The key :entity_field_pull_error_description is missing" if h[:pull_function] && h[:entity_field_pull_error_description].nil?
+        #errors << "The key :entity_field_pull_error_description is missing" if h[:pull_function] && h[:entity_field_pull_error_description].nil?
 
         # return list of errors
         errors.uniq
@@ -134,9 +114,9 @@ module BlackStack
         self.entity_field_push_success = h[:entity_field_push_success]
         self.entity_field_push_error_description = h[:entity_field_push_error_description]
         self.pull_function = h[:pull_function]
-        self.enttity_field_pull_time = h[:entity_field_pull_time]
-        self.entity_field_pull_success = h[:entity_field_pull_success]
-        self.entity_field_pull_error_description = h[:entity_field_pull_error_description]
+        #self.enttity_field_pull_time = h[:entity_field_pull_time]
+        #self.entity_field_pull_success = h[:entity_field_pull_success]
+        #self.entity_field_pull_error_description = h[:entity_field_pull_error_description]
       end
 
       def to_hash()
@@ -150,18 +130,19 @@ module BlackStack
         ret[:entity_field_push_success] = self.entity_field_push_success
         ret[:entity_field_push_error_description] = self.entity_field_push_error_description
         ret[:pull_function] = self.pull_function
-        ret[:enttity_field_pull_time] = self.enttity_field_pull_time
-        ret[:entity_field_pull_success] = self.entity_field_pull_success
-        ret[:entity_field_pull_error_description] = self.entity_field_pull_error_description
+        #ret[:enttity_field_pull_time] = self.enttity_field_pull_time
+        #ret[:entity_field_pull_success] = self.entity_field_pull_success
+        #ret[:entity_field_pull_error_description] = self.entity_field_pull_error_description
         ret
       end
 
       # execute the push function of this protocol, and update the push flags
-      def push(entity, node)
+      def push(entity, node, l=nil)
+        l = BlackStack::DummyLogger.new(nil) if l.nil?
         raise 'The push function is not defined' if self.push_function.nil?
         entity[entity_field_push_time] = now()
         begin
-          self.push_function.call(entity, node)
+          self.push_function.call(entity, node, l)
           entity[entity_field_push_success] = true
           entity[entity_field_push_error_description] = nil
           entity.save
@@ -171,7 +152,19 @@ module BlackStack
           entity.save
           raise e
         end
-      end
+      end # def push(entity, node, l=nil)
+
+      # execute the pull function of this protocol, and update the push flags
+      def pull(node, l=nil)
+        l = BlackStack::DummyLogger.new(nil) if l.nil?
+        raise 'The pull function is not defined' if self.pull_function.nil?
+        begin
+          self.pull_function.call(node, l)
+        rescue => e
+          raise e
+        end
+      end # def pull(node, l=nil)
+
     end # class Protocol
 
     # stub worker class
@@ -196,8 +189,8 @@ module BlackStack
         if h[:protocols].is_a?(Array)
           h[:protocols].each do |protocol|
             errors << "The key :protocols must be an Array of valid hash descritors of the Protocol class" unless protocol.is_a?(Hash)
-            protocol_errors = Protocol.descriptor_errors(protocol)
-            errors << "The key :protocols must be an Array of valid hash descritors of the Protocol class. Errors found are: #{protocol_errors.join('. ')}" unless protocol_errors.length == 0
+            z = Protocol.descriptor_errors(protocol)
+            errors << "The key :protocols must be an Array of valid hash descritors of the Protocol class (errors: #{z.join('. ')})" unless z.length == 0
           end
         end
         # validate: the key :assignation is nil or it is a symbol belonging the array ASSIGANTIONS
@@ -211,7 +204,7 @@ module BlackStack
       # setup dispatcher configuration here
       def initialize(h)
         errors = BlackStack::Workmesh::Service.descriptor_errors(h)
-        raise "The worker descriptor is not valid: #{errors.uniq.join(".\n")}" if errors.length > 0
+        raise "The service descriptor is not valid: #{errors.uniq.join(".\n")}" if errors.length > 0
         self.name = h[:name]
         self.entity_table = h[:entity_table]
         self.entity_field_assignation = h[:entity_field_assignation]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workmesh
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.56.0
+- !ruby/object:Gem::Dependency
+  name: blackstack-db
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: blackstack-core
   requirement: !ruby/object:Gem::Requirement