gloo 3.2.0 → 3.4.0

data/lib/gloo/web_svr/request.rb

@@ -1,5 +1,5 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 20124 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
 #
 # A web Request for a page, action, or static resource.
 #
@@ -9,6 +9,10 @@
 #   API - returns JSON instead of HTML (but is that different from Web Page?)
 #   Static Resource - File, PDF, Image, etc.
 # 
+# 
+# See More doc here:
+#    https://www.rubydoc.info/gems/rack/Rack/Request/Helpers#path-instance_method
+# 
 
 module Gloo
   module WebSvr
@@ -19,7 +23,8 @@ module Gloo
       HTTP_HOST = 'HTTP_HOST'.freeze
       QUERY_STRING = 'QUERY_STRING'.freeze
 
-      attr_reader :method, :host, :path, :query, :body
+      attr_reader :method, :host, :path, :query, :body, :ip
+      attr_reader :db, :elapsed
       attr_accessor :id
 
       
@@ -50,11 +55,22 @@ module Gloo
       # 
       def process
         start_timer
+
+        # Run the on_request script if there is one.
+        @handler.server_obj.set_request_data self
+        @handler.server_obj.run_on_request
+        
         result = @handler.handle self
         finish_timer
+
+        # Run the on_response script if there is one.
+        @handler.server_obj.set_response_data self, result
+        @handler.server_obj.run_on_response
+
         return result
       end
 
+      
       # ---------------------------------------------------------------------
       #    ENV
       # ---------------------------------------------------------------------
@@ -63,10 +79,20 @@ module Gloo
       # Write the request information to the log.
       # 
       def detect_env
-        @method = @env[ REQUEST_METHOD ]
-        @path = @env[ REQUEST_PATH ]
-        @host = @env[ HTTP_HOST ]
-        @query = @env[ QUERY_STRING ]
+        req = Rack::Request.new( @env )
+
+        @method = req.request_method
+        @path = req.path
+        @host = req.host_with_port
+        @query = req.query_string
+        @ip = req.ip
+
+        # @method = @env[ REQUEST_METHOD ]
+        # @path = @env[ REQUEST_PATH ]
+        # @host = @env[ HTTP_HOST ]
+        # @query = @env[ QUERY_STRING ]
+
+        @handler.server_obj.session.set_session_data_for_request( @env )
 
         @body = @env[ 'rack.input' ].read
         @body = Rack::Utils.parse_query @body
@@ -92,8 +118,8 @@ module Gloo
       def finish_timer
         @finish = Time.now
         @elapsed = ( ( @finish - @start ) * 1000.0 ).round(2)
-        db = @engine.running_app.db_time
-        @log.info "*** Web request complete.  DB: #{db} ms.  Elapsed time: #{@elapsed} ms"
+        @db = @engine.running_app.db_time
+        @log.info "*** Web request complete.  DB: #{@db} ms.  Elapsed time: #{@elapsed} ms"
       end
     
 

data/lib/gloo/web_svr/response.rb

@@ -1,5 +1,5 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 20124 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
 #
 # The Response for a web Request.
 #
@@ -88,7 +88,19 @@ module Gloo
       # Get the headers for the response.
       # 
       def headers
-        return { CONTENT_TYPE => @type }
+        # 
+        # TO DO: Add more cookie headers here.
+        # 
+        #  https://stackoverflow.com/questions/3295083/how-do-i-set-a-cookie-with-a-ruby-rack-middleware-component
+        #   https://www.rubydoc.info/gems/rack/1.4.7/Rack/Session/Cookie
+        #
+
+        headers = { CONTENT_TYPE => @type }
+
+        session = @engine&.running_app&.obj&.session      
+        headers = session.add_session_for_response( headers ) if session
+  
+        return headers
       end
 
       # 

data/lib/gloo/web_svr/response_code.rb

@@ -1,5 +1,5 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 20124 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
 #
 # Standard Response Codes.
 # 

data/lib/gloo/web_svr/routing/router.rb

@@ -1,9 +1,8 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 20124 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
 #
 # A helper class for page routing.
 # 
-require 'tty-table'
 
 module Gloo
   module WebSvr

data/lib/gloo/web_svr/routing/show_routes.rb

@@ -1,9 +1,8 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 20124 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
 #
 # A helper class for to show routes for a running app.
 # 
-require 'tty-table'
 
 module Gloo
   module WebSvr
@@ -77,11 +76,9 @@ module Gloo
         # Show the Routes title.
         # 
         def show_table
