gloo 3.1.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2040934825cd8c004b50e10414322e232c68d30299d7696bef2ae2f23cdb3e8
-  data.tar.gz: 70374a3c6d010fcc1d84d34ac1036c41d12d9699d8ce3629baf3a58683f0aac9
+  metadata.gz: 02f90941d4a489efde1a15b50d55c85af80e1ac02e012102644a21613ce23e90
+  data.tar.gz: 3216f0732a0e59b258453ce5d929f751477a264586e73f668ced1332cb601d61
 SHA512:
-  metadata.gz: 55b6ece805e4705bcc909de79b80bad0a188d72ccf547f74f272d7f50d720d19e5c9412a99247378f9675f11f53b940ef6a83c05fc5dccf5b87b925742a140f6
-  data.tar.gz: b53f60308d786d1d4a90ac4e6e8aceb0527832f824b2110d72b767d55bf5f7ed3df467da22df8be0c7ea240462cee1cb21ce9a30c9859f469635133f3687f56c
+  metadata.gz: b68948e64413281d9a1f51542888b6818adf28adfb0a625e0c8415c596600207365d761a6c5ebe36c5cebbeb6ab7ee6a6244dc1e8f215b58f5b7000909032d18
+  data.tar.gz: 9cef0e42026158497bf424828e691958a196ff7a6cd65771dff504a59c2a205691b997485e7cd1b50e8882d349076b0d8f8b8564f794d953021cf2e4a2310667

data/gloo.gemspec

@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'os', '~> 1.1', '>= 1.1.4'
   spec.add_dependency 'pg', '~> 1.5.4'
   spec.add_dependency 'thin', '~> 1.8.2'
+  spec.add_dependency 'redcarpet', '~> 3.6.0'
 end

data/lib/VERSION

@@ -1 +1 @@
-3.1.1
+3.3.0

data/lib/VERSION_NOTES

@@ -1,3 +1,16 @@
+3.3.0 - 2024.08.16
+ - Adds nil converters to string and integer.
+ - Adds render to markdown object to convert to html
+ - Adds invoke verb to call a function from a script
+ - Web updates: singular name conventions
+
+
+3.2.0 - 2024.07.07
+ - Update with more web server functionality, http methods, resource routing
+ - Expands query with additional html table support
+ - Other web additions and expansion
+
+
 3.1.1 - 2024.04.26
  - Clean build
 

data/lib/gloo/app/log.rb

@@ -17,6 +17,8 @@ module Gloo
       ERROR = 'error'.freeze
       LEVELS = [ DEBUG, INFO, WARN, ERROR ].freeze
 
+      CLEARED = "\n\n --- Log files cleared. --- \n\n".freeze
+
       LOG_FILE = 'gloo.log'.freeze
       ERROR_FILE = 'error.log'.freeze
 
@@ -46,15 +48,32 @@ module Gloo
       # Create the default [file] logger.
       #
       def create_loggers
-        f = File.join( @engine.settings.log_path, LOG_FILE )
-        @logger = Logger.new( f )
+        @logger = Logger.new( log_file )
         @logger.level = Logger::DEBUG
 
-        err = File.join( @engine.settings.log_path, ERROR_FILE )
-        @error = Logger.new( err )
+        @error = Logger.new( err_file )
         @error.level = Logger::WARN
       end
 
+      # ---------------------------------------------------------------------
+      #    Files
+      # ---------------------------------------------------------------------
+
+      # 
+      # Get the log file.
+      # 
+      def log_file
+        return File.join( @engine.settings.log_path, LOG_FILE )
+      end
+
+      # 
+      # Get the error log file.
+      # 
+      def err_file
+        return File.join( @engine.settings.log_path, ERROR_FILE )
+      end
+
+
       # ---------------------------------------------------------------------
       #    Static Helpers
       # ---------------------------------------------------------------------
@@ -67,6 +86,21 @@ module Gloo
         return LEVELS.include? str.strip.downcase
       end
 
