gloo 5.3.9 → 6.0

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

@@ -56,7 +56,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[inc dec randomize]
+        return super + %w[inc dec randomize format]
       end
 
       #
@@ -100,6 +100,24 @@ module Gloo
         return rand_value
       end
 
+      #
+      # Format the integer.
+      # With no parameter, adds comma separators (Ex: 1000 -> 1,000).
+      # With a parameter, uses it as a sprintf-style format string (Ex: '%05d').
+      #
+      # @param format [String] The sprintf-style format to use.
+      #
+      def msg_format
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          fmt = expr.evaluate
+          formatted = format( fmt, value )
+        else
+          formatted = value.to_s.reverse.scan( /.{1,3}/ ).join( ',' ).reverse
+        end
+        @engine.heap.it.set_to formatted
+      end
+
     end
   end
 end

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

@@ -9,9 +9,6 @@ module Gloo
   module Objs
     class StringGenerator
 
-      # TO DO: Consider adding in Faker generators as well.
-
-
       # ---------------------------------------------------------------------
       #    Generators
       # ---------------------------------------------------------------------
@@ -26,21 +23,21 @@ module Gloo
       #
       # Generate a random alphanumeric string.
       #
-      def self.alphanumeric len=10
+      def self.alphanumeric( len = 10 )
         return SecureRandom.alphanumeric( len )
       end
 
       #
       # Generate a random hex string.
       #
-      def self.hex len=10
-        s = SecureRandom.hex( len )
+      def self.hex( len = 10 )
+        return SecureRandom.hex( len )
       end
 
       #
       # Generate a random base64 string.
       #
-      def self.base64 len=12
+      def self.base64( len = 12 )
         return SecureRandom.base64( len )
       end
 

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

@@ -33,7 +33,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super # + [ "run" ]
+        return super
       end
 
     end

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

@@ -118,10 +118,8 @@ module Gloo
         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

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

@@ -63,12 +63,9 @@ module Gloo
       # Get the result, the return value or container of objects.
       # 
       def result
-        return_any = find_child RESULT
-
         # TODO: what does it look like to return objects?
         # if return_any is a container with children, return the container
-
-        return return_any ? return_any.value : nil
+        return find_child_value RESULT
       end
 
       #
@@ -128,7 +125,7 @@ module Gloo
 
       #
       # Send the object the invoke message.
-      # Invoke the functdion and return the result.
+      # Invoke the function and return the result.
       #
       def msg_invoke
         return invoke( nil )

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

@@ -33,8 +33,7 @@ module Gloo
       # Returns nil if there is none.
       #
       def times
-        o = find_child TIMES
-        return o ? o.value : 0
+        return find_child_value( TIMES ) || 0
       end
 
       #

data/lib/gloo/objs/dt/datetime.rb

@@ -59,10 +59,10 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[now add sub is_today is_future 
+        return super + %w[now add sub is_today is_future
           is_past is_yesterday is_tomorrow is_this_week
           begin_day end_day begin_week end_week
-          begin_month end_month begin_year end_year]
+          begin_month end_month begin_year end_year format]
       end
 
       #
@@ -102,20 +102,15 @@ module Gloo
       # Set the value to the beginning of the month.
       #
       def msg_begin_month
-        # dt = DtTools.beginning_of_month( self.value.to_time )
         dt = self.value.to_time.beginning_of_month
         self.set_value dt
         @engine.heap.it.set_to dt
-
-        self.set_value dt
-        @engine.heap.it.set_to dt
       end
 
       #
       # Set the value to the end of the month.
       #
       def msg_end_month
-        # dt = DtTools.end_of_month( self.value.to_time )
         dt = self.value.to_time.end_of_month
         self.set_value dt
         @engine.heap.it.set_to dt
@@ -237,7 +232,23 @@ module Gloo
         self.set_value( DateTime.now )
         @engine.heap.it.set_to self.value
       end
-  
+
+      #
+      # Format the date and time.
+      #
+      # @param format [String] The format to use.
+      #
+      def msg_format
+        format = "%Y-%m-%d %H:%M:%S"
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+          format = data
+        end
+        dt = Chronic.parse( self.value )
+        @engine.heap.it.set_to dt.strftime( format )
+      end
+
     end
   end
 end

data/lib/gloo/objs/dt/dt_tools.rb

@@ -76,14 +76,14 @@ class DtTools
   # Is the date in the past?
   # 
   def self.is_past?( dt )
-      dt < Time.now.beginning_of_day
+    dt < Time.now.beginning_of_day
   end
 
-  # 
+  #
   # Is the date in the future?
-  # 
+  #
   def self.is_future?( dt )
-      dt > Time.now.end_of_day
+    dt > Time.now.end_of_day
   end
 
   # 
