gloo 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1dca7b53440a446850b2c3bd58b9a2b3c66ef73156bf7e8e90bfba9ddd71032
-  data.tar.gz: 012614b36386042458633b635a4f28c33fd9be21a50be7bcf37271d8c2aa8360
+  metadata.gz: 02f90941d4a489efde1a15b50d55c85af80e1ac02e012102644a21613ce23e90
+  data.tar.gz: 3216f0732a0e59b258453ce5d929f751477a264586e73f668ced1332cb601d61
 SHA512:
-  metadata.gz: 0ae04823687860a34d4134bc9f3338a7d05dd68b6cd618d8ef8f1f51198bbcd2ea692f3737ab6e235f175ffa184114c6158071fc743ccc1073cba27d1d4efca0
-  data.tar.gz: 4a0c04fb3f64e2d7c045b72fd4a6f7c8b8d172b18b030de033d492803adf67eaf8c0f657e174b861d6de05172755f8bfb8273f3be42d53913c074923468371e7
+  metadata.gz: b68948e64413281d9a1f51542888b6818adf28adfb0a625e0c8415c596600207365d761a6c5ebe36c5cebbeb6ab7ee6a6244dc1e8f215b58f5b7000909032d18
+  data.tar.gz: 9cef0e42026158497bf424828e691958a196ff7a6cd65771dff504a59c2a205691b997485e7cd1b50e8882d349076b0d8f8b8564f794d953021cf2e4a2310667

data/gloo.gemspec

@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'os', '~> 1.1', '>= 1.1.4'
   spec.add_dependency 'pg', '~> 1.5.4'
   spec.add_dependency 'thin', '~> 1.8.2'
+  spec.add_dependency 'redcarpet', '~> 3.6.0'
 end

data/lib/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/lib/VERSION_NOTES

@@ -1,3 +1,10 @@
+3.3.0 - 2024.08.16
+ - Adds nil converters to string and integer.
+ - Adds render to markdown object to convert to html
+ - Adds invoke verb to call a function from a script
+ - Web updates: singular name conventions
+
+
 3.2.0 - 2024.07.07
  - Update with more web server functionality, http methods, resource routing
  - Expands query with additional html table support

data/lib/gloo/app/platform.rb

@@ -35,7 +35,13 @@ module Gloo
       #
       def show( msg, md=false, page=false )
         if md
-          msg = TTY::Markdown.parse msg
+          # 2024.08.16 - TTY::Markdown.parse msg was not working.
+          # Tried with redcarpet and it was not working either.
+          # So just leaving it for now.  Not sure I even really need it.
+          # TODO: Revisit and clean up.
+
+          # msg = TTY::Markdown.parse msg
+          # msg = Gloo::Objs::Markdown.md_2_manpage( msg )
         end
 
         if page

data/lib/gloo/convert/falseclass_to_integer.rb

@@ -0,0 +1,20 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  FALSE to Integer.
+#
+
+module Gloo
+  module Convert
+    class FalseClassToInteger
+
+      #
+      # Convert the given FALSE value to an integer.
+      #
+      def convert( value )
+        return 0
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_date.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to Date.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToDate
+
+      #
+      # Convert a nil to a date.
+      #
+      def convert( value )
+        return Chronic.parse( '' )
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_datetime.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to DateTime.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToDateTime
+
+      #
+      # Convert a nil to a date.
+      #
+      def convert( value )
+        return Chronic.parse( '' )
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_integer.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to Integer.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToInteger
+
+      #
+      # Convert a nil to a string.
+      #
+      def convert( value )
+        return 0
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_string.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to String.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToString
+
+      #
+      # Convert a nil to a string.
+      #
+      def convert( value )
+        return ''
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/nilclass_to_time.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  Nil to Time.
+#
+require 'chronic'
+
+module Gloo
+  module Convert
+    class NilClassToTime
+
+      #
+      # Convert a nil to a date.
+      #
+      def convert( value )
+        return Chronic.parse( '' )
+      end
+
+    end
+  end
+end

data/lib/gloo/convert/trueclass_to_integer.rb

@@ -0,0 +1,20 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  TRUE to Integer.
+#
+
+module Gloo
+  module Convert
+    class TrueClassToInteger
+
+      #
+      # Convert the given TRUE value to an integer.
+      #
+      def convert( value )
+        return 1
+      end
+
+    end
+  end
+end

data/lib/gloo/core/error.rb

@@ -56,6 +56,13 @@ module Gloo
         return @value.to_s
       end
 
+      # 
+      # Is this a function object?
+      # 
+      def is_function?
+        return false
+      end
+
     end
   end
 end

data/lib/gloo/core/it.rb

@@ -31,6 +31,13 @@ module Gloo
         return @value.to_s
       end
 
