gloo 3.1.0 → 3.2.0

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

@@ -13,6 +13,8 @@ module Gloo
       KEYWORD_SHORT = 'tbl'.freeze
       HEADERS = 'headers'.freeze
       DATA = 'data'.freeze
+      CELLS = 'cells'.freeze
+      STYLES = 'styles'.freeze
 
       #
       # The name of the object type.
@@ -58,12 +60,64 @@ module Gloo
         return [] unless o
 
         o = Gloo::Objs::Alias.resolve_alias( @engine, o )
-        cols = self.columns
-        return o.children.map do |e|
-          cols.map { |h| e.find_child( h ).value }
+        
+        if o.is_a? Gloo::Objs::Query
+          @engine.log.debug "Table getting data from query."
+          begin
+            result = o.run_query
+            return result
+          rescue => e
+            @engine.err e.message
+            return nil
+          end
+        else
+          cols = self.columns
+
+          if o.children&.first.children.empty?
+            # It is a simgle row table.
+            rows = [ cols.map { |h| o.find_child( h )&.value } ]
+          else
+            rows = o.children.map do |e|
+              cols.map { |h| e.find_child( h )&.value }
+            end
+          end
+
+          return [ cols, rows ]
         end
       end
 
+      # 
+      # Get the styles for the table, if any.
+      # 
+      def styles
+        style_h = {} 
+        o = find_child STYLES
+        return style_h unless o
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+
+        o.children.each do |c|
+          style_h[ c.name ] = c.value
+        end
+
+        return style_h
+      end
+
+      # 
+      # Get cell renderer hash keyed by column name.
+      # 
+      def cell_renderers
+        h = {}
+        o = find_child CELLS
+        return h unless o
+
+        o.children.each do |c|
+          h[ c.name ] = c.value
+        end
+
+        return h
+      end
+
+
       # ---------------------------------------------------------------------
       #    Children
       # ---------------------------------------------------------------------
@@ -88,6 +142,7 @@ module Gloo
         fac.create_can DATA, self
       end
 
+
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------
@@ -96,7 +151,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[show]
+        return super + %w[show render]
       end
 
       #
@@ -107,6 +162,90 @@ module Gloo
         @engine.platform.show_table headers, data, title
       end
 
+      def msg_render
+        return render
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Render
+      # ---------------------------------------------------------------------
+
+      # 
+      # Render the table.
+      # The render_ƒ is 'render_html', 'render_text', 'render_json', etc.
+      # 
+      def render render_ƒ
+        begin
+          result = self.data
+          head = self.headers 
+          head = result[0] if head.empty?
+          rows = result[1]
+
+          columns = build_columns result[0]
+
+          params = { 
+            head: head, 
+            cols: result[0],
+            columns: columns,
+            rows: rows,
+            styles: self.styles,
+            cell_renderers: self.cell_renderers
+          }
+
+          helper = Gloo::WebSvr::TableRenderer.new( @engine )
+          return helper.data_to_table params
+        rescue => e
+          @engine.err e.message
+          return nil
+        end
+      end
+
+      # 
+      # Build the column list based on the result data and
+      # the headers defined in the table object.
+      # 
+      def build_columns result_data
+        head_children = find_child HEADERS
+        cell_renderers = find_child CELLS
+
+        columns = []
+        return columns unless result_data
+        
+        result_data.each_with_index do |c,index|
+          visible = true
+          name = c
+          title = c
+          display_index = index
+
+          if head_children
+            child = head_children.find_child c
+            if child
+              title = child.value
+              display_index = head_children.child_index( c )
+            else
+              visible = false
+            end
+          end
+
+          cell_renderer = nil
+          if cell_renderers
+            this_cr = cell_renderers.find_child( c )
+            cell_renderer = this_cr.value if this_cr
+          end
+
+          columns << { 
+            name: name, 
+            title: title, 
+            visible: visible, 
+            data_index: index,
+            display_index: display_index,
+            cell_renderer: cell_renderer
+          }
+        end
+        return columns.sort_by { |hsh| hsh[ :display_index ] }
+      end
+
     end
   end
 end

data/lib/gloo/objs/web/json.rb

@@ -63,6 +63,8 @@ module Gloo
       # Make the JSON pretty.
       #
       def msg_pretty
+        return unless self.value
+
         json = JSON.parse( self.value )
         pretty = JSON.pretty_generate( json )
         set_value pretty

data/lib/gloo/objs/web_svr/element.rb

@@ -173,7 +173,7 @@ module Gloo
       # Get the expiration date for the certificate.
       #
       def msg_render
