utopia 2.30.2 → 2.31.0

data/lib/utopia/static.rb

@@ -3,116 +3,12 @@
 # Released under the MIT License.
 # Copyright, 2009-2025, by Samuel Williams.
 
-require_relative "middleware"
-require_relative "localization"
-
-require_relative "static/local_file"
-require_relative "static/mime_types"
-
-require "traces/provider"
+require_relative "static/middleware"
 
 module Utopia
-	# A middleware which serves static files from the specified root directory.
-	class Static
-		DEFAULT_CACHE_CONTROL = "public, max-age=3600".freeze
-
-		# @param root [String] The root directory to serve files from.
-		# @param types [Array] The mime-types (and file extensions) to recognize/serve.
-		# @param cache_control [String] The cache-control header to set for static content.
-		def initialize(app, root: Utopia::default_root, types: MIME_TYPES[:default], cache_control: DEFAULT_CACHE_CONTROL)
-			@app = app
-			@root = root
-			
-			@extensions = MimeTypeLoader.extensions_for(types)
-			
-			@cache_control = cache_control
-		end
-
-		def freeze
-			return self if frozen?
-			
-			@root.freeze
-			@extensions.freeze
-			@cache_control.freeze
-			
-			super
-		end
-
-		def fetch_file(path)
-			# We need file_path to be an absolute path for X-Sendfile to work correctly.
-			file_path = File.join(@root, path.components)
-			
-			if File.exist?(file_path)
-				return LocalFile.new(@root, path)
-			else
-				return nil
-			end
-		end
-
-		attr :extensions
-		
-		LAST_MODIFIED = "Last-Modified".freeze
-		CONTENT_TYPE = HTTP::CONTENT_TYPE
-		CACHE_CONTROL = HTTP::CACHE_CONTROL
-		ETAG = "ETag".freeze
-		ACCEPT_RANGES = "Accept-Ranges".freeze
-		
-		def response_headers_for(file, content_type)
-			if @cache_control.respond_to?(:call)
-				cache_control = @cache_control.call(file)
-			else
-				cache_control = @cache_control
-			end
-			
-			{
-				LAST_MODIFIED => file.mtime_date,
-				CONTENT_TYPE => content_type,
-				CACHE_CONTROL => cache_control,
-				ETAG => file.etag,
-				ACCEPT_RANGES => "bytes"
-			}
-		end
-		
-		def respond(env, path_info, extension)
-			path = Path[path_info].simplify
-			
-			if locale = env[Localization::CURRENT_LOCALE_KEY]
-				path.last.insert(path.last.rindex(".") || -1, ".#{locale}")
-			end
-			
-			if file = fetch_file(path)
-				response_headers = self.response_headers_for(file, @extensions[extension])
-				
-				if file.modified?(env)
-					return file.serve(env, response_headers)
-				else
-					return [304, response_headers, []]
-				end
-			end
-		end
-		
-		def call(env)
-			path_info = env[Rack::PATH_INFO]
-			extension = File.extname(path_info)
-			
-			if @extensions.key?(extension.downcase)
-				if response = self.respond(env, path_info, extension)
-					return response
-				end
-			end
-			
-			# else if no file was found:
-			return @app.call(env)
-		end
-	end
-	
-	Traces::Provider(Static) do
-		def respond(env, path_info, extension)
-			attributes = {
-				path_info: path_info,
-			}
-			
-			Traces.trace("utopia.static.respond", attributes: attributes) {super}
+	module Static
+		def self.new(...)
+			Middleware.new(...)
 		end
 	end
 end

data/lib/utopia/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2009-2025, by Samuel Williams.
 
 module Utopia
-	VERSION = "2.30.2"
+	VERSION = "2.31.0"
 end

data/lib/utopia.rb

@@ -5,6 +5,7 @@
 
 require_relative "utopia/version"
 
+require_relative "utopia/import_map"
 require_relative "utopia/content"
 require_relative "utopia/controller"
 require_relative "utopia/exceptions"

data/readme.md

