gloo 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c8d357cda5602195adcfddc50c58705d34670b6ac01848eb8a1d66243571356
-  data.tar.gz: 86687c8e18f4843dc9bca97111e140c26750479fce8619341a902284dde5a573
+  metadata.gz: afc950a2a2470041f3a3d990480cf26bee1005e6f4e00bcc95feb4e38d8de394
+  data.tar.gz: fe2cf5549734e2779ed1ed1f90bc5974fcae7c0b8245b22626a9828d2f54c54e
 SHA512:
-  metadata.gz: baa186fd096e79a6152b7c287e23048a4b2fa67af5aa5db1c4e860918f42477b75e52fabbae8309506adfa32a77f5616bc2c4f4b22b6972142cb3977c9c965c9
-  data.tar.gz: 8467cf3db96cd931cad4dc06910a4933c65284b25675a3f884e17d5639cb8b3d9b50ff8bd1c171d329f318317390e715a9a5af62dceed681509fe336d28c3439
+  metadata.gz: 7eed261a94581ca0a1e7f5c9a61657bd8e39f1455d55f4754bc4530641fe33ef359d7055f191dd204c505b31e501291803f5ef5822672640a280845c5c27b0d1
+  data.tar.gz: 643bd6cc65823bf8d1a8d1666e0b5b51abf5c44d0a8f2b25b51c901a1f18c3efda08264c5e686fe34efb0063a7e9e56b7040c50befa353e17369f0c04f32b186

data/lib/VERSION

@@ -1 +1 @@
-3.8.0
+3.9.0

data/lib/VERSION_NOTES

@@ -1,3 +1,12 @@
+3.9.0 - 2025.02.21
+ - Fixes alias in page parameters
+ - Adds comparison operators
+ - Renames some verb shortcuts for compatibility
+ - Adds Group-By option in for each child loop
+ - Adds starts_with?, ends_with?, contains?, and format_for_html messages to string
+
+
+
 3.8.0 - 2025.01.23
 - Fixes issue with sessions
 - Adds authenticity token tag and supporting session id and validation

data/lib/gloo/app/log.rb

@@ -169,7 +169,7 @@ module Gloo
       # Also write to the console unless quiet.
       #
       def error( msg, ex = nil, engine = nil )
-        engine&.heap&.error&.set_to msg
+        engine&.heap&.error&.set_to( msg ) if engine
         @logger.error msg
         @error.error msg
         if ex

data/lib/gloo/core/op.rb

@@ -13,19 +13,39 @@ module Gloo
       # Is the token an operator?
       #
       def self.op?( token )
-        return [ '+', '-', '*', '/' ].include?( token.strip )
+        return [ 
+          Gloo::Expr::OpPlus::SYMBOL,
+          Gloo::Expr::OpMinus::SYMBOL,
+          Gloo::Expr::OpMult::SYMBOL,
+          Gloo::Expr::OpDiv::SYMBOL,
+          Gloo::Expr::OpEq::SYMBOL,
+          Gloo::Expr::OpEq::ALT_SYMBOL,
+          Gloo::Expr::OpIneq::SYMBOL,
+          Gloo::Expr::OpGt::SYMBOL,
+          Gloo::Expr::OpLt::SYMBOL,
+          Gloo::Expr::OpGteq::SYMBOL,
+          Gloo::Expr::OpLteq::SYMBOL
+          ].include?( token.strip )
       end
 
       #
       # Create the operator for the given token.
       #
       def self.create_op( token )
-        return Gloo::Expr::OpMinus.new if token == '-'
-        return Gloo::Expr::OpMult.new if token == '*'
-        return Gloo::Expr::OpDiv.new if token == '/'
-        return Gloo::Expr::OpPlus.new if token == '+'
-
-        return default_op
+        case token
+          when Gloo::Expr::OpPlus::SYMBOL then Gloo::Expr::OpPlus.new
+          when Gloo::Expr::OpMinus::SYMBOL then Gloo::Expr::OpMinus.new
+          when Gloo::Expr::OpMult::SYMBOL then Gloo::Expr::OpMult.new
+          when Gloo::Expr::OpDiv::SYMBOL then Gloo::Expr::OpDiv.new
+          when Gloo::Expr::OpEq::SYMBOL then return Gloo::Expr::OpEq.new
+          when Gloo::Expr::OpEq::ALT_SYMBOL then return Gloo::Expr::OpEq.new
+          when Gloo::Expr::OpIneq::SYMBOL then return Gloo::Expr::OpIneq.new
+          when Gloo::Expr::OpGt::SYMBOL then return Gloo::Expr::OpGt.new
+          when Gloo::Expr::OpLt::SYMBOL then return Gloo::Expr::OpLt.new
+          when Gloo::Expr::OpGteq::SYMBOL then return Gloo::Expr::OpGteq.new
+          when Gloo::Expr::OpLteq::SYMBOL then return Gloo::Expr::OpLteq.new
+        else return default_op
+        end
       end
 
       #

