utopia 2.18.3 → 2.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f996bae57d16bd9ab485b96680ad4896673ec871127c2d313e72f4466f46a9c
-  data.tar.gz: b5841b727a69814fa3fc0b58b649de6a23aa10109fa376c6ef55a66e499c480c
+  metadata.gz: df0d36fb6627871090306a7049fcbd487139fa7e30c861c6c2abf270a3ad07ec
+  data.tar.gz: d6b3592a95d1652a9069d5841a5aa9ff7bf43d73c1a171b9be212602f888989c
 SHA512:
-  metadata.gz: 742e356fd94839d94068c67b6857f8ee8e8ee0f6912eb29bf08f6c4042aa2962ab3b6d3c2cdaca7d7820fb554938cda80f40ac37600c65f678799966c7fe66f1
-  data.tar.gz: 8b7612f9a4090f796c340901295e13beaa41b380354eb428d0321e5a25687b509b1e536dee03dede5c8776a3284f58627089abf2b79ef4fbfcf47428673792f8
+  metadata.gz: 00e3a8f9df669e72d419c490fd86f255981a3e05ab05a0f740d468e306494879c4e78449332b0c88151a64e2296a0968e117b8965e556c6225ec95f5795cd261
+  data.tar.gz: 9764e94964545f5b8bdd6f99763872d0391d71eef1327e3121c045e555f2a1b3821641640037d6d77c934f2f5145b9aa40e515096a9694d7c3698aa7044b45b5

data/bake/utopia/node.rb

@@ -15,9 +15,11 @@ def update
 	
 	install_root = root + "public/_components"
 	
-	package_root.children.select(&:directory?).collect(&:basename).each do |package_directory|
+	package_paths = expand_package_paths(package_root)
+	
+	package_paths.each do |package_path|
+		package_directory = package_path.relative_path_from(package_root)
 		install_path = install_root + package_directory
-		package_path = package_root + package_directory
 		
 		dist_path = package_path + 'dist'
 		
@@ -34,3 +36,21 @@ def update
 		FileUtils::Verbose.cp_r File.expand_path(link_path, install_path), install_path
 	end
 end
+
+private
+
+def expand_package_paths(root, into = [])
+	paths = root.children.select(&:directory?)
+	
+	paths.each do |path|
+		basename = path.basename.to_s
+		# Handle organisation sub-directories which start with an '@' symbol:
+		if basename.start_with?('@')
+			expand_package_paths(path, into)
+		else
+			into << path
+		end
+	end
+	
+	return into
+end

data/lib/utopia/command/site.rb

@@ -110,10 +110,10 @@ module Utopia
 					puts "make your life easier and more enjoyable.".center(78)
 					puts ""
 					puts "To start the development server, run:".center(78)
-					puts "rake server".center(78)
+					puts "bake utopia:development".center(78)
 					puts ""
 					puts "For extreme productivity, please consult the online documentation".center(78)
-					puts "https://github.com/ioquatix/utopia".center(78)
+					puts "https://github.com/socketry/utopia".center(78)
 					puts " ~ Samuel.  ".rjust(78)
 				end
 			end

data/lib/utopia/content/link.rb

@@ -50,6 +50,12 @@ module Utopia
 				end
 			end
 			
+			def full_path(root, extension = XNODE_EXTENSION)
+				if @path&.file?
+					File.join(root, @path.dirname, self.key + XNODE_EXTENSION)
+				end
+			end
+			
 			def href
 				@href ||= @info.fetch(:uri) do
 					@info.fetch(:href) do
@@ -96,17 +102,17 @@ module Utopia
 			def to_anchor(base: nil, content: self.title, builder: nil, **attributes)
 				attributes[:class] ||= 'link'
 				
-				Trenni::Builder.fragment(builder) do |builder|
+				Trenni::Builder.fragment(builder) do |inner_builder|
 					if href?
 						attributes[:href] ||= relative_href(base)
 						attributes[:target] ||= @info[:target]
 						
-						builder.inline('a', attributes) do
-							builder.text(content)
+						inner_builder.inline('a', attributes) do
+							inner_builder.text(content)
 						end
 					else
-						builder.inline('span', attributes) do
-							builder.text(content)
+						inner_builder.inline('span', attributes) do
+							inner_builder.text(content)
 						end
 					end
 				end

data/lib/utopia/content/links.rb

@@ -142,8 +142,10 @@ module Utopia
 			def load_metadata(path)
 				yaml_path = File.join(path, LINKS_YAML)
 				