-        content = self.render
+        content = self.render_html
         @engine.heap.it.set_to content 
         return content
       end
@@ -226,10 +226,9 @@ module Gloo
             e = Gloo::Objs::Alias.resolve_alias( engine, e )
             if e.class == Element
               rendered_obj_content << e.send( render_ƒ )
-            elsif e.class == Partial
-              rendered_obj_content << e.render( render_ƒ )
             else
-              rendered_obj_content << e.value.to_s
+              data = render_thing e, render_ƒ, engine
+              ( rendered_obj_content << data ) if data # e.render( render_ƒ )
             end
           end
         else
@@ -238,7 +237,16 @@ module Gloo
 
         return rendered_obj_content
       end
-                    
+
+      def self.render_thing e, render_ƒ, engine
+        begin
+          return e.render( render_ƒ )
+        rescue => e
+          engine.err e.message
+          return ''
+        end
+      end
+  
     end
   end
 end

data/lib/gloo/objs/web_svr/page.rb

@@ -17,6 +17,7 @@ module Gloo
 
       # Parameters used during render.
       PARAMS = 'params'.freeze
+      ID = 'id'.freeze
 
       # Content
       HEAD = 'head'.freeze
@@ -112,6 +113,19 @@ module Gloo
         params_can = find_child PARAMS
         return nil unless params_can
 
+        if @request
+          url_params = @request.query_params
+          url_params.each do |k,v|
+            o = params_can.find_child k
+            o.set_value( v ) if o
+          end
+
+          @request.body_params.each do |k,v|
+            o = params_can.find_child k
+            o.set_value( v ) if o
+          end
+        end
+
         h = {}
         params_can.children.each do |o|
           h[ o.name ] = o.value
@@ -281,15 +295,38 @@ module Gloo
         return @engine.running_app.obj.redirect
       end
 
+      # 
+      # Set the ID parameter if there is one.
+      # 
+      def set_id
+        return unless @request.id
+        @engine.log.info "Setting ID: #{@request.id}"
+
+        params_can = find_child PARAMS
+        return nil unless params_can
+
+        id_obj = params_can.find_child( ID )
+        return unless id_obj
+
+        id_obj.set_value( @request.id )
+      end
+
       # 
       # Render the page.
+      # If this is being called from the web server,
+      # the request will be passed in and will include
+      # request context such as params.
       # 
-      def render
-        run_on_render
-        return nil if redirect_set?
+      def render request=nil
+        @request = request
+        set_id if @request
 
+        # Set Params before running on render
         params = params_hash
 
+        run_on_render
+        return nil if redirect_set?
+
         if is_html?
           contents = render_html params
         elsif is_json?
@@ -302,6 +339,7 @@ module Gloo
         end
         
         run_on_rendered
+        @request = nil
         return nil if redirect_set?
 
         return contents

data/lib/gloo/objs/web_svr/partial.rb

@@ -161,8 +161,13 @@ module Gloo
         run_on_render
 
         part_content = ''
-        content.children.each do |e|
-          part_content << e.send( render_ƒ )
+        data = content
+        if data.children.empty?
+          part_content = data.value
+        else
+          data.children.each do |e|
+            part_content << e.send( render_ƒ )
+          end
         end
       
         # part_content = Page.render_params part_content, params_hash

data/lib/gloo/objs/web_svr/svr.rb

@@ -16,6 +16,10 @@ module Gloo
       HOST = 'host'.freeze
       PORT = 'port'.freeze
 
+      # SSL Configuration
+      SSL_CERT = 'ssl_cert'.freeze
+      SSL_KEY = 'ssl_key'.freeze
+
       # Events
       ON_START = 'on_start'.freeze
       ON_STOP = 'on_stop'.freeze
@@ -32,7 +36,7 @@ module Gloo
 
 
       # Messages
-      SERVER_NOT_RUNNING = 'The web server is not running and cannot be stopped'.freeze
+      SERVER_NOT_RUNNING = 'The web server is not running!'.freeze
 
       # 
       # Should the current request be redirected?
@@ -115,6 +119,56 @@ module Gloo
         return o
       end
 
