gloo 4.4.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8433bf6ce21086f0a4ade5d45ef2c4bca77aa0d43edf087304a84b08d91ca49a
-  data.tar.gz: 0a9bb39b56d34eb411b617cd8260aaf42afc8574aa7535dc61eedef21d6fc593
+  metadata.gz: 5b1e92d71d83b685d683e227bdd72ff8e7fdd5b407b31d979f9c19feae43c260
+  data.tar.gz: 1aae0b03ead99c6f5217c1ba4e74eda67cc094ddff5e444f9ca885758d4fd6a1
 SHA512:
-  metadata.gz: 80bf8f11fe5329c2475fe95839f995f6d6726f7c9798701a98d0ba80fe1bcfc3f0004c5c9fd34f931d65c8587542abdbdaba3e1bc5f0e554a91b44788690ef0f
-  data.tar.gz: 5fdecb6bfcfdf629db8f48cd7a8a8b41727d7461984d2131c697ba39e7e68113c87e5034b4ca165d67a7cb1a1ce1e693563eed0f4c2ff60c82b78c1ac05c511d
+  metadata.gz: dcd415b7a6328f5ad4ba0450e5a844e5abb22cd4d7367dc768f68c70cebd7c4f37661858617b0838209542a8f6718048456a376a6f35a67b522d812498bf4651
+  data.tar.gz: 78e495f4c2ec8d377c7e085a496a585071e9396d154e1a0c40fa478e68eb2522840b40bfa0d7c45308bb682373abbda5b23f75dbcfd4fe067def9945a0ca704d

data/lib/VERSION

@@ -1 +1 @@
-4.4.0
+4.6.0

data/lib/VERSION_NOTES

@@ -1,3 +1,11 @@
+4.6.0 - 2025.08.24
+ - Adds option to render inline file data (rather than a file on disk)
+
+
+4.5.0 - 2025.08.05
+ - Adds option to use assets in the user lib.
+
+
 4.4.0 - 2025.07.30
  - Adds form and fields
  - Adds option to include image_tag and other asset tags in helper rendering.

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

@@ -42,6 +42,7 @@ module Gloo
       FILE_TYPE = 'file_type'.freeze
       FILE_PATH = 'file_path'.freeze
       FILE_NAME = 'file_name'.freeze
+      FILE_DATA = 'file_data'.freeze
       DOWNLOAD_FILE = 'download_file'.freeze
 
       #
@@ -506,6 +507,17 @@ module Gloo
         return o&.value
       end
 
+      # 
+      # Get the File content
+      # 
+      def file_data
+        o = find_child FILE_DATA
+        return nil unless o
+
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+        return o&.value
+      end
+
       # 
       # Get the name of the file.
       # 
@@ -530,7 +542,12 @@ module Gloo
       # 
       def render_file params
         type = file_type
-        data = File.binread file_path
+        inline_content = file_data
+        if inline_content.nil?
+          data = File.binread( file_path )
+        else
+          data = inline_content
+        end
         code = Gloo::WebSvr::ResponseCode::SUCCESS
         fname = file_name
         download = download_file

data/lib/gloo/web_svr/asset.rb

@@ -8,6 +8,7 @@ module Gloo
   module WebSvr
     class Asset
       
+      LIB_FOLDER = 'lib'.freeze
       ASSET_FOLDER = 'asset'.freeze
       IMAGE_FOLDER = 'image'.freeze
       STYLESHEET_FOLDER = 'stylesheet'.freeze
@@ -35,6 +36,55 @@ module Gloo
       end
 
 
+      # ---------------------------------------------------------------------
+      #    lib asset Helpers
+      # ---------------------------------------------------------------------
+
+      # 
+      # Get the asset folder in the User's lib.
+      # Returns nil if it does not exist.
+      #
+      def lib_asset_folder
+        dir = File.join( @engine.settings.user_root, LIB_FOLDER, ASSET_FOLDER )
+        return dir if Dir.exist?( dir )
+
+        return nil
+      end
+
+      # 
+      # Get the stylesheets folder in the User's lib.
+      # Returns nil if it does not exist.
+      #
+      def lib_stylesheet_folder
+        dir = File.join( lib_asset_folder, STYLESHEET_FOLDER )
+        return dir if Dir.exist?( dir )
+
+        return nil
+      end
+
+      # 
+      # Get the javascript folder in the User's lib.
+      # Returns nil if it does not exist.
+      #
+      def lib_javascript_folder
+        dir = File.join( lib_asset_folder, JAVASCRIPT_FOLDER )
+        return dir if Dir.exist?( dir )
+
+        return nil
+      end
+
+      # 
+      # Get the images folder in the User's lib.
+      # Returns nil if it does not exist.
+      #
+      def lib_image_folder
+        dir = File.join( lib_asset_folder, IMAGE_FOLDER )
+        return dir if Dir.exist?( dir )
+
+        return nil
+      end
+
+
       # ---------------------------------------------------------------------
       #    Asset Helpers
       # ---------------------------------------------------------------------
@@ -79,6 +129,12 @@ module Gloo
         # Look in the web server's asset folder.
         pn = File.join( asset_folder, pn )
 
+        # Try the lib assets if not found
+        unless File.exist? pn
+          lib = lib_asset_folder
+          pn = File.join( lib, file.value ) if lib
+        end
+
         return pn
       end
 
@@ -214,6 +270,11 @@ module Gloo
       def add_images
         @log.debug 'Adding image asset routes to web server…'
         
+        lib = lib_image_folder
+        if lib
+          add_files_in_folder( lib, @images, IMAGE_FOLDER )
+        end
+
         return unless File.exist? image_folder
 
         # for each file in the images folder
@@ -227,6 +288,11 @@ module Gloo
       def add_stylesheets
         @log.debug 'Adding stylesheet asset routes to web server…'
 
+        lib = lib_stylesheet_folder
+        if lib
+          add_files_in_folder( lib, @stylesheets, STYLESHEET_FOLDER )
+        end
+
         return unless File.exist? stylesheet_folder
 
         # for each file in the stylesheets folder
@@ -245,6 +311,11 @@ module Gloo
       def add_javascript
         @log.debug 'Adding javascript asset routes to web server…'
 
+        lib = lib_javascript_folder
+        if lib
+          add_files_in_folder( lib, @javascript, JAVASCRIPT_FOLDER )
+        end
+
         return unless File.exist? javascript_folder
 
         # for each file in the javascript folder

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-30 00:00:00.000000000 Z
+date: 2025-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler