utopia 2.18.4 → 2.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3b6e619bc7db476e12fb64c15765a84349a8aabc6ee8b2b4e46a8ea80936e4
-  data.tar.gz: 3fe0eeafcf89805747e888122545ac3ab73e0a87a61f6a157eb8c7a86a442135
+  metadata.gz: 526a3c6e7bb9c6d338f6b48e0a2967b9c0d5388206059904efd111600c9c9b37
+  data.tar.gz: dd9cb6a66793cd0d621cb6edc843480f0297ef594c2750bacc203c3649091fac
 SHA512:
-  metadata.gz: 1a3a7677b5ee5f54ceb5267614f46ca8791d6ac5db62db29485e9392cb993e4b6e39ab6be6a1bbbd9faa7182368612f3347cf4faa769e44ad00d35b9c2abe99b
-  data.tar.gz: 5f9b615c2fe980279cbc0a5516d0e69e7c94af88805dce6d1c5409b860b5fb2be29f575da05c21aa750056232ef95c0fb802a789cc6630b24ff3fcd8514d0d49
+  metadata.gz: 3ae7de79938757ecd86a84d35a56d1185955812ab41cc0e29d44a6604ef669bfadbc52f36390e1d19cf53acc7a1f375cf59d484627d899c8ed3bdf3bb78b9927
+  data.tar.gz: 9d193e4f88eb12f346371c738396b555b94315f9dcdd004d9395cff0229887f37ad6f22ee5c87d86a12aa9e65b9ecd174005348e495e14ffda76ad57b930e8c5

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.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/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/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.4"
+	VERSION = "2.18.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.18.4
+  version: 2.18.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -261,12 +261,15 @@ files:
 - bake/utopia/static.rb
 - bake/utopia/test.rb
 - bin/utopia
+- lib/.DS_Store
 - lib/utopia.rb
+- lib/utopia/.DS_Store
 - 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/.DS_Store
 - lib/utopia/content/document.rb
 - lib/utopia/content/link.rb
 - lib/utopia/content/links.rb
@@ -277,6 +280,7 @@ files:
 - lib/utopia/content/tags.rb
 - lib/utopia/content_length.rb
 - lib/utopia/controller.rb
+- lib/utopia/controller/.DS_Store
 - lib/utopia/controller/actions.md
 - lib/utopia/controller/actions.rb
 - lib/utopia/controller/base.rb
@@ -307,7 +311,10 @@ files:
 - lib/utopia/static/local_file.rb
 - lib/utopia/static/mime_types.rb
 - lib/utopia/version.rb
+- setup/.DS_Store
+- setup/server/.DS_Store
 - setup/server/git/hooks/post-receive
+- setup/site/.DS_Store
 - setup/site/.gitignore
 - setup/site/.rspec
 - setup/site/Guardfile
@@ -319,12 +326,14 @@ files:
 - setup/site/falcon.rb
 - setup/site/gems.rb
 - setup/site/lib/readme.txt
+- setup/site/pages/.DS_Store
 - setup/site/pages/_heading.xnode
 - setup/site/pages/_page.xnode
 - setup/site/pages/errors/exception.xnode
 - setup/site/pages/errors/file-not-found.xnode
 - setup/site/pages/links.yaml
 - setup/site/pages/welcome/index.xnode
+- setup/site/public/.DS_Store
 - setup/site/public/_static/icon.svg
 - setup/site/public/_static/site.css
 - setup/site/public/_static/utopia-background.svg
@@ -333,6 +342,7 @@ files:
 - setup/site/spec/spec_helper.rb
 - setup/site/spec/website_context.rb
 - setup/site/spec/website_spec.rb
+- setup/site/tmp/Gemfile
 homepage: https://github.com/ioquatix/utopia
 licenses:
 - MIT
@@ -353,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.