+
+      # ---------------------------------------------------------------------
+      #    SSL
+      # ---------------------------------------------------------------------
+
+      # 
+      # Is SSL configured for this server?
+      # True if the Cert and Key are both present.
+      # 
+      def use_ssl?
+        return ssl_cert && ssl_key
+      end
+
+      #
+      # Get the SSL certificate from the child object.
+      # Returns nil if there is none.
+      #
+      def ssl_cert
+        cert = find_child SSL_CERT
+        return nil unless cert
+
+        cert = Gloo::Objs::Alias.resolve_alias( @engine, cert )
+        return cert
+      end
+
+      #
+      # Get the SSL key from the child object.
+      # Returns nil if there is none.
+      #
+      def ssl_key
+        key = find_child SSL_KEY
+        return nil unless key
+
+        key = Gloo::Objs::Alias.resolve_alias( @engine, key )
+        return key
+      end
+
+      # 
+      # Get the SSL configuration for the server.
+      # 
+      def ssl_config
+        return nil unless use_ssl?
+
+        return {
+          :private_key_file => ssl_key.value,
+          :cert_chain_file => ssl_cert.value,
+          :verify_peer => false,
+        }
+      end
+
       # ---------------------------------------------------------------------
       #    Children
       # ---------------------------------------------------------------------
@@ -156,7 +210,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + [ 'start', 'stop' ]
+        return super + [ 'start', 'stop', 'routes' ]
       end
 
       #
@@ -183,6 +237,18 @@ module Gloo
         end
       end
 
+      # 
+      # Helper message to show all routes in the running server.
+      # 
+      def msg_routes
+        if @router
+          @router.show_routes
+        else
+          @engine.log.error SERVER_NOT_RUNNING
+        end
+      end
+
+
       # ---------------------------------------------------------------------
       #    Start and Stop Events
       #    Might come from messages or from other application events.
@@ -197,10 +263,10 @@ module Gloo
         @engine.log.info "Web Server URL: #{config.base_url}"
 
         handler = Gloo::WebSvr::Handler.new( @engine, self )
-        @web_server = Gloo::WebSvr::Server.new( @engine, handler, config )
+        @web_server = Gloo::WebSvr::Server.new( @engine, handler, config, ssl_config )
         @web_server.start
 
-        @router = Gloo::WebSvr::Router.new( @engine, self )
+        @router = Gloo::WebSvr::Routing::Router.new( @engine, self )
         @router.add_page_routes
 
         @asset = Gloo::WebSvr::Asset.new( @engine, self )
@@ -219,6 +285,7 @@ module Gloo
         @engine.log.info "Stopping web server…"
         @web_server.stop
         @web_server = nil
+        @router = nil
 
         run_on_stop
         @engine.log.info "Web server stopped…"

data/lib/gloo/verbs/break.rb

@@ -0,0 +1,44 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Break out of the script without error.
+#
+
+module Gloo
+  module Verbs
+    class Break < Gloo::Core::Verb
+
+      KEYWORD = 'break'.freeze
+      KEYWORD_SHORT = 'stop'.freeze
+
+      #
+      # Run the verb.
+      # Stop the execution of the current script.
+      #
+      def run
+        @engine.exec_env.running_script.break_out
+      end
+
+      #
+      # Get the Verb's keyword.
+      #
+      def self.keyword
+        return KEYWORD
+      end
+
+      #
+      # Get the Verb's keyword shortcut.
+      #
+      def self.keyword_shortcut
+        return KEYWORD_SHORT
+      end
+
+      # ---------------------------------------------------------------------
+      #    Private functions
+      # ---------------------------------------------------------------------
+
+      private
+
+    end
+  end
+end

data/lib/gloo/verbs/create.rb

@@ -57,6 +57,12 @@ module Gloo
         if Gloo::Expr::LString.string?( value )
           value = Gloo::Expr::LString.strip_quotes( value )
         end
+
+        # Check to see if this is an alias
+        pn = Gloo::Core::Pn.new( @engine, name )
+        obj = pn.resolve if pn
+        name = obj.value if obj&.is_alias?
+
         obj = @engine.factory.create( { name: name, type: type, value: value } )
 
         obj.add_default_children if obj&.add_children_on_create?

data/lib/gloo/verbs/log.rb

@@ -16,11 +16,11 @@ module Gloo
       #
       def run
         if @tokens.token_count > 1
-          expr = Gloo::Expr::Expression.new( @engine, @tokens.params )
-          result = expr.evaluate
-          level = log_level_specified( result )
-          @engine.log.write result, level
-          @engine.heap.it.set_to result
+          if is_clear_cmd?
+            @engine.log.clear
+          else
+            write_to_log
+          end
         else
           @engine.log.debug ''
         end
@@ -46,6 +46,27 @@ module Gloo
 
       private
 
+      # 
+      # Write to the specified logger.
+      # 
+      def write_to_log
+        expr = Gloo::Expr::Expression.new( @engine, @tokens.params )
+        result = expr.evaluate
+        level = log_level_specified( result )
+        @engine.log.write result, level
+        @engine.heap.it.set_to result
+      end
+
+      # 
+      # Is this a clear logs command?
+      # 
+      def is_clear_cmd?      
+        return true if ( ( @tokens.token_count == 2 ) && 
+          ( @tokens.params.first == 'clear' ) )
+          
+        return false
+      end
+
       #
       # Get the formatted string.
       #