data/lib/gloo/expr/op_div.rb

@@ -8,6 +8,8 @@ module Gloo
   module Expr
     class OpDiv < Gloo::Core::Op
 
+      SYMBOL = '/'.freeze
+
       #
       # Perform the operation and return the result.
       #

data/lib/gloo/expr/op_eq.rb

@@ -0,0 +1,29 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2025 Eric Crane.  All rights reserved.
+#
+# Equality operator.
+#
+
+module Gloo
+  module Expr
+    class OpEq < Gloo::Core::Op
+
+      SYMBOL = '='.freeze
+      ALT_SYMBOL = '=='.freeze
+
+      #
+      # Perform the operation and return the result.
+      #
+      def perform( left, right )
+        return left == right.to_s if left.is_a? String
+
+        return left == right.to_i if left.is_a? Integer
+
+        return left == right.to_f if left.is_a? Numeric
+
+        return false
+      end
+
+    end
+  end
+end

data/lib/gloo/expr/op_gt.rb

@@ -0,0 +1,26 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2025 Eric Crane.  All rights reserved.
+#
+# Greater than operator.
+#
+
+module Gloo
+  module Expr
+    class OpGt < Gloo::Core::Op
+
+      SYMBOL = '>'.freeze
+
+      #
+      # Perform the operation and return the result.
+      #
+      def perform( left, right )
+        return left > right.to_i if left.is_a? Integer
+
+        return left > right.to_f if left.is_a? Numeric
+
+        return false
+      end
+
+    end
+  end
+end

data/lib/gloo/expr/op_gteq.rb

@@ -0,0 +1,26 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2025 Eric Crane.  All rights reserved.
+#
+# Greater than or equal operator.
+#
+
+module Gloo
+  module Expr
+    class OpGteq < Gloo::Core::Op
+
+      SYMBOL = '>='.freeze
+
+      #
+      # Perform the operation and return the result.
+      #
+      def perform( left, right )
+        return left >= right.to_i if left.is_a? Integer
+
+        return left >= right.to_f if left.is_a? Numeric
+
+        return false
+      end
+
+    end
+  end
+end

data/lib/gloo/expr/op_ineq.rb

@@ -0,0 +1,28 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2025 Eric Crane.  All rights reserved.
+#
+# Inequality operator.
+#
+
+module Gloo
+  module Expr
+    class OpIneq < Gloo::Core::Op
+
+      SYMBOL = '!='.freeze
+
+      #
+      # Perform the operation and return the result.
+      #
+      def perform( left, right )
+        return left != right.to_s if left.is_a? String
+
+        return left != right.to_i if left.is_a? Integer
+
+        return left != right.to_f if left.is_a? Numeric
+        
+        return false
+      end
+
+    end
+  end
+end

data/lib/gloo/expr/op_lt.rb

@@ -0,0 +1,26 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2025 Eric Crane.  All rights reserved.
+#
+# Less than operator.
+#
+
+module Gloo
+  module Expr
+    class OpLt < Gloo::Core::Op
+
+      SYMBOL = '<'.freeze
+
+      #
+      # Perform the operation and return the result.
+      #
+      def perform( left, right )
+        return left < right.to_i if left.is_a? Integer
+
+        return left < right.to_f if left.is_a? Numeric
+
+        return false
+      end
+
+    end
+  end
+end

data/lib/gloo/expr/op_lteq.rb

@@ -0,0 +1,26 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2025 Eric Crane.  All rights reserved.
+#
+# Less than or equal operator.
+#
+
+module Gloo
+  module Expr
+    class OpLteq < Gloo::Core::Op
+
+      SYMBOL = '<='.freeze
+
+      #
+      # Perform the operation and return the result.
+      #
+      def perform( left, right )
+        return left <= right.to_i if left.is_a? Integer
+
+        return left <= right.to_f if left.is_a? Numeric
+
+        return false
+      end
+
+    end
+  end
+end

