gloo 3.2.0 → 3.4.0

data/lib/gloo/core/gloo_system.rb

@@ -6,7 +6,6 @@
 # system level variables and functions.  But it is not
 # actually an object in the normal sense of the word.
 #
-require 'tty-platform'
 require 'os'
 
 module Gloo
@@ -217,20 +216,17 @@ module Gloo
 
       # Get the platform CPU
       def msg_platform_cpu
-        platform = TTY::Platform.new
-        return platform.cpu
+        return OS.host_cpu
       end
 
       # Get the platform Operating System
       def msg_platform_os
-        platform = TTY::Platform.new
-        return platform.os
+        return RUBY_PLATFORM
       end
 
       # Get the platform version
       def msg_platform_version
-        platform = TTY::Platform.new
-        return platform.version
+        return 'n/a'
       end
 
       # Is the platform Windows?
@@ -240,14 +236,12 @@ module Gloo
 
       # Is the platform Unix?
       def msg_platform_unix?
-        platform = TTY::Platform.new
-        return platform.unix?
+        return OS.posix?
       end
 
       # Is the platform Linux?
       def msg_platform_linux?
-        platform = TTY::Platform.new
-        return platform.linux?
+        return OS.posix?
       end
 
       # Is the platform Mac?
@@ -259,9 +253,8 @@ module Gloo
       # Get the command to open a file on this platform.
       #
       def self.open_for_platform
-        platform = TTY::Platform.new
-        return 'open' if platform.mac?
-        return 'xdg-open' if platform.linux?
+        return 'open' if OS.mac?
+        return 'xdg-open' if OS.posix?
         
         return 'Start-Process' if OS.windows?
 

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

@@ -144,6 +144,13 @@ module Gloo
         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

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/objs/basic/container.rb

@@ -58,8 +58,7 @@ module Gloo
       def msg_show_key_value_table
         data = self.children.map { |o| [ o.name, o.value ] }
 
-        # TODO: this doesn't work:
-        # @engine.platform.show_table nil, data, title
+        @engine.platform.table.show [], data
       end
 
       # 

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

@@ -10,6 +10,7 @@ module Gloo
 
       KEYWORD = 'integer'.freeze
       KEYWORD_SHORT = 'int'.freeze
+      DEFAULT_RANDOM_RANGE = 100
 
       #
       # The name of the object type.
@@ -37,6 +38,7 @@ module Gloo
         self.value = new_value.to_i
       end
 
+      
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------
@@ -45,7 +47,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[inc dec]
+        return super + %w[inc dec randomize]
       end
 
       #
@@ -68,6 +70,27 @@ module Gloo
         return i
       end
 
+      # 
+      # Set the value to a random number.
+      # The range is 0 to DEFAULT_RANDOM_RANGE (not including the range).
+      # To model a 6-sided die, 
+      # set range to 6 and add 1 to the result.
+      # 
+      def msg_randomize
+        range = DEFAULT_RANDOM_RANGE
+
+        # Check for a range.
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          range = expr.evaluate
+        end
+
+        rand_value = rand( range )
+        set_value rand_value
+        @engine.heap.it.set_to rand_value
+        return rand_value
+      end
+
     end
   end
 end

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

@@ -3,6 +3,8 @@
 #
 # A String.
 #
+require 'base64'
+require 'uri'
 
 module Gloo
   module Objs
@@ -40,7 +42,8 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[up down size]
+        return super + %w[up down size encode64 decode64 escape unescape
+          gen_alphanumeric gen_uuid gen_hex gen_base64]
       end
 
       #
@@ -52,6 +55,118 @@ module Gloo
         return s
       end
 