data/lib/gloo/verbs/redirect.rb

@@ -12,7 +12,11 @@ module Gloo
       KEYWORD = 'redirect'.freeze
       KEYWORD_SHORT = 'go'.freeze
 
+      RUN_MESSAGE = 'run'.freeze
+
       MISSING_EXPR_ERR = 'Missing Expression!'.freeze
+      APP_NOT_RUNING_ERR = 'The application is not running!'.freeze
+      BAD_TARGET_ERR = 'Bad redirect target!'.freeze
 
       #
       # Run the verb.
@@ -23,12 +27,8 @@ module Gloo
           return
         end
 
-        # Send the redirect page to the running app.
-        if @engine.app_running?
-          obj_name = @tokens.second
-          pn = Gloo::Core::Pn.new( @engine, obj_name )
-          @engine.running_app.obj.redirect = pn.resolve
-        end
+        determine_target
+        redirect_to_target
       end
 
       #
@@ -51,6 +51,54 @@ module Gloo
 
       private
 
+      # 
+      # Send the control to the redirect target.
+      # This could be a page or a script.
+      # 
+      def redirect_to_target
+        if @target_obj.class == Gloo::Objs::Page 
+          redirect_to_page
+        elsif @target_obj.can_receive_message?( RUN_MESSAGE )
+          redirect_to_script
+        else
+          @engine.err BAD_TARGET_ERR
+        end
+      end
+
+      # 
+      # Find the target of the redirect.
+      # 
+      def determine_target
+        obj_name = @tokens.second
+        pn = Gloo::Core::Pn.new( @engine, obj_name )
+
+        @target_obj = pn.resolve
+ 
+        @engine.log.info "obj type: #{@target_obj.class}"
+      end
+
+      # 
+      # Redirect to a page.
+      # This requires a running web server.
+      # 
+      def redirect_to_page
+        if @engine.app_running?
+          @engine.running_app.obj.redirect = @target_obj
+        else
+          @engine.err APP_NOT_RUNING_ERR
+        end
+      end
+
+      # 
+      # Redirect to another script.
+      # This stops execution of the current script.
+      # 
+      def redirect_to_script
+        @engine.exec_env.running_script.break_out
+
+        Gloo::Exec::Dispatch.message( @engine, RUN_MESSAGE, @target_obj )
+      end
+
     end
   end
 end

data/lib/gloo/web_svr/asset.rb

@@ -11,6 +11,7 @@ module Gloo
       ASSETS_FOLDER = 'assets'.freeze
       IMAGES_FOLDER = 'images'.freeze
       STYLESHEETS_FOLDER = 'stylesheets'.freeze
+      JAVASCRIPT_FOLDER = 'javascript'.freeze
 
       CSS_TYPE = 'text/css'.freeze
       JS_TYPE = 'text/javascript'.freeze
@@ -59,6 +60,13 @@ module Gloo
         return File.join( assets_folder, STYLESHEETS_FOLDER )
       end
 
+      # 
+      # Get the stylesheets folder in the project.
+      #
+      def javascript_folder
+        return File.join( assets_folder, JAVASCRIPT_FOLDER )
+      end
+
       # 
       # Find and return the page for the given route.
       # 
@@ -125,6 +133,7 @@ module Gloo
         add_containers
         add_images
         add_stylesheets
+        add_javascript
       end
 
       # 
@@ -141,6 +150,9 @@ module Gloo
 
         @stylesheets = @assets.find_child( STYLESHEETS_FOLDER ) || 
           @factory.create_can( STYLESHEETS_FOLDER, @assets )
+
+        @javascript = @assets.find_child( JAVASCRIPT_FOLDER ) || 
+          @factory.create_can( JAVASCRIPT_FOLDER, @assets )
       end
 
       #
@@ -175,6 +187,22 @@ module Gloo
         end
       end
 
+      #
+      # Add the Javascript files to the web server pages.
+      #
+      def add_javascript
+        @log.debug 'Adding javascript asset routes to web server…'
+
+        return unless File.exist? javascript_folder
+
+        # for each file in the javascript folder
+        # create a file object and add it to the javascript container
+        Dir.each_child( javascript_folder ) do |name|
+          pn = File.join( JAVASCRIPT_FOLDER, name )
+          add_file_obj( @javascript, name, pn )
+        end
+      end
+
       # 
       # Add a file object (page route) to the given container.
       #