-          @log.show "\n\tRoutes in Running Web App\n", :white
-
-          table = TTY::Table.new( headers, @found_routes )
-          renderer = TTY::Table::Renderer::Unicode.new( table, padding: [0,1] )
-          puts renderer.render
+          puts RETURN
+          title = "Routes in Running Web App"
+          @engine.platform.table.show headers, @found_routes, title
           puts RETURN
         end
 

data/lib/gloo/web_svr/server.rb

@@ -1,5 +1,5 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 20124 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
 # 
 # Starting work on web server inside gloo.
 # 

data/lib/gloo/web_svr/session.rb

@@ -0,0 +1,161 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
+#
+# Helpers for getting and setting session data.
+# 
+# Resources:
+#   https://www.rubydoc.info/gems/rack/1.5.5/Rack/Request#cookies-instance_method
+#   https://rubydoc.info/github/rack/rack/Rack/Utils#set_cookie_header-class_method
+#   https://en.wikipedia.org/wiki/HTTP_cookie
+#   
+require 'base64'
+
+module Gloo
+  module WebSvr
+    class Session
+
+      SESSION_CONTAINER = 'session'.freeze
+
+      
+      # ---------------------------------------------------------------------
+      #    Initialization
+      # ---------------------------------------------------------------------
+
+      #
+      # Set up the web server.
+      #
+      def initialize( engine, server_obj )
+        @engine = engine
+        @log = @engine.log
+
+        @server_obj = server_obj
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Set Session Data for Request
+      # ---------------------------------------------------------------------
+
+      # 
+      # Get the session data from the encrypted cookie.
+      # Add it to the session container.
+      # 
+      def set_session_data_for_request( env )
+        cookie_hash = Rack::Utils.parse_cookies( env )
+
+        # Are we using sessions?
+        if @server_obj.use_session?
+          data = cookie_hash[ session_name ]
+
+          if data
+            data = decode_decrypt( data ) 
+
+            data.each do |key, value|
+              @server_obj.set_session_var( key, value )
+            end
+          end
+        end
+
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Get Session Data for Response
+      # ---------------------------------------------------------------------
+
+      # 
+      # If there is session data, encrypt and add it to the response.
+      # Once done, clear out the session data.
+      # 
+      def add_session_for_response( headers )
+        # Are we using sessions?
+        if @server_obj.use_session?
+          # Build and add encrypted session data
+          data = @server_obj.get_session_data
+          unless data.empty?
+            data = encrypt_encode( data )
+            session_hash = { 
+              value: data, 
+              path: cookie_path, 
+              expires: cookie_expires,
+              http_only: true }
+
+            if secure_cookie?
+              session_hash[ :secure ] = true
+            end
+
+            Rack::Utils.set_cookie_header!( headers, session_name, session_hash )
+          end
+
+          # Clear out session data
+          @server_obj.clear_session_data
+        end
+
+        return headers
+      end
+
+
+      # ---------------------------------------------------------------------
+      #    Helper functions
+      # ---------------------------------------------------------------------
+
+      # 
+      # Encrypt and encode the session data.
+      # 
+      def encrypt_encode( data )
+        return Gloo::Objs::Cipher.encrypt( data.to_json, key, iv )
+      end
+
+      # 
+      # Decode and decrypt the session data.
+      # 
+      def decode_decrypt( data )
+        data = Gloo::Objs::Cipher.decrypt( data, key, iv )
+        return JSON.parse( data )
+      end
+
+      # 
+      # Get the session cookie name.
+      # 
+      def session_name
+        return @server_obj.session_name
+      end
+
+      # 
+      # Get the key for the encryption cipher.
+      # 
+      def key
+        return @server_obj.encryption_key
+      end
+
+      # 
+      # Get the initialization vector for the cipher.
+      # 
+      def iv
+        return @server_obj.encryption_iv
+      end
+
+      # 
+      # Get the path for the session cookie.
+      # 
+      def cookie_path
+        return @server_obj.session_cookie_path
+      end
+
+      # 
+      # Get the expiration time for the session cookie.
+      # 
+      def cookie_expires
+        return @server_obj.session_cookie_expires
+      end
+
+      # 
+      # Should the session cookie be secure?
+      # 
+      def secure_cookie?
+        return @server_obj.session_cookie_secure
+      end
+
+    end
+  end
+end

data/lib/gloo/web_svr/table_renderer.rb

@@ -1,5 +1,5 @@
 # Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 20124 Eric Crane.  All rights reserved.
+# Copyright:: Copyright (c) 2024 Eric Crane.  All rights reserved.
 #
 # A helper class used to render HTML tables.
 # 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,40 +110,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: tty
+  name: inquirer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -168,22 +190,16 @@ dependencies:
   name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -292,6 +308,34 @@ 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
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.20
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.20
 description: A scripting languge to keep it all together.
 email:
 - eric.crane@mac.com
