gloo 3.3.0 → 3.4.1

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/data/markdown.rb

@@ -56,23 +56,14 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[show page render]
+        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 )
-      end
-
-      #
-      # Show the markdown data in the terminal, paginated.
-      #
-      def msg_page
-        return unless self.value
-
-        @engine.platform.show( self.value, true, true )
+        @engine.platform.show self.value
       end
 
       #
@@ -94,6 +85,29 @@ module Gloo
         @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
       # ---------------------------------------------------------------------
@@ -113,25 +127,6 @@ module Gloo
         return markdown.render( md )
       end
 
-      # 
-      # Does not work.
-      # See note in the platform.rb file.
-      # 
-      # # 
-      # # Convert markdown to manpage using the
-      # # Redcarpet markdown processor.
-      # # 
-      # def self.md_2_manpage( md )
-      #   markdown = Redcarpet::Markdown.new( 
-      #     Redcarpet::Render::ManPage, 
-      #     autolink: true, 
-      #     fenced_code_blocks: true,
-      #     tables: true, 
-      #     strikethrough: true )
-          
-      #   return markdown.render( md )
-      # end
-
     end
   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
 
 

data/lib/gloo/objs/data/query_result.rb

@@ -3,7 +3,6 @@
 #
 # The result of a SQL database query.
 #
-require 'tty-table'
 
 module Gloo
   module Objs
@@ -15,16 +14,16 @@ module Gloo
       PARAMS = 'params'.freeze
 
 
-
       # ---------------------------------------------------------------------
       #    Set up the Result
       # ---------------------------------------------------------------------
 
       # 
       # Create the Result object
-      def initialize( heads, data )
+      def initialize( heads, data, engine=nil )
         @heads = heads
         @data = data
+        @engine = engine
       end
 
 
@@ -72,18 +71,14 @@ module Gloo
         @heads.each_with_index do |h, i|
           arr << [ h, row[i] ]
         end
-        table = TTY::Table.new( [ 'Field', 'Value' ], arr )
-        renderer = TTY::Table::Renderer::Unicode.new( table, padding: [0,1] )
-        puts renderer.render
+        @engine.platform.table.show [ 'Field', 'Value' ], arr
       end
 
       # 
       # Show multiple rows in a table view.
       # 
       def show_rows
-        table = TTY::Table.new( @heads, @data )
-        renderer = TTY::Table::Renderer::Unicode.new( table, padding: [0,1] )
-        puts renderer.render
+        @engine.platform.table.show @heads, @data
       end
 
       # ---------------------------------------------------------------------

data/lib/gloo/objs/data/table.rb

@@ -159,7 +159,7 @@ module Gloo
       #
       def msg_show
         title = self.value
-        @engine.platform.show_table headers, data, title
+        @engine.platform.table.show headers, data[1], title
       end
 
       def msg_render

data/lib/gloo/objs/security/cipher.rb

@@ -0,0 +1,193 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# A object to encrypt and decrypt text.
+#
+require 'openssl'
+require 'base64'
+
+module Gloo
+  module Objs
+    class Cipher < Gloo::Core::Obj
+
+      KEYWORD = 'cipher'.freeze
+      KEYWORD_SHORT = 'crypt'.freeze
+
+      CIPHER_TYPE = 'AES-256-CBC'.freeze
+      KEY = 'key'.freeze
+      INIT_VECTOR = 'init_vector'.freeze
+      DATA = 'data'.freeze
+
+      #
+      # The name of the object type.
+      #
+      def self.typename
+        return KEYWORD
+      end
+
+      #
+      # The short name of the object type.
+      #
+      def self.short_typename
+        return KEYWORD_SHORT
+      end
+
+      #
+      # Get the Cipher Key.
+      # Returns nil if there is none.
+      #
+      def key
+        o = find_child KEY
+        return o&.value
+      end
+
+      #
+      # Get the Initialization Vector.
+      # Returns nil if there is none.
+      #
+      def init_vector
+        o = find_child INIT_VECTOR
+        return o&.value
+      end
+
+      #
+      # Get the data value of the object.
+      # This might be encrypted or decrypted based on 
+      # what action was last taken.
+      #
+      def data
+        o = find_child DATA
+        return o&.value
+      end
+
+      #
+      # Update the key value.
+      #
+      def update_key( new_val )
+        o = find_child KEY
+        return unless o
+
+        o.set_value new_val
+      end
+
+      #
+      # Update the initialization vector value.
+      #
+      def update_init_vector( new_val )
+        o = find_child INIT_VECTOR
+        return unless o
+
+        o.set_value new_val
+      end
+
+      #
+      # Update the data value of the object.
+      #
+      def update_data( new_val )
+        o = find_child DATA
+        return unless o
+
+        o.set_value new_val
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Children
+      # ---------------------------------------------------------------------
+
+      #
+      # Does this object have children to add when an object
+      # is created in interactive mode?
+      # This does not apply during obj load, etc.
+      #
+      def add_children_on_create?
+        return true
+      end
+
+      #
+      # Add children to this object.
+      # This is used by containers to add children needed
+      # for default configurations.
+      #
+      def add_default_children
+        fac = @engine.factory
+        fac.create_string KEY, '', self
+        fac.create_string INIT_VECTOR, '', self
+        fac.create_string DATA, '', self
+      end
+
+      # ---------------------------------------------------------------------
+      #    Messages
+      # ---------------------------------------------------------------------
+
+      #
+      # Get a list of message names that this object receives.
+      #
+      def self.messages
+        return super + %w[generate_keys encrypt decrypt]
+      end
+
+      #
+      # Generate random Key and Initialization Vector.
+      #
+      def msg_generate_keys
+        cipher = OpenSSL::Cipher.new( CIPHER_TYPE )
+
+        key = cipher.random_key
+        key = Base64.encode64 key
+        update_key key
+
+        iv = update_init_vector cipher.random_iv
+        iv = Base64.encode64 iv
+        update_init_vector iv
+      end
+
+      #
+      # Decrypt the encrypted child object.
+      #
+      def msg_decrypt
+        update_data Cipher.decrypt( data, key, init_vector )
+      end
+
+      #
+      # Encrypt the decrypted child object.
+      #
+      def msg_encrypt
+        update_data Cipher.encrypt( data, key, init_vector )
+      end
+
+      # ---------------------------------------------------------------------
+      #    Static Methods
+      # ---------------------------------------------------------------------
+
+      # 
+      # Encrypt the data using the key and initialization vector.
+      # Returns the encrypted data (base64 encoded).
+      # 
+      def self.encrypt( data, key, iv )
+        cipher = OpenSSL::Cipher.new( CIPHER_TYPE )
+        cipher.encrypt
+        cipher.key = Base64.decode64( key )
+        cipher.iv = Base64.decode64( iv ) unless iv.blank?
+
+        encrypted_msg = cipher.update( data ) + cipher.final
+        return Base64.encode64( encrypted_msg )
+      end
+
+      # 
+      # Decrypt the data using the key and initialization vector.
+      # Returns the decrypted data.
+      #
+      def self.decrypt( data, key, iv )
+        cipher = OpenSSL::Cipher.new( CIPHER_TYPE )
+        data = Base64.decode64( data )
+        cipher.decrypt
+        cipher.key = Base64.decode64( key )
+        cipher.iv = Base64.decode64( iv ) unless iv.blank?
+
+        return cipher.update( data ) + cipher.final
+      end
+
+    end
+  end
+end