utopia 2.20.1 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a414341752cd45376ffac50a8ebd4b5e3ee49eb2868ce87dc41f3696c07d76
-  data.tar.gz: 989e031a0c3f3680d52f28540f94712f32e00cb95af7c5575a81ef7f7b8ed6d6
+  metadata.gz: 64d6cd31c0780c6d2071157034b6d125da0b4e6c3649affafb9338208b0467b7
+  data.tar.gz: 9092ab79ee6fb441051e1114fefbe41761aa5339d2eee574d588729e7ea5c479
 SHA512:
-  metadata.gz: 5d8ff1cf0d72eabbef7550ef1c049f6af84c9cd110403cff6999c506ac8200697fa8930cc2db29cc666b23dd13b144a81c45301d669c43bff618719254247293
-  data.tar.gz: dbd8e4c9379ad5d539a8e099402630a23b9c7a5422d369a2f5cdcea1426d07b1bffb2532b1694dad71b8966dcdb8a8084d4270af809ce3ef23e3b0dfddd48883
+  metadata.gz: cd49ec085295dded939c0da489dfc6bb64a97207032bd3cf177b39cf84f131f00b935c96173c2c6196c50032a07f4786b2312144b776cbadd4c05840b96f9f70
+  data.tar.gz: 5fc0e4c878dfa11693481cbaf560d9024f69c66c48db29cc5722a56757d216449c4026e59f534578a784f6484a94ee0bd894831e93bcddeb26830dcadf17be2b

data/bake/utopia/environment.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2018-2022, by Samuel Williams.
+
+# Update environment variables in config/environment.yaml
+def initialize(...)
+	super
+	
+	require 'securerandom'
+	require 'yaml/store'
+	require 'console'
+end
+
+# Setup default environemnts "testing" and "development".
+# @parameter root [String] The root directory of the project.
+def setup(root: context.root)
+	defaults(name: "testing", root: root)
+	defaults(name: "development", root: root)
+end
+
+# Setup the defaults for a specific environment.
+# @parameter name [String] The name of the environment to setup.
+# @parameter root [String] The root directory of the project.
+def defaults(name, root: context.root)
+	update_environment(root, name) do |store|
+		# Set some useful defaults for the environment.
+		store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
+	end
+end
+
+# Update the specified environment.
+# @parameter name [String] The name of the environment to update.
+# @parameter variables [Hash(String, String)] A list of environment KEY=VALUE pairs to set.
+def update(name, root: context.root, **variables)
+	update_environment(root, name) do |store|
+		variables&.each do |variable|
+			key, value = variable.split('=', 2)
+			
+			if value
+				puts "ENV[#{key.inspect}] will default to #{value.inspect} unless otherwise specified."
+				store[key] = value
+			else
+				puts "ENV[#{key.inspect}] will be unset unless otherwise specified."
+				store.delete(key)
+			end
+		end
+		
+		yield store if block_given?
+		
+		Console.logger.debug(self) do |buffer|
+			buffer.puts "Environment #{name} (#{path}):"
+			store.roots.each do |key|
+				value = store[key]
+				
+				buffer.puts "#{key}=#{value.inspect}"
+			end
+		end
+	end
+end
+
+def read(name, root: context.root)
+	environment_path = self.environment_path(root, name)
+	
+	if File.exist?(environment_path)
+		Console.logger.debug(self) {"Loading environment #{name} from #{environment_path}..."}
+		YAML.load_file(environment_path)
+	else
+		Console.logger.debug(self) {"No environment #{name} found at #{environment_path}."}
+		{}
+	end
+end
+
+private
+
+def environment_path(root, name)
+	File.join(root, "config", "#{name}.yaml")
+end
+
+# Setup `config/environment.yaml` according to specified options.
+def update_environment(root, name)
+	environment_path = self.environment_path(root, name)
+	FileUtils.mkpath File.dirname(environment_path)
+	
+	store = YAML::Store.new(environment_path)
+	
+	store.transaction do
+		yield store, name, environment_path
+	end
+end

data/bake/utopia/node.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-# Copy all installed JavaScript components to the public root.
+# Released under the MIT License.
+# Copyright, 2016-2022, by Samuel Williams.
+
 def update
 	require 'fileutils'
 	require 'utopia/path'