+      # 
+      # Is this a function object?
+      # 
+      def is_function?
+        return false
+      end
+
     end
   end
 end

data/lib/gloo/core/obj.rb

@@ -144,6 +144,13 @@ module Gloo
         return self.type_display == Gloo::Objs::Alias.typename
       end
 
+      # 
+      # Is this a function object?
+      # 
+      def is_function?
+        return self.type_display == Gloo::Objs::Function.typename
+      end
+
 
       # ---------------------------------------------------------------------
       #    Children

data/lib/gloo/core/parser.rb

@@ -20,8 +20,11 @@ module Gloo
       #
       # Parse a command from the immediate execution context.
       #
-      def parse_immediate( cmd )
-        cmd, params = split_params cmd
+      def parse_immediate( full_cmd )
+        # Break the full command into verb and params
+        cmd, params = split_params full_cmd
+
+        # Params are the parenthetical part of the command at the end
         params = Gloo::Core::Tokens.new( params ) if params
         tokens = Gloo::Core::Tokens.new( cmd )
         dic = Gloo::Core::Dictionary.instance
@@ -42,7 +45,7 @@ module Gloo
         if i && cmd.strip.end_with?( ')' )
           pstr = cmd[ i + 1..-1 ]
           params = pstr.strip[ 0..-2 ] if pstr
-          cmd = cmd[ 0, i - 1 ]
+          cmd = cmd[ 0, i].strip
         end
         return cmd, params
       end

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

@@ -37,6 +37,7 @@ module Gloo
         self.value = new_value.to_i
       end
 
+      
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------

data/lib/gloo/objs/{basic → ctrl}/function.rb

@@ -14,6 +14,7 @@ module Gloo
 
       # Events
       ON_INVOKE = 'on_invoke'.freeze
+      AFTER_INVOKE = 'after_invoke'.freeze
 
       # Parameters to the function invocation.
       PARAMS = 'params'.freeze
@@ -132,6 +133,16 @@ module Gloo
         Gloo::Exec::Dispatch.message( @engine, 'run', o )
       end
 
+      #
+      # Run the after invoke script if there is one.
+      #
+      def run_after_invoke
+        o = find_child AFTER_INVOKE
+        return unless o
+
+        Gloo::Exec::Dispatch.message( @engine, 'run', o )
+      end
+
 
       # ---------------------------------------------------------------------
       #    Messages
@@ -147,6 +158,7 @@ module Gloo
         run_on_invoke
         return_value = result
         @engine.heap.it.set_to return_value
+        run_after_invoke
         
         return return_value
       end

data/lib/gloo/objs/data/markdown.rb

@@ -3,6 +3,7 @@
 #
 # Markdown data.
 #
+require 'redcarpet'
 
 module Gloo
   module Objs
@@ -55,7 +56,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[show page]
+        return super + %w[show page render]
       end
 
       #
@@ -71,9 +72,66 @@ module Gloo
       def msg_page
         return unless self.value
 
-        @engine.platform.show( md, true, true )
+        @engine.platform.show( self.value, true, true )
       end
 
+      #
+      # Render the markdown as HTML.
+      # Needs an optional parameter of where to put the rendered html.
+      # The html will be in 'it' as well.
+      #
+      def msg_render
+        html = Gloo::Objs::Markdown.md_2_html( value )
+
+        # Put the HTML in the optional parameter if one is given.
+        if @params&.token_count&.positive?
+          pn = Gloo::Core::Pn.new( @engine, @params.first )
+          o = pn.resolve
+          o.set_value html
+        end
+
+        # Put the HTML in it, in any case.
+        @engine.heap.it.set_to html
+      end
+
+      # ---------------------------------------------------------------------
+      #    Static Helpers
+      # ---------------------------------------------------------------------
+
+      # 
+      # Convert markdown to HTML using the
+      # Redcarpet markdown processor.
+      # 
+      def self.md_2_html( md )
+        markdown = Redcarpet::Markdown.new( 
+          Redcarpet::Render::HTML, 
+          autolink: true, 
+          fenced_code_blocks: true,
+          tables: true, 
+          strikethrough: true )
+          
+        return markdown.render( md )
+      end
+
+      # 
+      # Does not work.
+      # See note in the platform.rb file.
+      # 
+      # # 
+      # # Convert markdown to manpage using the
+      # # Redcarpet markdown processor.
+      # # 
+      # def self.md_2_manpage( md )
+      #   markdown = Redcarpet::Markdown.new( 
+      #     Redcarpet::Render::ManPage, 
+      #     autolink: true, 
+      #     fenced_code_blocks: true,
+      #     tables: true, 
+      #     strikethrough: true )
+          
+      #   return markdown.render( md )
+      # end
+
     end
   end
 end

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

@@ -196,6 +196,8 @@ module Gloo
         o = find_child ON_RENDER
         return unless o
 