data/lib/gloo/expr/op_minus.rb

@@ -8,6 +8,8 @@ module Gloo
   module Expr
     class OpMinus < Gloo::Core::Op
 
+      SYMBOL = '-'.freeze
+
       #
       # Perform the operation and return the result.
       #

data/lib/gloo/expr/op_mult.rb

@@ -8,6 +8,8 @@ module Gloo
   module Expr
     class OpMult < Gloo::Core::Op
 
+      SYMBOL = '*'.freeze
+
       #
       # Perform the operation and return the result.
       #

data/lib/gloo/expr/op_plus.rb

@@ -8,6 +8,8 @@ module Gloo
   module Expr
     class OpPlus < Gloo::Core::Op
 
+      SYMBOL = '+'.freeze
+
       #
       # Perform the operation and return the result.
       #

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

@@ -12,6 +12,7 @@ module Gloo
 
       KEYWORD = 'string'.freeze
       KEYWORD_SHORT = 'str'.freeze
+      MISSING_PARAM_MSG = 'Missing parameter!'.freeze
 
       #
       # The name of the object type.
@@ -42,10 +43,95 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[up down size encode64 decode64 escape unescape
+        return super + %w[up down size starts_with? ends_with? contains? 
+          format_for_html encode64 decode64 escape unescape
           gen_alphanumeric gen_uuid gen_hex gen_base64]
       end
 
+      # 
+      # Convert whitespace to HTML friendly spaces.
+      # 
+      def msg_format_for_html
+        text = self.value
+        out = ""
+        return out unless text
+
+        # indentation
+        text.each_line do |line|
+          i = 0
+          while line[i] == ' '
+            i += 1
+            out << "&nbsp;"
+          end
+    
+          i = 0
+          while line[i] == "\t"
+            i += 1
+            out << "&nbsp;&nbsp;&nbsp;&nbsp;"
+          end
+          out << line
+        end
+    
+        self.value = out.gsub( "\n", "<br/>" )
+      end
+
+      # 
+      # Does the string start with the given string?
+      # 
+      def msg_starts_with?
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+
+          result = self.value.start_with?( data )
+          @engine.heap.it.set_to result
+          return result
+        else
+          # Error
+          @engine.log.error MISSING_PARAM_MSG
+          @engine.heap.it.set_to false
+          return false
+        end
+      end
+
+      # 
+      # Does the string end with the given string?
+      # 
+      def msg_ends_with?
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+
+          result = value.end_with?( data )
+          @engine.heap.it.set_to result
+          return result
+        else
+          # Error
+          @engine.log.error MISSING_PARAM_MSG
+          @engine.heap.it.set_to false
+          return false
+        end
+      end
+
+      # 
+      # Does the string contain the given string?
+      #
+      def msg_contains?
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+
+          result = value.include?( data )
+          @engine.heap.it.set_to result
+          return result
+        else
+          # Error
+          @engine.log.error MISSING_PARAM_MSG
+          @engine.heap.it.set_to false
+          return false
+        end
+      end
+
       #
       # Get the size of the string.
       #

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

@@ -10,6 +10,11 @@ module Gloo
 
       CHILD = 'child'.freeze
       IN = 'IN'.freeze
+
+      GROUP_BY = 'group_by'.freeze
+      ON_GROUP_START = 'on_group_start'.freeze
+      ON_GROUP_END = 'on_group_end'.freeze
+
       
       # ---------------------------------------------------------------------
       #    Create Iterator
@@ -34,6 +39,61 @@ module Gloo
         return false
       end
 
+      
+      # ---------------------------------------------------------------------
+      #    Group By
+      # ---------------------------------------------------------------------
+      
+      # 
+      # If the iterator has a group by,
+      # then we need to group by that value.
+      # Otherwise, we just loop for each child.
+      #
+      def has_group_by?
+        child = @iterator_obj.find_child GROUP_BY
+        return false unless child
+
+        return true
+      end
+
+      # 
+      # Get the child that is the group by.
+      # Return nil if there is no group by.
+      #
+      def group_by_value obj_can
+        return nil unless obj_can
+
+        child = @iterator_obj.find_child GROUP_BY
+        return nil unless child
+
+        group_by_child_name = child.value
+
+        obj = obj_can.find_child( group_by_child_name )
+        return nil unless obj
+
+        return obj.value
+      end
+
+      #
+      # Run the on group start script.
+      #
+      def run_on_group_start
+        o = @iterator_obj.find_child ON_GROUP_START
+        return unless o
+
+        Gloo::Exec::Dispatch.message( @engine, 'run', o )
+      end
+
+      #
+      # Run the on group end script.
+      #
+      def run_on_group_end
+        o = @iterator_obj.find_child ON_GROUP_END
+        return unless o
+
+        Gloo::Exec::Dispatch.message( @engine, 'run', o )
+      end
+
 
       # ---------------------------------------------------------------------
       #    Iterate
@@ -46,11 +106,38 @@ module Gloo
         o = @iterator_obj.find_child IN
         return unless o
 
+        # Set up for optional groups.
+        group_mode = false
+        if has_group_by?
+          group_mode = true
+          last_group = nil
+          first_time = true
+        end
+
         o = Gloo::Objs::Alias.resolve_alias( @engine, o )
         o.children.each do |child|
+          if group_mode
+            group_value = group_by_value( child )
+            # puts "last group = #{last_group}, group_value = #{group_value}"
+            if last_group != group_value
+              last_group = group_value
+              # puts "New group: #{group_value}"
+              if first_time
+                first_time = false
+              else
+                run_on_group_end
+              end
+              run_on_group_start
+            end
+          end
+
           set_child child
           @iterator_obj.run_do
         end
+
+        if group_mode && !first_time
+          run_on_group_end
+        end
       end
 
       #

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

@@ -137,6 +137,8 @@ module Gloo
 
         h = {}
         params_can.children.each do |o|
+          # resolve aliases
+          o = Gloo::Objs::Alias.resolve_alias( @engine, o )
           h[ o.name ] = o.value
         end
 

data/lib/gloo/verbs/load.rb

@@ -9,7 +9,7 @@ module Gloo
     class Load < Gloo::Core::Verb
 
       KEYWORD = 'load'.freeze
-      KEYWORD_SHORT = '<'.freeze
+      KEYWORD_SHORT = 'ld'.freeze
       MISSING_EXPR_ERR = 'Missing Expression!'.freeze
 
       #

data/lib/gloo/verbs/save.rb

@@ -9,7 +9,7 @@ module Gloo
     class Save < Gloo::Core::Verb
 
       KEYWORD = 'save'.freeze
-      KEYWORD_SHORT = '>'.freeze
+      KEYWORD_SHORT = 'sv'.freeze
 
       #
       # Run the verb.

data/lib/gloo/verbs/show.rb

@@ -9,7 +9,7 @@ module Gloo
     class Show < Gloo::Core::Verb
 
       KEYWORD = 'show'.freeze
-      KEYWORD_SHORT = '='.freeze
+      KEYWORD_SHORT = 'print'.freeze
 
       #
       # Run the verb.

data/lib/gloo/web_svr/table_renderer.rb

@@ -73,8 +73,8 @@ module Gloo
           end
 
           str += "<tr class='#{styles[ ROW ]}'>"
-          str += "<th style='#{styles[ HEAD_CELL ]}'>#{head[ :title ]}</th>"
-          str += "<td style='#{styles[ CELL ]}'>#{cell_value}</td>"
+          str += "<th class='#{styles[ HEAD_CELL ]}'>#{head[ :title ]}</th>"
+          str += "<td class='#{styles[ CELL ]}'>#{cell_value}</td>"
           str += "</tr>"
         end
 
@@ -113,7 +113,7 @@ module Gloo
             else
               cell_value = cell
             end
-            str += "<td style='#{styles[ CELL ]}'>#{cell_value}</td>"
+            str += "<td class='#{styles[ CELL ]}'>#{cell_value}</td>"
           end
           str += "</tr>"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -419,6 +419,12 @@ files:
 - lib/gloo/expr/l_integer.rb
 - lib/gloo/expr/l_string.rb
 - lib/gloo/expr/op_div.rb
+- lib/gloo/expr/op_eq.rb
+- lib/gloo/expr/op_gt.rb
+- lib/gloo/expr/op_gteq.rb
+- lib/gloo/expr/op_ineq.rb
+- lib/gloo/expr/op_lt.rb
+- lib/gloo/expr/op_lteq.rb
 - lib/gloo/expr/op_minus.rb
 - lib/gloo/expr/op_mult.rb
 - lib/gloo/expr/op_plus.rb