utopia 2.24.4 → 2.26.0

data/lib/utopia/session.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2014-2024, by Samuel Williams.
+# Copyright, 2014-2025, by Samuel Williams.
 # Copyright, 2019, by Huba Nagy.
 
-require 'openssl'
-require 'digest/sha2'
-require 'console'
-require 'json'
+require "openssl"
+require "digest/sha2"
+require "console"
+require "json"
 
-require_relative 'session/lazy_hash'
-require_relative 'session/serialization'
+require_relative "session/lazy_hash"
+require_relative "session/serialization"
 
 module Utopia
 	# A middleware which provides a secure client-side session storage using a private symmetric encrpytion key.
@@ -20,7 +20,7 @@ module Utopia
 		
 		MAXIMUM_SIZE = 1024*32
 		
-		SECRET_KEY = 'UTOPIA_SESSION_SECRET'.freeze
+		SECRET_KEY = "UTOPIA_SESSION_SECRET".freeze
 		
 		RACK_SESSION = "rack.session".freeze
 		CIPHER_ALGORITHM = "aes-256-cbc"

data/lib/utopia/setup.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2010-2024, by Samuel Williams.
+# Copyright, 2010-2025, by Samuel Williams.
 
-require 'yaml'
-require 'securerandom'
+require "yaml"
+require "securerandom"
 
-require 'variant'
+require "variant"
 
-require 'console'
+require "console"
 
 module Utopia
 	# Used for setting up a Utopia web application, typically via `config/environment.rb`
@@ -58,11 +58,11 @@ module Utopia
 		end
 		
 		def apply!
-			add_load_path('lib')
+			add_load_path("lib")
 			
 			apply_environment
 			
-			require_relative '../utopia'
+			require_relative "../utopia"
 		end
 		
 		private

data/lib/utopia/shell.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2025, by Samuel Williams.
 
-require 'rack/builder'
-require 'rack/test'
-require 'irb'
+require "rack/builder"
+require "rack/test"
+require "irb"
 
 module Utopia
 	# This is designed to be used with the corresponding bake task.
@@ -19,7 +19,7 @@ module Utopia
 		
 		def app
 			@app ||= Rack::Builder.parse_file(
-				File.expand_path('config.ru', @context.root)
+				File.expand_path("config.ru", @context.root)
 			).first
 		end
 		

data/lib/utopia/static/local_file.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2022, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 
-require 'time'
-require 'digest/sha1'
+require "time"
+require "digest/sha1"
 
 module Utopia
 	# A middleware which serves static files from the specified root directory.
@@ -64,23 +64,23 @@ module Utopia
 			end
 
 			def modified?(env)
-				if modified_since = env['HTTP_IF_MODIFIED_SINCE']
+				if modified_since = env["HTTP_IF_MODIFIED_SINCE"]
 					return false if File.mtime(full_path) <= Time.parse(modified_since)
 				end
 
-				if etags = env['HTTP_IF_NONE_MATCH']
+				if etags = env["HTTP_IF_NONE_MATCH"]
 					etags = etags.split(/\s*,\s*/)
-					return false if etags.include?(etag) || etags.include?('*')
+					return false if etags.include?(etag) || etags.include?("*")
 				end
 
 				return true
 			end
 
 			CONTENT_LENGTH = Rack::CONTENT_LENGTH
-			CONTENT_RANGE = 'Content-Range'.freeze
+			CONTENT_RANGE = "Content-Range".freeze
 			
 			def serve(env, response_headers)
-				ranges = Rack::Utils.get_byte_ranges(env['HTTP_RANGE'], size)
+				ranges = Rack::Utils.get_byte_ranges(env["HTTP_RANGE"], size)
 				response = [200, response_headers, self]
 
 				# puts "Requesting ranges: #{ranges.inspect} (#{size})"

data/lib/utopia/static/mime_types.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2022, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 
-require 'mime/types'
+require "mime/types"
 
 module Utopia
 	# A middleware which serves static files from the specified root directory.