+      # ---------------------------------------------------------------------
+      #    Log file clearing
+      # ---------------------------------------------------------------------
+
+      # 
+      # Clear the log files.
+      # 
+      def clear
+        File.write( log_file, CLEARED )
+        File.write( err_file, CLEARED )
+
+        create_loggers
+      end
+
+
       # ---------------------------------------------------------------------
       #    Standard Output
       # ---------------------------------------------------------------------
@@ -74,8 +108,14 @@ module Gloo
       #
       # Show a message unless we're in quite mode.
       #
-      def show( msg )
-        puts msg unless @quiet
+      def show( msg, color=nil )
+        return if @quiet
+
+        if color
+          puts ColorizedString[ msg ].colorize( color.to_sym )
+        else
+          puts msg 
+        end
       end
 
       # ---------------------------------------------------------------------

data/lib/gloo/app/platform.rb

@@ -35,7 +35,13 @@ module Gloo
       #
       def show( msg, md=false, page=false )
         if md
-          msg = TTY::Markdown.parse msg
+          # 2024.08.16 - TTY::Markdown.parse msg was not working.
+          # Tried with redcarpet and it was not working either.
+          # So just leaving it for now.  Not sure I even really need it.
+          # TODO: Revisit and clean up.
+
+          # msg = TTY::Markdown.parse msg
+          # msg = Gloo::Objs::Markdown.md_2_manpage( msg )
         end
 
         if page

data/lib/gloo/app/running_app.rb

@@ -10,7 +10,7 @@ module Gloo
   module App
     class RunningApp
 
-      attr_reader :obj
+      attr_reader :obj, :db_time
 
       #
       # Set up the running app for the given object.
@@ -19,6 +19,8 @@ module Gloo
         @engine = engine
         @log = @engine.log
         @obj = obj
+
+        @db_clients = {}
       end
 
       # 
@@ -36,6 +38,45 @@ module Gloo
         @log.debug "running app stopped for #{@obj.pn}"
       end
 
+
+      # ---------------------------------------------------------------------
+      #    DB function timer
+      # ---------------------------------------------------------------------
+
+      # 
+      # Add the given time to the db time.
+      #
+      def add_db_time time
+        @db_time = 0 unless @db_time
+        @db_time += time
+      end
+
+      # 
+      # Reset the db time to zero
+      # 
+      def reset_db_time
+        @db_time = 0
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Cached Database Connections
+      # ---------------------------------------------------------------------
+
+      # 
+      # Cache the given DB client for the given object.
+      # 
+      def cache_db_client( obj, client )
+        @db_clients[ obj.pn ] = client
+      end
+
+      # 
+      # Get the DB client for the given object.
+      # 
+      def db_client_for_obj( obj )
+        return @db_clients[ obj.pn ]
+      end
+
     end
   end
 end

data/lib/gloo/convert/falseclass_to_integer.rb

@@ -0,0 +1,20 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  FALSE to Integer.
+#
+
+module Gloo
+  module Convert
+    class FalseClassToInteger
+
+      #
+      # Convert the given FALSE value to an integer.
+      #
+      def convert( value )
+        return 0
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_date.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to Date.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToDate
+
+      #
+      # Convert a nil to a date.
+      #
+      def convert( value )
+        return Chronic.parse( '' )
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_datetime.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to DateTime.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToDateTime
+
+      #
+      # Convert a nil to a date.
+      #
+      def convert( value )
+        return Chronic.parse( '' )
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_integer.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to Integer.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToInteger
+
+      #
+      # Convert a nil to a string.
+      #
+      def convert( value )
+        return 0
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_string.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to String.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToString
+
+      #
+      # Convert a nil to a string.
+      #
+      def convert( value )
+        return ''
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_time.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to Time.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToTime
+
+      #
+      # Convert a nil to a date.
+      #
+      def convert( value )
+        return Chronic.parse( '' )
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/trueclass_to_integer.rb

@@ -0,0 +1,20 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  TRUE to Integer.
+#
+
+module Gloo
+  module Convert
+    class TrueClassToInteger
+
+      #
+      # Convert the given TRUE value to an integer.
+      #
+      def convert( value )
+        return 1
+      end
+
+    end
+  end
+end

data/lib/gloo/core/error.rb

