gloo 3.4.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac56d6b0d2298092e23e0bf352b6b5c77bfbf0d231b060003a404bc8e313e269
-  data.tar.gz: 9524d5e521c258dd5922c49c3c8dfcef2c52f57d0dff02306bfdb5ed3f1d0baa
+  metadata.gz: 6e79ebad69bd8325e6f1b09ecd7d32520e7f82d1e4181d74c31433e4ca159cda
+  data.tar.gz: 50cdd391fa4d96d0cb8897bf8b8fdb02b30aea567083343e5540b492399a9e93
 SHA512:
-  metadata.gz: c6e81f7c12f73b7736c79be525c23a300b231fbb76884490ef1b0b87ff85f3e85533ef708edb4b1044d99e443b7fb0df3f39551dce69b6d6dd91a3d2692dc472
-  data.tar.gz: 3c50b4ffba3590217bcd2641a190e196a472620321a5f23eeb07d8e5cf24d19ba81d675497143bf44ea4c389d308ae65446ceee8be50037e5dbbc26c13cfad8f
+  metadata.gz: 6712527d452fb8c73799f4e9829ffe58edb518aa6ed440e30fadb9211af0b899dce31453098f518b6310b693aec330d567b7ffb50713049c9abb3c27b7395eb8
+  data.tar.gz: ba4b513a0e8b587d7418d10a16cfed7ecd2df4a9ce85409cdd78c59a5d936b0714008bfd02baa8a66814be1855ece161d3a07a9b7b1f6e6783d1ef9cf5091835

data/.ruby-version

@@ -1 +1 @@
-ruby-3.2.5
+3.3.5

data/lib/VERSION

@@ -1 +1 @@
-3.4.1
+3.6.0

data/lib/VERSION_NOTES

@@ -1,3 +1,18 @@
+3.6.0 - 2024.11.26
+ - Adds support for route parameters
+ - Updates iterators
+ - Clear results for SQL queries
+ - Bug fixes
+
+
+3.5.0 - 2024.10.18
+ - check obj for message alternate to tell
+ - new base object messages
+ - fixes issue with single row returned from query
+ - adds on_error event
+ - use aliases in pwd obj
+
+
 3.4.1 - 2024.09.23
  - Removes old, unused sound objects
  - Adds support for lib folder in gloo rather than in the project folder

data/lib/gloo/app/args.rb

@@ -51,12 +51,12 @@ module Gloo
         return true unless app?
 
         if @app_path.nil?
-          @engine.log.error "App Path required to run in App mode."
+          @engine.err "App Path required to run in App mode."
           return false
         end
 
         unless File.directory? @app_path
-          @engine.log.error "'#{@app_path}' is not a valid directory."
+          @engine.err "'#{@app_path}' is not a valid directory."
           return false
         end
 

data/lib/gloo/app/engine.rb

@@ -201,7 +201,7 @@ module Gloo
         begin
           @parser.run @last_cmd
         rescue => e
-          err e.message
+          log_exception e
         end
       end
 
@@ -282,11 +282,30 @@ module Gloo
       # Report an error.
       # Write it to the log and set the heap error value.
       #
-      def err( msg )
+      def err( msg, backtrace=nil )
         @log.error msg
         @heap.error.set_to msg
+
+        @event_manager.on_error( msg, backtrace)
       end
 
+      # 
+      # Log an exception.
+      # This function does not log the full backtrace, but 
+      # does write part of it to the log.
+      # 
+      def log_exception ex
+        # Get the stack trace, and if needed truncate to fit.
+        msg_lines = ex.backtrace
+        if msg_lines.count > 27
+          msg_lines = msg_lines[0..13] + [ '... truncated ...' ] + msg_lines[-13..-1]
+        end
+        backtrace = msg_lines.join( "\n" )
+        @log.error backtrace
+
+        err( ex.message, backtrace)
+      end
+        
     end
   end
 end

data/lib/gloo/app/info.rb

@@ -4,8 +4,6 @@
 # Application information such as Version and public name.
 #
 
-# require 'gloo-lang'
-
 module Gloo
   module App
     class Info

data/lib/gloo/convert/converter.rb

@@ -30,8 +30,7 @@ module Gloo
           o = clazz.new
           return o.convert( value )
         rescue => e
-          @engine.log.error e.message
-          @engine.heap.error.set_to e.message
+          @engine.log_exception e
         end
 
         return default

data/lib/gloo/convert/string_to_integer.rb

