gloo 3.5.0 → 3.6.0

data/lib/gloo/objs/ctrl/each_word.rb

@@ -0,0 +1,67 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Iterate over each word in a string.
+# 
+
+module Gloo
+  module Objs
+    class EachWord
+
+      WORD = 'word'.freeze
+
+      
+      # ---------------------------------------------------------------------
+      #    Create Iterator
+      # ---------------------------------------------------------------------
+
+      def initialize( engine, iterator_obj )
+        @engine = engine
+        @iterator_obj = iterator_obj
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Check if this is the right iterator
+      # ---------------------------------------------------------------------
+
+      #
+      # Use this iterator for each loop?
+      #
+      def self.use_for?( iterator_obj )
+        return true if iterator_obj.find_child WORD
+
+        return false
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Iterate
+      # ---------------------------------------------------------------------
+
+      #
+      # Run for each word.
+      #
+      def run
+        str = @iterator_obj.in_value
+        return unless str
+
+        str.split( ' ' ).each do |word|
+          set_word word
+          @iterator_obj.run_do
+        end
+      end
+
+      #
+      # Set the value of the word.
+      #
+      def set_word( word )
+        o = @iterator_obj.find_child WORD
+        return unless o
+
+        o.set_value word
+      end
+
+    end
+  end
+end

data/lib/gloo/objs/data/query.rb

@@ -34,6 +34,15 @@ module Gloo
         return KEYWORD_SHORT
       end
 
+      # 
+      # Get the result container if it exists.
+      # 
+      def get_result_can
+        result_can = find_child RESULT
+        result_can = Gloo::Objs::Alias.resolve_alias( @engine, result_can )
+        return result_can
+      end
+
       # ---------------------------------------------------------------------
       #    Children
       # ---------------------------------------------------------------------
@@ -78,6 +87,8 @@ module Gloo
         return unless db
 
         begin
+          clear_results
+
           result = db.query( sql_value, param_array )
           process_result( result, db )
         rescue => e
@@ -177,8 +188,7 @@ module Gloo
         return unless query_result
         return unless query_result.has_data_to_show?
 
-        result_can = find_child RESULT
-        result_can = Gloo::Objs::Alias.resolve_alias( @engine, result_can )
+        result_can = get_result_can
 
         if result_can
           if simple_list?
@@ -205,12 +215,51 @@ module Gloo
         params = []
         o.children.each do |p|
           p = Gloo::Objs::Alias.resolve_alias( @engine, p )
-          params << p.value
+          params << p.sql_value
         end
 
         return params
       end
 
+      # 
+      # Clear out results container.
+      # Prevents data from the last use being used in this 
+      # one if no data was found.
+      # 
+      def clear_results
+        result_can = get_result_can
+        return unless result_can
+        return unless result_can.child_count.positive?
+
+        if result_is_values?
+          clear_values
+        else
+          get_result_can.delete_children
+        end
+      end
+
+      # 
+      # Is the result container a list of values?
+      # If not it is a list of rows.
+      # 
+      def result_is_values?
+        first_child = get_result_can.children.first
+
+        if first_child && first_child&.is_container?
+          return false
+        end
+
+        return true
+      end
+
+      # 
+      # Clear out the values in the results container.
+      # 
+      def clear_values
+        get_result_can.children.each do |c|
+          c.value = nil
+        end
+      end
 
     end
   end

data/lib/gloo/objs/system/file_handle.rb

@@ -33,8 +33,8 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        basic = %w[read write]
-        checks = %w[check_exists check_is_file check_is_dir]
+        basic = %w[read write get_name get_ext get_parent]
+        checks = %w[exists? is_file? is_dir?]
         search = %w[find_match]
         show = %w[show page open]
         return super + basic + show + checks + search
@@ -102,7 +102,7 @@ module Gloo
       #
       # Check to see if the file exists.
       #
-      def msg_check_exists
+      def msg_exists?
         result = File.exist? value
         @engine.heap.it.set_to result
       end
@@ -110,7 +110,7 @@ module Gloo
       #
       # Check to see if the file is a file.
       #
-      def msg_check_is_file
+      def msg_is_file?
         result = File.file? value
         @engine.heap.it.set_to result
       end
@@ -118,7 +118,7 @@ module Gloo
       #
       # Check to see if the file is a directory.
       #
-      def msg_check_is_dir
+      def msg_is_dir?
         result = File.directory? value
         @engine.heap.it.set_to result
       end
@@ -131,6 +131,40 @@ module Gloo
         @engine.heap.it.set_to result
       end
 