@@ -56,6 +56,13 @@ module Gloo
         return @value.to_s
       end
 
+      # 
+      # Is this a function object?
+      # 
+      def is_function?
+        return false
+      end
+
     end
   end
 end

data/lib/gloo/core/it.rb

@@ -31,6 +31,13 @@ module Gloo
         return @value.to_s
       end
 
+      # 
+      # Is this a function object?
+      # 
+      def is_function?
+        return false
+      end
+
     end
   end
 end

data/lib/gloo/core/obj.rb

@@ -137,6 +137,21 @@ module Gloo
         return self.value.to_s.strip.empty?
       end
 
+      # 
+      # Is this an alias to another object?
+      # 
+      def is_alias?
+        return self.type_display == Gloo::Objs::Alias.typename
+      end
+
+      # 
+      # Is this a function object?
+      # 
+      def is_function?
+        return self.type_display == Gloo::Objs::Function.typename
+      end
+
+
       # ---------------------------------------------------------------------
       #    Children
       # ---------------------------------------------------------------------
@@ -193,7 +208,7 @@ module Gloo
           return o if name.downcase == o.name.downcase
         end
 
-        if self.type_display == Gloo::Objs::Alias.typename
+        if is_alias?
           ln = Gloo::Core::Pn.new( @engine, self.value )
           redirect = ln.resolve
           return redirect.find_child( name )
@@ -201,6 +216,16 @@ module Gloo
         return nil
       end
 
+      #
+      # Get the index of the child with the given name.
+      # 
+      def child_index( name )
+        @children.each_with_index do |o, i|
+          return i if name.downcase == o.name.downcase
+        end
+        return nil
+      end
+
       #
       # Delete all children from the container.
       #
@@ -300,6 +325,21 @@ module Gloo
         @engine.persist_man.reload self
       end
 
+
+      # ---------------------------------------------------------------------
+      #    Render
+      # ---------------------------------------------------------------------
+
+      # 
+      # Render the object.
+      # By default this is just the object's value.
+      # The render_ƒ is 'render_html', 'render_text', 'render_json', etc.
+      # 
+      def render render_ƒ
+        return self.value.to_s
+      end
+
+
       # ---------------------------------------------------------------------
       #    Help
       # ---------------------------------------------------------------------

data/lib/gloo/core/parser.rb

@@ -20,8 +20,11 @@ module Gloo
       #
       # Parse a command from the immediate execution context.
       #
-      def parse_immediate( cmd )
-        cmd, params = split_params cmd
+      def parse_immediate( full_cmd )
+        # Break the full command into verb and params
+        cmd, params = split_params full_cmd
+
+        # Params are the parenthetical part of the command at the end
         params = Gloo::Core::Tokens.new( params ) if params
         tokens = Gloo::Core::Tokens.new( cmd )
         dic = Gloo::Core::Dictionary.instance
@@ -42,7 +45,7 @@ module Gloo
         if i && cmd.strip.end_with?( ')' )
           pstr = cmd[ i + 1..-1 ]
           params = pstr.strip[ 0..-2 ] if pstr
-          cmd = cmd[ 0, i - 1 ]
+          cmd = cmd[ 0, i].strip
         end
         return cmd, params
       end

data/lib/gloo/exec/exec_env.rb

@@ -10,6 +10,7 @@ module Gloo
     class ExecEnv
 
       attr_accessor :verbs, :actions, :scripts, :here
+      attr_reader :running_script
 
       VERB_STACK = 'verbs'.freeze
       ACTION_STACK = 'actions'.freeze
@@ -22,6 +23,7 @@ module Gloo
       def initialize( engine )
         @engine = engine
         @engine.log.debug 'exec env intialized...'
+        @running_script = nil
 
         @verbs = Gloo::Exec::Stack.new( @engine, VERB_STACK )
         @actions = Gloo::Exec::Stack.new( @engine, ACTION_STACK )
@@ -43,6 +45,7 @@ module Gloo
       #
       def push_script( script )
         @scripts.push script
+        @running_script = script
         @here.push script.obj
       end
 
@@ -51,6 +54,7 @@ module Gloo
       #
       def pop_script
         @scripts.pop