@@ -12,6 +12,8 @@ module Gloo
       # Convert the given string value to an integer.
       #
       def convert( value )
+        return nil if value.blank?
+        
         return value.to_i
       end
 

data/lib/gloo/core/dictionary.rb

@@ -190,7 +190,7 @@ module Gloo
       #
       def add_key( keyword )
         if @keywords.include?( keyword )
-          # @engine.log.error "duplicate keyword '#{keyword}'"
+          # @engine.err "duplicate keyword '#{keyword}'"
           return
         end
 

data/lib/gloo/core/event_manager.rb

@@ -72,6 +72,25 @@ module Gloo
         arr.each { |o| Gloo::Exec::Dispatch.message( @engine, 'run', o ) }
       end
 
+      # 
+      # Run the on_error scripts in any open objects.
+      # For each on_error script found, look for the error_data container
+      # and set the error message and backtrace.
+      # 
+      def on_error msg, backtrace
+        @engine.log.debug 'on_error event'
+        arr = Gloo::Core::ObjFinder.by_name( @engine, 'on_error' )
+        arr.each do |o|
+          data = o.parent.find_child 'error_data'
+          if data
+            data.find_child( 'message' ).set_value msg
+            data.find_child( 'backtrace' ).set_value backtrace
+          end
+
+          Gloo::Exec::Dispatch.message( @engine, 'run', o )
+        end
+      end
+
     end
   end
 end

data/lib/gloo/core/factory.rb

@@ -164,7 +164,7 @@ module Gloo
       #
       def create_new( name, value, type, parent )
         unless parent
-          @engine.log.error "Could not create object.  Bad path: #{name}"
+          @engine.err "Could not create object.  Bad path: #{name}"
           return nil
         end
 
@@ -202,7 +202,7 @@ module Gloo
         end
 
         unless t.can_create?
-          @engine.log.error "'#{type_name}' cannot be created."
+          @engine.err "'#{type_name}' cannot be created."
           return nil
         end
 

data/lib/gloo/core/gloo_system.rb

@@ -138,7 +138,7 @@ module Gloo
         o = "msg_#{msg}"
         return self.public_send( o ) if self.respond_to? o
 
-        @engine.log.error "Message #{msg} not implemented"
+        @engine.err "Message #{msg} not implemented"
         return false
       end
 

data/lib/gloo/core/here.rb

@@ -15,7 +15,7 @@ module Gloo
       # Does the pathname start with here reference?
       #
       def self.includes_here_ref?( elements )
-        return elements.first.start_with?( HERE )
+        return elements.first&.start_with?( HERE )
       end
 
       #

data/lib/gloo/core/obj.rb

@@ -137,6 +137,13 @@ module Gloo
         return self.value.to_s.strip.empty?
       end
 
+      # 
+      # Value for a SQL query.
+      # 
+      def sql_value
+        return self.value
+      end
+
       # 
       # Is this an alias to another object?
       # 
@@ -144,6 +151,13 @@ module Gloo
         return self.type_display == Gloo::Objs::Alias.typename
       end
 
+      # 
+      # Is this a container object?
+      # 
+      def is_container?
+        return self.type_display == Gloo::Objs::Container.typename
+      end
+
       # 
       # Is this a function object?
       # 
@@ -216,6 +230,30 @@ module Gloo
         return nil
       end
 
+      # 
+      # Find a child, resolve any alias references.
+      # This returns the object, not the value.
+      # 
+      def find_child_resolve_alias( name )
+        o = find_child name
+        return nil unless o
+
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+        return o
+      end
+
+      # 
+      # Find a child, resolve any alias references,
+      # and return the object's value.
+      # 
+      def find_child_value( name )
+        o = find_child name
+        return nil unless o
+
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+        return o&.value
+      end
+
       #
       # Get the index of the child with the given name.
       # 
@@ -264,7 +302,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return %w[reload unload]
+        return %w[reload unload blank? contains?]
       end
 
       #
@@ -282,7 +320,7 @@ module Gloo
         @params = params
         return self.dispatch msg if self.can_receive_message? msg
 
-        @engine.log.error "Object #{self.name} cannot receive message #{msg}"
+        @engine.err "Object #{self.name} cannot receive message #{msg}"
         return false
       end
 
@@ -295,7 +333,7 @@ module Gloo
           self.public_send( o )
           return true
         else
-          @engine.log.error "Message #{msg} not implemented"
+          @engine.err "Message #{msg} not implemented"
           return false
         end
       end
