utopia 2.12.4 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9337b078fadd4ee1864f180fcf809aa1d0474dccf787d58bde6d1456250c53ea
-  data.tar.gz: 8235f4bb0c2a7c80888a2db6aec97e9c4975037f8e2ef375884dd6ca790d3944
+  metadata.gz: b240d4136827fcc12241cfc1832cd83480dfee29799b2ebe88e6dd93e0e80285
+  data.tar.gz: 9adc393d85d0a5fa16e2821110a726432590cc284ff3a7d09f592a6e722a4e4b
 SHA512:
-  metadata.gz: d54248e9cbaf387b609f076f7c1bdb4b2b4dee6a9759a64d6d519d31c53b034cc01349e3990e7cbe199aad47198bbca6d0e2a7ac8c381b56eca24dee71a63b9d
-  data.tar.gz: e148586d9ac9ead60a77c0a539bef13ffa4ace1e5027311a82b9f4333b343e4ab7ee39db90313500133f76c3689227c37005507b68334ee7da3183017bcd244d
+  metadata.gz: 04e639d5368fd47d89d0cbd8f8c9702e9630a6993876fe25661245fac16c67e8185a2ced3da82b0a1957d1a018e3de7f6b41f7f452eb17f033400a8c8fe235a7
+  data.tar.gz: 535ab13548bb9a19865361af11d29bfe661a9a00545fa5417ae96f2f21ee02bd2e9c3bbdbc3a7c37c9a2056e2ad42eee704b74a659f70244b7973528f1d570b3

data/Gemfile

@@ -6,9 +6,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-	gem 'pry'
-	gem 'pry-coolline'
-	
 	gem 'yard'
 	
 	gem 'kramdown'
@@ -26,5 +23,6 @@ group :test do
 	gem 'guard-falcon'
 	
 	gem 'rack-test'
-	gem 'rack-freeze', '~> 1.2'
 end
+
+gem "thread-local", "~> 1.0"

data/README.md