@@ -132,28 +132,108 @@ class DtTools
   
 
   # ---------------------------------------------------------------------
-  #    Begin/end Helpers
+  #    Comparison
   # ---------------------------------------------------------------------
 
-  def self.get_utc_offset t
-    utc_offset = ActiveSupport::TimeZone[ t.zone ].utc_offset
-    return utc_offset
+  # Kind pairings that can never be compared, even though both sides
+  # look like date/time values (eg. a time can't be compared to a date).
+  INCOMPATIBLE_DT_KINDS = [
+    [ :date, :time ], [ :time, :date ],
+    [ :time, :datetime ], [ :datetime, :time ]
+  ].freeze
+
+  #
+  # What kind of date/time value does this string look like?
+  # Returns :date, :time, :datetime, or nil if it doesn't match
+  # the exact format that gloo date/time/datetime objects use.
+  #
+  def self.dt_kind( value )
+    return nil unless value.is_a? String
+    return :datetime if value =~ /\A\d{4}\.\d{2}\.\d{2}\s\d{2}:\d{2}:\d{2}\s(am|pm)\z/i
+    return :date if value =~ /\A\d{4}\.\d{2}\.\d{2}\z/
+    return :time if value =~ /\A\d{2}:\d{2}:\d{2}\s(am|pm)\z/i
+
+    return nil
   end
-  
-  # 
-  # Returns the beginning of the month for the given time.
-  # 
-  def self.beginning_of_month t
-    utc_offset = get_utc_offset t
-    Time.new(t.year, t.month, 1, 0, 0, 0, utc_offset)
+
+  #
+  # Strictly parse a string using the exact format for the given kind.
+  #
+  def self.strict_dt_parse( kind, str )
+    format = { date: Gloo::Objs::Date::DEFAULT_FORMAT,
+               time: Gloo::Objs::Time::DEFAULT_FORMAT,
+               datetime: Gloo::Objs::Datetime::DEFAULT_FORMAT }[ kind ]
+    return ::DateTime.strptime( str, format )
+  rescue StandardError
+    return nil
   end
 
-  # 
-  # Returns the end of the month for the given time.
-  # 
-  def self.end_of_month t
-    utc_offset = get_utc_offset t
-    Time.new(t.year, t.month, t.end_of_month.day, 23, 59, 59, utc_offset)
+  #
+  # Reduce a parsed value down to the granularity of the given kind,
+  # so a strictly-parsed value and a loosely-parsed value can be compared.
+  #
+  def self.normalize_dt( kind, dt )
+    return dt.to_date if kind == :date
+    return [ dt.hour, dt.min, dt.sec ] if kind == :time
+
+    return dt
+  end
+
+  #
+  # Loosely parse an arbitrary string (eg. "3 days from now") and reduce
+  # it to the granularity of the given kind for comparison.
+  #
+  # Bare numbers (eg. "11", "2026") are rejected even though Chronic can
+  # parse them - it treats them as an hour or day-of-month relative to
+  # today, which is misleading rather than a genuine date/time value.
+  #
+  def self.loose_dt_parse( kind, str )
+    return nil if str =~ /\A\s*\d+\s*\z/
+
+    dt = Chronic.parse( str )
+    return nil if dt.nil?
+
+    return normalize_dt( kind, dt.to_datetime )
+  rescue StandardError
+    return nil
+  end
+
+  #
+  # Compare two raw values with date/time/datetime semantics.
+  # Returns :not_dt if neither value looks like a date, time, or datetime,
+  # so the caller can fall back to its normal comparison logic.
+  # Otherwise returns -1, 0, or 1 (as with <=>), or nil if the two
+  # values can't be meaningfully compared.
+  #
+  def self.compare_dt( left, right )
+    l_kind = dt_kind( left )
+    r_kind = dt_kind( right )
+    return :not_dt if l_kind.nil? && r_kind.nil?
+
+    if l_kind && r_kind
+      return nil if INCOMPATIBLE_DT_KINDS.include?( [ l_kind, r_kind ] )
+
+      l = strict_dt_parse( l_kind, left )
+      r = strict_dt_parse( r_kind, right )
+      return nil if l.nil? || r.nil?
+
+      return l <=> r
+    end
+
+    # Only one side looks like a date/time/datetime value. Try to parse
+    # the other side as that same kind (eg. a date compared to a string).
+    kind = l_kind || r_kind
+    known, other = l_kind ? [ left, right ] : [ right, left ]
+    return nil unless other.is_a? String
+
+    k = strict_dt_parse( kind, known )
+    return nil if k.nil?
+
+    o = loose_dt_parse( kind, other )
+    return nil if o.nil?
+
+    result = normalize_dt( kind, k ) <=> o
+    return l_kind ? result : -result
   end
 
 end