@@ -329,14 +373,23 @@ files:
 - lib/gloo/app/log.rb
 - lib/gloo/app/mode.rb
 - lib/gloo/app/platform.rb
+- lib/gloo/app/prompt.rb
 - lib/gloo/app/running_app.rb
 - lib/gloo/app/settings.rb
+- lib/gloo/app/table.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,22 +426,20 @@ 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
+- lib/gloo/objs/basic/string_generator.rb
 - lib/gloo/objs/basic/text.rb
 - lib/gloo/objs/basic/untyped.rb
-- lib/gloo/objs/cli/banner.rb
-- lib/gloo/objs/cli/bar.rb
 - lib/gloo/objs/cli/colorize.rb
 - lib/gloo/objs/cli/confirm.rb
 - lib/gloo/objs/cli/menu.rb
 - lib/gloo/objs/cli/menu_item.rb
-- lib/gloo/objs/cli/pastel.rb
 - 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
@@ -405,6 +456,8 @@ files:
 - lib/gloo/objs/dt/time.rb
 - lib/gloo/objs/ror/erb.rb
 - lib/gloo/objs/ror/eval.rb
+- lib/gloo/objs/security/cipher.rb
+- lib/gloo/objs/security/password.rb
 - lib/gloo/objs/snd/play.rb
 - lib/gloo/objs/snd/say.rb
 - lib/gloo/objs/system/file_handle.rb
@@ -439,6 +492,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
@@ -466,6 +520,7 @@ files:
 - lib/gloo/web_svr/routing/router.rb
 - lib/gloo/web_svr/routing/show_routes.rb
 - lib/gloo/web_svr/server.rb
+- lib/gloo/web_svr/session.rb
 - lib/gloo/web_svr/table_renderer.rb
 - lib/gloo/web_svr/web_method.rb
 - lib/run.rb
@@ -488,7 +543,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Gloo scripting language.  A scripting language built on ruby.

data/lib/gloo/objs/cli/banner.rb

@@ -1,118 +0,0 @@
-# Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
-#
-# Show a large-text banner.
-#
-require 'tty-font'
-require 'pastel'
-
-module Gloo
-  module Objs
-    class Banner < Gloo::Core::Obj
-
-      KEYWORD = 'banner'.freeze
-      KEYWORD_SHORT = 'ban'.freeze
-      TEXT = 'text'.freeze
-      STYLE = 'style'.freeze
-      COLOR = 'color'.freeze
-
-      #
-      # The name of the object type.
-      #
-      def self.typename
-        return KEYWORD
-      end
-
-      #
-      # The short name of the object type.
-      #
-      def self.short_typename
-        return KEYWORD_SHORT
-      end
-
-      #
-      # Get the banner text from the child object.
-      #
-      def text_value
-        o = find_child TEXT
-        return '' unless o
-
-        return o.value
-      end
-
-      #
-      # Get the banner style from the child object.
-      #
-      def style_value
-        o = find_child STYLE
-        return '' unless o
-
-        return o.value
-      end
-
-      #
-      # Get the banner color from the child object.
-      #
-      def color_value
-        o = find_child COLOR
-        return '' unless o
-
-        return o.value
-      end
-
-      # ---------------------------------------------------------------------
-      #    Children
-      # ---------------------------------------------------------------------
-
-      # Does this object have children to add when an object
-      # is created in interactive mode?
-      # This does not apply during obj load, etc.
-      def add_children_on_create?
-        return true
-      end
-
-      # Add children to this object.
-      # This is used by containers to add children needed
-      # for default configurations.
-      def add_default_children
-        fac = @engine.factory
-        fac.create_string TEXT, '', self
-        fac.create_string STYLE, '', self
-        fac.create_string COLOR, '', self
-      end
-
-      # ---------------------------------------------------------------------
-      #    Messages
-      # ---------------------------------------------------------------------
-
-      #
-      # Get a list of message names that this object receives.
-      #
-      def self.messages
-        return super + %w[show]
-      end
-
-      #
-      # Show the banner bar
-      #
-      def msg_show
-        Banner.show_banner( self.text_value, self.style_value, self.color_value )
-      end
-
-      # 
-      # Show the banner bar.
-      # text - the text of the banner
-      # style - the style of the banner
-      # color - the color of the banner
-      # 
-      def self.show_banner( text, style, color )
-        font = TTY::Font.new style
-        t = font.write( text )
-        pastel = ::Pastel.new
-        c = color.split( ' ' ).map( &:to_sym )
-        puts pastel.decorate( t, *c )
-      end
-
-    end
-  end
-end