gloo 3.1.1 → 3.2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -431,6 +431,7 @@ files:
 - lib/gloo/utils/words.rb
 - lib/gloo/verbs/alert.rb
 - lib/gloo/verbs/beep.rb
+- lib/gloo/verbs/break.rb
 - lib/gloo/verbs/cls.rb
 - lib/gloo/verbs/context.rb
 - lib/gloo/verbs/create.rb
@@ -461,8 +462,12 @@ files:
 - lib/gloo/web_svr/request.rb
 - lib/gloo/web_svr/response.rb
 - lib/gloo/web_svr/response_code.rb
-- lib/gloo/web_svr/router.rb
+- lib/gloo/web_svr/routing/resource_router.rb
+- 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/table_renderer.rb
+- lib/gloo/web_svr/web_method.rb
 - lib/run.rb
 homepage: http://github.com/ecrane/gloo
 licenses:
@@ -483,7 +488,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Gloo scripting language.  A scripting language built on ruby.

data/lib/gloo/web_svr/router.rb

@@ -1,179 +0,0 @@
-# Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 20124 Eric Crane.  All rights reserved.
-#
-# A helper class for page routing.
-# 
-
-module Gloo
-  module WebSvr
-    class Router
-      
-      PAGE_CONTAINER = 'page'.freeze
-      INDEX = 'index'.freeze
-      SEGMENT_DIVIDER = '/'.freeze
-
-      attr_reader :route_segments
-
-
-      # ---------------------------------------------------------------------
-      #    Initialization
-      # ---------------------------------------------------------------------
-
-      #
-      # Set up the web server.
-      #
-      def initialize( engine, web_svr_obj )
-        @engine = engine
-        @log = @engine.log
-
-        @web_svr_obj = web_svr_obj
-      end
-
-
-      # ---------------------------------------------------------------------
-      #    Routing
-      # ---------------------------------------------------------------------
-
-      # 
-      # Find and return the page for the given route.
-      # 
-      def page_for_route path
-        @engine.log.info "routing to #{path}"
-        detect_segments path
-
-        return @web_svr_obj.home_page if is_root_path?
-
-        pages = @web_svr_obj.pages_container
-        return find_route_segment( pages.children ) if pages
-
-        return nil
-      end
-
-
-      # ---------------------------------------------------------------------
-      #    Dynamic Add Page Routes
-      # ---------------------------------------------------------------------
-
-      # 
-      # Get the root level page container.
-      #
-      def page_container
-        pn = Gloo::Core::Pn.new( @engine, PAGE_CONTAINER )
-        return pn.resolve
-      end
-
-      # 
-      # Add all page routes to the web server pages (routes).
-      # 
-      def add_page_routes
-        can = page_container
-        return unless can
-
-        @log.debug 'Adding page routes to web server…'
-        @factory = @engine.factory
-
-        add_pages can, @web_svr_obj.pages_container
-      end
-
-      #
-      # Add the pages to the web server pages.
-      # This is a recursive function that will add all
-      # pages in the folder and subfolders.
-      #
-      def add_pages can, parent
-        # for each file in the page container
-        # create a page object and add it to the routes
-        can.children.each do |obj|
-          if obj.class == Gloo::Objs::Container
-            child_can = parent.find_add_child( obj.name, 'container' )
-            add_pages( obj, child_can )
-          elsif obj.class == Gloo::Objs::Page
-            add_route_alias( parent, obj.name, obj.pn )
-          end
-        end
-      end
-
-      # 
-      # Add route alias to the page.
-      # 
-      def add_route_alias( parent, name, pn )
-        name = name.gsub( '.', '_' )
-
-        # First make sure the child doesn't already exist.
-        child = parent.find_child( name )
-        return if child
-
-        @factory.create_alias( name, pn, parent )
-      end
-
-      
-      # ---------------------------------------------------------------------
-      #    Helper funcions
-      # ---------------------------------------------------------------------
-
-      # 
-      # Find the route segment in the object container.
-      # 
-      def find_route_segment objs
-        this_segment = next_segment
-
-        this_segment = INDEX if this_segment.blank?
-
-        objs.each do |o|
-          o = Gloo::Objs::Alias.resolve_alias( @engine, o )
-
-          if o.name == this_segment
-            if o.class == Gloo::Objs::Page
-              @engine.log.debug "found page for route: #{o.pn}"
-              return o
-            elsif o.class == Gloo::Objs::FileHandle
-              @engine.log.debug "found static file for route: #{o.pn}"
-              return o
-            else
-              return nil unless o.child_count > 0
-
-              return find_route_segment( o.children )
-            end
-          end
-        end
-
-        return nil 
-      end
-
-      # 
-      # Get the next segment in the route.
-      # 
-      def next_segment
-        this_segment = @route_segments.shift
-        return nil if this_segment.nil?
-
-        # A URL might include a dot in a name, but we can't do that
-        # because dot is a reserve path thing. So we replace it with
-        # an underscore.
-        this_segment = this_segment.gsub( '.', '_' )
-
-        return this_segment
-      end
-
-      # 
-      # Is this the root path?
-      def is_root_path?
-        return @route_segments.count == 0
-      end
-
-      # 
-      # Create a list of path segments.
-      # 
-      def detect_segments path
-        # Split the path into segments.
-        @route_segments = path.split SEGMENT_DIVIDER
-
-        # Remove the first segment if it is empty.
-        @route_segments.shift if @route_segments.first.blank?
-
-        return @route_segments
-      end
-
-    end
-  end
-end