data/lib/gloo/objs/dt/time.rb

@@ -58,7 +58,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[now add sub hh mm ss am]
+        return super + %w[now add sub hh mm ss am format]
       end
 
       #
@@ -133,6 +133,22 @@ module Gloo
         dt = Chronic.parse( self.value )
         @engine.heap.it.set_to dt.strftime( '%p' )
       end
+
+      #
+      # Format the time.
+      #
+      # @param format [String] The format to use.
+      #
+      def msg_format
+        format = "%H:%M:%S"
+        if @params&.token_count&.positive?
+          expr = Gloo::Expr::Expression.new( @engine, @params.tokens )
+          data = expr.evaluate
+          format = data
+        end
+        dt = Chronic.parse( self.value )
+        @engine.heap.it.set_to dt.strftime( format )
+      end
     end
   end
 end

data/lib/gloo/objs/str_utils/cipher.rb

@@ -37,8 +37,7 @@ module Gloo
       # Returns nil if there is none.
       #
       def key
-        o = find_child KEY
-        return o&.value
+        return find_child_value KEY
       end
 
       #
@@ -46,25 +45,23 @@ module Gloo
       # Returns nil if there is none.
       #
       def init_vector
-        o = find_child INIT_VECTOR
-        return o&.value
+        return find_child_value INIT_VECTOR
       end
 
       #
       # Get the data value of the object.
-      # This might be encrypted or decrypted based on 
+      # This might be encrypted or decrypted based on
       # what action was last taken.
       #
       def data
-        o = find_child DATA
-        return o&.value
+        return find_child_value DATA
       end
 
       #
       # Update the key value.
       #
       def update_key( new_val )
-        o = find_child KEY
+        o = find_child_resolve_alias KEY
         return unless o
 
         o.set_value new_val
@@ -74,7 +71,7 @@ module Gloo
       # Update the initialization vector value.
       #
       def update_init_vector( new_val )
-        o = find_child INIT_VECTOR
+        o = find_child_resolve_alias INIT_VECTOR
         return unless o
 
         o.set_value new_val
@@ -84,7 +81,7 @@ module Gloo
       # Update the data value of the object.
       #
       def update_data( new_val )
-        o = find_child DATA
+        o = find_child_resolve_alias DATA
         return unless o
 
         o.set_value new_val
@@ -137,7 +134,7 @@ module Gloo
         key = Base64.encode64 key
         update_key key
 
-        iv = update_init_vector cipher.random_iv
+        iv = cipher.random_iv
         iv = Base64.encode64 iv
         update_init_vector iv
       end

data/lib/gloo/objs/str_utils/outline.rb

@@ -139,8 +139,6 @@ module Gloo
           add_topic id, name
         end
 
-        # show_items_r( @root[ :children ], 0 )
-
         # Generate the HTML from the outline structure
         html = render_outline
   

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

@@ -1,7 +1,7 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
 # Copyright:: Copyright (c) 2019 Eric Crane.  All rights reserved.
 #
-# An object that evaluate a ruby statement.
+# An object that evaluates an ERB template.
 #
 require 'erb'
 
@@ -34,17 +34,16 @@ module Gloo
       #
       def template_value
         tmpl = find_child TEMPLATE
-        return nil unless tmpl
-
-        return tmpl.value
+        tmpl = Gloo::Objs::Alias.resolve_alias( @engine, tmpl )
+        return tmpl&.value
       end
 
       #
       # Set the result of the ERB template conversion.
       #
       def set_result( data )
-        r = find_child RESULT
-        return nil unless r
+        r = find_child_resolve_alias RESULT
+        return unless r
 
         r.set_value data
       end

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

@@ -157,7 +157,6 @@ module Gloo
       #
       def msg_mkdir
         FileUtils.mkdir_p(value) unless Dir.exist?(value)
-        # Dir.mkdir(value) unless Dir.exist?(value)
       end
 
       #

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

@@ -30,22 +30,19 @@ module Gloo
       end
 
       #
-      # Get the URI from the child object.
+      # Get the command from the child object.
       # Returns nil if there is none.
       #
       def cmd_value
-        cmd = find_child CMD
-        return nil unless cmd
-
-        return cmd.value
+        return find_child_value CMD
       end
 
       #
       # Set the result of the system call.
       #
       def set_result( data )
-        r = find_child RESULT
-        return nil unless r
+        r = find_child_resolve_alias RESULT
+        return unless r
 
         r.set_value data
       end
@@ -56,10 +53,7 @@ module Gloo
       # otherwise it will just get the result of the call.
       #
       def output?