@@ -305,7 +343,7 @@ module Gloo
       #
       def msg_unload
         if self.root?
-          @engine.log.error 'Cannot unload the root object.'
+          @engine.err 'Cannot unload the root object.'
           return
         end
 
@@ -318,13 +356,31 @@ module Gloo
       #
       def msg_reload
         if self.root?
-          @engine.log.error 'Cannot reload the root object.'
+          @engine.err 'Cannot reload the root object.'
           return
         end
 
         @engine.persist_man.reload self
       end
 
+      # 
+      # Check to see if the value is blank.
+      # 
+      def msg_blank?
+        val_blank = value.blank?
+        @engine.heap.it.set_to val_blank
+        return val_blank
+      end
+
+      # 
+      # Check to see if there are children.
+      # 
+      def msg_contains?
+        has_children = child_count.positive?
+        @engine.heap.it.set_to has_children
+        return has_children
+      end
+
 
       # ---------------------------------------------------------------------
       #    Render

data/lib/gloo/core/parser.rb

@@ -31,7 +31,7 @@ module Gloo
         verb = dic.find_verb( tokens.verb )
         return verb.new( @engine, tokens, params ) if verb
 
-        @engine.log.error "Verb '#{tokens.verb}' was not found."
+        @engine.err "Verb '#{tokens.verb}' was not found."
         return nil
       end
 

data/lib/gloo/core/pn.rb

@@ -150,7 +150,7 @@ module Gloo
           @elements[ 0..-2 ].each do |e|
             o = o.find_child( e )
             if o.nil?
-              @engine.log.error "Object '#{e}' was not found."
+              @engine.err "Object '#{e}' was not found."
               return nil
             end
           end

data/lib/gloo/exec/dispatch.rb

@@ -12,10 +12,29 @@ module Gloo
   module Exec
     class Dispatch
 
+      OBJ_NOT_FOUND_ERR = 'Object was not found: '.freeze
+
+      # 
+      # Send a message to an object of a given name (and path).
+      # Once the object is found, the message is dispatched.
+      # 
+      def self.send_message( engine, msg, to_obj_pn, params = nil )
+        pn = Gloo::Core::Pn.new( engine, to_obj_pn )
+        target_obj = pn.resolve
+
+        unless target_obj
+          engine.err "#{OBJ_NOT_FOUND_ERR} #{to_obj_pn}"
+          return
+        end
+        Gloo::Exec::Dispatch.message( engine, msg, target_obj, params )
+      end
+
       #
       # Dispatch the given message to the given object.
       #
       def self.message( engine, msg, to_obj, params = nil )
+        return unless to_obj
+        
         engine.log.debug "Dispatch message #{msg} to #{to_obj.name}"
         a = Gloo::Exec::Action.new msg, to_obj, params
         Gloo::Exec::Dispatch.action( engine, a )

data/lib/gloo/exec/runner.rb

@@ -36,7 +36,7 @@ module Gloo
         if o
           o.send_message 'run'
         else
-          engine.log.error "Could not send message to object.  Bad path: #{path_name}"
+          engine.err "Could not send message to object.  Bad path: #{path_name}"
         end
       end
 

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

@@ -38,7 +38,16 @@ module Gloo
         self.value = new_value.to_i
       end
 
-      
+      # 
+      # Value for a SQL query.
+      # 
+      def sql_value
+        return nil if self.value.blank?
+        
+        return self.value
+      end
+
+
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------

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

@@ -3,6 +3,7 @@
 #
 # A looping construct...do something for each whatever in something.
 # This object has several possible uses:
+#   - each child in a container
 #   - each word in a string
 #   - each line in a string
 #   - each file in a directory
@@ -15,13 +16,9 @@ module Gloo
 
       KEYWORD = 'each'.freeze
       KEYWORD_SHORT = 'each'.freeze
-      CHILD = 'child'.freeze
       WORD = 'word'.freeze
-      LINE = 'line'.freeze
-      FILE = 'file'.freeze
-      REPO = 'repo'.freeze
-      IN = 'IN'.freeze
       DO = 'do'.freeze
+      IN = 'IN'.freeze
 
       #
       # The name of the object type.
@@ -42,8 +39,7 @@ module Gloo
       # Returns nil if there is none.
       #
       def in_value
-        o = find_child IN
-        return o ? o.value : nil
+        return find_child_value IN
       end
 
       #