@@ -31,6 +31,13 @@ Please see the [project documentation](https://socketry.github.io/utopia/) for m
 
 Please see the [project releases](https://socketry.github.io/utopia/releases/index) for all releases.
 
+### v2.31.0
+
+  - Add agent context.
+  - Better simplification of relative paths, e.g. `../../foo` is not modified to `foo`.
+  - Move top level classes into `class Middleware` in their respective namespaces.
+  - Move `Utopia::Responder` into `Utopia::Controller` layer.
+
 ### v2.30.1
 
   - Minor compatibility fixes.

data/releases.md

@@ -1,5 +1,12 @@
 # Releases
 
+## v2.31.0
+
+  - Add agent context.
+  - Better simplification of relative paths, e.g. `../../foo` is not modified to `foo`.
+  - Move top level classes into `class Middleware` in their respective namespaces.
+  - Move `Utopia::Responder` into `Utopia::Controller` layer.
+
 ## v2.30.1
 
   - Minor compatibility fixes.

data/setup/site/config.ru

@@ -46,4 +46,4 @@ use Utopia::Static
 # Serve dynamic content:
 use Utopia::Content
 
-run lambda { |env| [404, {}, []] }
+run lambda {|env| [404, {}, []]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.30.2
+  version: 2.31.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -169,6 +169,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: protocol-url
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -250,12 +264,20 @@ files:
 - bake/utopia/shell.rb
 - bake/utopia/site.rb
 - bake/utopia/static.rb
+- context/getting-started.md
+- context/index.yaml
+- context/integrating-with-javascript.md
+- context/middleware.md
+- context/server-setup.md
+- context/updating-utopia.md
+- context/what-is-xnode.md
 - lib/utopia.rb
 - lib/utopia/content.rb
 - lib/utopia/content/document.rb
 - lib/utopia/content/link.rb
 - lib/utopia/content/links.rb
 - lib/utopia/content/markup.rb
+- lib/utopia/content/middleware.rb
 - lib/utopia/content/namespace.rb
 - lib/utopia/content/node.rb
 - lib/utopia/content/response.rb
@@ -264,7 +286,9 @@ files:
 - lib/utopia/controller/actions.md
 - lib/utopia/controller/actions.rb
 - lib/utopia/controller/base.rb
+- lib/utopia/controller/middleware.rb
 - lib/utopia/controller/respond.rb
+- lib/utopia/controller/responder.rb
 - lib/utopia/controller/rewrite.md
 - lib/utopia/controller/rewrite.rb
 - lib/utopia/controller/variables.rb
@@ -274,20 +298,23 @@ files:
 - lib/utopia/extensions/array_split.rb
 - lib/utopia/extensions/date_comparisons.rb
 - lib/utopia/http.rb
-- lib/utopia/locale.rb
+- lib/utopia/import_map.rb
 - lib/utopia/localization.rb
+- lib/utopia/localization/middleware.rb
+- lib/utopia/localization/wrapper.rb
 - lib/utopia/middleware.rb
 - lib/utopia/path.rb
 - lib/utopia/path/matcher.rb
 - lib/utopia/redirection.rb
-- lib/utopia/responder.rb
 - lib/utopia/session.rb
 - lib/utopia/session/lazy_hash.rb
+- lib/utopia/session/middleware.rb
 - lib/utopia/session/serialization.rb
 - lib/utopia/setup.rb
 - lib/utopia/shell.rb
 - lib/utopia/static.rb
 - lib/utopia/static/local_file.rb
+- lib/utopia/static/middleware.rb
 - lib/utopia/static/mime_types.rb
 - lib/utopia/version.rb
 - license.md
@@ -339,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
 test_files: []

data/lib/utopia/locale.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2015-2025, by Samuel Williams.
-
-module Utopia
-	# A structured representation of locale based on RFC3066.
-	Locale = Struct.new(:language, :country, :variant) do
-		def to_s
-			to_a.compact.join("-")
-		end
-		
-		def self.dump(instance)
-			if instance
-				instance.to_s
-			end
-		end
-		
-		def self.load(instance)
-			if instance.is_a? String
-				self.new(*instance.split("-", 3))
-			elsif instance.is_a? Array
-				return self.new(*instance)
-			elsif instance.is_a? self
-				return instance.frozen? ? instance : instance.dup
-			end
-		end
-	end
-end

data/lib/utopia/responder.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2020-2025, by Samuel Williams.
-
-require_relative "middleware"
-
-module Utopia
-	class Responder
-		Handler = Struct.new(:content_type, :block) do
-			def split(*arguments)
-				self.content_type.split(*arguments)
-			end
-			
-			def call(context, request, media_range, *arguments, **options)
-				context.instance_exec(media_range, *arguments, **options, &self.block)
-			end
-		end
-		
-		Responds = Struct.new(:responder, :context, :request) do
-			# @todo Refactor `object` -> `*arguments`...
-			def with(object, **options)
-				responder.call(context, request, object, **options)
-			end
-		end
-		
-		def initialize
-			@handlers = HTTP::Accept::MediaTypes::Map.new
-		end
-		
-		attr :handlers
-		
-		def freeze
-			@handlers.freeze
-			
-			super
-		end
-		
-		def call(context, request, *arguments, **options)
-			# Parse the list of browser preferred content types and return ordered by priority:
-			media_types = HTTP::Accept::MediaTypes.browser_preferred_media_types(request.env)
-			
-			handler, media_range = @handlers.for(media_types)
-			
-			if handler
-				handler.call(context, request, media_range, *arguments, **options)
-			end
-		end
-		
-		# Add a converter for the specified content type. Call the block with the response content if the request accepts the specified content_type.
-		def handle(content_type, &block)
-			@handlers << Handler.new(content_type, block)
-		end
-		
-		def respond_to(context, request)
-			Responds.new(self, context, request)
-		end
-	end
-end