+        @engine.log.debug "running on_render for page"
+
         Gloo::Exec::Dispatch.message( @engine, 'run', o )
       end
 
@@ -206,6 +208,8 @@ module Gloo
         o = find_child ON_RENDERED
         return unless o
 
+        @engine.log.debug "running on_rendered for page"
+
         Gloo::Exec::Dispatch.message( @engine, 'run', o )
       end
 
@@ -321,12 +325,12 @@ module Gloo
         @request = request
         set_id if @request
 
-        # Set Params before running on render
-        params = params_hash
-
         run_on_render
         return nil if redirect_set?
 
+        # Set Params before running on render
+        params = params_hash
+
         if is_html?
           contents = render_html params
         elsif is_json?
@@ -337,7 +341,7 @@ module Gloo
           @engine.log.error "Unknown content type: #{content_type}"
           return nil
         end
-        
+
         run_on_rendered
         @request = nil
         return nil if redirect_set?

data/lib/gloo/verbs/invoke.rb

@@ -0,0 +1,80 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Invoke a function from a script.
+#
+
+module Gloo
+  module Verbs
+    class Invoke < Gloo::Core::Verb
+
+      KEYWORD = 'invoke'.freeze
+      KEYWORD_SHORT = '~>'.freeze
+
+      #
+      # Run the verb.
+      #
+      def run
+        if @tokens.token_count > 1
+          ob = @tokens.first
+
+          # Get the function object
+          pn = Gloo::Core::Pn.new( @engine, @tokens.second ) 
+          func = pn.resolve
+
+          # Is the object a function?
+          if func&.is_function?
+            params = get_params_arr
+          
+            @engine.log.debug "invoking function: #{func.pn}"
+            result = func.invoke( params ) 
+            @engine.log.debug "function returned: #{result}"
+            @engine.heap.it.set_to result
+            return result
+          end
+        end
+      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
+
+      #
+      # Get params array.
+      #
+      def get_params_arr
+        @engine.log.debug "token params: #{@tokens.params}"
+        params = @tokens.params[1..-1]
+
+        @engine.log.info "params: #{params}"
+        evaluated_params = []
+
+        params.each do |p|
+          expr = Gloo::Expr::Expression.new( @engine, [ p ] )
+          evaluated_params << expr.evaluate
+        end
+
+        @engine.log.debug "evaluated_params: #{evaluated_params}"
+
+        return evaluated_params
+      end
+
+    end
+  end
+end

data/lib/gloo/web_svr/asset.rb

@@ -8,9 +8,9 @@ module Gloo
   module WebSvr
     class Asset
       
-      ASSETS_FOLDER = 'assets'.freeze
-      IMAGES_FOLDER = 'images'.freeze
-      STYLESHEETS_FOLDER = 'stylesheets'.freeze
+      ASSET_FOLDER = 'asset'.freeze
+      IMAGE_FOLDER = 'image'.freeze
+      STYLESHEET_FOLDER = 'stylesheet'.freeze
       JAVASCRIPT_FOLDER = 'javascript'.freeze
 
       CSS_TYPE = 'text/css'.freeze
@@ -42,29 +42,29 @@ module Gloo
       # 
       # Get the asset folder in the project.
       #
-      def assets_folder
-        return File.join( @engine.settings.project_path, ASSETS_FOLDER )
+      def asset_folder
+        return File.join( @engine.settings.project_path, ASSET_FOLDER )
       end
 
       #
       # Get the images folder in the project.
       #
-      def images_folder
-        return File.join( assets_folder, IMAGES_FOLDER )
+      def image_folder
+        return File.join( asset_folder, IMAGE_FOLDER )
       end
 
       # 
       # Get the stylesheets folder in the project.
       #
-      def stylesheets_folder
-        return File.join( assets_folder, STYLESHEETS_FOLDER )
+      def stylesheet_folder
+        return File.join( asset_folder, STYLESHEET_FOLDER )
       end
 
       # 
       # Get the stylesheets folder in the project.
       #
       def javascript_folder
-        return File.join( assets_folder, JAVASCRIPT_FOLDER )
+        return File.join( asset_folder, JAVASCRIPT_FOLDER )
       end
 
       # 
@@ -77,7 +77,7 @@ module Gloo
         return pn if File.exist? pn
 
         # Look in the web server's asset folder.
-        pn = File.join( assets_folder, pn )
+        pn = File.join( asset_folder, pn )
 
         return pn
       end
@@ -125,7 +125,7 @@ module Gloo
       # Add all asssets to the web server pages (routes).
       # 
       def add_asset_routes
-        return unless File.exist? assets_folder
+        return unless File.exist? asset_folder
 
         @log.debug 'Adding asset routes to web server…'
         @factory = @engine.factory
