utopia-project 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b881d5774920131aff82d0f6fe8416713c6f303b70d45dd9235e926923026b89
-  data.tar.gz: 40f0084a464195072528cf7d5a893eb9a26c2028deef1945c9cd94125c9054f2
+  metadata.gz: 24fda7ece0102628b1160b9f9b93cc15ca75ac1c7f7ed6d1a674521705ba96f3
+  data.tar.gz: 4ca114651629fefcc0a5db05ac38712c96454e2f8de97b53fabc0bae1d18e2d2
 SHA512:
-  metadata.gz: 9bc24dcf38b852cd8e7f7a1fc0e07859393dcb78bc6e24c24c22e0fd083d67d9dcca9866853661aac2a286509e720c61f2087ea1956e7f266740dd4db9748a37
-  data.tar.gz: b927441a75fbaa02b1f20f6e3f74bae3e0c2ddfe2dcfe1232badde18c8a14c63e5f8c550ece8c1cffc07e697062ee71c2bd5f7b136752fc5a524966df1c76b80
+  metadata.gz: e2ff765506a5841b132cfea27267c2ab1a50d319d127b7ec6c55342c99a7321216c04c593e814a8bd5959189b1c7c2bec37a43865c36a71a46a102a111d57550
+  data.tar.gz: 24d6eb555a6540e181cf62ab7172864ecb88bde77cb8e0a2924655f868753ece0d6e7a9d6ebc5f16dae9bb6e33bbb77aba8a5105fcf5468e9181324e95b7726b

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.1"
+		VERSION = "0.18.0"
 	end
 end

data/pages/_page.xnode

@@ -17,12 +17,14 @@
 		
 		<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>
 		
 		<script type="text/javascript">
 		//<![CDATA[
 			jQuery(function($) {
+				mermaid.init();
 				$.syntax();
 			});
 		//]]>
@@ -38,4 +40,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/controller.rb

@@ -14,5 +14,9 @@ on '**/*/index' do |request, path|
 	
 	@node, @symbol = @base.lookup(lexical_path)
 	
+	unless @symbol
+		fail! :not_found
+	end
+	
 	path.components = ["show"]
-end
+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>