+      # 
+      # Escape the string.
+      # Make it URL safe.
+      # The value of the string is changed.
+      # 
+      def msg_escape
+        s = URI::DEFAULT_PARSER.escape( value )
+        set_value s
+        @engine.heap.it.set_to s
+        return s
+      end
+
+      # 
+      # Unescape the string.
+      # The value of the string is changed.
+      # 
+      def msg_unescape
+        s = URI::DEFAULT_PARSER.unescape( value )
+        set_value s
+        @engine.heap.it.set_to s
+        return s
+      end
+
+      # 
+      # Encode the string as base64.
+      # Changes the value of the string.
+      # 
+      def msg_encode64
+        s = Base64.encode64( value )
+        set_value s
+        @engine.heap.it.set_to s
+        return s
+      end
+
+      # 
+      # Decode the string from base64.
+      # Changes the value of the string.
+      # 
+      def msg_decode64
+        s = Base64.decode64( value )
+        set_value s
+        @engine.heap.it.set_to s
+        return s
+      end
+
+      #
+      # Generate a new UUID in the string.
+      #
+      def msg_gen_uuid
+        s = StringGenerator.uuid
+        set_value s
+        @engine.heap.it.set_to s
+        return s
+      end
+
+      #
+      # Generate a random alphanumeric string.
+      # By default the length is 10 characters.
+      # Set the length with an optional parameter.
+      #
+      def msg_gen_alphanumeric
+        len = 10
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+          len = data.to_i
+        end
+
+        s = StringGenerator.alphanumeric( len )
+        set_value s
+        @engine.heap.it.set_to s
+        return s
+      end
+
+      #
+      # Generate a random hex string.
+      # By default the length is 10 hex characters.
+      # Set the length with an optional parameter.
+      #
+      def msg_gen_hex
+        len = 10
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+          len = data.to_i
+        end
+
+        s = StringGenerator.hex( len )
+        set_value s
+        @engine.heap.it.set_to s
+        return s
+      end
+
+      #
+      # Generate a random base64 string.
+      # By default the length is 12 characters.
+      # Set the length with an optional parameter.
+      #
+      def msg_gen_base64
+        len = 12
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+          len = data.to_i
+        end
+
+        s = StringGenerator.base64( len )
+        set_value s
+        @engine.heap.it.set_to s
+        return s
+      end
+
       #
       # Convert string to upper case
       #

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

@@ -0,0 +1,49 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# String generation utilities.
+# This is a static class.
+#
+
+module Gloo
+  module Objs
+    class StringGenerator
+
+      # TO DO: Consider adding in Faker generators as well.
+
+
+      # ---------------------------------------------------------------------
+      #    Generators
+      # ---------------------------------------------------------------------
+
+      #
+      # Generate a new UUID.
+      #
+      def self.uuid
+        return SecureRandom.uuid
+      end
+
+      #
+      # Generate a random alphanumeric string.
+      #
+      def self.alphanumeric len=10
+        return SecureRandom.alphanumeric( len )
+      end
+
+      #
+      # Generate a random hex string.
+      #
+      def self.hex len=10
+        s = SecureRandom.hex( len )
+      end
+
+      #
+      # Generate a random base64 string.
+      #
+      def self.base64 len=12
+        return SecureRandom.base64( len )
+      end
+
+    end
+  end
+end

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

@@ -55,23 +55,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[edit page]
-      end
-
-      #
-      # Show the contents of the file, paginated.
-      #
-      def msg_page
-        return unless value
-
-        @engine.platform.show( value, false, true )
-      end
-
-      #
-      # Edit the text in the default editor.
-      #
-      def msg_edit
-        self.value = @engine.platform.edit( self.value )
+        return super
       end
 
     end

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

@@ -19,8 +19,7 @@ module Gloo
       BEFORE_MENU = 'before_menu'.freeze
       DEFAULT = 'default'.freeze
       TITLE = 'title'.freeze
-      TITLE_STYLE = 'straight'.freeze
-      TITLE_COLOR = 'bright_cyan'.freeze
+      TITLE_COLOR = 'green'.freeze
       QUIT_ITEM_NAME = 'q'.freeze
 
       @@menu_stack = []
@@ -234,7 +233,7 @@ module Gloo
             dt = DateTime.now
             d = dt.strftime( '%Y.%m.%d' )
             t = dt.strftime( '%I:%M:%S' )
-            cmd = @engine.platform.prompt.ask( "\n#{d.yellow} #{t.white} >" )
+            cmd = @engine.platform.prompt.ask( "#{d.yellow} #{t.white} >" )
           else
             cmd = @engine.platform.prompt.ask( prompt_value )
           end
@@ -320,7 +319,9 @@ module Gloo
       def run_default_title
         @engine.platform&.clear_screen
         show_menu_stack
-        Banner.show_banner( title, TITLE_STYLE, TITLE_COLOR )
+
+        title_text = @engine.platform.table.box( title )
+        puts title_text.colorize( :color => :white, :background => :black )
       end
 
       #

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

@@ -116,8 +116,9 @@ module Gloo
         prompt = prompt_value
         return unless prompt
 
-        per = Gloo::App::Settings.page_size( @engine )
-        result = @engine.platform.prompt.select( prompt, options, :per_page => per )
+        # Page size was part of the tty-prompt but not used now.
+        # per = Gloo::App::Settings.page_size( @engine )
+        result = @engine.platform.prompt.select( prompt, options )
         set_result self.key_for_option( result )
       end
 

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

data/lib/gloo/objs/data/markdown.rb

@@ -3,6 +3,7 @@
 #
 # Markdown data.
 #