+        @running_script = @scripts.stack.last
         @here.pop
       end
 

data/lib/gloo/exec/script.rb

@@ -9,13 +9,13 @@ module Gloo
     class Script
 
       attr_accessor :obj
-
       #
       # Set up the script.
       #
       def initialize( engine, obj )
         @engine = engine
         @obj = obj
+        @break_out = false
       end
 
       #
@@ -30,6 +30,7 @@ module Gloo
           @engine.parser.run @obj.value
         elsif @obj.value.is_a? Array
           @obj.value.each do |line|
+            break if @break_out
             @engine.parser.run line
           end
         end
@@ -45,6 +46,13 @@ module Gloo
         return @obj.pn
       end
 
+      # 
+      # Stop running this script.
+      # 
+      def break_out
+        @break_out = true
+      end
+
     end
   end
 end

data/lib/gloo/objs/basic/container.rb

@@ -33,7 +33,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[count delete_children show_key_value_table]
+        return super + %w[count delete_children child_exists show_key_value_table]
       end
 
       #
@@ -57,9 +57,25 @@ module Gloo
       #
       def msg_show_key_value_table
         data = self.children.map { |o| [ o.name, o.value ] }
-        @engine.platform.show_table nil, data, title
+
+        # TODO: this doesn't work:
+        # @engine.platform.show_table nil, data, title
       end
 
+      # 
+      # Check to see if there is a child with the given name.
+      # 
+      def msg_child_exists
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+        end
+        return unless data
+
+        val = self.contains_child?( data )
+        @engine.heap.it.set_to val
+        return val
+      end
     end
   end
 end

data/lib/gloo/objs/basic/integer.rb

@@ -37,6 +37,7 @@ module Gloo
         self.value = new_value.to_i
       end
 
+      
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------

data/lib/gloo/objs/cli/menu.rb

@@ -68,7 +68,10 @@ module Gloo
       # 
       def add_loop_child
         o = find_child LOOP
-        return if o
+        if o
+          o.set_value true
+          return 
+        end
 
         fac = @engine.factory
         fac.create_bool LOOP, true, self
@@ -324,7 +327,7 @@ module Gloo
       # Run the selected command.
       #
       def run_command( cmd )
-        @engine.log.debug "Menu Command: #{cmd}"
+        @engine.log.info "Menu Command: #{cmd}"
         obj = find_cmd cmd
 
         if obj
@@ -335,15 +338,18 @@ module Gloo
           s.run
         else
           if cmd == '?'
+            @engine.log.debug 'Showing options'
             show_options
           elsif cmd == 'q!'
-            @engine.log.info 'Quitting Gloo'
+            @engine.log.debug 'Quitting Gloo'
             @engine.stop_running
           elsif cmd == 'qq'
+            @engine.log.debug 'Quitting to top level menu'
             pop_to_top_level_menu
           elsif cmd.starts_with? ':'
             gloo_cmd = cmd[1..-1].strip
             if gloo_cmd.blank?
+              @engine.log.debug 'Quitting all menus and dropping into Gloo'
               quit_all_menus
             else
               @engine.log.debug "Running Gloo command: #{gloo_cmd}"

data/lib/gloo/objs/{basic → ctrl}/function.rb

@@ -14,6 +14,7 @@ module Gloo
 
       # Events
       ON_INVOKE = 'on_invoke'.freeze
+      AFTER_INVOKE = 'after_invoke'.freeze
 
       # Parameters to the function invocation.
       PARAMS = 'params'.freeze
@@ -132,6 +133,16 @@ module Gloo
         Gloo::Exec::Dispatch.message( @engine, 'run', o )
       end
 
+      #
+      # Run the after invoke script if there is one.
+      #
+      def run_after_invoke
+        o = find_child AFTER_INVOKE
+        return unless o
+
+        Gloo::Exec::Dispatch.message( @engine, 'run', o )
+      end
+
 
       # ---------------------------------------------------------------------
       #    Messages
@@ -147,6 +158,7 @@ module Gloo
         run_on_invoke
         return_value = result
         @engine.heap.it.set_to return_value
+        run_after_invoke
         
         return return_value
       end