-				if File.exist?(yaml_path) && data = YAML.load_file(yaml_path)
-					return symbolize_keys(data)
+				if File.exist?(yaml_path)
+					if data = YAML.safe_load(File.read(yaml_path), permitted_classes: [Date, Time])
+						return symbolize_keys(data)
+					end
 				else
 					return {}
 				end

data/lib/utopia/content.rb

@@ -92,7 +92,7 @@ module Utopia
 			end
 		end
 		
-		# @param path [Path] the request_path is an absolute uri path, e.g. `/foo/bar`. If an xnode file exists on disk for this exact path, it is instantiated, otherwise nil.
+		# @param path [Path] the request path is an absolute uri path, e.g. `/foo/bar`. If an xnode file exists on disk for this exact path, it is instantiated, otherwise nil.
 		def lookup_node(path, locale = nil)
 			resolve_link(
 				@links.for(path, locale)
@@ -100,11 +100,9 @@ module Utopia
 		end
 		
 		def resolve_link(link)
-			if path = link&.path
-				full_path = File.join(@root, path.dirname, link.key + XNODE_EXTENSION)
-				
+			if full_path = link&.full_path(@root)
 				if File.exist?(full_path)
-					return Node.new(self, path, path, full_path)
+					return Node.new(self, link.path, link.path, full_path)
 				end
 			end
 		end

data/lib/utopia/controller/actions.md

@@ -73,4 +73,4 @@ otherwise do |request, path|
 end
 ```
 
-If you are doing this to perform some kind of rewriting, it may be preferable to use the [Rewrite](../rewrite/) controller layer.
+If you are doing this to perform some kind of rewriting, it may be preferable to use the [Rewrite](../Rewrite/) controller layer.

data/lib/utopia/controller/base.rb

@@ -65,19 +65,17 @@ module Utopia
 				"\#<#{self.class}#{details.join}>"
 			end
 			
-			class << self
-				def freeze
-					# This ensures that all class variables are frozen.
-					self.instance_variables.each do |name|
-						self.instance_variable_get(name).freeze
-					end
-					
-					super
+			def self.freeze
+				# This ensures that all class variables are frozen.
+				self.instance_variables.each do |name|
+					self.instance_variable_get(name).freeze
 				end
 				
-				def direct?(path)
-					path.dirname == uri_path
-				end
+				super
+			end
+			
+			def self.direct?(path)
+				path.dirname == uri_path
 			end
 			
 			def catch_response

data/lib/utopia/path.rb

@@ -136,6 +136,10 @@ module Utopia
 			return @components.last == ''
 		end
 		
+		def file?
+			return @components.last != ''
+		end
+		
 		def to_directory
 			if directory?
 				return self
@@ -259,6 +263,8 @@ module Utopia
 			end
 		end
 		
+		alias last? file?
+		
 		# Pops the last path component.
 		def pop
 			# We don't want to convert an absolute path to a relative path.

data/lib/utopia/version.rb

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

data/setup/site/README.md

@@ -6,11 +6,11 @@ Welcome to Utopia, a Ruby framework for web site and application development. Fo
 
 To start the development server, simply execute
 
-	> rake
+	> bake
 	Generating transient session key for development...
 	20:57:36 - INFO - Starting Falcon HTTP server on localhost:9292
 	20:57:36 - INFO - Guard::RSpec is running
 	20:57:36 - INFO - Guard is now watching at '...'
 	[1] guard(main)>
 
-Then browse http://localhost:9292 (or as specified) to see your new site.
+Then browse https://localhost:9292 (or as specified) to see your new site.

data/setup/site/config.ru

@@ -14,6 +14,7 @@ else
 	use Rack::ShowExceptions unless UTOPIA.testing?
 end
 
+# serve static files from public/
 use Utopia::Static, root: 'public'
 
 use Utopia::Redirection::Rewrite, {
@@ -39,6 +40,7 @@ use Utopia::Session,
 
 use Utopia::Controller
 
+# serve static files from pages/
 use Utopia::Static
 
 # Serve dynamic content

data/setup/site/gems.rb

@@ -14,6 +14,7 @@ gem 'rake'
 gem 'bake'
 gem 'bundler'
 gem 'rack-test'
+gem 'net-smtp'
 
 group :development do
 	gem 'guard-falcon', require: false

data/setup/site/pages/_page.xnode

@@ -14,7 +14,7 @@
 		
 		<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
 		
-		<link rel="icon" type="image/png" href="/_static/icon.png" />
+		<link rel="icon" type="image/png" href="/_static/icon.svg" />
 		<link rel="stylesheet" href="/_static/site.css" type="text/css" media="screen" />
 	</head>
 

data/setup/site/public/_static/icon.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="100%" height="100%" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:square;stroke-miterlimit:1.5;">
+    <g transform="matrix(0.922789,0,0,0.922789,16.591,0.837867)">
+        <path d="M120.731,31.594L212.702,84.694L212.702,190.893L120.731,243.993L28.759,190.893L28.759,84.694L120.731,31.594Z" style="fill:none;"/>
+        <clipPath id="_clip1">
+            <path d="M120.731,31.594L212.702,84.694L212.702,190.893L120.731,243.993L28.759,190.893L28.759,84.694L120.731,31.594Z"/>
+        </clipPath>
+        <g clip-path="url(#_clip1)">
+            <g transform="matrix(18.3943,0,0,10.62,-1929.57,-966.601)">
+                <g transform="matrix(1,0,0,0.178571,106.463,93.9922)">
+                    <rect x="0" y="0" width="10" height="56" style="fill:#f79433;"/>
+                </g>
+                <g transform="matrix(1,0,0,0.416667,106.463,80.6588)">
+                    <rect x="0" y="56" width="10" height="24" style="fill:#4e8dd8;"/>
+                </g>
+            </g>
+        </g>
+        <path d="M120.731,31.594L212.702,84.694L212.702,190.893L120.731,243.993L28.759,190.893L28.759,84.694L120.731,31.594Z" style="fill:none;stroke:black;stroke-width:26.01px;"/>
+    </g>
+</svg>

data/setup/site/public/_static/utopia-background.svg

@@ -1 +1,11 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 10 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><rect x="0" y="0" width="10" height="56" style="fill:#f79433;"/><rect x="0" y="56" width="10" height="24" style="fill:#4e8dd8;"/></svg>
+<?xml version="1.0" standalone="no"?>
+<svg 
+	width="100%" height="100%" 
+	viewBox="0 0 10 80"
+	preserveAspectRatio="none"
+	version="1.1"
+	xmlns="http://www.w3.org/2000/svg"
+	xmlns:xlink= "http://www.w3.org/1999/xlink">
+	<rect x="0" y="0" width="10" height="56" style="fill:#f79433;"/>
+	<rect x="0" y="56" width="10" height="24" style="fill:#4e8dd8;"/>
+</svg>

data/setup/site/public/_static/utopia.svg

@@ -1 +1,19 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 420 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><rect x="0" y="0" width="420" height="56" style="fill:#f79433;"/><rect x="0" y="56" width="420" height="24" style="fill:#4e8dd8;"/><g><path d="M75.145,70.819c2.37,-3.097 4.173,-6.921 5.111,-11.365c0.91,-4.318 1.498,-9.261 1.498,-14.692l0,-44.762l-62.754,0l0,44.762c0,2.628 0.244,5.333 0.407,8.035c0.168,2.782 0.674,5.515 1.345,8.118c0.68,2.644 1.739,5.173 3.067,7.517c1.363,2.405 3.263,4.526 5.609,6.303c2.319,1.755 5.245,3.163 8.677,4.172c1.617,0.478 3.416,1.093 5.354,1.093l13.856,0c3.071,0 5.797,-1.058 8.131,-2.001c4.042,-1.631 7.305,-4.049 9.699,-7.18Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M151.481,18.701l0,-18.701l-62.754,-0.022l0,18.723l22.246,0l0.02,61.299l17.93,0l-0.02,-61.299l22.578,0Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M229.926,39.999c0,-22.051 -16.979,-39.992 -37.852,-39.992c-20.872,0 -37.851,17.942 -37.851,39.992c0,22.054 16.979,39.994 37.851,39.994c20.873,0 37.852,-17.94 37.852,-39.994Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M269.238,50.909c9.717,0 17.181,-2.066 22.183,-6.395c5.087,-4.399 7.667,-10.942 7.667,-19.575c0,-3.257 -0.393,-5.962 -1.167,-8.476c-0.778,-2.528 -1.883,-4.934 -3.281,-6.814c-1.401,-1.882 -3.098,-3.458 -5.045,-4.703c-1.895,-1.21 -4.003,-2.198 -6.264,-2.943c-2.239,-0.737 -4.64,-1.263 -7.139,-1.56c-2.464,-0.292 -5.016,-0.443 -7.587,-0.443l-29.468,0l0,80l17.93,0l0,-29.091l12.171,0Z" style="fill:#fff;fill-rule:nonzero;"/><rect x="304.879" y="0" width="17.93" height="80" style="fill:#fff;"/><path d="M362.589,0l-29.477,80l75.888,0l-31.247,-80l-15.164,0Z" style="fill:#fff;fill-rule:nonzero;"/></g></g></svg>
+<?xml version="1.0" standalone="no"?>
+<svg 
+	width="100%" height="100%" 
+	viewBox="0 0 420 80"
+	preserveAspectRatio="none"
+	version="1.1"
+	xmlns="http://www.w3.org/2000/svg"
+	xmlns:xlink= "http://www.w3.org/1999/xlink">
+	<rect x="0" y="0" width="420" height="56" style="fill:#f79433;"/>
+	<rect x="0" y="56" width="420" height="24" style="fill:#4e8dd8;"/>
+	<g>
+		<path d="M75.145,70.819c2.37,-3.097 4.173,-6.921 5.111,-11.365c0.91,-4.318 1.498,-9.261 1.498,-14.692l0,-44.762l-62.754,0l0,44.762c0,2.628 0.244,5.333 0.407,8.035c0.168,2.782 0.674,5.515 1.345,8.118c0.68,2.644 1.739,5.173 3.067,7.517c1.363,2.405 3.263,4.526 5.609,6.303c2.319,1.755 5.245,3.163 8.677,4.172c1.617,0.478 3.416,1.093 5.354,1.093l13.856,0c3.071,0 5.797,-1.058 8.131,-2.001c4.042,-1.631 7.305,-4.049 9.699,-7.18Z" style="fill:#fff;fill-rule:nonzero;"/>
+		<path d="M151.481,18.701l0,-18.701l-62.754,-0.022l0,18.723l22.246,0l0.02,61.299l17.93,0l-0.02,-61.299l22.578,0Z" style="fill:#fff;fill-rule:nonzero;"/>
+		<path d="M229.926,39.999c0,-22.051 -16.979,-39.992 -37.852,-39.992c-20.872,0 -37.851,17.942 -37.851,39.992c0,22.054 16.979,39.994 37.851,39.994c20.873,0 37.852,-17.94 37.852,-39.994Z" style="fill:#fff;fill-rule:nonzero;"/>
+		<path d="M269.238,50.909c9.717,0 17.181,-2.066 22.183,-6.395c5.087,-4.399 7.667,-10.942 7.667,-19.575c0,-3.257 -0.393,-5.962 -1.167,-8.476c-0.778,-2.528 -1.883,-4.934 -3.281,-6.814c-1.401,-1.882 -3.098,-3.458 -5.045,-4.703c-1.895,-1.21 -4.003,-2.198 -6.264,-2.943c-2.239,-0.737 -4.64,-1.263 -7.139,-1.56c-2.464,-0.292 -5.016,-0.443 -7.587,-0.443l-29.468,0l0,80l17.93,0l0,-29.091l12.171,0Z" style="fill:#fff;fill-rule:nonzero;"/>
+		<path d="M362.589,0l-29.477,80l75.888,0l-31.247,-80l-15.164,0Z" style="fill:#fff;fill-rule:nonzero;"/>
+		<rect x="304.879" y="0" width="17.93" height="80" style="fill:#fff;"/>
+	</g>
+</svg>

data/setup/site/spec/website_context.rb

@@ -34,10 +34,10 @@ RSpec.shared_context "server" do
 		require 'benchmark/http/spider'
 	end
 	
-	let(:endpoint) {Async::HTTP::Endpoint.parse("http://localhost", Async::IO::Endpoint.unix("server.ipc"))}
-	
-	let!(:server_task) do
-		reactor.async do
+	before do
+		@endpoint = Async::HTTP::Endpoint.parse("http://localhost", Async::IO::Endpoint.unix("server.ipc"))
+		
+		@server_task = reactor.async do
 			middleware = Falcon::Server.middleware(app)
 			
 			server = Falcon::Server.new(middleware, endpoint)
@@ -47,6 +47,8 @@ RSpec.shared_context "server" do
 	end
 	
 	after do
-		server_task.stop
+		@server_task.stop
 	end
+	
+	let(:endpoint) {@endpoint}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.18.3
+  version: 2.19.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2021-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -325,7 +339,7 @@ files:
 - setup/site/pages/errors/file-not-found.xnode
 - setup/site/pages/links.yaml
 - setup/site/pages/welcome/index.xnode
-- setup/site/public/_static/icon.png
+- setup/site/public/_static/icon.svg
 - setup/site/public/_static/site.css
 - setup/site/public/_static/utopia-background.svg
 - setup/site/public/_static/utopia.svg
@@ -353,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.