@@ -142,14 +142,14 @@ module Gloo
       def add_containers
         pages = @web_svr_obj.pages_container
 
-        @assets = pages.find_child( ASSETS_FOLDER ) || 
-          @factory.create_can( ASSETS_FOLDER, pages )
+        @assets = pages.find_child( ASSET_FOLDER ) || 
+          @factory.create_can( ASSET_FOLDER, pages )
 
-        @images = @assets.find_child( IMAGES_FOLDER ) || 
-          @factory.create_can( IMAGES_FOLDER, @assets )
+        @images = @assets.find_child( IMAGE_FOLDER ) || 
+          @factory.create_can( IMAGE_FOLDER, @assets )
 
-        @stylesheets = @assets.find_child( STYLESHEETS_FOLDER ) || 
-          @factory.create_can( STYLESHEETS_FOLDER, @assets )
+        @stylesheets = @assets.find_child( STYLESHEET_FOLDER ) || 
+          @factory.create_can( STYLESHEET_FOLDER, @assets )
 
         @javascript = @assets.find_child( JAVASCRIPT_FOLDER ) || 
           @factory.create_can( JAVASCRIPT_FOLDER, @assets )
@@ -161,12 +161,12 @@ module Gloo
       def add_images
         @log.debug 'Adding image asset routes to web server…'
         
-        return unless File.exist? images_folder
+        return unless File.exist? image_folder
 
         # for each file in the images folder
         # create a file object and add it to the images container
-        Dir.each_child( images_folder ) do |name|
-          pn = File.join( IMAGES_FOLDER, name )
+        Dir.each_child( image_folder ) do |name|
+          pn = File.join( IMAGE_FOLDER, name )
           add_file_obj( @images, name, pn )
         end
       end
@@ -177,12 +177,12 @@ module Gloo
       def add_stylesheets
         @log.debug 'Adding stylesheet asset routes to web server…'
 
-        return unless File.exist? stylesheets_folder
+        return unless File.exist? stylesheet_folder
 
         # for each file in the stylesheets folder
         # create a file object and add it to the stylesheets container
-        Dir.each_child( stylesheets_folder ) do |name|
-          pn = File.join( STYLESHEETS_FOLDER, name )
+        Dir.each_child( stylesheet_folder ) do |name|
+          pn = File.join( STYLESHEET_FOLDER, name )
           add_file_obj( @stylesheets, name, pn )
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -292,6 +292,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 description: A scripting languge to keep it all together.
 email:
 - eric.crane@mac.com
@@ -332,11 +346,18 @@ files:
 - lib/gloo/app/running_app.rb
 - lib/gloo/app/settings.rb
 - lib/gloo/convert/converter.rb
+- lib/gloo/convert/falseclass_to_integer.rb
+- lib/gloo/convert/nilclass_to_date.rb
+- lib/gloo/convert/nilclass_to_datetime.rb
+- lib/gloo/convert/nilclass_to_integer.rb
+- lib/gloo/convert/nilclass_to_string.rb
+- lib/gloo/convert/nilclass_to_time.rb
 - lib/gloo/convert/string_to_date.rb
 - lib/gloo/convert/string_to_datetime.rb
 - lib/gloo/convert/string_to_decimal.rb
 - lib/gloo/convert/string_to_integer.rb
 - lib/gloo/convert/string_to_time.rb
+- lib/gloo/convert/trueclass_to_integer.rb
 - lib/gloo/core/baseo.rb
 - lib/gloo/core/dictionary.rb
 - lib/gloo/core/error.rb
@@ -373,7 +394,6 @@ files:
 - lib/gloo/objs/basic/boolean.rb
 - lib/gloo/objs/basic/container.rb
 - lib/gloo/objs/basic/decimal.rb
-- lib/gloo/objs/basic/function.rb
 - lib/gloo/objs/basic/integer.rb
 - lib/gloo/objs/basic/script.rb
 - lib/gloo/objs/basic/string.rb
@@ -389,6 +409,7 @@ files:
 - lib/gloo/objs/cli/prompt.rb
 - lib/gloo/objs/cli/select.rb
 - lib/gloo/objs/ctrl/each.rb
+- lib/gloo/objs/ctrl/function.rb
 - lib/gloo/objs/ctrl/repeat.rb
 - lib/gloo/objs/data/markdown.rb
 - lib/gloo/objs/data/mysql.rb
@@ -439,6 +460,7 @@ files:
 - lib/gloo/verbs/files.rb
 - lib/gloo/verbs/help.rb
 - lib/gloo/verbs/if.rb
+- lib/gloo/verbs/invoke.rb
 - lib/gloo/verbs/list.rb
 - lib/gloo/verbs/load.rb
 - lib/gloo/verbs/log.rb
@@ -488,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Gloo scripting language.  A scripting language built on ruby.