-        o = find_child GET_OUTPUT
-        return false unless o
-
-        return o.value
+        return find_child_value GET_OUTPUT
       end
 
       # ---------------------------------------------------------------------

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

@@ -1,7 +1,7 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
 # Copyright:: Copyright (c) 2019 Eric Crane.  All rights reserved.
 #
-# An object that can post JSON to a URI.
+# An object that can make an HTTP GET request.
 #
 require 'net/http'
 require 'uri'
@@ -111,28 +111,22 @@ module Gloo
       # Returns nil if there is none.
       #
       def uri_value
-        uri = find_child URL
-        return nil unless uri
-
-        return uri.value
+        return find_child_value URL
       end
 
       #
       # Should we skip SSL verification during the request?
       #
       def skip_ssl_verify?
-        skip = find_child SKIP_SSL_VERIFY
-        return false unless skip
-
-        return skip.value
+        return find_child_value( SKIP_SSL_VERIFY ) || false
       end
 
       #
       # Set the result of the API call.
       #
       def update_result( data )
-        r = find_child RESULT
-        return nil unless r
+        r = find_child_resolve_alias RESULT
+        return unless r
 
         r.set_value data
       end
@@ -142,7 +136,7 @@ module Gloo
       #
       def full_url_value
         p = ''
-        params = find_child PARAMS
+        params = find_child_resolve_alias PARAMS
         params.children.each do |child|
           p << ( p.empty? ? '?' : '&' )
 

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

@@ -37,10 +37,7 @@ module Gloo
       # Returns nil if there is none.
       #
       def uri_value
-        uri = find_child URL
-        return nil unless uri
-
-        return uri.value
+        return find_child_value URL
       end
 
       #
@@ -50,7 +47,7 @@ module Gloo
       def body_as_json
         h = {}
 
-        body = find_child BODY
+        body = find_child_resolve_alias BODY
         body.children.each do |child|
           child_val = Gloo::Objs::Alias.resolve_alias( @engine, child )
           h[ child.name ] = child_val.value
@@ -63,8 +60,8 @@ module Gloo
       # Set the result of the API call.
       #
       def update_result( data )
-        r = find_child RESULT
-        return nil unless r
+        r = find_child_resolve_alias RESULT
+        return unless r
 
         r.set_value data
       end
@@ -142,26 +139,6 @@ module Gloo
         end
       end
 
-      # #
-      # # Post the content to the endpoint.
-      # #
-      # def self.post_json_1( url, body, use_ssl = true )
-      #   # Structure the request
-      #   uri = URI.parse( url )
-      #
-      #   request = Net::HTTP::Post.new( uri.path )
-      #   request.content_type = 'application/json'
-      #   request.body = body
-      #   n = Net::HTTP.new( uri.host, uri.port )
-      #   n.use_ssl = use_ssl
-      #
-      #   # Send the payload to the endpoint.
-      #   result = n.start { |http| http.request( request ) }
-      #   @engine.log.debug result.code
-      #   @engine.log.debug result.message
-      #   return result.body
-      # end
-
       # ---------------------------------------------------------------------
       #    Private functions
       # ---------------------------------------------------------------------
@@ -172,10 +149,7 @@ module Gloo
       # Should we skip SSL verification during the request?
       #
       def skip_ssl_verify?
-        skip = find_child SKIP_SSL_VERIFY
-        return false unless skip
-
-        return skip.value
+        return find_child_value( SKIP_SSL_VERIFY ) || false
       end
 
     end

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

@@ -106,7 +106,7 @@ module Gloo
         end
         parent = pn.resolve
 
-        h = convert_obj_to_hash( parent )
+        h = Json.convert_obj_to_hash( parent )
         json = JSON.parse( h.to_json )
         json = JSON.pretty_generate( json )
 

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

@@ -62,7 +62,7 @@ module Gloo
       #
       def msg_get_cert_expires
         return unless value
-        o = value
+
         uri = URI( value )
         response = Net::HTTP.start( uri.host, uri.port, :use_ssl => true )
         cert = response.peer_cert
@@ -143,7 +143,7 @@ module Gloo
 
 
       # ---------------------------------------------------------------------
-      #    Helper functiont to open a URL
+      #    Helper function to open a URL
       # ---------------------------------------------------------------------
 
       # 

data/lib/gloo/persist/disc_mech.rb

@@ -2,9 +2,9 @@
 # Copyright:: Copyright (c) 2022 Eric Crane.  All rights reserved.
 #
 # Disc based mechanism for files.
-# Provides interaction between the persistance classes and the OS 
+# Provides interaction between the persistence classes and the OS
 # file and folder system.
-# This class might be overiden elsewhere to provide other mechanism.
+# This class might be overridden elsewhere to provide other mechanism.
 # For example, in gloo-web, there will be a db based mechanism.
 #