utopia 2.20.1 → 2.22.0

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.20.1
+  version: 2.22.0
 platform: ruby
 authors:
 - Samuel Williams
 - Huba Nagy
 - Michael Adams
 - Olle Jonsson
-- System Administrator
-- k1tsu
+- Pierre Montelle
 autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
-  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
-  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
-  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
-  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
-  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
-  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
-  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
-  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
-  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
-  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
-  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
-  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
-  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
-  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
-  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
-  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
-  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
-  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
-  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
-  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
-  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
-  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
-  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
-  HiLJ8VOFx6w=
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -49,14 +49,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: console
   requirement: !ruby/object:Gem::Requirement
@@ -145,16 +145,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: samovar
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: async-rspec
+  name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -226,7 +226,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: async-websocket
+  name: bake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -240,7 +240,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -254,7 +254,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -268,7 +268,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: falcon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -282,7 +282,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: falcon
+  name: sus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -296,37 +296,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sus-fixtures-async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 description:
 email:
-executables:
-- utopia
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - bake/utopia.rb
+- bake/utopia/environment.rb
 - bake/utopia/node.rb
+- bake/utopia/server.rb
 - bake/utopia/shell.rb
+- bake/utopia/site.rb
 - bake/utopia/static.rb
-- bake/utopia/test.rb
-- bin/utopia
 - lib/utopia.rb
-- lib/utopia/command.rb
-- lib/utopia/command/environment.rb
-- lib/utopia/command/server.rb
-- lib/utopia/command/site.rb
 - lib/utopia/content.rb
 - lib/utopia/content/document.rb
 - lib/utopia/content/link.rb
@@ -368,16 +364,18 @@ files:
 - lib/utopia/static/local_file.rb
 - lib/utopia/static/mime_types.rb
 - lib/utopia/version.rb
+- license.md
+- readme.md
 - setup/server/git/hooks/post-receive
 - setup/site/.gitignore
-- setup/site/.rspec
 - setup/site/Guardfile
-- setup/site/README.md
 - setup/site/bake.rb
 - setup/site/config.ru
-- setup/site/config/README.md
 - setup/site/config/environment.rb
+- setup/site/config/readme.md
+- setup/site/config/sus.rb
 - setup/site/falcon.rb
+- setup/site/fixtures/website.rb
 - setup/site/gems.rb
 - setup/site/lib/readme.txt
 - setup/site/pages/_heading.xnode
@@ -391,9 +389,8 @@ files:
 - setup/site/public/_static/utopia-background.svg
 - setup/site/public/_static/utopia.svg
 - setup/site/public/readme.txt
-- setup/site/spec/spec_helper.rb
-- setup/site/spec/website_context.rb
-- setup/site/spec/website_spec.rb
+- setup/site/readme.md
+- setup/site/test/website.rb
 homepage: https://github.com/ioquatix/utopia
 licenses:
 - MIT
@@ -407,14 +404,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.

data/bake/utopia/test.rb

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

data/bin/utopia

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright, 2015, 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_relative '../lib/utopia/command'
-
-Utopia::Command.call

data/lib/utopia/command/environment.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2016, 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 'securerandom'
-require 'yaml/store'
-require 'console'
-
-module Utopia
-	module Command
-		# Set environment variables within the server deployment.
-		class Environment < Samovar::Command
-			self.description = "Update environment variables in config/environment.yaml"
-			
-			options do
-				option '-e/--environment-name <name>', "The environment file to modify.", default: 'environment'
-				option '-d/--defaults', "Initialize any recommended defaults."
-			end
-			
-			many :variables, "A list of environment KEY=VALUE pairs to set."
-			
-			def self.defaults(destination_root)
-				# Set some useful defaults for the environment.
-				self["--environment-name", "testing", "--defaults"].call(destination_root)
-				self["--environment-name", "development", "--defaults"].call(destination_root)
-			end
-			
-			def environment_name
-				@options[:environment_name]
-			end
-			
-			# Setup `config/environment.yaml` according to specified options.
-			def update_environment(root, name = self.environment_name)
-				environment_path = File.join(root, "config", "#{name}.yaml")
-				FileUtils.mkpath File.dirname(environment_path)
-				
-				store = YAML::Store.new(environment_path)
-				
-				store.transaction do
-					yield store, name, environment_path
-				end
-			end
-			
-			def call(root = parent.root)
-				update_environment(root) do |store, name, path|
-					if @options[:defaults]
-						# Set some useful defaults for the environment.
-						store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
-					end
-					
-					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
-					
-					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
-		end
-	end
-end

data/lib/utopia/command/server.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2016, 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_relative 'site'
-
-require 'fileutils'
-
-require 'samovar'
-
-module Utopia
-	module Command
-		# Server setup commands.
-		class Server < Samovar::Command
-			# Create a server.
-			class Create < Samovar::Command
-				self.description = "Create a remote Utopia website suitable for deployment using git."
-				
-				def call
-					destination_root = parent.root
-					
-					FileUtils.mkdir_p File.join(destination_root, "public")
-					
-					Update[parent: parent].call
-					
-					# Print out helpful git remote add message:
-					hostname = `hostname`.chomp
-					puts "Now add the git remote to your local repository:\n\tgit remote add production ssh://#{hostname}#{destination_root}"
-					puts "Then push to it:\n\tgit push --set-upstream production master"
-				end
-			end
-			
-			# Update a server.
-			class Update < Samovar::Command
-				self.description = "Update the git hooks in an existing server repository."
-				
-				def template_root
-					# The root directory of the template server deployment:
-					File.join(SETUP_ROOT, 'server')
-				end
-				
-				def call
-					destination_root = parent.root
-					
-					Dir.chdir(destination_root) do
-						# 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") or fail "could not initialize repository"
-						
-						system("git", "config", "receive.denyCurrentBranch", "ignore") or fail "could not set configuration"
-						system("git", "config", "core.worktree", destination_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")
-						
-						# 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
-					end
-					
-					# Set some useful defaults for the environment.
-					environment = Environment[]
-					environment.update_environment(destination_root) do |store|
-						store['VARIANT'] ||= 'production'
-						store['UTOPIA_SESSION_SECRET'] ||= SecureRandom.hex(40)
-					end
-					
-					# Copy git hooks:
-					system("cp", "-r", File.join(template_root, 'git', 'hooks'), File.join(destination_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(destination_root, '.git')) or fail "could not update permissions of .git directory"
-				end
-			end
-			
-			self.description = "Manage server deployments."
-			
-			nested :command, {
-				'create' => Create,
-				'update' => Update
-			}
-			
-			def root
-				@parent.root
-			end
-			
-			def call
-				@command.call
-			end
-		end
-	end
-end