gloo 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acb72dd7e7dbe69a4d95d34e635f901f5f803a89bb0efe1e85bdb174d354fd0b
-  data.tar.gz: 444ddbe5953b27b9898e4242c59d5b7f5807755e931c40187518b41df6198d91
+  metadata.gz: f56c4555331bec60162670855f1719a51f45a7e071894e593cc3c03978fc99af
+  data.tar.gz: 4728ef424397e70d8d0cd61ff1aec8bbf89a6eb18474e0a9cb1e283f7fb627a2
 SHA512:
-  metadata.gz: c1f3a3769396e391bc8e1cadac57aa1e6475ac3d27a959c7756886e24f41e60dda88989c51bdfe5f2e284d632d8071beb3643d3d98bb660b3b947e67072c9644
-  data.tar.gz: e395ecabc34a2247a7c102ec4ae35a3206d78eafbe7781feee51c3e08e1ebadf783bf6869e5ba95c8ac05095897fb026d67576901adaf0eef37d17ad0115bb63
+  metadata.gz: d08f2ccb6e471d19bc34897a5cce4f906d5b3345e3937b7d291853a9e122783ae797afe56b1e76268dad9f0b6b4eb99a49d577a56cf5261f7d0442b7caf9ff52
+  data.tar.gz: 987e9c14f85397171f44a853fa7db9e7455d1b2afc5a5e515d79cc47b5a8b57629e4e58d2ad28b7c3d7d0d13008634fbd7dd9766580f3d875b20ca795bcfcb86

data/lib/VERSION

@@ -1 +1 @@
-4.0.0
+4.1.0

data/lib/VERSION_NOTES

@@ -1,3 +1,9 @@
+4.1.0 - 2025.05.01
+ - Adds File Render as page option
+ - Adds initial support for multipart forms (file uploads)
+ - Adds delete message for a file
+
+
 4.0.0 - 2025.04.23
  - Adds cache for assets
  - Continuation character

data/lib/gloo/objs/system/file_handle.rb

@@ -37,7 +37,7 @@ module Gloo
       # Get a list of message names that this object receives.
       #
       def self.messages
-        basic = %w[read write get_name get_ext get_parent get_sha256]
+        basic = %w[read write delete get_name get_ext get_parent get_sha256]
         checks = %w[exists? is_file? is_dir?]
         search = %w[find_match]
         show = %w[show page open]
@@ -103,6 +103,14 @@ module Gloo
         File.write( value, data )
       end
 
+      #
+      # Delete the file.
+      #
+      def msg_delete
+        return unless value
+        File.delete( value )
+      end
+
       #
       # Check to see if the file exists.
       #

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

@@ -35,8 +35,15 @@ module Gloo
       HTML_CONTENT = 'html'.freeze
       TEXT_CONTENT = 'text'.freeze
       JSON_CONTENT = 'json'.freeze
+      FILE_CONTENT = 'file'.freeze
       RETURN_CODE = 'return_code'.freeze
 
+      # Children for FILE pages.
+      FILE_TYPE = 'file_type'.freeze
+      FILE_PATH = 'file_path'.freeze
+      FILE_NAME = 'file_name'.freeze
+      DOWNLOAD_FILE = 'download_file'.freeze
+
       #
       # The name of the object type.
       #
@@ -203,6 +210,10 @@ module Gloo
         return content_type == JSON_CONTENT
       end
 
+      def is_file?
+        return content_type == FILE_CONTENT
+      end
+
 
       # ---------------------------------------------------------------------
       #    Events
@@ -311,6 +322,7 @@ module Gloo
         return content
       end
 
+
       # ---------------------------------------------------------------------
       #    Render
       # ---------------------------------------------------------------------
@@ -376,6 +388,8 @@ module Gloo
           contents = render_json
         elsif is_text?
           contents = render_text params
+        elsif is_file?
+          contents = render_file params
         else
           @engine.err "Unknown content type: #{content_type}"
           return nil
@@ -465,6 +479,67 @@ module Gloo
         return content
       end
 
+
+      # ---------------------------------------------------------------------
+      #    File Renderer
+      # ---------------------------------------------------------------------
+
+      # 
+      # Get the type of the file.
+      # 
+      def file_type
+        o = find_child FILE_TYPE
+        return nil unless o
+
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+        return o&.value
+      end
+
+      # 
+      # Get the path to the file.
+      # 
+      def file_path
+        o = find_child FILE_PATH
+        return nil unless o
+
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+        return o&.value
+      end
+
+      # 
+      # Get the name of the file.
+      # 
+      def file_name
+        o = find_child FILE_NAME
+        return nil unless o
+
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+        return o&.value
+      end
+
+      def download_file
+        o = find_child DOWNLOAD_FILE
+        return false unless o
+
+        o = Gloo::Objs::Alias.resolve_alias( @engine, o )
+        return o&.value
+      end
+
+      # 
+      # Render a file.
+      # 
+      def render_file params
+        type = file_type
+        data = File.binread file_path
+        code = Gloo::WebSvr::ResponseCode::SUCCESS
+        fname = file_name
+        download = download_file
+
+        return Gloo::WebSvr::Response.new( 
+          @engine, code, type, data, true, fname, download )
+      end
+
+
     end
   end
 end

