utopia-project 0.17.4 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6176970e81e3db9ebf924a9eed9861a31138b43d6db9a29054856abd87e154f
-  data.tar.gz: 3a367e385bcdc566400ab235bbf291ad58165f03593a5e0f9ab1800df605b697
+  metadata.gz: 7f6b9549d2593b6e98df5835223e53620a8d6dc0e872ea9985fda546acf3abad
+  data.tar.gz: 4319b4bf7c421b92bfcaec70afd936990093cca86e9e01cc9827b4b80a560d0c
 SHA512:
-  metadata.gz: e37cf4cbe1dfd1d7301bab29990c71363970afc6c339991bd0de327cdbd875f2adef1b2802904d0a77ac96c41c7d297f87b7fe61e393645edab294d2936abe57
-  data.tar.gz: edad3d8c936317fa48d03dbafb4294e8c9d0115700bbedad69d296f735cbff7122e50e501b032a5f2b069851532a22d709388652276c061c4ea60506519b3e68
+  metadata.gz: e6448dd25db8864ad3f927e8be3e52d5e89ee4dcc30252837a14d514290dc21dfd2c50f214f08a8ea612fdb8b7b446ccc157263806a4f9f7536a25ad3dafd3bf
+  data.tar.gz: f1dfe097db443ef684d8243d169b096ca3d96a783176e54c2434bdf0d84cfb5fc64b481ac371f2dd7aa1520551f16e75cd2b2d9b4408f8f24937b1092549cc26

data/bake/utopia/project.rb

@@ -32,13 +32,26 @@ end
 
 # Generate a static copy of the site.
 # @parameter output_path [String] The output path for the static site.
-def static(output_path: "docs")
+# @parameter force [Boolean] Remove the output directory before generating the static content.
+def static(output_path: "docs", force: true)
 	require 'rackula/command'
 	
 	config_path = File.expand_path("../../template/config.ru", __dir__)
 	public_path = File.expand_path("../../public", __dir__)
 	
-	Rackula::Command::Top["generate", "--force",
+	arguments = []
+	
+	if force
+		arguments << "--force"
+	end
+	
+	pp ["generate", *arguments,
+		"--config", config_path,
+		"--public", public_path,
+		"--output-path", output_path
+	]
+	
+	Rackula::Command::Top["generate", *arguments,
 		"--config", config_path,
 		"--public", public_path,
 		"--output-path", output_path

data/lib/utopia/project/document.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'markly'
+require_relative 'renderer'
 
 module Utopia
 	module Project
@@ -69,7 +69,7 @@ module Utopia
 			end
 			
 			def to_html(node = self.root, **options)
-				renderer = Markly::HTMLRenderer.new(ids: true, flags: Markly::UNSAFE, **options)
+				renderer = Renderer.new(ids: true, flags: Markly::UNSAFE, **options)
 				Trenni::MarkupString.raw(renderer.render(node))
 			end
 			

data/lib/utopia/project/guide.rb

@@ -68,7 +68,7 @@ module Utopia
 					@document ||= self.readme_document.tap do |document|
 						child = document.first_child
 						
-						if child.type == :header
+						if child&.type == :header
 							@title = child.first_child.string_content
 							
 							@description = child.next

data/lib/utopia/project/renderer.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Copyright, 2020, 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 'markly'
+require 'markly/renderer/html'
+
+module Utopia
+	module Project
+		class Renderer < Markly::Renderer::HTML
+			def code_block(node)
+				language, _ = node.fence_info.split(/\s+/, 2)
+				
+				if language == "mermaid"
+					block do
+						out(
+							"<div#{source_position(node)} class=\"mermaid\">",
+							escape_html(node.string_content),
+							"</div>"
+						)
+					end
+				else
+					super
+				end
+			end
+		end
+	end
+end

data/lib/utopia/project/version.rb

@@ -22,6 +22,6 @@
 
 module Utopia
 	module Project
-		VERSION = "0.17.4"
+		VERSION = "0.19.0"
 	end
 end

data/pages/_page.xnode

@@ -17,6 +17,7 @@
 		
 		<script src="/_components/jquery/jquery.min.js"></script>
 		<script src="/_components/jquery-syntax/jquery.syntax.min.js"></script>
+		<script src="/_components/mermaid/mermaid.min.js"></script>
 		
 		<script src="/_static/links.js"></script>
 		
@@ -25,6 +26,12 @@
 			jQuery(function($) {
 				$.syntax();
 			});
+			
+			let isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches
+			let config = {theme: 'light'};
+			if (isDarkMode) config.theme = 'dark';
+			else config.theme = 'forest';
+			mermaid.initialize(config);
 		//]]>
 		</script>
 	</head>
@@ -38,4 +45,4 @@
 			<footer>Documentation generated by <a href="https://github.com/socketry/utopia-project">Utopia::Project</a>.</footer>
 		</main>
 	</body>
-</html>
+</html>