utopia 2.18.4 → 2.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3b6e619bc7db476e12fb64c15765a84349a8aabc6ee8b2b4e46a8ea80936e4
-  data.tar.gz: 3fe0eeafcf89805747e888122545ac3ab73e0a87a61f6a157eb8c7a86a442135
+  metadata.gz: afe16033d2147ab12f15fc57a7f22662691ef24fa5f9c2281ae661449e6cbef8
+  data.tar.gz: f1120652e3576dd04a33ee41c72532154566bfd257328bf324592c0e0dd3400a
 SHA512:
-  metadata.gz: 1a3a7677b5ee5f54ceb5267614f46ca8791d6ac5db62db29485e9392cb993e4b6e39ab6be6a1bbbd9faa7182368612f3347cf4faa769e44ad00d35b9c2abe99b
-  data.tar.gz: 5f9b615c2fe980279cbc0a5516d0e69e7c94af88805dce6d1c5409b860b5fb2be29f575da05c21aa750056232ef95c0fb802a789cc6630b24ff3fcd8514d0d49
+  metadata.gz: 1c10bac71475edee0ec72765c4f313a3ad3b78decd3b141c4b3dca90b137eba79982a894dda1961d83f9b747d1bdca62bf46161e877577e2aa01ebff984da271
+  data.tar.gz: e253761fc895fd0d4086a7febcdfeb50b060067df76f8f067b273f18ed0984511687745e0f408e76ea2a481683a3e0662944e0d71d09243d3aaa54b082ac24e6

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/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

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/static/mime_types.rb

@@ -52,7 +52,7 @@ module Utopia
 				["torrent", "application/x-bittorrent"]
 			],
 			:images => [
-				"png", "gif", "jpeg", "tiff", "svg"
+				"png", "gif", "jpeg", "tiff", "svg", "webp"
 			],
 			:default => [
 				:media, :text, :archive, :images, :fonts

data/lib/utopia/version.rb

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

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/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.4
+  version: 2.19.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-12-27 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
@@ -353,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.