utopia 2.24.4 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b5e5a7cfeb8b469cb25b6700b937524b97a7696000b7f0800f03643ae7a778
-  data.tar.gz: 58e2310129e1010481b2a159cf70b0fd43be7371b8afbc539c13a3358323cfea
+  metadata.gz: d94f472431ddf09a1bb0002c02e1e94fb7cacf720bf93054286f5616c5ae9f7d
+  data.tar.gz: bf9576183c19dd53684c3a0f21c90aa8a785cb8301ef1ce712aea08890ed3918
 SHA512:
-  metadata.gz: f2ebbc9fed8c39d736ffc99b7b073a35935e552232d046e024a6debb84b5aab4783739c23be4539b12af43093afa3fcf7d763387bf8e9c8fbc1bf23889e3e659
-  data.tar.gz: 17d8624002a5a6e51c373c9b41d45e5461adbef09d7f7c45801408eac08828e25226bbfcd4e3a22477b64477130e2eb601b7fed27655e582c154e91c917f114e
+  metadata.gz: 86a05f2d63c9f2e1cb140816329dec2c6ac22e1b03b505dbfb3b43efb316a05407f8c1004501a00751cfcded37ceee31f0d30743a1f07f78c38350afb1500094
+  data.tar.gz: facdc1eaea6987c92664ba4434ef8d19adfb62f990236c5fa84f03d732b7d80840ac7541d546d4ce1c555c1d47755cb41f36d28e7a2fa9a257b8bdeecb6ae00f

data/bake/utopia/environment.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2018-2025, by Samuel Williams.
 
 # Update environment variables in config/environment.yaml
 def initialize(...)
 	super
 	
-	require 'securerandom'
-	require 'yaml/store'
-	require 'console'
+	require "securerandom"
+	require "yaml/store"
+	require "console"
 end
 
 # Setup default environemnts "testing" and "development".
@@ -26,7 +26,7 @@ def defaults(name, root: context.root)
 	update_environment(root, name) do |store|
 		Console.info(self) {"Setting up defaults for environment #{name}..."}
 		# Set some useful defaults for the environment.
-		store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
+		store["UTOPIA_SESSION_SECRET"] ||= SecureRandom.hex(40)
 	end
 end
 
@@ -51,10 +51,8 @@ def update(name, root: context.root, **variables)
 		yield store if block_given?
 		
 		Console.info(self) do |buffer|
-			buffer.puts "Environment #{name} (#{path}):"
-			store.roots.each do |key|
-				value = store[key]
-				
+			buffer.puts "Environment #{name.inspect} (#{path}):"
+			store.each do |key, value|
 				buffer.puts "#{key}=#{value.inspect}"
 			end
 		end
@@ -84,9 +82,15 @@ def update_environment(root, name)
 	environment_path = self.environment_path(root, name)
 	FileUtils.mkpath File.dirname(environment_path)
 	
-	store = YAML::Store.new(environment_path)
+	if File.exist?(environment_path)
+		store = YAML.load_file(environment_path)
+	else
+		store = Hash.new
+	end
+	
+	yield store, name, environment_path
 	
-	store.transaction do
-		yield store, name, environment_path
+	File.open(environment_path, "w") do |file|
+		YAML.dump(store, file)
 	end
 end

data/bake/utopia/node.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2016-2022, by Samuel Williams.
+# Copyright, 2016-2025, by Samuel Williams.
 
 def update
-	require 'fileutils'
-	require 'utopia/path'
+	require "fileutils"
+	require "utopia/path"
 	
 	root = Pathname.new(context.root)
 	package_root = root + "node_modules"
@@ -23,7 +23,7 @@ def update
 		package_directory = package_path.relative_path_from(package_root)
 		install_path = install_root + package_directory
 		
-		dist_path = package_path + 'dist'
+		dist_path = package_path + "dist"
 		
 		FileUtils::Verbose.rm_rf(install_path)
 		FileUtils::Verbose.mkpath(install_path.dirname)
@@ -47,7 +47,7 @@ def expand_package_paths(root, into = [])
 	paths.each do |path|
 		basename = path.basename.to_s
 		# Handle organisation sub-directories which start with an '@' symbol:
-		if basename.start_with?('@')
+		if basename.start_with?("@")
 			expand_package_paths(path, into)
 		else
 			into << path

data/bake/utopia/server.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 
 def initialize(...)
 	super
 	
