utopia-project 0.17.2 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13dcaedbe87eadb28fcf370e994c7ffd437f3e8fca3e2d15f7e897308287bc73
-  data.tar.gz: 6862aa1a83b3992ef595862fc4eabbecb85059fcb0adb951fddf690048a039a7
+  metadata.gz: 4d59b43aec217ee84beb050d7d6e151d46aa441cbee39b73b9e664fdf773432f
+  data.tar.gz: 4e76c51906d87652a1f0e8242ef4ae8bc28994ff2e6330e5269f8c1a4387dcd5
 SHA512:
-  metadata.gz: a8644039ddaca927d7861e32174b007c02361ba58fabadd293ae0c6239301b5e9102a0c2917cef4cc3f868541a1f04f93342272a09e543375a33ea74c7bb88c5
-  data.tar.gz: c9a6a4fa69158fa61cc8e01fbd855fb98a752e129deb838e5ade864ec3012c7d15219e276a4dd3bf297d063fba5478c980e67fd9278d9ec71a367b1fc93d57fd
+  metadata.gz: e849c822aed4c2591a1116bc4ed36d45c3ede9836b51b1cf2e42fbba2fddf4a79227991dfceb73b9d3810b1ca347402bc7966f4134634a2fdd7840c9c7d9f49c
+  data.tar.gz: 06fb199a979a521f6ea11ddc419aeaf616e82d478019122b3fe41fcc6a8de68a6991d688499381b0fda0c30861faf07860c764f9075f19cf4b67760f51b5637a

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/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.2"
+		VERSION = "0.18.1"
 	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>

data/pages/source/_pragmas.xnode

@@ -9,9 +9,9 @@ pragmas = documentation&.filter(Decode::Comment::Pragma).to_a
 if pragmas&.any? ?>
 <ul class="pragmas #{attributes[:class]}">
 	<?r pragmas.each do |pragma| ?>
-		<li class="pragma #{pragma.directive}" title="#{pragma.text.first}">
+		<li class="pragma #{pragma.directive}" title="#{pragma.text&.first}">
 			#{pragma.directive}
 		</li>
 	<?r end ?>
 </ul>
-<?r end ?>
+<?r end ?>

data/pages/source/show.xnode

@@ -9,8 +9,8 @@
 	<?r
 	if document = base.document_for(symbol)
 		?>#{document.to_html}<?r
-	elsif documentation = symbol.documentation
-		?>#{base.format(documentation.text.join("\n"), symbol)}<?r
+	elsif text = symbol.documentation&.text
+		?>#{base.format(text.join("\n"), symbol)}<?r
 	end
 	?>
 	
@@ -63,4 +63,4 @@
 	</section>
 	
 	<content:discuss/>
-</content:page>
+</content:page>