@@ -57,7 +57,6 @@ There is an excellent [documentation wiki](https://ioquatix.github.io/utopia/) i
 - [Trenni::Formatters](https://github.com/ioquatix/trenni-formatters) — Helpers for HTML generation including views and forms.
 - [Utopia::Gallery](https://github.com/ioquatix/utopia-gallery) — A fast photo gallery based on [libvips](https://github.com/jcupitt/libvips).
 - [Utopia::Analytics](https://github.com/ioquatix/utopia-analytics) — Simple integration with Google Analytics.
-- [Rack::Freeze](https://github.com/ioquatix/rack-freeze) — Multi-thread safety in Rack.
 - [HTTP::Accept](https://github.com/ioquatix/http-accept) — RFC compliant header parser.
 - [Samovar](https://github.com/ioquatix/samovar) — Command line parser used by Utopia.
 - [Mapping](https://github.com/ioquatix/mapping) — Provide structured conversions for web interfaces.

data/bake/utopia.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Set up the environment for the web application.
+def environment(name: nil)
+	require_relative '../lib/utopia/logger'
+	
+	if name
+		ENV['UTOPIA_ENV'] = name
+	end
+	
+	require File.expand_path('config/environment', context.root)
+end
+
+# Start the development server.
+def development
+	self.environment
+	
+	exec('guard', '-g', 'development')
+end

data/bake/utopia/shell.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Start an interactive console for the web application.
+def shell
+	call 'utopia:environment'
+	
+	require 'utopia/shell'
+	
+	binding = Utopia::Shell.new(self.context).binding
+	
+	IRB.setup(binding.source_location[0], argv: [])
+	workspace = IRB::WorkSpace.new(binding)
+	
+	irb = IRB::Irb.new(workspace)
+	irb.run(IRB.conf)
+end

data/bake/utopia/static.rb

@@ -0,0 +1,43 @@
+# 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.
+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')
+	container_class = Async::Container::Threaded
+	server_port = 9090
+	
+	app, options = Rack::Builder.parse_file(config_path)
+	
+	container = container_class.run(count: 2) do
+		Async do
+			server = Falcon::Server.new(
+				Falcon::Server.middleware(app),
+				Async::HTTP::Endpoint.parse("http://localhost:#{server_port}")
+			)
+			
+			server.run
+		end
+	end
+	
+	output_path = File.expand_path(output_path, Dir.pwd)
+	
+	# Delete any existing stuff:
+	FileUtils.rm_rf(output_path)
+	
+	# Copy all public assets:
+	FileUtils::Verbose.mkpath(output_path)
+	Dir.glob(File.join(Dir.pwd, 'public/*')) do |path|
+		FileUtils::Verbose.cp_r(path, output_path)
+	end
+	
+	# Generate HTML pages:
+	system("wget", "--mirror", "--recursive", "--continue", "--convert-links", "--adjust-extension", "--no-host-directories", "--directory-prefix", output_path.to_s, "http://localhost:#{server_port}")
+	
+	container.stop
+end

data/bake/utopia/test.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Enable coverage 
+def coverage
+	ENV['COVERAGE'] = 'PartialSummary'
+end
+
+def test
+	system("rspec", exception: true)
+end

data/bake/utopia/yarn.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Copy all installed JavaScript components to the public root.
+def update
+	require 'fileutils'
+	require 'utopia/path'
+	
+	yarn_package_root = self.root + "lib/components"
+	yarn_install_root = self.root + "public/_components"
+	
+	yarn_package_root.children.select(&:directory?).collect(&:basename).each do |package_directory|
+		install_path = @yarn_install_root + package_directory
+		package_path = @yarn_package_root + package_directory
+		dist_path = package_path + 'dist'
+		
+		FileUtils::Verbose.rm_rf(install_path)
+		FileUtils::Verbose.mkpath(install_path.dirname)
+		
+		# If a package has a dist directory, we only symlink that... otherwise we have to do the entire package, and hope that bower's ignore was setup correctly:
+		if dist_path.exist?
+			link_path = Utopia::Path.shortest_path(dist_path, install_path)
+		else
+			link_path = Utopia::Path.shortest_path(package_path, install_path)
+		end
+		
+		FileUtils::Verbose.cp_r File.expand_path(link_path, install_path), install_path
+	end
+end

data/documentation/Gemfile

@@ -4,8 +4,6 @@ source "https://rubygems.org"
 
 gem "utopia", path: File.expand_path("../", __dir__)
 
-gem "rack-freeze", "~> 1.2"
-
 gem "rake"
 gem "bundler"
 
@@ -13,14 +11,9 @@ gem "kramdown"
 gem "kramdown-parser-gfm"
 
 group :development do
-	# For `rake server`:
 	gem "guard-falcon"
 	gem "falcon"
 	
-	# For `rake console`:
-	gem "pry"
 	gem "rack-test"
-	
-	# For `rspec` testing:
 	gem "rspec"
 end

data/documentation/config.ru

@@ -3,7 +3,7 @@
 
 require_relative 'config/environment'
 
-require 'rack/freeze'
+self.freeze_app
 
 if RACK_ENV == :production
 	# Handle exceptions in production with a error page and send an email notification:

data/lib/utopia/command/server.rb

@@ -69,7 +69,7 @@ module Utopia
 						system("git", "config", "core.worktree", destination_root) or fail "could not set configuration"
 						
 						system("bundle", "config", "set", "--local", "deployment", "true")
-						system("bundle", "config", "set", "--local", "without", "development test")
+						system("bundle", "config", "set", "--local", "without", "development")
 						
 						# In theory, to convert from non-shared to shared:
 						# chgrp -R <group-name> .                   # Change files and directories' group
@@ -81,8 +81,7 @@ module Utopia
 					# Set some useful defaults for the environment.
 					environment = Environment[]
 					environment.update_environment(destination_root) do |store|
-						store['RACK_ENV'] ||= 'production'
-						store['DATABASE_ENV'] ||= 'production'
+						store['VARIANT'] ||= 'production'
 						store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
 					end
 					

data/lib/utopia/command/site.rb

@@ -33,7 +33,7 @@ module Utopia
 		# Local site setup commands.
 		class Site < Samovar::Command
 			# Configuration files which should be installed/updated:
-			CONFIGURATION_FILES = ['.yarnrc', '.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'Gemfile', 'Guardfile', 'Rakefile', 'tasks/yarn.rake', 'tasks/deploy.rake', 'tasks/development.rake', 'tasks/environment.rake', 'tasks/log.rake', 'spec/spec_helper.rb', 'spec/website_context.rb', 'spec/website_spec.rb']
+			CONFIGURATION_FILES = ['.yarnrc', '.gitignore', 'config.ru', 'config/environment.rb', 'falcon.rb', 'Gemfile', 'Guardfile', 'bake.rb', 'spec/spec_helper.rb', 'spec/website_context.rb', 'spec/website_spec.rb']
 			
 			# Directories that should exist:
 			DIRECTORIES = ["config", "lib", "pages", "public", "tasks", "spec"]
@@ -73,9 +73,12 @@ module Utopia
 					CONFIGURATION_FILES.each do |configuration_file|
 						destination_path = File.join(destination_root, configuration_file)
 						
-						buffer = File.read(destination_path).gsub('$UTOPIA_VERSION', Utopia::VERSION)
-						
-						File.open(destination_path, "w") { |file| file.write(buffer) }
+						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
+							warn "Could not open #{destination_path}, maybe it should be removed from CONFIGURATION_FILES?"
+						end
 					end
 					
 					Dir.chdir(destination_root) do
@@ -96,6 +99,12 @@ module Utopia
 						end
 					end
 					
+					# Set some useful defaults for the environment.
+					environment = Environment[]
+					environment.update_environment(destination_root, :testing) do |store|
+						store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
+					end
+					
 					name = `git config user.name || whoami`.chomp
 					
 					puts

data/lib/utopia/content/node.rb

@@ -92,9 +92,7 @@ module Utopia
 			end
 
 			def related_links
-				name = @uri_path.basename
-				
-				return @controller.links(@uri_path.dirname, :name => @uri_path.basename, :indices => true)
+				@controller.links(@uri_path.dirname, :name => @uri_path.basename, :indices => true)
 			end
 
 			def siblings_path

data/lib/utopia/content/tags.rb

@@ -22,6 +22,8 @@
 
 require_relative 'namespace'
 
+require 'variant'
+
 module Utopia
 	class Content
 		# Tags which provide intrinsic behaviour within the content middleware.
@@ -57,9 +59,11 @@ module Utopia
 			# 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|
-				environment = document.attributes.fetch(:environment){RACK_ENV}.to_s
+				variant = document.attributes.fetch(:variant) do
+					Variant.for(:utopia)
+				end.to_s
 				
-				if state[:only].split(',').include?(environment)
+				if state[:only].split(',').include?(variant)
 					document.parse_markup(state.content)
 				end
 			end

data/lib/utopia/logger.rb

@@ -24,4 +24,4 @@ require 'console'
 
 module Utopia
 	extend Console
-end
+end

data/lib/utopia/session.rb

@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 require 'openssl'
-require 'securerandom'
 require 'digest/sha2'
 
 require 'json'
@@ -60,8 +59,7 @@ module Utopia
 			@cookie_name = @session_name + ".encrypted"
 			
 			if secret.nil? or secret.empty?
-				secret = SecureRandom.hex(32)
-				warn "#{self.class} secret is #{secret.inspect}, generating transient secret key!" if $VERBOSE
+				raise ArgumentError, "invalid session secret: #{secret.inspect}"
 			end
 			
 			# This generates a 32-byte key suitable for aes.

data/lib/utopia/setup.rb

@@ -21,93 +21,134 @@
 # THE SOFTWARE.
 
 require 'yaml'
+require 'securerandom'
+
+require 'variant'
+
+require_relative 'logger'
 
 module Utopia
 	# Used for setting up a Utopia web application, typically via `config/environment.rb`
 	class Setup
-		def initialize(config_root, external_encoding: Encoding::UTF_8)
-			@config_root = config_root
-			
-			@external_encoding = external_encoding
+		def initialize(root, *arguments, **options)
+			@root = root
 			
-			@environment = nil
+			super(*arguments, **options)
 		end
 		
-		attr :config_root
-		attr :external_encoding
-		attr :environment
+		attr :root
 		
-		ENVIRONMENT_KEY = 'UTOPIA_ENV'.freeze
-		DEFAULT_ENVIRONMENT = 'environment'.freeze
-		
-		def explicit_environment_name
-			ENV[ENVIRONMENT_KEY]
+		def config_root
+			File.expand_path("config", @root)
 		end
 		
 		def site_root
-			File.dirname(@config_root)
+			@root
+		end
+		
+		def production?
+			Variant.for(:utopia) == :production
+		end
+		
+		def staging?
+			Variant.for(:utopia) == :staging
+		end
+		
+		def development?
+			Variant.for(:utopia) == :development
+		end
+		
+		def testing?
+			Variant.for(:utopia) == :testing
 		end
 		
-		def apply
-			set_external_encoding
+		def secret_for(key)
+			secret = ENV["UTOPIA_#{key.upcase}_SECRET"]
 			
-			apply_environment
+			if secret.nil? || secret.empty?
+				secret = SecureRandom.hex(32)
+				
+				Utopia.logger.warn(self) do
+					"Generating transient #{key} secret: #{secret.inspect}"
+				end
+			end
 			
+			return secret
+		end
+		
+		def apply!
 			add_load_path('lib')
 			
+			apply_environment
+			
 			require_relative '../utopia'
 		end
 		
+		private
+		
 		def apply_environment
-			if name = explicit_environment_name
-				load_environment(name)
-			else
-				load_environment(DEFAULT_ENVIRONMENT)
-			end
+			# First try to load `config/environment.yaml` if it exists:
+			load_environment(:environment)
+			
+			# NOTE: loading the environment above MAY set `VARIANT`. So, it's important to look up the variant AFTER loading that environment.
+			
+			# Then, try to load the variant specific environment:
+			variant = Variant.for(:utopia)
+			load_environment(variant)
 		end
 		
-		def environment_path(name, root = @config_root)
-			File.expand_path("#{name}.yaml", root)
+		# Add the given path to $LOAD_PATH. If it's relative, make it absolute relative to `site_path`.
+		def add_load_path(path)
+			# Allow loading library code from lib directory:
+			$LOAD_PATH << File.expand_path(path, site_root)
 		end
 		
-		# If you don't specify these, it's possible to have issues when encodings mismatch on the server.
-		def set_external_encoding(encoding = Encoding::UTF_8)
-			# TODO: Deprecate and remove this setup - it should be the responsibility of the server to set this correctly.
-			if Encoding.default_external != encoding
-				warn "Updating Encoding.default_external from #{Encoding.default_external} to #{encoding}" if $VERBOSE
-				Encoding.default_external = encoding
-			end
+		def environment_path(variant)
+			File.expand_path("config/#{variant}.yaml", @root)
 		end
 		
 		# Load the named configuration file from the `config_root` directory.
-		def load_environment(*args)
-			path = environment_path(*args)
+		def load_environment(variant)
+			path = environment_path(variant)
 			
 			if File.exist?(path)
+				Utopia.logger.debug(self) {"Loading environment at path: #{path.inspect}"}
+				
 				# Load the YAML environment file:
-				@environment = YAML.load_file(path)
+				environment = YAML.load_file(path)
 				
 				# We update ENV but only when it's not already set to something:
-				ENV.update(@environment) do |name, old_value, new_value|
+				ENV.update(environment) do |name, old_value, new_value|
 					old_value || new_value
 				end
+				
+				return true
+			else
+				Utopia.logger.debug(self) {"Ignoring environment at path: #{path.inspect} (file not found)"}
+				
+				return false
 			end
 		end
-		
-		# Add the given path to $LOAD_PATH. If it's relative, make it absolute relative to `site_path`.
-		def add_load_path(path)
-			# Allow loading library code from lib directory:
-			$LOAD_PATH << File.expand_path(path, site_root)
-		end
 	end
 	
-	# The main entry point for `config/environment.rb` for setting up the site.
-	def self.setup(config_root = nil, **options)
-		# We extract the directory of the caller to get the path to $root/config
-		if config_root.nil?
+	@setup = nil
+	
+	# You can call this method exactly once per process.
+	def self.setup(root = nil, **options)
+		if @setup
+			raise RuntimeError, "Utopia already setup!"
+		end
+		
+		# We extract the root from the caller of this method:
+		if root.nil?
 			config_root = File.dirname(caller[0])
+			root = File.dirname(config_root)
 		end
 		
-		Setup.new(config_root, **options).tap(&:apply)
+		@setup = Setup.new(root, **options)
+		
+		@setup.apply!
+		
+		return @setup
 	end
 end

data/lib/utopia/shell.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Copyright, 2020, 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.
+
+require 'rack/builder'
+require 'rack/test'
+require 'irb'
+
+module Utopia
+	# This is designed to be used with the corresponding bake task.
+	class Shell
+		include Rack::Test::Methods
+		
+		def initialize(context)
+			@context = context
+			@app = nil
+		end
+		
+		def app
+			@app ||= Rack::Builder.parse_file(
+				File.expand_path('config.ru', @context.root)
+			).first
+		end
+		
+		def to_s
+			self.class.name
+		end
+		
+		def binding
+			super
+		end
+	end
+end

data/lib/utopia/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "2.12.4"
+	VERSION = "2.13.0"
 end

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

@@ -63,10 +63,12 @@ Dir.chdir(GIT_WORK_TREE) do
 	sudo %W{git submodule update -i}
 	
 	if File.exist? 'Gemfile'
-		sudo %W{bundle install --jobs=4 --retry=2}
+		sudo %W{bundle install}
 	end
 	
-	if File.exist? 'Rakefile'
+	if File.exist? 'bake.rb'
+		sudo %W{bundle exec bake deploy restart}
+	elsif File.exist? 'Rakefile'
 		sudo %W{bundle exec rake deploy restart}
 	end
 end

data/setup/site/Gemfile

@@ -7,17 +7,16 @@ gem 'utopia', '~> $UTOPIA_VERSION'
 # gem 'utopia-analytics'
 
 gem 'rake'
+gem 'bake'
+gem 'variant'
 gem 'bundler'
 
-gem 'rack-freeze', '~> 1.2'
 gem 'rack-test'
 
 group :development do
-	# For `rake server`:
 	gem 'guard-falcon', require: false
 	gem 'guard-rspec', require: false
 	
-	# For `rspec` testing:
 	gem 'rspec'
 	gem 'covered'
 	

data/setup/site/bake.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Prepare the application for start/restart.
+def deploy
+	# This task is typiclly run after the site is updated but before the server is restarted.
+end
+
+# Restart the application server.
+def restart
+	call 'falcon:supervisor:restart'
+end
+
+# Start the development server.
+def default
+	call 'utopia:development'
+end

data/setup/site/config.ru

@@ -3,26 +3,28 @@
 
 require_relative 'config/environment'
 
-require 'rack/freeze'
+self.freeze_app
 
-if RACK_ENV == :production
+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 RACK_ENV == :test
+	use Rack::ShowExceptions unless UTOPIA.testing?
 end
 
 use Utopia::Static, root: 'public'
 
-use Utopia::Redirection::Rewrite,
+use Utopia::Redirection::Rewrite, {
 	'/' => '/welcome/index'
+}
 
 use Utopia::Redirection::DirectoryIndex
 
-use Utopia::Redirection::Errors,
+use Utopia::Redirection::Errors, {
 	404 => '/errors/file-not-found'
+}
 
 require 'utopia/localization'
 use Utopia::Localization,
@@ -32,7 +34,7 @@ use Utopia::Localization,
 require 'utopia/session'
 use Utopia::Session,
 	expires_after: 3600 * 24,
-	secret: ENV['UTOPIA_SESSION_SECRET'],
+	secret: UTOPIA.secret_for(:session),
 	secure: true
 
 use Utopia::Controller

data/setup/site/config/environment.rb

@@ -4,6 +4,4 @@ require 'bundler/setup'
 Bundler.setup
 
 require 'utopia/setup'
-Utopia.setup
-
-RACK_ENV = ENV.fetch('RACK_ENV', :development).to_sym unless defined? RACK_ENV
+UTOPIA ||= Utopia.setup

data/setup/site/pages/welcome/index.xnode

@@ -11,7 +11,7 @@
 		<div>
 			<i class="fa fa-cubes"></i>
 			<h2>Modular code and structure</h2>
-			<p>Utopia provides independently useful <a href="https://github.com/rack/rack">Rack</a> middleware and has been designed with simplicify in mind. Several fully-featured webapps and a ton of commercial websites have guided the development of the Utopia stack. It is capable of handling a diverse range of requirements.</p>
+			<p>Utopia provides independently useful <a href="https://github.com/rack/rack">Rack</a> middleware and has been designed with simplicity in mind. Several fully-featured webapps and a ton of commercial websites have guided the development of the Utopia stack. It is capable of handling a diverse range of requirements.</p>
 		</div>
 		
 		<div>

data/setup/site/spec/spec_helper.rb

@@ -2,7 +2,9 @@
 
 require 'bundler/setup'
 require 'covered/rspec'
-require 'utopia'
+require 'variant'
+
+Variant.force!(:testing)
 
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure

data/setup/site/spec/website_spec.rb

@@ -12,9 +12,9 @@ RSpec.describe "website", timeout: 120 do
 	it "should be responsive" do
 		Async::HTTP::Client.open(endpoint, connection_limit: 8) do |client|
 			spider.fetch(statistics, client, endpoint.url) do |method, uri, response|
-				#if response.failure?
+				if response.failure?
 					Async.logger.error{"#{method} #{uri} -> #{response.status}"}
-				#end
+				end
 			end.wait
 		end
 		

data/spec/utopia/command_spec.rb

@@ -87,10 +87,10 @@ RSpec.describe "utopia command" do
 			result = sh_status(utopia, "--in", dir, "site", "create")
 			expect(result).to be == 0
 			
-			expect(Dir.entries(dir)).to include(".yarnrc", ".git", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "config.ru", "lib", "pages", "public", "spec")
+			expect(Dir.entries(dir)).to include(".yarnrc", ".git", "Gemfile", "Gemfile.lock", "README.md", "bake.rb", "config.ru", "lib", "pages", "public", "spec")
 			
 			Dir.chdir(dir) do
-				result = sh_status("rake", "test")
+				result = sh_status("bundle", "exec", "bake", "utopia:test")
 				expect(result).to be == 0
 			end
 		end
@@ -113,7 +113,7 @@ RSpec.describe "utopia command" do
 			end
 			
 			environment = YAML.load_file(File.join(dir, 'config/environment.yaml'))
-			expect(environment).to include('RACK_ENV', 'UTOPIA_SESSION_SECRET')
+			expect(environment).to include('VARIANT', 'UTOPIA_SESSION_SECRET')
 		end
 	end
 	
@@ -161,7 +161,7 @@ RSpec.describe "utopia command" do
 				expect(result).to be == 0
 			end
 			
-			files = %W[.yarnrc .git Gemfile Gemfile.lock README.md Rakefile config.ru lib pages public]
+			files = %W[.yarnrc .git Gemfile Gemfile.lock README.md bake.rb config.ru lib pages public]
 			
 			expect(Dir.entries(server_path)).to include(*files)
 			

data/spec/utopia/content/tags_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Utopia::Content::Tags do
 	describe '<utopia:environment>' do
 		let(:node) do
 			MockNode.new('utopia' => subject) do |document, state|
-				document.tag("utopia:environment", only: 'test') do
+				document.tag("utopia:environment", only: 'testing') do
 					document.text("Hello World")
 				end
 				
@@ -42,7 +42,7 @@ RSpec.describe Utopia::Content::Tags do
 		end
 		
 		it "it should render correct content for test" do
-			document[:environment] = "test"
+			document[:variant] = "testing"
 			
 			result = document.render_node(node)
 			
@@ -50,7 +50,7 @@ RSpec.describe Utopia::Content::Tags do
 		end
 		
 		it "it should render correct content for production" do
-			document[:environment] = "production"
+			document[:variant] = "production"
 			
 			result = document.render_node(node)
 			

data/spec/utopia/performance_spec/config.ru

@@ -4,17 +4,19 @@
 require 'utopia'
 require 'json'
 
-require 'rack/freeze'
+self.freeze_app
 
 use Utopia::ContentLength
 
-use Utopia::Redirection::Rewrite,
+use Utopia::Redirection::Rewrite, {
 	'/' => '/welcome/index'
+}
 
 use Utopia::Redirection::DirectoryIndex
 
-use Utopia::Redirection::Errors,
+use Utopia::Redirection::Errors, {
 	404 => '/errors/file-not-found'
+}
 
 # use Utopia::Localization,
 # 	:default_locale => 'en',

data/spec/utopia/redirection_spec.ru

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-use Utopia::Redirection::Rewrite, "/" => "/welcome/index"
+use Utopia::Redirection::Rewrite, {"/" => "/welcome/index"}
 
 use Utopia::Redirection::DirectoryIndex
 
-use Utopia::Redirection::Errors,
+use Utopia::Redirection::Errors, {
 	404 => '/error',
 	418 => '/teapot'
+}
 
 use Utopia::Redirection::Moved, "/a", "/b"
 use Utopia::Redirection::Moved, "/hierarchy/", "/hierarchy", flatten: true

data/spec/utopia/setup_spec.rb

@@ -26,25 +26,31 @@ RSpec.describe Utopia::Setup do
 	let(:config_root) {File.expand_path('setup_spec/config', __dir__)}
 	subject{Utopia::Setup.new(config_root)}
 	
+	let(:environment) {Variant::Environment.instance}
+	
 	it "should load specified environment" do
-		stub_const("Utopia::Setup::ENV", {'UTOPIA_ENV' => 'production'})
-		
-		expect(subject).to receive(:load_environment).with('production')
-		
-		subject.apply_environment
+		environment.with({'VARIANT' => 'production'}) do
+			expect(subject).to receive(:load_environment).with(:environment).ordered
+			expect(subject).to receive(:load_environment).with(:production).ordered
+			subject.send(:apply_environment)
+		end
 	end
 	
 	it "should load default environment" do
-		stub_const("Utopia::Setup::ENV", {})
-		
-		expect(subject).to receive(:load_environment).with('environment')
+		environment.with({}) do
+			stub_const("ENV", {})
+			expect(subject).to receive(:load_environment).with(:environment).ordered
+			expect(subject).to receive(:load_environment).with(:development).ordered
+		end
 		
-		subject.apply_environment
+		subject.send(:apply_environment)
 	end
 	
 	it "should add load path" do
-		subject.add_load_path('lib')
+		expect($LOAD_PATH).to receive(:<<).with(
+			File.expand_path('lib', subject.site_root)
+		)
 		
-		expect($LOAD_PATH).to include(File.expand_path('lib', subject.site_root))
+		subject.send(:add_load_path, 'lib')
 	end
 end

data/utopia.gemspec

@@ -29,8 +29,9 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency 'samovar', '~> 2.1'
 	spec.add_dependency 'console', '~> 1.0'
+	spec.add_dependency 'variant', '~> 0.1'
 	
-	spec.add_dependency 'rack', '~> 2.0'
+	spec.add_dependency 'rack', '~> 2.2'
 	
 	spec.add_dependency 'http-accept', '~> 2.1'
 	
@@ -38,6 +39,8 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency 'concurrent-ruby', '~> 1.0'
 	
+	spec.add_development_dependency 'bake'
+	
 	spec.add_development_dependency 'falcon'
 	spec.add_development_dependency 'async-rspec'
 	spec.add_development_dependency 'async-websocket'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.12.4
+  version: 2.13.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -80,20 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: variant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: http-accept
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: falcon
   requirement: !ruby/object:Gem::Requirement
@@ -253,11 +281,16 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- benchmarks/call_vs_check.rb
-- benchmarks/const_vs_hash.rb
-- benchmarks/hash_vs_openstruct.rb
-- benchmarks/string_vs_symbol.rb
-- benchmarks/struct_vs_class.rb
+- bake/utopia.rb
+- bake/utopia/shell.rb
+- bake/utopia/static.rb
+- bake/utopia/test.rb
+- bake/utopia/yarn.rb
+- benchmark/call_vs_check.rb
+- benchmark/const_vs_hash.rb
+- benchmark/hash_vs_openstruct.rb
+- benchmark/string_vs_symbol.rb
+- benchmark/struct_vs_class.rb
 - bin/utopia
 - docs/.nojekyll
 - docs/_components/jquery-syntax/base/jquery.syntax.brush.apache.css
@@ -628,6 +661,7 @@ files:
 - lib/utopia/session/lazy_hash.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/mime_types.rb
@@ -641,7 +675,7 @@ files:
 - setup/site/Gemfile
 - setup/site/Guardfile
 - setup/site/README.md
-- setup/site/Rakefile
+- setup/site/bake.rb
 - setup/site/config.ru
 - setup/site/config/README.md
 - setup/site/config/environment.rb
@@ -661,12 +695,6 @@ files:
 - setup/site/spec/spec_helper.rb
 - setup/site/spec/website_context.rb
 - setup/site/spec/website_spec.rb
-- setup/site/tasks/deploy.rake
-- setup/site/tasks/development.rake
-- setup/site/tasks/environment.rake
-- setup/site/tasks/log.rake
-- setup/site/tasks/static.rake
-- setup/site/tasks/yarn.rake
 - spec/mock_node.rb
 - spec/spec_helper.rb
 - spec/utopia/command_spec.rb

data/setup/site/Rakefile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'pathname'
-SITE_ROOT = Pathname.new(__dir__).realpath
-
-# Load all rake tasks:
-import(*Dir.glob('tasks/**/*.rake'))
-
-task :default => :development

data/setup/site/tasks/deploy.rake

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-desc 'Run by git post-update hook when deployed to a web server'
-task :deploy do
-	# This task is typiclly run after the site is updated but before the server is restarted.
-end
-
-desc 'Restart the application server'
-task :restart do
-	if falcon = `which falcon`.chomp! and File.exist?("supervisor.ipc")
-		sh(falcon, 'supervisor', 'restart')
-	end
-end

data/setup/site/tasks/development.rake

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:test)
-
-task :coverage do
-	ENV['COVERAGE'] = 'PartialSummary'
-end
-
-desc 'Start the development server.'
-task :server => :environment do
-	exec('guard', '-g', 'development')
-end
-
-desc 'Start the development environment which includes web server and tests.'
-task :development => :environment do
-	exec('guard', '-g', 'development,test')
-end
-
-desc 'Start an interactive console for your web application'
-task :console => :environment do
-	require 'irb'
-	require 'rack/test'
-	
-	include Rack::Test::Methods
-	
-	def app
-		@app ||= Rack::Builder.parse_file(SITE_ROOT + 'config.ru').first
-	end
-	
-	IRB.start
-end

data/setup/site/tasks/environment.rake

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-desc 'Set up the environment for running your web application'
-task :environment => :log do |task|
-	require SITE_ROOT + 'config/environment'
-	
-	# We ensure this is part of the shell environment so if other commands are invoked they will work correctly.
-	ENV['RACK_ENV'] = RACK_ENV.to_s if defined?(RACK_ENV)
-	ENV['DATABASE_ENV'] = DATABASE_ENV.to_s if defined?(DATABASE_ENV)
-	
-	# This generates a consistent session secret if one was not already provided:
-	if ENV['UTOPIA_SESSION_SECRET'].nil?
-		require 'securerandom'
-		
-		Utopia.logger.warn 'Generating transient session key for development...'
-		ENV['UTOPIA_SESSION_SECRET'] = SecureRandom.hex(32)
-	end
-end

data/setup/site/tasks/log.rake

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-task :log do
-	require 'utopia/logger'
-	
-	# This is deprecated, prefer to use `Utopia.logger` or `Async.logger`:
-	LOGGER = Utopia.logger
-end
-
-namespace :log do
-	desc "Increase verbosity of logger to info."
-	task :info => :log do
-		Utopia.logger.info!
-	end
-
-	desc "Increase verbosity of global debug."
-	task :debug => :log do
-		Utopia.logger.debug!
-	end
-end

data/setup/site/tasks/static.rake

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-namespace :static do
-	task :static_environment do
-		RACK_ENV ||= :static
-		DATABASE_ENV ||= :production
-		SERVER_PORT ||= 9291
-	end
-
-	desc "Generate a static copy of the site."
-	task :generate => [:static_environment, :environment] do
-		require 'falcon/server'
-		require 'async/io'
-		require 'async/container'
-		
-		config_path = SITE_ROOT + 'config.ru'
-		container_class = Async::Container::Threaded
-		
-		app, options = Rack::Builder.parse_file(config_path.to_s)
-		
-		container = container_class.new(concurrency: 2) do
-			server = Falcon::Server.new(app, [
-				Async::IO::Endpoint.parse("tcp://localhost:#{SERVER_PORT}", reuse_port: true)
-			])
-			
-			server.run
-		end
-		
-		output_path = ENV.fetch('OUTPUT_PATH') {SITE_ROOT + 'static'}
-		
-		# Delete any existing stuff:
-		FileUtils.rm_rf(output_path)
-		
-		# Copy all public assets:
-		Dir.glob(SITE_ROOT + 'public/*').each do |path|
-			FileUtils.cp_r(path, output_path)
-		end
-		
-		# Generate HTML pages:
-		system("wget", "--mirror", "--recursive", "--continue", "--convert-links", "--adjust-extension", "--no-host-directories", "--directory-prefix", output_path.to_s, "http://localhost:#{SERVER_PORT}")
-		
-		container.stop
-	end
-end

data/setup/site/tasks/yarn.rake

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-namespace :yarn do
-	desc 'Load the .bowerrc file and setup the environment for other tasks.'
-	task :environment do
-		@yarn_package_root = SITE_ROOT + "lib/components"
-		@yarn_install_root = SITE_ROOT + "public/_components"
-	end
-	
-	desc 'Update the bower packages and link into the public directory.'
-	task :update => :environment do
-		require 'fileutils'
-		require 'utopia/path'
-		
-		@yarn_package_root.children.select(&:directory?).collect(&:basename).each do |package_directory|
-			install_path = @yarn_install_root + package_directory
-			package_path = @yarn_package_root + package_directory
-			dist_path = package_path + 'dist'
-			
-			FileUtils::Verbose.rm_rf install_path
-			FileUtils::Verbose.mkpath(install_path.dirname)
-			
-			# If a package has a dist directory, we only symlink that... otherwise we have to do the entire package, and hope that bower's ignore was setup correctly:
-			if File.exist? dist_path
-				link_path = Utopia::Path.shortest_path(dist_path, install_path)
-			else
-				link_path = Utopia::Path.shortest_path(package_path, install_path)
-			end
-			
-			FileUtils::Verbose.cp_r File.expand_path(link_path, install_path), install_path
-		end
-	end
-end