+require 'redcarpet'
 
 module Gloo
   module Objs
@@ -55,23 +56,75 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[show page]
+        return super + %w[show render update_asset_path]
       end
 
       #
       # Show the markdown data in the terminal.
       #
       def msg_show
-        @engine.platform.show( self.value, true, false )
+        @engine.platform.show self.value
       end
 
       #
-      # Show the markdown data in the terminal, paginated.
+      # Render the markdown as HTML.
+      # Needs an optional parameter of where to put the rendered html.
+      # The html will be in 'it' as well.
       #
-      def msg_page
-        return unless self.value
+      def msg_render
+        html = Gloo::Objs::Markdown.md_2_html( value )
 
-        @engine.platform.show( md, true, true )
+        # Put the HTML in the optional parameter if one is given.
+        if @params&.token_count&.positive?
+          pn = Gloo::Core::Pn.new( @engine, @params.first )
+          o = pn.resolve
+          o.set_value html
+        end
+
+        # Put the HTML in it, in any case.
+        @engine.heap.it.set_to html
+      end
+
+      # 
+      # Update the asset path in the markdown.
+      # Take out leading relative path so that path starts
+      # at the asset root.
+      # 
+      def msg_update_asset_path
+        data = self.value
+        out_data = ""
+        
+        data.lines.each do |line|
+          if line.include?( '![' ) && line.include?( '](') && line.include?( '/asset/')
+            prefix = line[ 0, ( line.index( '](' ) + 2 ) ]
+            suffix = line[ (line.index( '/asset/' )) .. -1 ]
+            out_data << "#{prefix}#{suffix}"
+          else
+            out_data << line
+          end
+        end
+
+        self.value = out_data
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Static Helpers
+      # ---------------------------------------------------------------------
+
+      # 
+      # Convert markdown to HTML using the
+      # Redcarpet markdown processor.
+      # 
+      def self.md_2_html( md )
+        markdown = Redcarpet::Markdown.new( 
+          Redcarpet::Render::HTML, 
+          autolink: true, 
+          fenced_code_blocks: true,
+          tables: true, 
+          strikethrough: true )
+          
+        return markdown.render( md )
       end
 
     end

data/lib/gloo/objs/data/mysql.rb

@@ -105,17 +105,24 @@ module Gloo
 
         client = app.db_client_for_obj( self ) if app 
 
-        unless client
-          h = {
-            host: host_value,
-            database: db_value,
-            username: user_value,
-            password: passwd_value
-          }
-          client = Mysql2::Client.new( h )
-
-          app.cache_db_client( self, client ) if app
+        if client && client.ping
+          @engine.log.debug "Connection is established and active."
+          return client
+        elsif client
+          @engine.log.debug "Connection is established but NOT active.  Reconnecting."
+        else
+          @engine.log.debug "Opening a new Connection."
         end
+
+        h = {
+          host: host_value,
+          database: db_value,
+          username: user_value,
+          password: passwd_value
+        }
+        client = Mysql2::Client.new( h )
+
+        app.cache_db_client( self, client ) if app
         
         return client
       end
@@ -129,28 +136,33 @@ module Gloo
 
         heads = []
         data = []
-        if params
-          pst = client.prepare( sql )
-          rs = pst.execute( *params, :as => :array )
-          if rs
-            rs.each do |row|
-              arr = []
-              row.each do |o| 
-                arr << o
+        begin
+          if params
+            pst = client.prepare( sql )
+            rs = pst.execute( *params, :as => :array )
+            if rs
+              rs.each do |row|
+                arr = []
+                row.each do |o| 
+                  arr << o
+                end
+                data << arr
               end
-              data << arr
             end
-          end
-        else
-          rs = client.query( sql, :as => :array ) 
-          if rs
-            rs.each do |row|
-              data << row
+          else
+            rs = client.query( sql, :as => :array ) 
+            if rs
+              rs.each do |row|
+                data << row
+              end
             end
           end
+
+          heads = rs.fields if rs
+        rescue => e
+          @engine.err e.message
         end
 
-        heads = rs.fields if rs
         return [ heads, data ]
       end
 
@@ -158,7 +170,7 @@ module Gloo
       # Based on the result set, build a QueryResult object.
       # 
       def get_query_result( result )
-        return QueryResult.new result[0], result[1]
+        return QueryResult.new result[0], result[1], @engine
       end
 
 

data/lib/gloo/objs/data/pg.rb

@@ -123,7 +123,7 @@ module Gloo
       # Based on the result set, build a QueryResult object.
       # 
       def get_query_result( result )
-        return QueryResult.new result[0], result[1]
+        return QueryResult.new result[0], result[1], @engine
       end