utopia 2.32.0 → 3.0.0

data/setup/site/test/website.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2025, by Samuel Williams.
+# Copyright, 2016-2026, by Samuel Williams.
 
 require "website"
 require "benchmark/http"
@@ -16,7 +16,7 @@ describe "website" do
 	it "should be responsive" do
 		spider.fetch(statistics, client, endpoint.url) do |method, uri, response|
 			if response.failure?
-				Console.error(endpoint) {"#{method} #{uri} -> #{response.status}"}
+				Console.error(endpoint){"#{method} #{uri} -> #{response.status}"}
 			end
 		end.wait
 		

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.32.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -86,21 +86,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.24'
 - !ruby/object:Gem::Dependency
-  name: http-accept
+  name: irb
+  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'
+- !ruby/object:Gem::Dependency
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: irb
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,89 +128,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: net-smtp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: protocol-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: msgpack
+  name: protocol-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.70'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.70'
 - !ruby/object:Gem::Dependency
-  name: net-smtp
+  name: protocol-media
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: protocol-url
+  name: protocol-media-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: protocol-url
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: samovar
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +286,7 @@ files:
 - context/updating-utopia.md
 - context/what-is-xnode.md
 - lib/utopia.rb
+- lib/utopia/application.rb
 - lib/utopia/content.rb
 - lib/utopia/content/builder.rb
 - lib/utopia/content/document.rb
@@ -290,6 +305,7 @@ files:
 - lib/utopia/controller/middleware.rb
 - lib/utopia/controller/respond.rb
 - lib/utopia/controller/responder.rb
+- lib/utopia/controller/result.rb
 - lib/utopia/controller/rewrite.md
 - lib/utopia/controller/rewrite.rb
 - lib/utopia/controller/variables.rb
@@ -301,12 +317,22 @@ files:
 - lib/utopia/http.rb
 - lib/utopia/import_map.rb
 - lib/utopia/localization.rb
+- lib/utopia/localization/locales.rb
 - lib/utopia/localization/middleware.rb
-- lib/utopia/localization/wrapper.rb
+- lib/utopia/localization/preferences.rb
+- lib/utopia/localization/resolver.rb
 - lib/utopia/middleware.rb
 - lib/utopia/path.rb
 - lib/utopia/path/matcher.rb
 - lib/utopia/redirection.rb
+- lib/utopia/redirection/client_redirect.rb
+- lib/utopia/redirection/directory_index.rb
+- lib/utopia/redirection/errors.rb
+- lib/utopia/redirection/moved.rb
+- lib/utopia/redirection/request_failure.rb
+- lib/utopia/redirection/rewrite.rb
+- lib/utopia/request.rb
+- lib/utopia/response.rb
 - lib/utopia/session.rb
 - lib/utopia/session/lazy_hash.rb
 - lib/utopia/session/middleware.rb
@@ -323,11 +349,11 @@ files:
 - releases.md
 - setup/server/git/hooks/post-receive
 - setup/site/.gitignore
-- setup/site/Guardfile
 - setup/site/bake.rb
-- setup/site/config.ru
+- setup/site/config/application.rb
 - setup/site/config/environment.rb
 - setup/site/config/readme.md
+- setup/site/config/serve.rb
 - setup/site/config/sus.rb
 - setup/site/falcon.rb
 - setup/site/fixtures/website.rb
@@ -360,14 +386,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
 test_files: []

data/lib/utopia/localization/wrapper.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2009-2025, by Samuel Williams.
-
-require_relative "middleware"
-
-module Utopia
-	# A middleware which attempts to find localized content.
-	module Localization
-		LOCALIZATION_KEY = "utopia.localization".freeze
-		CURRENT_LOCALE_KEY = "utopia.localization.current_locale".freeze
-		
-		# A wrapper to provide easy access to locale related data in the request.
-		class Wrapper
-			def initialize(env)
-				@env = env
-			end
-			
-			def localization
-				@env[LOCALIZATION_KEY]
-			end
-			
-			def localized?
-				localization != nil
-			end
-			
-			# Returns the current locale or nil if not localized.
-			def current_locale
-				@env[CURRENT_LOCALE_KEY]
-			end
-			
-			# Returns the default locale or nil if not localized.
-			def default_locale
-				localization && localization.default_locale
-			end
-			
-			# Returns an empty array if not localized.
-			def all_locales
-				localization && localization.all_locales || []
-			end
-			
-			def localized_path(path, locale)
-				"/#{locale}#{path}"
-			end
-		end
-		
-		def self.[] request
-			Wrapper.new(request.env)
-		end
-	end
-end

data/setup/site/Guardfile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-group :development do
-	guard :falcon, port: 9292 do
-		watch("Gemfile.lock")
-		watch("gems.locked")
-		watch("config.ru")
-		watch(%r{^config|lib|pages/.*})
-		
-		notification :off
-	end
-end

data/setup/site/config.ru

@@ -1,49 +0,0 @@
-#!/usr/bin/env rackup
-# frozen_string_literal: true
-
-require_relative "config/environment"
-
-self.freeze_app
-
-if UTOPIA.production?
-	# Handle exceptions in production with a error page and send an email notification:
-	use Utopia::Exceptions::Handler
-	use Utopia::Exceptions::Mailer
-else
-	# We want to propate exceptions up when running tests:
-	use Rack::ShowExceptions unless UTOPIA.testing?
-end
-
-# Serve static files from "public" directory:
-use Utopia::Static, root: "public"
-
-use Utopia::Redirection::Rewrite, {
-	"/" => "/welcome/index"
-}
-
-use Utopia::Redirection::DirectoryIndex
-
-use Utopia::Redirection::Errors, {
-	404 => "/errors/file-not-found"
-}
-
-require "utopia/localization"
-use Utopia::Localization,
-	default_locale: "en",
-	locales: ["en", "de", "ja", "zh"]
-
-require "utopia/session"
-use Utopia::Session,
-	expires_after: 3600 * 24,
-	secret: UTOPIA.secret_for(:session),
-	secure: true
-
-use Utopia::Controller
-
-# Serve static files from "pages" directory:
-use Utopia::Static
-
-# Serve dynamic content:
-use Utopia::Content
-
-run lambda {|env| [404, {}, []]}