-	require 'fileutils'
-	require 'socket'
+	require "fileutils"
+	require "socket"
 end
 
 # Create a remote Utopia website suitable for deployment using git.
@@ -25,7 +25,7 @@ end
 SETUP_ROOT = File.expand_path("../../setup", __dir__)
 
 # The root directory of the template server deployment:
-SERVER_ROOT = File.join(SETUP_ROOT, 'server')
+SERVER_ROOT = File.join(SETUP_ROOT, "server")
 
 # Update the git hooks in an existing server repository.
 def update(root: context.root)
@@ -49,13 +49,13 @@ def update(root: context.root)
 	# Set some useful defaults for the environment.
 	recipe = context.lookup("utopia:environment:update")
 	recipe.instance.update("environment", root: root) do |store|
-		store['VARIANT'] ||= 'production'
-		store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
+		store["VARIANT"] ||= "production"
+		store["UTOPIA_SESSION_SECRET"] ||= SecureRandom.hex(40)
 	end
 	
 	# Copy git hooks:
-	system("cp", "-r", File.join(SERVER_ROOT, 'git', 'hooks'), File.join(root, '.git')) or fail "could not copy git hooks"
+	system("cp", "-r", File.join(SERVER_ROOT, "git", "hooks"), File.join(root, ".git")) or fail "could not copy git hooks"
 	# finally set everything in the .git directory to be group writable
 	# This failed for me and I had to do sudo chown http:http .git -R first.
-	system("chmod", "-Rf", "g+w", File.join(root, '.git')) or fail "could not update permissions of .git directory"
+	system("chmod", "-Rf", "g+w", File.join(root, ".git")) or fail "could not update permissions of .git directory"
 end

data/bake/utopia/shell.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2025, by Samuel Williams.
 
 def shell
-	call 'utopia:environment'
+	call "utopia:environment"
 	
-	require 'utopia/shell'
+	require "utopia/shell"
 	
 	binding = Utopia::Shell.new(self.context).binding
 	

data/bake/utopia/site.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2024, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 # Copyright, 2020, by Michael Adams.
 
 def initialize(...)
 	super
 	
-	require 'fileutils'
-	require 'find'
-	require 'console'
+	require "fileutils"
+	require "find"
+	require "console"
 	
-	require_relative '../../lib/utopia/version'
+	require_relative "../../lib/utopia/version"
 end
 
 # The path to the setup directory in the gem:
 SETUP_ROOT = File.expand_path("../../setup", __dir__)
 
 # Configuration files which should be installed/updated:
-CONFIGURATION_FILES = ['.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'gems.rb', 'Guardfile', 'bake.rb', 'test/website.rb', 'fixtures/website.rb']
+CONFIGURATION_FILES = [".gitignore", "config.ru", "config/environment.rb", "falcon.rb", "gems.rb", "Guardfile", "bake.rb", "test/website.rb", "fixtures/website.rb"]
 
 # Directories that should exist:
 DIRECTORIES = ["config", "lib", "pages", "public", "bake", "fixtures", "test"]
@@ -27,7 +27,7 @@ DIRECTORIES = ["config", "lib", "pages", "public", "bake", "fixtures", "test"]
 OLD_PATHS = ["access_log", "cache", "tmp", "Rakefile", "tasks", ".bowerrc"]
 
 # The root directory of the template site:
-SITE_ROOT = File.join(SETUP_ROOT, 'site')
+SITE_ROOT = File.join(SETUP_ROOT, "site")
 
 # Create a new local Utopia website using the default template.
 def create(root: context.root)
@@ -56,7 +56,7 @@ def create(root: context.root)
 		destination_path = File.join(root, configuration_file)
 		
 		if File.exist?(destination_path)
-			buffer = File.read(destination_path).gsub('$UTOPIA_VERSION', Utopia::VERSION)
+			buffer = File.read(destination_path).gsub("$UTOPIA_VERSION", Utopia::VERSION)
 			File.open(destination_path, "w") { |file| file.write(buffer) }
 		else
 			Console.warn(self) {"Could not open #{destination_path}, maybe it should be removed from CONFIGURATION_FILES?"}
@@ -65,9 +65,9 @@ def create(root: context.root)
 	
 	system("bundle", "install", chdir: root) or warn "could not install bundled gems"
 	
-	context.lookup('utopia:environment:setup').call(root: root)
+	context.lookup("utopia:environment:setup").call(root: root)
 	
-	if !File.exist?('.git')
+	if !File.exist?(".git")
 		Console.info(self) {"Setting up git repository..."}
 		
 		system("git", "init", chdir: root) or warn "could not create git repository"
@@ -118,11 +118,11 @@ def upgrade(root: context.root)
 			Console.info(self) {"Updating #{destination_path}..."}
 			
 			FileUtils.copy_entry(source_path, destination_path)
-			buffer = File.read(destination_path).gsub('$UTOPIA_VERSION', Utopia::VERSION)
+			buffer = File.read(destination_path).gsub("$UTOPIA_VERSION", Utopia::VERSION)
 			File.open(destination_path, "w") { |file| file.write(buffer) }
 		end
 		
-		context.lookup('utopia:environment:setup').call(root: root)
+		context.lookup("utopia:environment:setup").call(root: root)
 	
 		# Stage any files that have been changed or removed:
 		system("git", "add", "-u", chdir: root) or fail "could not add files"
@@ -155,12 +155,12 @@ end
 
 # Move legacy `pages/_static` to `public/_static`.
 def move_static!(root)
-	old_static_path = File.expand_path('pages/_static', root)
+	old_static_path = File.expand_path("pages/_static", root)
 	
 	# If public/_static doens't exist, we are done.
 	return unless File.exist?(old_static_path)
 	
-	new_static_path = File.expand_path('public/_static', root)
+	new_static_path = File.expand_path("public/_static", root)
 	
 	if File.exist?(new_static_path)
 		if File.lstat(new_static_path).symlink?
@@ -179,13 +179,13 @@ end
 
 # Move `Gemfile` to `gems.rb`.
 def update_gemfile!(root)
-	gemfile_path = File.expand_path('Gemfile', root)
+	gemfile_path = File.expand_path("Gemfile", root)
 	
 	# If `Gemfile` doens't exist, we are done:
 	return unless File.exist?(gemfile_path)
 	
 	# If `gems.rb` already exists, we are done:
-	gems_path = File.expand_path('gems.rb', root)
+	gems_path = File.expand_path("gems.rb", root)
 	return if File.exist?(gems_path)
 	
 	system("git", "mv", "Gemfile", "gems.rb", chdir: root)

data/bake/utopia/static.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2022, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 
-def generate(output_path: 'static')
-	require 'falcon/server'
-	require 'async/io'
-	require 'async/http/endpoint'
-	require 'async/container'
+def generate(output_path: "static")
+	require "falcon/server"
+	require "async/io"
+	require "async/http/endpoint"
+	require "async/container"
 	
-	config_path = File.join(Dir.pwd, 'config.ru')
+	config_path = File.join(Dir.pwd, "config.ru")
 	container_class = Async::Container::Threaded
 	server_port = 9090
 	
@@ -33,7 +33,7 @@ def generate(output_path: 'static')
 	
 	# Copy all public assets:
 	FileUtils::Verbose.mkpath(output_path)
-	Dir.glob(File.join(Dir.pwd, 'public/*')) do |path|
+	Dir.glob(File.join(Dir.pwd, "public/*")) do |path|
 		FileUtils::Verbose.cp_r(path, output_path)
 	end
 	

data/bake/utopia.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2024, by Samuel Williams.
+# Copyright, 2017-2025, by Samuel Williams.
 
 def environment(name: nil)
 	if name
-		ENV['UTOPIA_ENV'] = name
+		ENV["UTOPIA_ENV"] = name
 	end
 	
-	require File.expand_path('config/environment', context.root)
+	require File.expand_path("config/environment", context.root)
 end
 
 # Start the development server.
 def development
 	self.environment
 	
-	exec('guard', '-g', 'development')
+	exec("guard", "-g", "development")
 end

data/lib/utopia/content/document.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2015-2024, by Samuel Williams.
+# Copyright, 2015-2025, by Samuel Williams.
 
-require_relative 'links'
-require_relative 'response'
-require_relative 'markup'
+require_relative "links"
+require_relative "response"
+require_relative "markup"
 
 module Utopia
 	class Content

data/lib/utopia/content/link.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2024, by Samuel Williams.
+# Copyright, 2009-2025, by Samuel Williams.
 # Copyright, 2017, by Huba Nagy.
 # Copyright, 2020, by Michael Adams.
 
-require 'yaml'
-require 'xrb/builder'
+require "yaml"
+require "xrb/builder"
 
-require 'xrb/strings'
+require "xrb/strings"
 
-require_relative '../path'
-require_relative '../locale'
+require_relative "../path"
+require_relative "../locale"
 
 module Utopia
 	class Content
@@ -75,7 +75,7 @@ module Utopia
 			end
 			
 			def relative_href(base = nil)
-				if base and href.start_with? '/'
+				if base and href.start_with? "/"
 					Path.shortest_path(href, base)
 				else
 					href
@@ -87,18 +87,18 @@ module Utopia
 			end
 			
 			def to_anchor(base: nil, content: self.title, builder: nil, **attributes)
-				attributes[:class] ||= 'link'
+				attributes[:class] ||= "link"
 				
 				XRB::Builder.fragment(builder) do |inner_builder|
 					if href?
 						attributes[:href] ||= relative_href(base)
 						attributes[:target] ||= @info[:target]
 						
-						inner_builder.inline('a', attributes) do
+						inner_builder.inline("a", attributes) do
 							inner_builder.text(content)
 						end
 					else
-						inner_builder.inline('span', attributes) do
+						inner_builder.inline("span", attributes) do
 							inner_builder.text(content)
 						end
 					end

data/lib/utopia/content/links.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2015-2022, by Samuel Williams.
+# Copyright, 2015-2025, by Samuel Williams.
 
-require_relative 'link'
+require_relative "link"
 
-require 'concurrent/map'
+require "concurrent/map"
 
 module Utopia
 	class Content
 		# The file extension for markup nodes on disk.
-		XNODE_EXTENSION = '.xnode'
+		XNODE_EXTENSION = ".xnode"
 		INDEX = "index"
 		
 		class Links
@@ -263,7 +263,7 @@ module Utopia
 					
 					# After processing all directory entries, we are left with virtual links:
 					metadata.each do |key, info|
-						name, locale = key.split('.', 2)
+						name, locale = key.split(".", 2)
 						localized = (virtuals[name] ||= {})
 						localized[locale] = info
 					end

data/lib/utopia/content/markup.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2024, by Samuel Williams.
+# Copyright, 2009-2025, by Samuel Williams.
 
-require 'xrb/parsers'
-require 'xrb/entities'
-require 'xrb/strings'
-require 'xrb/tag'
+require "xrb/parsers"
+require "xrb/entities"
+require "xrb/strings"
+require "xrb/tag"
 
 module Utopia
 	class Content
@@ -153,7 +153,7 @@ module Utopia
 			end
 
 			def cdata(string)
-				@delegate.text(string[9..-4])
+				@delegate.write(string[9..-4])
 			end
 
 			def text(string)

data/lib/utopia/content/node.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2022, by Samuel Williams.
+# Copyright, 2009-2025, by Samuel Williams.
 # Copyright, 2015, by Huba Nagy.
 
-require_relative 'markup'
-require_relative 'links'
+require_relative "markup"
+require_relative "links"
 
-require_relative 'document'
+require_relative "document"
 
-require 'pathname'
+require "pathname"
 
 module Utopia
 	class Content
@@ -35,7 +35,7 @@ module Utopia
 				@controller.lookup_node(parent_path + Path[path])
 			end
 			
-			def local_path(path = '.', base = nil)
+			def local_path(path = ".", base = nil)
 				path = Path[path]
 				
 				root = Pathname.new(@controller.root)
@@ -48,7 +48,7 @@ module Utopia
 				end
 			end
 			
-			def relative_path(path = '.')
+			def relative_path(path = ".")
 				path = Path[path]
 				base = uri_path.dirname
 				
@@ -59,7 +59,7 @@ module Utopia
 				@uri_path.dirname
 			end
 			
-			def links(path = '.', **options, &block)
+			def links(path = ".", **options, &block)
 				path = uri_path.dirname + Path[path]
 				
 				links = @controller.links(path, **options)

data/lib/utopia/content/response.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2010-2022, by Samuel Williams.
+# Copyright, 2010-2025, by Samuel Williams.
 
 module Utopia
 	class Content
 		# Compatibility with older versions of rack:
-		EXPIRES = 'expires'.freeze
-		CACHE_CONTROL = 'cache-control'.freeze
-		CONTENT_TYPE = 'content-type'.freeze
-		NO_CACHE = 'no-cache'.freeze
+		EXPIRES = "expires".freeze
+		CACHE_CONTROL = "cache-control".freeze
+		CONTENT_TYPE = "content-type".freeze
+		NO_CACHE = "no-cache".freeze
 		
 		# A basic content response, including useful defaults for typical HTML5 content.
 		class Response

data/lib/utopia/content/tags.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2012-2022, by Samuel Williams.
+# Copyright, 2012-2025, by Samuel Williams.
 
-require_relative 'namespace'
+require_relative "namespace"
 
-require 'variant'
+require "variant"
 
 module Utopia
 	class Content
@@ -15,7 +15,7 @@ module Utopia
 			
 			# Invokes a node and renders a single node to the output stream.
 			# @param path [String] The path of the node to invoke.
-			tag('node') do |document, state|
+			tag("node") do |document, state|
 				path = Path[state[:path]]
 				
 				node = document.lookup_node(path)
@@ -25,7 +25,7 @@ module Utopia
 			
 			# Invokes a deferred tag from the current state. Works together with {Document::State#defer}.
 			# @param id [String] The id of the deferred to invoke.
-			tag('deferred') do |document, state|
+			tag("deferred") do |document, state|
 				id = state[:id].to_i
 				
 				deferred = document.parent.deferred[id]
@@ -34,19 +34,19 @@ module Utopia
 			end
 			
 			# Renders the content of the parent node into the output of the document.
-			tag('content') do |document, state|
+			tag("content") do |document, state|
 				# We are invoking this node within a parent who has content, and we want to generate output equal to that.
 				document.write(document.parent.content)
 			end
 			
 			# Render the contents only if in the correct environment.
 			# @param only [String] A comma separated list of environments to check.
-			tag('environment') do |document, state|
+			tag("environment") do |document, state|
 				variant = document.attributes.fetch(:variant) do
 					Variant.for(:utopia)
 				end.to_s
 				
-				if state[:only].split(',').include?(variant)
+				if state[:only].split(",").include?(variant)
 					document.parse_markup(state.content)
 				end
 			end

data/lib/utopia/content.rb

@@ -1,29 +1,29 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2024, by Samuel Williams.
+# Copyright, 2009-2025, by Samuel Williams.
 
-require_relative 'middleware'
-require_relative 'localization'
+require_relative "middleware"
+require_relative "localization"
 
-require_relative 'content/links'
-require_relative 'content/node'
-require_relative 'content/markup'
-require_relative 'content/tags'
+require_relative "content/links"
+require_relative "content/node"
+require_relative "content/markup"
+require_relative "content/tags"
 
-require 'xrb/template'
+require "xrb/template"
 
-require 'concurrent/map'
+require "concurrent/map"
 
-require 'traces/provider'
+require "traces/provider"
 
 module Utopia
 	# A middleware which serves dynamically generated content based on markup files.
 	class Content
-		CONTENT_NAMESPACE = 'content'.freeze
-		UTOPIA_NAMESPACE = 'utopia'.freeze
-		DEFERRED_TAG_NAME = 'utopia:deferred'.freeze
-		CONTENT_TAG_NAME = 'utopia:content'.freeze
+		CONTENT_NAMESPACE = "content".freeze
+		UTOPIA_NAMESPACE = "utopia".freeze
+		DEFERRED_TAG_NAME = "utopia:deferred".freeze
+		CONTENT_TAG_NAME = "utopia:content".freeze
 		
 		# @param root [String] The content root where pages will be generated from.
 		# @param namespaces [Hash<String,Library>] Tag namespaces for dynamic tag lookup.
@@ -130,7 +130,7 @@ module Utopia
 		private
 		
 		def lookup_content(name, parent_path)
-			if String === name && name.index('/')
+			if String === name && name.index("/")
 				name = Path.create(name)
 			end
 			
@@ -152,7 +152,7 @@ module Utopia
 				end
 				
 				if String === name_path
-					tag_path = File.join(@root, components, '_' + name_path)
+					tag_path = File.join(@root, components, "_" + name_path)
 					
 					if File.exist? tag_path
 						return Node.new(self, Path[components] + name, parent_path + name, tag_path)
@@ -186,8 +186,8 @@ module Utopia
 	Traces::Provider(Content) do
 		def respond(link, request)
 			attributes = {
-				'link.key' => link.key,
-				'link.href' => link.href
+				"link.key" => link.key,
+				"link.href" => link.href
 			}
 			
 			Traces.trace("utopia.content.respond", attributes: attributes) {super}