data/bake/utopia/server.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2017-2022, by Samuel Williams.
+
+def initialize(...)
+	super
+	
+	require 'fileutils'
+	require 'socket'
+end
+
+# Create a remote Utopia website suitable for deployment using git.
+def create(root: context.root)
+	FileUtils.mkdir_p File.join(root, "public")
+	
+	update(root: root)
+	
+	# Print out helpful git remote add message:
+	puts "Now add the git remote to your local repository:\n\tgit remote add production ssh://#{Socket.gethostname}#{root}"
+	puts "Then push to it:\n\tgit push --set-upstream production main"
+end
+
+# The path to the setup directory in the gem:
+SETUP_ROOT = File.expand_path("../../setup", __dir__)
+
+# The root directory of the template server deployment:
+SERVER_ROOT = File.join(SETUP_ROOT, 'server')
+
+# Update the git hooks in an existing server repository.
+def update(root: context.root)
+	# It's okay to call this on an existing repo, it will only update config as required to enable --shared.
+	# --shared allows multiple users to access the site with the same group.
+	system("git", "init", "--shared", chdir: root) or fail "could not initialize repository"
+	
+	system("git", "config", "receive.denyCurrentBranch", "ignore", chdir: root) or fail "could not set configuration"
+	system("git", "config", "core.worktree", root, chdir: root) or fail "could not set configuration"
+	
+	# Doing this invokes a lot of behaviour that isn't always ideal...
+	# system("bundle", "config", "set", "--local", "deployment", "true")
+	system("bundle", "config", "set", "--local", "without", "development", chdir: root) or fail "could not set bundle configuration"
+	
+	# In theory, to convert from non-shared to shared:
+	# chgrp -R <group-name> .                   # Change files and directories' group
+	# chmod -R g+w .                            # Change permissions
+	# chmod g-w .git/objects/pack/*             # Git pack files should be immutable
+	# chmod g+s `find . -type d`                # New files get group id of directory
+		
+	# 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)
+	end
+	
+	# 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"
+end

data/bake/utopia/shell.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-# Start an interactive console for the web application.
+# Released under the MIT License.
+# Copyright, 2020-2022, by Samuel Williams.
+
 def shell
 	call 'utopia:environment'
 	

data/bake/utopia/site.rb

@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2020, by Michael Adams.
+
+def initialize(...)
+	super
+	
+	require 'fileutils'
+	require 'find'
+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']
+
+# Directories that should exist:
+DIRECTORIES = ["config", "lib", "pages", "public", "bake", "test"]
+
+# Directories that should be removed during upgrade process:
+OLD_PATHS = ["access_log", "cache", "tmp", "Rakefile", "tasks", ".bowerrc"]
+
+# The root directory of the template site:
+SITE_ROOT = File.join(SETUP_ROOT, 'site')
+
+# Create a new local Utopia website using the default template.
+def create(root: context.root)
+	Console.logger.debug(self) {"Setting up site in #{root} for Utopia v#{Utopia::VERSION}..."}
+	
+	DIRECTORIES.each do |directory|
+		FileUtils.mkdir_p(File.join(root, directory))
+	end
+	
+	Find.find(SITE_ROOT) do |source_path|
+		# Compute the destination path:
+		destination_path = File.join(root, source_path[SITE_ROOT.size..-1])
+		
+		if File.directory?(source_path)
+			# Create the directory:
+			FileUtils.mkdir_p(destination_path)
+		else
+			# Copy the file, unless it already exists:
+			unless File.exist? destination_path
+				FileUtils.copy_entry(source_path, destination_path)
+			end
+		end
+	end
+	
+	CONFIGURATION_FILES.each do |configuration_file|
+		destination_path = File.join(root, configuration_file)
+		
+		if File.exist?(destination_path)
+			buffer = File.read(destination_path).gsub('$UTOPIA_VERSION', Utopia::VERSION)
+			File.open(destination_path, "w") { |file| file.write(buffer) }
+		else
+			Console.logger.warn(self) {"Could not open #{destination_path}, maybe it should be removed from CONFIGURATION_FILES?"}
+		end
+	end
+	
+	system("bundle", "install", chdir: root) or warn "could not install bundled gems"
+	
+	if !File.exist?('.git')
+		Console.logger.info(self) {"Setting up git repository..."}
+		
+		system("git", "init", chdir: root) or warn "could not create git repository"
+		system("git", "add", ".", chdir: root) or warn "could not add all files"
+		system("git", "commit", "-q", "-m", "Initial Utopia v#{Utopia::VERSION} site.", chdir: root) or warn "could not commit files"
+	end
+	
+	context.lookup('utopia:environment:defaults').call(root)
+	
+	name = `git config user.name || whoami`.chomp
+	
+	puts
+	puts "  #{name},".ljust(78)
+	puts "Thank you for using Utopia!".center(78)
+	puts "We sincerely hope that Utopia helps to".center(78)
+	puts "make your life easier and more enjoyable.".center(78)
+	puts ""
+	puts "To start the development server, run:".center(78)
+	puts "bake utopia:development".center(78)
+	puts ""
+	puts "For extreme productivity, please consult the online documentation".center(78)
+	puts "https://github.com/socketry/utopia".center(78)
+	puts " ~ Samuel.  ".rjust(78)
+end
+
+# Upgrade an existing site to use the latest configuration files from the template.
+def upgrade(root: context.root)
+	branch_name = "utopia-upgrade-#{Utopia::VERSION}"
+	
+	$stderr.puts "Upgrading #{destination_root}..."
+	
+	system('git', 'checkout', '-b', branch_name, chdir: root) or fail "could not change branch"
+	
+	DIRECTORIES.each do |directory|
+		FileUtils.mkdir_p(File.join(root, directory))
+	end
+	
+	OLD_PATHS.each do |path|
+		path = File.join(root, path)
+		Console.logger.info(self) {"Removing #{path}..."}
+		FileUtils.rm_rf(path)
+	end
+	
+	CONFIGURATION_FILES.each do |configuration_file|
+		source_path = File.join(SITE_ROOT, configuration_file)
+		destination_path = File.join(root, configuration_file)
+		
+		Console.logger.info(self) {"Updating #{destination_path}..."}
+		
+		FileUtils.copy_entry(source_path, destination_path)
+		buffer = File.read(destination_path).gsub('$UTOPIA_VERSION', Utopia::VERSION)
+		File.open(destination_path, "w") { |file| file.write(buffer) }
+	end
+	
+	context.lookup('environment:defaults').call(root)
+	
+	begin
+		# Stage any files that have been changed or removed:
+		system("git", "add", "-u", chdir: root) or fail "could not add files"
+		
+		# Stage any new files that we have explicitly added:
+		system("git", "add", *CONFIGURATION_FILES, chdir: root) or fail "could not add files"
+		
+		move_static!(root)
+		update_gemfile!(root)
+		
+		# Commit all changes:
+		system("git", "commit", "-m", "Upgrade to utopia #{Utopia::VERSION}.", chdir: root) or fail "could not commit changes"
+		
+		# Checkout main..
+		system("git", "checkout", "main", chdir: root) or fail "could not checkout main"
+		
+		# and merge:
+		system("git", "merge", "--squash", "--no-commit", branch_name, chdir: root) or fail "could not merge changes"
+	rescue => error
+		Console.logger.error(self, error) {"Upgrade failed."}
+		
+		system("git", "checkout", "master", chdir: root)
+	ensure
+		system("git", "branch", "-D", branch_name, chdir: root)
+	end
+end
+
+private
+
+# Move legacy `pages/_static` to `public/_static`.
+def move_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)
+	
+	if File.exist?(new_static_path)
+		if File.lstat(new_static_path).symlink?
+			FileUtils.rm_f new_static_path
+		else
+			Console.logger.warn(self) {"Can't move pages/_static to public/_static, destination already exists."}
+			return
+		end
+	end
+	
+	# One more sanity check:
+	if File.directory?(old_static_path)
+		system("git", "mv", "pages/_static", "public/")
+	end
+end
+
+# Move `Gemfile` to `gems.rb`.
+def update_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)
+	return if File.exist?(gems_path)
+	
+	system("git", "mv", "Gemfile", "gems.rb", chdir: root)
+	system("git", "mv", "Gemfile.lock", "gems.locked", chdir: root)
+end