data/lib/utopia/static.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2023, by Samuel Williams.
+# Copyright, 2009-2025, by Samuel Williams.
 
-require_relative 'middleware'
-require_relative 'localization'
+require_relative "middleware"
+require_relative "localization"
 
-require_relative 'static/local_file'
-require_relative 'static/mime_types'
+require_relative "static/local_file"
+require_relative "static/mime_types"
 
-require 'traces/provider'
+require "traces/provider"
 
 module Utopia
 	# A middleware which serves static files from the specified root directory.
 	class Static
-		DEFAULT_CACHE_CONTROL = 'public, max-age=3600'.freeze
+		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.
@@ -51,17 +51,17 @@ module Utopia
 
 		attr :extensions
 		
-		LAST_MODIFIED = 'Last-Modified'.freeze
+		LAST_MODIFIED = "Last-Modified".freeze
 		CONTENT_TYPE = HTTP::CONTENT_TYPE
 		CACHE_CONTROL = HTTP::CACHE_CONTROL
-		ETAG = 'ETag'.freeze
-		ACCEPT_RANGES = 'Accept-Ranges'.freeze
+		ETAG = "ETag".freeze
+		ACCEPT_RANGES = "Accept-Ranges".freeze
 		
 		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}")
+				path.last.insert(path.last.rindex(".") || -1, ".#{locale}")
 			end
 			
 			if file = fetch_file(path)

data/lib/utopia/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2009-2024, by Samuel Williams.
 
 module Utopia
-	VERSION = "2.24.4"
+	VERSION = "2.26.0"
 end

data/lib/utopia.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2022, by Samuel Williams.
+# Copyright, 2009-2025, by Samuel Williams.
 
-require_relative 'utopia/version'
+require_relative "utopia/version"
 
-require_relative 'utopia/content'
-require_relative 'utopia/controller'
-require_relative 'utopia/exceptions'
-require_relative 'utopia/redirection'
-require_relative 'utopia/static'
-require_relative 'utopia/content_length'
+require_relative "utopia/content"
+require_relative "utopia/controller"
+require_relative "utopia/exceptions"
+require_relative "utopia/redirection"
+require_relative "utopia/static"
 
 # Utopia is a web application framework built on top of Rack.
 module Utopia

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2009-2024, by Samuel Williams.  
+Copyright, 2009-2025, by Samuel Williams.  
 Copyright, 2015-2019, by Huba Nagy.  
 Copyright, 2020, by Olle Jonsson.  
 Copyright, 2020, by Pierre Montelle.  

data/readme.md

@@ -2,7 +2,7 @@
 
 Utopia is a website generation framework which provides a robust set of tools to build highly complex dynamic websites. It uses the filesystem heavily for content and provides functions for interacting with files and directories as structure representing the website.
 
