gloo 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b527dd8c4837506689358a05681e7e81ba5804aeb617815db80e014a6f0f381b
-  data.tar.gz: 9d0d089ff54f1c669ee3b1009411e8a0310ed01792b008946f3fee8feff89313
+  metadata.gz: 6e79ebad69bd8325e6f1b09ecd7d32520e7f82d1e4181d74c31433e4ca159cda
+  data.tar.gz: 50cdd391fa4d96d0cb8897bf8b8fdb02b30aea567083343e5540b492399a9e93
 SHA512:
-  metadata.gz: f0632bc38a33051cbe970e0f29e01fac34d29ad9988df31773518c5cdc4d501a9462ff9a3c17fd54fa5db8b5c5326fa890eb8a1d395d7dedef057b5e41da16fc
-  data.tar.gz: 6370739e3e635f6659ed5f28c62fd7d858cd8cb7b02e2115c29119434b8459e5cdb78dc9d1f3a547424425e41242d000216b9f89899734aa7d1e9206b4282662
+  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.5.0
+3.6.0

data/lib/VERSION_NOTES

@@ -1,3 +1,10 @@
+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

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/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/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?
       # 

data/lib/gloo/exec/dispatch.rb

@@ -33,6 +33,8 @@ module Gloo
       # 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/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

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

@@ -0,0 +1,68 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Iterate over each child in an object container.
+# 
+
+module Gloo
+  module Objs
+    class EachChild
+
+      CHILD = 'child'.freeze
+      IN = 'IN'.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 CHILD
+
+        return false
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Iterate
+      # ---------------------------------------------------------------------
+
+      #
+      # Run for each child.
+      #
+      def run
+        o = @iterator_obj.find_child IN
+        return unless o
+
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+        o.children.each do |child|
+          set_child child
+          @iterator_obj.run_do
+        end
+      end
+
+      #
+      # Set the child alias.
+      #
+      def set_child( obj )
+        o = @iterator_obj.find_child CHILD
+        return unless o
+
+        o.set_value obj.pn
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Iterate over each file in a folder.
+# 
+
+module Gloo
+  module Objs
+    class EachFile
+
+      FILE = 'file'.freeze
+      EXT = 'ext'.freeze
+      WILD = '*'.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 FILE
+
+        return false
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Iterate
+      # ---------------------------------------------------------------------
+
+      #
+      # Run for each file.
+      #
+      def run
+        folder = @iterator_obj.in_value
+        return unless folder
+
+        unless Dir.exist?( folder )
+          @engine.err "Folder does not exist: #{folder}"
+        end
+
+        Dir.glob( "#{folder}#{wildcard}" ).each do |f|
+          set_file f
+          @iterator_obj.run_do
+        end
+      end
+
+      # 
+      # Get the wildcard for the glob.
+      # 
+      def wildcard
+        o = @iterator_obj.find_child EXT
+        return WILD unless o
+
+        return "#{WILD}.#{o.value}"
+      end
+
+      #
+      # Set the value of the word.
+      #
+      def set_file( f )
+        o = @iterator_obj.find_child FILE
+        return unless o
+
+        o.set_value f
+      end
+      
+    end
+  end
+end

data/lib/gloo/objs/ctrl/each_line.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 line in a text block.
+# 
+
+module Gloo
+  module Objs
+    class EachLine
+
+      LINE = 'line'.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 LINE
+
+        return false
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Iterate
+      # ---------------------------------------------------------------------
+
+      #
+      # Run for each line.
+      #
+      def run
+        str = @iterator_obj.in_value
+        return unless str
+
+        str.each_line do |line|
+          set_line line
+          @iterator_obj.run_do
+        end
+      end
+
+      #
+      # Set the value of the word.
+      #
+      def set_line( line )
+        o = @iterator_obj.find_child LINE
+        return unless o
+
+        o.set_value line
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Iterate over each repo in a directory.
+# 
+
+module Gloo
+  module Objs
+    class EachRepo
+
+      FILE = 'file'.freeze
+      REPO = 'repo'.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 REPO
+
+        return false
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Iterate
+      # ---------------------------------------------------------------------
+
+      #
+      # 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 repo.
+      #
+      def run
+        path = @iterator_obj.in_value
+        return unless path
+
+        path = Pathname.new( path )
+        repos = find_all_git_projects( path )
+        repos.each do |o|
+          set_repo o
+          @iterator_obj.run_do
+        end
+      end
+
+      #
+      # Set the value of the repo.
+      # This is a path to the repo.
+      #
+      def set_repo( path )
+        o = @iterator_obj.find_child REPO
+        return unless o
+
+        o.set_value path
+      end
+      
+    end
+  end
+end