data/bake/utopia/static.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-# Generate a static copy of the site.
-# @param output_path [String] the path where the files for the static site will be created.
+# Released under the MIT License.
+# Copyright, 2017-2022, by Samuel Williams.
+
 def generate(output_path: 'static')
 	require 'falcon/server'
 	require 'async/io'

data/bake/utopia.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-# Set up the environment for the web application.
+# Released under the MIT License.
+# Copyright, 2017-2022, by Samuel Williams.
+
 def environment(name: nil)
 	require_relative '../lib/utopia/logger'
 	

data/lib/utopia/content/document.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2015-2022, by Samuel Williams.
 
 require_relative 'links'
 require_relative 'response'

data/lib/utopia/content/link.rb

@@ -1,24 +1,9 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2009-2022, by Samuel Williams.
+# Copyright, 2017, by Huba Nagy.
+# Copyright, 2020, by Michael Adams.
 
 require 'yaml'
 require 'trenni/builder'

data/lib/utopia/content/links.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2015-2022, by Samuel Williams.
 
 require_relative 'link'
 

data/lib/utopia/content/markup.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2009-2022, by Samuel Williams.
 
 require 'trenni/parsers'
 require 'trenni/entities'

data/lib/utopia/content/namespace.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2017-2022, by Samuel Williams.
 
 module Utopia
 	class Content

data/lib/utopia/content/node.rb

@@ -1,24 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2009-2022, by Samuel Williams.
+# Copyright, 2015, by Huba Nagy.
 
 require_relative 'markup'
 require_relative 'links'
@@ -184,4 +168,4 @@ module Utopia
 			end
 		end
 	end
-end
+end

data/lib/utopia/content/response.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2010-2022, by Samuel Williams.
 
 module Utopia
 	class Content

data/lib/utopia/content/tags.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2012-2022, by Samuel Williams.
 
 require_relative 'namespace'
 

data/lib/utopia/content.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2009-2022, by Samuel Williams.
 
 require_relative 'middleware'
 require_relative 'localization'