+      #
+      # Get the name of the file.
+      #
+      def msg_get_name
+        if value.blank?
+          @engine.heap.it.set_to ''
+        else
+          file_name = File.basename( value, File.extname( value ) )
+          @engine.heap.it.set_to file_name
+        end
+      end
+
+      #
+      # Get the file's extension.
+      #
+      def msg_get_ext
+        if value.blank?
+          @engine.heap.it.set_to ''
+        else
+          @engine.heap.it.set_to File.extname( value )
+        end
+      end
+
+      # 
+      # Get the parent directory of the file.
+      # 
+      def msg_get_parent
+        if value.blank?
+          @engine.heap.it.set_to ''
+        else
+          @engine.heap.it.set_to File.dirname( value )
+        end
+      end
+
     end
   end
 end

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

@@ -226,7 +226,7 @@ module Gloo
             e = Gloo::Objs::Alias.resolve_alias( engine, e )
             if e.class == Element
               rendered_obj_content << e.send( render_ƒ )
-            else
+            elsif e
               data = render_thing e, render_ƒ, engine
               ( rendered_obj_content << data ) if data # e.render( render_ƒ )
             end

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

@@ -114,14 +114,22 @@ module Gloo
         params_can = find_child PARAMS
         return nil unless params_can
 
+        # First set URL route params if there are any.
+        if @request&.request_params&.route_params
+          @request.request_params.route_params.each_with_index do |route_p,i|
+            o = params_can.children[i]
+            o.set_value( route_p ) if o && o.name != ID
+          end
+        end
+
         if @request
-          url_params = @request.query_params
+          url_params = @request.request_params.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|
+          @request.request_params.body_params.each do |k,v|
             o = params_can.find_child k
             o.set_value( v ) if o
           end
@@ -316,8 +324,8 @@ module Gloo
       # Set the ID parameter if there is one.
       # 
       def set_id
-        return unless @request.id
-        @engine.log.info "Setting ID: #{@request.id}"
+        return unless @request.request_params.id
+        @engine.log.info "Setting ID: #{@request.request_params.id}"
 
         params_can = find_child PARAMS
         return nil unless params_can
@@ -325,7 +333,7 @@ module Gloo
         id_obj = params_can.find_child( ID )
         return unless id_obj
 
-        id_obj.set_value( @request.id )
+        id_obj.set_value( @request.request_params.id )
       end
 
       # 
@@ -336,6 +344,8 @@ module Gloo
       # 
       def render request=nil
         @request = request
+
+        # TODO : refactor this
         set_id if @request
 
         # Run the on prerender script

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

@@ -74,7 +74,8 @@ module Gloo
       # If the redirect is set, then use that page instead
       # of the one requested.
       # 
-      attr_accessor :redirect, :router, :asset, :embedded_renderer
+      attr_accessor :redirect, :redirect_hard
+      attr_accessor :router, :asset, :embedded_renderer
       attr_accessor :session
 
       #
@@ -292,7 +293,7 @@ module Gloo
         child_obj = session_container.find_child( key )
         unless child_obj
           fac = @engine.factory
-          child_obj = fac.create_string key, value, session_obj
+          child_obj = fac.create_string key, value, session_container
         end
         child_obj.value = value
       end
@@ -560,17 +561,27 @@ module Gloo
       # the on_response event is fired.
       # 
       def set_response_data( request, response, page_obj=nil )
-        data = find_child RESPONSE_DATA
-        return unless data
-        data = Gloo::Objs::Alias.resolve_alias( @engine, data )
-
-        data.find_child( ELAPSED )&.set_value( request.elapsed )
-        data.find_child( DB )&.set_value( request.db )
-        data.find_child( TYPE )&.set_value( response.type )
-        data.find_child( CODE )&.set_value( response.code )
-
-        if page_obj
-          data.find_child( PAGE )&.set_value( page_obj.pn ) 
+        begin
+          data = find_child RESPONSE_DATA
+          return unless data
+          data = Gloo::Objs::Alias.resolve_alias( @engine, data )
+
+          data.find_child( ELAPSED )&.set_value( request.elapsed )
+          data.find_child( DB )&.set_value( request.db )
+
+          if ( response )
+            data.find_child( TYPE )&.set_value( response.type )
+            data.find_child( CODE )&.set_value( response.code )
+          else
+            data.find_child( TYPE )&.set_value( '' )
+            data.find_child( CODE )&.set_value( '' )
+          end
+
+          if page_obj
+            data.find_child( PAGE )&.set_value( page_obj.pn ) 
+          end
+        rescue => e
+          @engine.log_exception e
         end
       end
 

