utopia 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a73ea69813127b09be72632c42f1ce6a6a4e94678c823575125223ae19b520
-  data.tar.gz: 8c50126b47f9184bce9237dade14818cf70d959f0aae2fb34f8fb486a22a0d0d
+  metadata.gz: b209f640f2956c9d656cbac537793f828bb7dd398b9e7a2df41f3591aedd2aa6
+  data.tar.gz: 3d4ad85f0e311e7ec907e51bc837fad936658648f718986d2049c05b8e9391a3
 SHA512:
-  metadata.gz: 12bf144743c5b6cae0f147e60d37815c081025a86c6ac7c4146fbb392087819ddafa80c431579855ddd1e7b565fbc24a00902df3bc56222e6d218e48e5eade98
-  data.tar.gz: 76d0216724af21e389d71b6236ab36ebf5810f6365a536f000e6601d83c8df03a451a9e5eecc2cdcb045c8c1b206018a02a4762433e2e6b227a1508dd6df34f2
+  metadata.gz: 93c77c5abbef5ed5436b00220acdaeec1a774d23ea6e3418ebe0c29b5511b7da4439902bccbc264c4111ba5f5bb529e30e0215a93bc94cd6607f4ee89445ec2e
+  data.tar.gz: 59463ee050dec081e27b81829c79515e3845a7f15cab56cfbca7763a317ce11a864f4b019dca9ac276f95068ed7f5bb2ab21ad7923a5c40535faf79c033639ff

data/context/what-is-xnode.md

@@ -39,3 +39,9 @@ In order to render this, you will need two additional files, `_page.xnode` and `
 ```
 
 When the parser encounters `<content:heading>...` in the main page, it would evaluate the above template. `<utopia:content/>` is a special tag that evaluates to the content that the parent tag provided, so in this case: `"Welcome to my page"`.  Thus, the final output is `<h1>Welcome to my page</h1>`.
+
+## Relative Content
+
+By default, `<content:...>` tags resolve relative to the physical location of the template which contains them. This ensures that a shared template uses its own related content templates consistently.
+
+Use the `<relative:...>` namespace when a shared template should instead allow content to be overridden relative to the node being rendered. For example, a root `_page.xnode` can render `<relative:header/>`; when it wraps `blog/index.xnode`, Utopia first looks for `blog/_header.xnode` before falling back to `/_header.xnode`.

data/lib/utopia/content/middleware.rb

@@ -25,6 +25,7 @@ module Utopia
 			include Localization::Resolver
 			
 			CONTENT_NAMESPACE = "content".freeze
+			RELATIVE_NAMESPACE = "relative".freeze
 			UTOPIA_NAMESPACE = "utopia".freeze
 			CONTENT_TAG_NAME = "utopia:content".freeze
 			
@@ -45,6 +46,9 @@ module Utopia
 				# Default content namespace for dynamic path based lookup:
 				@namespaces[CONTENT_NAMESPACE] ||= self.method(:content_tag)
 				
+				# Resolve content relative to the logical invocation path:
+				@namespaces[RELATIVE_NAMESPACE] ||= self.method(:relative_tag)
+				
 				# The core namespace for utopia specific functionality:
 				@namespaces[UTOPIA_NAMESPACE] ||= Tags
 			end
@@ -190,8 +194,8 @@ module Utopia
 				return nil
 			end
 			
-			def content_tag(name, node)
-				full_path = node.parent_path + name
+			def content_tag(name, node, parent_path: node.parent_path)
+				full_path = parent_path + name
 				
 				name = full_path.pop
 				
@@ -206,6 +210,10 @@ module Utopia
 					lookup_content(name, full_path)
 				end
 			end
+			
+			def relative_tag(name, node)
+				content_tag(name, node, parent_path: node.request_path.dirname)
+			end
 		end
 		
 		Traces::Provider(Middleware) do

data/lib/utopia/static/mime_types.rb

@@ -16,8 +16,11 @@ module Utopia
 			:media => [
 				:xiph, "mp3", "mp4", "wav", "aiff", "aac", "webm", "weba", "mov", "avi", "wmv", "mpg", "m3u8", "ts"
 			],
+			:scripts => [
+				"js", "mjs", "wasm"
+			],
 			:text => [
-				"html", "css", "js", "map", "txt", "rtf", "xml", "pdf"
+				"html", "css", "map", "txt", "rtf", "xml", "pdf"
 			],
 			:fonts => [
 				"otf", "eot", "ttf", "woff", "woff2"
@@ -29,7 +32,7 @@ module Utopia
 				"png", "gif", "jpeg", "tiff", "svg", "webp"
 			],
 			:default => [
-				:media, :text, :archive, :images, :fonts
+				:media, :scripts, :text, :archive, :images, :fonts
 			]
 		}
 		

data/lib/utopia/version.rb

@@ -5,5 +5,5 @@
 
 # @namespace
 module Utopia
-	VERSION = "3.0.0"
+	VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Samuel Williams