-[![Development Status](https://github.com/socketry/utopia/workflows/Test/badge.svg)](https://github.com/socketry/utopia/actions?workflow=Test)
+[![Development Status](https://github.com/ioquatix/utopia/workflows/Test/badge.svg)](https://github.com/ioquatix/utopia/actions?workflow=Test)
 
 ## Features
 

data/setup/server/git/hooks/post-receive

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
@@ -20,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'etc'
+require "etc"
 
 # Add the following into sudoers for this to work correctly:
 # Users in group wheel can execute all commands as user http with no password.
@@ -29,25 +30,25 @@ require 'etc'
 GIT_WORK_TREE = `git config core.worktree`.chomp
 
 # We convert GIT_DIR to an absolute path:
-ENV['GIT_DIR'] = File.join(Dir.pwd, ENV['GIT_DIR'])
+ENV["GIT_DIR"] = File.join(Dir.pwd, ENV["GIT_DIR"])
 
 # We deploy the site as the user and group of the directory for the working tree:
 File.stat(GIT_WORK_TREE).tap do |stat|
-	ENV['DEPLOY_USER'] = DEPLOY_USER = Etc.getpwuid(stat.uid).name
-	ENV['DEPLOY_GROUP'] = DEPLOY_GROUP = Etc.getgrgid(stat.gid).name
+	ENV["DEPLOY_USER"] = DEPLOY_USER = Etc.getpwuid(stat.uid).name
+	ENV["DEPLOY_GROUP"] = DEPLOY_GROUP = Etc.getgrgid(stat.gid).name
 end
 
 WHOAMI = `whoami`.chomp!
 
 # We should find out if we need to use sudo or not:
 SUDO = if WHOAMI != DEPLOY_USER
-	['sudo', '-u', DEPLOY_USER]
+	["sudo", "-u", DEPLOY_USER]
 end
 
 CommandFailure = Class.new(StandardError)
 
 def sh(command)
-	puts command.join(' ')
+	puts command.join(" ")
 	unless system(*command)
 		raise CommandFailure.new("#{command.join(' ')} failed with #{$?}!")
 	end
@@ -62,13 +63,13 @@ Dir.chdir(GIT_WORK_TREE) do
 	sudo %W{git checkout -f}
 	sudo %W{git submodule update -i}
 	
-	if File.exist? 'gems.rb'
+	if File.exist? "gems.rb"
 		sudo %W{bundle install}
 	end
 	
-	if File.exist? 'bake.rb'
+	if File.exist? "bake.rb"
 		sudo %W{bundle exec bake deploy restart}
-	elsif File.exist? 'Rakefile'
+	elsif File.exist? "Rakefile"
 		sudo %W{bundle exec rake deploy restart}
 	end
 end

data/setup/site/Guardfile

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

data/setup/site/bake.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2025, by Samuel Williams.
 
 def deploy
 	# This task is typiclly run after the site is updated but before the server is restarted.
@@ -9,10 +9,10 @@ end
 
 # Restart the application server.
 def restart
-	call 'falcon:supervisor:restart'
+	call "falcon:supervisor:restart"
 end
 
 # Start the development server.
 def default
-	call 'utopia:development'
+	call "utopia:development"
 end

data/setup/site/config/environment.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2022, by Samuel Williams.
+# Copyright, 2016-2025, by Samuel Williams.
 
-require 'bundler/setup'
+require "bundler/setup"
 Bundler.setup
 
-require 'utopia/setup'
+require "utopia/setup"
 UTOPIA ||= Utopia.setup

data/setup/site/config/sus.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 
-require 'variant'
+require "variant"
 Variant.force!(:testing)
 
-require 'covered/sus'
+require "covered/sus"
 include Covered::Sus

data/setup/site/config.ru

@@ -1,7 +1,7 @@
 #!/usr/bin/env rackup
 # frozen_string_literal: true
 
-require_relative 'config/environment'
+require_relative "config/environment"
 
 self.freeze_app
 
@@ -15,24 +15,24 @@ else
 end
 
 # Serve static files from "public" directory:
-use Utopia::Static, root: 'public'
+use Utopia::Static, root: "public"
 
 use Utopia::Redirection::Rewrite, {
-	'/' => '/welcome/index'
+	"/" => "/welcome/index"
 }
 
 use Utopia::Redirection::DirectoryIndex
 
 use Utopia::Redirection::Errors, {
-	404 => '/errors/file-not-found'
+	404 => "/errors/file-not-found"
 }
 
-require 'utopia/localization'
+require "utopia/localization"
 use Utopia::Localization,
-	default_locale: 'en',
-	locales: ['en', 'de', 'ja', 'zh']
+	default_locale: "en",
+	locales: ["en", "de", "ja", "zh"]
 
-require 'utopia/session'
+require "utopia/session"
 use Utopia::Session,
 	expires_after: 3600 * 24,
 	secret: UTOPIA.secret_for(:session),

data/setup/site/fixtures/website.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2023, by Samuel Williams.
+# Copyright, 2016-2025, by Samuel Williams.
 
-require 'rack/test'
-require 'sus/fixtures/async/http'
-require 'protocol/rack'
+require "rack/test"
+require "sus/fixtures/async/http"
+require "protocol/rack"
 
 AWebsite = Sus::Shared("a website") do
 	include Rack::Test::Methods
 	
-	let(:rackup_path) {File.expand_path('../config.ru', __dir__)}
+	let(:rackup_path) {File.expand_path("../config.ru", __dir__)}
 	let(:rackup_directory) {File.dirname(rackup_path)}
 	
 	let(:app) {Rack::Builder.parse_file(rackup_path)}
@@ -31,7 +31,7 @@ end
 AServer = Sus::Shared("a server") do
 	include Sus::Fixtures::Async::HTTP::ServerContext
 	
-	let(:rackup_path) {File.expand_path('../config.ru', __dir__)}
+	let(:rackup_path) {File.expand_path("../config.ru", __dir__)}
 	let(:rackup_directory) {File.dirname(rackup_path)}
 	
 	let(:rack_app) {Rack::Builder.parse_file(rackup_path)}

data/setup/site/gems.rb

@@ -1,33 +1,33 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2012-2023, by Samuel Williams.
+# Copyright, 2012-2025, by Samuel Williams.
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 group :preload do
-	gem 'utopia', '~> $UTOPIA_VERSION'
+	gem "utopia", "~> $UTOPIA_VERSION"
 	# gem 'utopia-gallery'
 	# gem 'utopia-analytics'
 	
-	gem 'variant'
+	gem "variant"
 end
 
-gem 'net-smtp'
+gem "net-smtp"
 
 group :development do
-	gem 'bake-test'
-	gem 'rack-test'
-	gem 'guard-falcon', require: false
+	gem "bake-test"
+	gem "rack-test"
+	gem "guard-falcon", require: false
 	
-	gem 'sus'
-	gem 'sus-fixtures-async-http'
+	gem "sus"
+	gem "sus-fixtures-async-http"
 	
-	gem 'covered'
+	gem "covered"
 	
-	gem 'benchmark-http'
+	gem "benchmark-http"
 end
 
 group :production do
-	gem 'falcon'
+	gem "falcon"
 end

data/setup/site/test/website.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2024, by Samuel Williams.
+# Copyright, 2016-2025, by Samuel Williams.
 
-require 'website'
-require 'benchmark/http'
+require "website"
+require "benchmark/http"
 
 describe "website" do
 	include_context AServer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.24.4
+  version: 2.26.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -9,7 +9,6 @@ authors:
 - Michael Adams
 - Olle Jonsson
 - Pierre Montelle
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -41,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-06-30 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -225,8 +224,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-description:
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -248,7 +245,6 @@ files:
 - lib/utopia/content/node.rb
 - lib/utopia/content/response.rb
 - lib/utopia/content/tags.rb
-- lib/utopia/content_length.rb
 - lib/utopia/controller.rb
 - lib/utopia/controller/actions.md
 - lib/utopia/controller/actions.rb
@@ -312,7 +308,6 @@ licenses:
 metadata:
   funding_uri: https://github.com/sponsors/ioquatix/
   source_code_uri: https://github.com/ioquatix/utopia.git
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -327,8 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
 test_files: []

data/lib/utopia/content_length.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2016-2022, by Samuel Williams.
-
-require_relative 'middleware'
-
-module Utopia
-	# A faster implementation of Rack::ContentLength which doesn't rewrite body, but does expect it to either be an Array or an object that responds to #bytesize.
-	class ContentLength
-		def initialize(app)
-			@app = app
-		end
-		
-		def content_length_of(body)
-			if body.respond_to?(:map)
-				return body.map(&:bytesize).reduce(0, :+)
-			end
-		end
-		
-		def call(env)
-			response = @app.call(env)
-			
-			unless response[2]&.empty? or response[1].include?(Rack::CONTENT_LENGTH)
-				if content_length = self.content_length_of(response[2])
-					response[1][Rack::CONTENT_LENGTH] = content_length
-				end
-			end
-			
-			return response
-		end
-	end
-end