@@ -56,6 +52,7 @@ module Gloo
         Gloo::Exec::Dispatch.message( @engine, 'run', o )
       end
 
+
       # ---------------------------------------------------------------------
       #    Children
       # ---------------------------------------------------------------------
@@ -81,6 +78,7 @@ module Gloo
         fac.create_script DO, '', self
       end
 
+
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------
@@ -94,186 +92,21 @@ module Gloo
 
       # Run the system command.
       def msg_run
-        if each_child?
-          run_each_child
-        elsif each_word?
-          run_each_word
-        elsif each_line?
-          run_each_line
-        elsif each_repo?
-          run_each_repo
+        if EachChild.use_for?( self )
+          EachChild.new( @engine, self ).run
+        elsif EachWord.use_for?( self )
+          EachWord.new( @engine, self ).run
+        elsif EachLine.use_for?( self )
+          EachLine.new( @engine, self ).run
+        elsif EachFile.use_for?( self )
+          EachFile.new( @engine, self ).run
+        elsif EachRepo.use_for?( self )
+          EachRepo.new( @engine, self ).run
+        else 
+          @engine.err "Not set up to run each for that target."
         end
       end
 
-      # ---------------------------------------------------------------------
-      #    Child Object
-      # ---------------------------------------------------------------------
-
-      #
-      # Is it set up to run for each word?
-      # If there is a child object by the name "word"
-      # then we will loop for each word in the string.
-      #
-      def each_child?
-        return true if contains_child? CHILD
-
-        return false
-      end
-
-      #
-      # Run for each word.
-      #
-      def run_each_child
-        o = find_child IN
-        return unless o
-
-        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
-        o.children.each do |child|
-          set_child child
-          run_do
-        end
-      end
-
-      #
-      # Set the child alias.
-      #
-      def set_child( obj )
-        o = find_child CHILD
-        return unless o
-
-        o.set_value obj.pn
-      end
-
-      # ---------------------------------------------------------------------
-      #    Word
-      # ---------------------------------------------------------------------
-
-      #
-      # Is it set up to run for each word?
-      # If there is a child object by the name "word"
-      # then we will loop for each word in the string.
-      #
-      def each_word?
-        return true if find_child WORD
-
-        return false
-      end
-
-      #
-      # Run for each word.
-      #
-      def run_each_word
-        str = in_value
-        return unless str
-
-        str.split( ' ' ).each do |word|
-          set_word word
-          run_do
-        end
-      end
-
-      #
-      # Set the value of the word.
-      #
-      def set_word( word )
-        o = find_child WORD
-        return unless o
-
-        o.set_value word
-      end
-
-      # ---------------------------------------------------------------------
-      #    Line
-      # ---------------------------------------------------------------------
-
-      #
-      # Is it set up to run for each line?
-      # If there is a child object by the name "line"
-      # then we will loop for each line in the string.
-      #
-      def each_line?
-        return true if find_child LINE
-
-        return false
-      end
-
-      #
-      # Run for each line.
-      #
-      def run_each_line
-        str = in_value
-        return unless str
-
-        str.each_line do |line|
-          set_line line
-          run_do
-        end
-      end
-
-      #
-      # Set the value of the word.
-      #
-      def set_line( line )
-        o = find_child LINE
-        return unless o
-
-        o.set_value line
-      end
-
-      # ---------------------------------------------------------------------
-      #    Git Repo
-      # ---------------------------------------------------------------------
-
-      #
-      # Is it set up to run for each git repo?
-      # If there is a child object by the name "repo"
-      # then we will loop for each repo in the directory.
-      #
-      def each_repo?
-        return true if find_child REPO
-
-        return false
-      end
-
-      #
-      # Find all git projects in a path.
-      #
-      def find_all_git_projects( path )
-        path.children.collect do |f|
-          if f.directory? && ( File.basename( f ) == '.git' )
-            File.dirname( f )
-          elsif f.directory?
-            find_all_git_projects( f )
-          end
-        end.flatten.compact
-      end
-
-      #
-      # Run for each line.
-      #
-      def run_each_repo
-        path = in_value
-        return unless path
-
-        path = Pathname.new( path )
-        repos = find_all_git_projects( path )
-        repos.each do |o|
-          set_repo o
-          run_do
-        end
-      end
-
-      #
-      # Set the value of the repo.
-      # This is a path to the repo.
-      #
-      def set_repo( path )
-        o = find_child REPO
-        return unless o
-
-        o.set_value path
-      end
-
     end
   end
 end