data/lib/gloo/persist/file_loader.rb

@@ -154,7 +154,7 @@ module Gloo
         params = { name: name, type: type, value: value, parent: @parent }
         @last = @engine.factory.create( params )
 
-        if value.empty? && @last&.multiline_value?
+        if value&.empty? && @last&.multiline_value?
           @multi_indent = 0
           @in_multiline = true
           puts "*** Start multiline. multi_indent: #{@multi_indent}" if @debug

data/lib/gloo/persist/line_splitter.rb

@@ -39,6 +39,7 @@ module Gloo
       def detect_name
         @line = @line.strip
         @idx = @line.index( ' ' )
+        @idx = 0 unless @idx
         @name = @line[ 0..@idx - 1 ]
       end
 

data/lib/gloo/verbs/redirect.rb

@@ -13,6 +13,7 @@ module Gloo
       KEYWORD_SHORT = 'go'.freeze
 
       RUN_MESSAGE = 'run'.freeze
+      KEYWORD_HARD = 'hard'.freeze
 
       MISSING_EXPR_ERR = 'Missing Expression!'.freeze
       APP_NOT_RUNING_ERR = 'The application is not running!'.freeze
@@ -27,8 +28,12 @@ module Gloo
           return
         end
 
-        determine_target
-        redirect_to_target
+        if is_hard_redirect?
+          redirect_hard
+        else
+          determine_target
+          redirect_to_target
+        end
       end
 
       #
@@ -51,6 +56,32 @@ module Gloo
 
       private
 
+      # 
+      # Is this a hard redirect?
+      # A hard redirect returns the new URL to the client.
+      # 
+      def is_hard_redirect?
+        return false unless @params&.token_count&.positive?
+
+        param_val = @params.tokens.first
+        return ( param_val.downcase == KEYWORD_HARD )
+      end
+
+      # 
+      # Redirect to the target using a hard redirect.
+      # 
+      def redirect_hard
+        expr = Gloo::Expr::Expression.new( @engine, @tokens.params )
+        to_site = expr.evaluate
+
+        if @engine.app_running?
+          @engine.exec_env.running_script.break_out
+          @engine.running_app.obj.redirect_hard = to_site
+        else
+          @engine.err APP_NOT_RUNING_ERR
+        end
+      end
+
       # 
       # Send the control to the redirect target.
       # This could be a page or a script.

data/lib/gloo/web_svr/handler.rb

@@ -36,10 +36,15 @@ module Gloo
       def handle request
         @request = request
         page_obj = nil
+        route_params = nil
 
-        page, id = @server_obj.router.page_for_route( @request.path, @request.method )
+        page, id, route_params = @server_obj.router.page_for_route( @request.path, @request.method )
         @engine.log.debug "Found Page: #{page&.name}" if page
-        request.id = id
+
+        request.request_params.id = id
+        request.request_params.route_params = route_params
+        request.request_params.log_id_keys
+
         if page
           if page.is_a? Gloo::Objs::FileHandle
             result = handle_file page
@@ -60,7 +65,10 @@ module Gloo
       # 
       def handle_page page
         result = page.render @request
-        if redirect_set?
+        if redirect_hard_set?
+          result = server_redirect_result
+          @engine.running_app.obj.redirect_hard = nil
+        elsif redirect_set?
           page = @engine.running_app.obj.redirect
           @log.debug "Redirecting to: #{page.pn}"
           @engine.running_app.obj.redirect = nil
@@ -110,7 +118,7 @@ module Gloo
 
 
       # ---------------------------------------------------------------------
-      #    Helper functions
+      #    Redirect Helper functions
       # ---------------------------------------------------------------------
 
       # 
@@ -121,6 +129,23 @@ module Gloo
         return @engine.running_app.obj.redirect
       end
 
+      # 
+      # Is there a redirect page set in the running app?
+      # 
+      def redirect_hard_set?
+        return false unless @engine.app_running?
+        return @engine.running_app.obj.redirect_hard
+      end
+
+      # 
+      # Return a redirect result.
+      # 
+      def server_redirect_result
+        target = @engine.running_app.obj.redirect_hard
+
+        return Gloo::WebSvr::Response.redirect_response( @engine, target )
+      end    
+
     end
   end
 end

data/lib/gloo/web_svr/request.rb

@@ -23,9 +23,9 @@ module Gloo
       HTTP_HOST = 'HTTP_HOST'.freeze
       QUERY_STRING = 'QUERY_STRING'.freeze
 