data/lib/gloo/web_svr/asset_info.rb

@@ -73,6 +73,8 @@ module Gloo
       # Index the the given asset info record.
       # 
       def self.index info
+        return unless info
+
         @@index_by_pn[ info.pn ] = info
         @@index_by_published[ info.published_pn ] = info
       end
@@ -81,7 +83,9 @@ module Gloo
       # Find the asset info for the given published name.
       #
       def self.find_published_name_for pn
-        return @@index_by_pn[ pn ].published_pn
+        return nil unless pn
+
+        return @@index_by_pn[ pn ]&.published_pn
       end
 
       # 

data/lib/gloo/web_svr/request_params.rb

@@ -15,7 +15,7 @@ module Gloo
     class RequestParams
 
       attr_accessor :id, :route_params
-      attr_reader :query_params, :body_params
+      attr_reader :query_params, :body_params, :body_binary
       
       # ---------------------------------------------------------------------
       #    Initialization
@@ -48,13 +48,59 @@ module Gloo
       # Detect the parameters from the body of the request.
       # 
       def init_body_params body
-        if body
-          @body_params = Rack::Utils.parse_query body
+        if body && body.length > 0
+          # if body is binary, then it is not a query string
+          begin
+            @body_params = Rack::Utils.parse_query body
+          rescue => exception
+            init_multipart body 
+          end
         else
           @body_params = {} 
         end
       end
 
+      # 
+      # Set the body to a binary file.
+      # 
+      # TODO: find a lib or method to handle this.
+      # This is very rough and will need to be fixed.
+      # 
+      def init_multipart body
+        # puts "*********** first lines: *********** "
+        # body.lines[0..3].each { |line| puts line }
+        # puts "*********** last lines: *********** "
+        # body.lines.last(5).each { |line| puts line }
+        # puts "************************************"
+
+        # boundary = body.lines.first
+        # puts "boundary: #{boundary}"
+
+        header = body.lines[1..3].join
+        # puts "header: #{header}"
+
+        footer = body.lines.last(5).join
+        # puts "footer: #{footer}"
+
+        binary_data = body.lines[4..-6].join
+        # puts "binary_data length: #{binary_data.length}"
+        # puts "binary first line: #{binary_data.lines.first}"
+        # puts "binary last line: #{binary_data.lines.last}"
+
+        i = header.lines.first.index( 'filename=' )
+        filename = header.lines.first[ i+10..-4 ]
+        content_type = header.lines.second[14..-3]
+        # puts "filename: #{filename}"
+        # puts "content_type: #{content_type}"
+
+        @body_binary = body
+        @body_params = {}
+        @body_params[ 'content_type' ] = content_type
+        @body_params[ 'file_name' ] = filename
+        @body_params[ 'file_size' ] = binary_data.length
+        @body_params[ 'file_data' ] = binary_data
+      end
+
 
       # ---------------------------------------------------------------------
       #    Authenticity Token checking
@@ -105,7 +151,15 @@ module Gloo
         end
 
         if @body_params && ! @body_params.empty?
-          @log.info "--- Body Parameters: #{@body_params}"
+          if @body_params[ 'file_data' ]
+            # exclude the file data from the params shown
+            params = @body_params.dup
+            params.delete( 'file_data' )
+            params[ 'file_data' ] = '...'
+            @log.info "--- Body Parameters: #{params}"
+          else
+            @log.info "--- Body Parameters: #{@body_params}"
+          end
         end
       end
 

data/lib/gloo/web_svr/response.rb

@@ -19,6 +19,7 @@ module Gloo
             
       attr_reader :code, :type, :data
       attr_accessor :location
+      attr_accessor :file_name
       
 
       # ---------------------------------------------------------------------
@@ -32,7 +33,9 @@ module Gloo
         code = Gloo::WebSvr::ResponseCode::SUCCESS, 
         type = HTML_TYPE, 
         data = nil,
-        assetCache = false )
+        assetCache = false,
+        file_name = nil,
+        download = false )
         
         @engine = engine
         @log = @engine.log if @engine
@@ -42,6 +45,8 @@ module Gloo
         @data = data
         @assetCache = assetCache
         @location = nil
+        @file_name = file_name
+        @download = download
       end
 
 
@@ -125,8 +130,15 @@ module Gloo
           headers[ 'Location' ] = @location
         end
 
-        if @assetCache
+        if @assetCache || @file_name
           headers[ 'Cache-Control' ] = 'public, max-age=604800'
+          headers[ 'Expires' ] = (Time.now.utc + 604800).to_s
+        end
+
+        if @file_name
+          disp = @download ? 'attachment' : 'inline'
+          headers[ 'Content-Disposition' ] = "#{disp}; filename=#{@file_name}"
+          headers[ 'Content-Length' ] = @data.length.to_s
         end
 
         session = @engine&.running_app&.obj&.session

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-23 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler