gloo 3.4.1 → 3.6.0

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
@@ -354,7 +364,7 @@ module Gloo
         elsif is_text?
           contents = render_text params
         else
-          @engine.log.error "Unknown content type: #{content_type}"
+          @engine.err "Unknown content type: #{content_type}"
           return nil
         end
 

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

@@ -50,6 +50,7 @@ module Gloo
       CODE = 'code'.freeze
       ELAPSED = 'elapsed'.freeze
       DB = 'db'.freeze
+      PAGE = 'page'.freeze
 
       # Container with pages in the web app.
       PAGES = 'pages'.freeze
@@ -73,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
 
       #
@@ -291,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
@@ -426,7 +428,7 @@ module Gloo
           @engine.stop_running_app
           # The running app will call the stop function (below)
         else
-          @engine.log.error SERVER_NOT_RUNNING
+          @engine.err SERVER_NOT_RUNNING
         end
       end
 
@@ -437,7 +439,7 @@ module Gloo
         if @router
           @router.show_routes
         else
-          @engine.log.error SERVER_NOT_RUNNING
+          @engine.err SERVER_NOT_RUNNING
         end
       end
 
@@ -558,15 +560,29 @@ module Gloo
       # This is done after the page is rendered and before
       # the on_response event is fired.
       # 
-      def set_response_data( request, response )
-        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 )
+      def set_response_data( request, response, page_obj=nil )
+        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

@@ -35,7 +35,7 @@ module Gloo
       #
       def load
         unless @mech.exist?( @pn )
-          @engine.log.error "File '#{@pn}' does not exist."
+          @engine.err "File '#{@pn}' does not exist."
           return
         end
 
@@ -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/file_storage.rb

@@ -37,7 +37,7 @@ module Gloo
         if @obj
           @engine.log.debug "Loaded object: #{@obj.name}"
         else
-          @engine.log.error "Error loading file at #{@pn}"
+          @engine.err "Error loading file at #{@pn}"
         end
       end
 

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/check.rb

@@ -0,0 +1,54 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Alternate version of the Tell verb.
+# Reads better to check object conditions.
+#
+
+module Gloo
+  module Verbs
+    class Check < Gloo::Core::Verb
+
+      KEYWORD = 'check'.freeze
+      KEYWORD_SHORT = '<-'.freeze
+      FOR = 'for'.freeze
+      UNKNOWN_MSG_ERR = 'Missing message!'.freeze
+
+      #
+      # Run the verb.
+      #
+      def run
+        msg = @tokens.after_token( FOR )
+
+        unless msg
+          @engine.err( UNKNOWN_MSG_ERR ) 
+          return
+        end
+
+        Gloo::Exec::Dispatch.send_message(
+          @engine, msg, @tokens.second, @params )
+      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/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.
@@ -83,6 +114,7 @@ module Gloo
       # 
       def redirect_to_page
         if @engine.app_running?
+          @engine.exec_env.running_script.break_out
           @engine.running_app.obj.redirect = @target_obj
         else
           @engine.err APP_NOT_RUNING_ERR

data/lib/gloo/verbs/tell.rb

@@ -1,7 +1,9 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
 # Copyright:: Copyright (c) 2019 Eric Crane.  All rights reserved.
 #
-# Create an object, optionally of a type.
+# Send a message to an object.
+# Tell the object to do some known action.
+# Also see the Check verb.
 #
 
 module Gloo
@@ -11,18 +13,21 @@ module Gloo
       KEYWORD = 'tell'.freeze
       KEYWORD_SHORT = '->'.freeze
       TO = 'to'.freeze
-      OBJ_NOT_FOUND_ERR = 'Object was not found: '.freeze
       UNKNOWN_MSG_ERR = 'Missing message!'.freeze
 
       #
       # Run the verb.
       #
       def run
-        setup_msg
-        return unless @msg
+        msg = @tokens.after_token( TO )
 
-        setup_target
-        dispatch_msg
+        unless msg
+          @engine.err( UNKNOWN_MSG_ERR ) 
+          return
+        end
+
+        Gloo::Exec::Dispatch.send_message(
+          @engine, msg, @tokens.second, @params )
       end
 
       #
@@ -45,36 +50,6 @@ module Gloo
 
       private
 
-      #
-      # Lookup the message to send.
-      #
-      def setup_msg
-        @msg = @tokens.after_token( TO )
-
-        @engine.err( UNKNOWN_MSG_ERR ) unless @msg
-      end
-
-      #
-      # Setup the target of the message.
-      #
-      def setup_target
-        @obj_name = @tokens.second
-        pn = Gloo::Core::Pn.new( @engine, @obj_name )
-        @target_obj = pn.resolve
-      end
-
-      #
-      # Dispatch the message to the target object.
-      #
-      def dispatch_msg
-        if @target_obj
-          Gloo::Exec::Dispatch.message(
-            @engine, @msg, @target_obj, @params )
-        else
-          @engine.err "#{OBJ_NOT_FOUND_ERR} #{@obj_name}"
-        end
-      end
-
     end
   end
 end

data/lib/gloo/web_svr/handler.rb

@@ -35,21 +35,28 @@ 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
           else
             result = handle_page page
+            page_obj = page
           end
         else
           result = server_error_result
         end
 
-        return result
+        return result, page_obj
       end
 
       # 
@@ -58,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
@@ -108,7 +118,7 @@ module Gloo
 
 
       # ---------------------------------------------------------------------
-      #    Helper functions
+      #    Redirect Helper functions
       # ---------------------------------------------------------------------
 
       # 
@@ -119,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
 
@@ -60,11 +61,11 @@ module Gloo
         @handler.server_obj.set_request_data self
         @handler.server_obj.run_on_request
         
-        result = @handler.handle self
+        result, page_obj = @handler.handle self
         finish_timer
 
         # Run the on_response script if there is one.
-        @handler.server_obj.set_response_data self, result
+        @handler.server_obj.set_response_data( self, result, page_obj )
         @handler.server_obj.run_on_response
 
         return result
@@ -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

data/lib/gloo/web_svr/response.rb

@@ -18,6 +18,7 @@ module Gloo
       HTML_TYPE = 'text/html'.freeze
             
       attr_reader :code, :type, :data
+      attr_accessor :location
       
 
       # ---------------------------------------------------------------------
@@ -37,6 +38,7 @@ module Gloo
         @code = code
         @type = type
         @data = data
+        @location = nil
       end
 
 
@@ -71,6 +73,25 @@ module Gloo
         return Gloo::WebSvr::Response.new( engine, code, HTML_TYPE, data )
       end
 
+      # 
+      # Helper to create a redirect response.
+      # 
+      def self.redirect_response( engine, target )
+        code = Gloo::WebSvr::ResponseCode::FOUND
+        data = <<~TEXT
+        <head>
+          <html>
+            <body><a href="#{target}">target is here</a></body>
+          </html>
+        </head>
+        TEXT
+
+        response = Gloo::WebSvr::Response.new( engine, code, HTML_TYPE, data )
+        response.location = target
+
+        return response
+      end
+
 
       # ---------------------------------------------------------------------
       #    Data Functions
@@ -97,6 +118,10 @@ module Gloo
 
         headers = { CONTENT_TYPE => @type }
 
+        if @location
+          headers[ 'Location' ] = @location
+        end
+
         session = @engine&.running_app&.obj&.session      
         headers = session.add_session_for_response( headers ) if session