-      attr_reader :method, :host, :path, :query, :body, :ip
+      attr_reader :method, :host, :path, :ip, :query
       attr_reader :db, :elapsed
-      attr_accessor :id
+      attr_accessor :request_params
 
       
       # ---------------------------------------------------------------------
@@ -38,6 +38,7 @@ module Gloo
       def initialize( engine, handler, env = nil )
         @engine = engine
         @log = @engine.log
+        @request_params = RequestParams.new( @log )
 
         @handler = handler
 
@@ -85,18 +86,13 @@ module Gloo
         @path = req.path
         @host = req.host_with_port
         @query = req.query_string
-        @ip = req.ip
-
-        # @method = @env[ REQUEST_METHOD ]
-        # @path = @env[ REQUEST_PATH ]
-        # @host = @env[ HTTP_HOST ]
-        # @query = @env[ QUERY_STRING ]
 
+        @request_params.init_query_params( @query )
+        @ip = req.ip
         @handler.server_obj.session.set_session_data_for_request( @env )
 
-        @body = @env[ 'rack.input' ].read
-        @body = Rack::Utils.parse_query @body
-        check_body_method
+        @request_params.init_body_params( @env[ 'rack.input' ].read )
+        @method = @request_params.get_body_method_override @method
       end
 
 
@@ -127,38 +123,13 @@ module Gloo
       #    Helper functions
       # ---------------------------------------------------------------------
 
-      # 
-      # Check the body to see if there is a PATCH or a PUT in 
-      # the method override.
-      # 
-      def check_body_method
-        if @body[ '_method' ]
-          @method = @body[ '_method' ].upcase
-        end
-      end
-
-      #
-      # Get the hash of query parameters.
-      # 
-      def query_params
-        return {} unless @query
-        return Rack::Utils.parse_query( @query )
-      end
-
-      # 
-      # Get the hash of body parameters.
-      # 
-      def body_params
-        return @body ? @body : {}
-      end
-
       # 
       # Write the request information to the log.
       # 
       def log
         @log.info "#{@method} #{@host}#{@path}"
-        @log.info "Parameters: #{@query}"
-        @log.info "Body: #{@body}" unless @body.empty?
+
+        @request_params.log_params
       end
 
     end

data/lib/gloo/web_svr/request_params.rb

@@ -0,0 +1,104 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# A Parameters associated with a request.
+#
+# Kinds of Params
+#   Id - The entity id
+#   Key - URL parameter key
+#   URL Params - Parameters in the URL
+#   Body Params - Data from the body of the request
+# 
+
+module Gloo
+  module WebSvr
+    class RequestParams
+
+      attr_accessor :id, :route_params
+      attr_reader :query_params, :body_params
+      
+      # ---------------------------------------------------------------------
+      #    Initialization
+      # ---------------------------------------------------------------------
+
+      #
+      # Set up the web server.
+      #
+      def initialize( log )
+        @log = log
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Value Detection
+      # ---------------------------------------------------------------------
+
+      # 
+      # Detect the parameters from query string.
+      # 
+      def init_query_params query_string
+        if query_string
+          @query_params = Rack::Utils.parse_query( query_string )
+        else
+          @query_params = {} 
+        end
+      end
+
+      # 
+      # Detect the parameters from the body of the request.
+      # 
+      def init_body_params body
+        if body
+          @body_params = Rack::Utils.parse_query body
+        else
+          @body_params = {} 
+        end
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Helper functions
+      # ---------------------------------------------------------------------
+
+      # 
+      # Check the body to see if there is a PATCH or a PUT in 
+      # the method override.
+      # 
+      def get_body_method_override orig_method
+        if @body_params[ '_method' ]
+          return @body_params[ '_method' ].upcase
+        end
+        return orig_method
+      end
+
+      # 
+      # Write the querey and body params to the log.
+      # 
+      def log_params
+        return unless @log
+
+        if @query_params && ! @query_params.empty?
+          @log.info "--- Query Parameters: #{@query_params}" 
+        end
+
+        if @body_params && ! @body_params.empty?
+          @log.info "--- Body Parameters: #{@body_params}"
+        end
+      end
+
+      # 
+      # Write the id and route params to the log.
+      # 
+      def log_id_keys
+        return unless @log
+
+        @log.info "--- ID Parameter: #{@id}" if @id
+
+        if @route_params && ! @route_params.empty?
+          @log.info "--- Route Parameters: #{@route_params}"
+        end
+      end
+
+    end
+  end
+end