utopia-project 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b291760470f3fac6826c055b7541f19dae489777f8e936dcb5426e236eb458a8
-  data.tar.gz: '09d320eadae6e0feed0ad04da6f2b6ce0d1be30b7c2571cca96215e27d881a37'
+  metadata.gz: c71cf5c142e09f4a14c86c346f006a9208a104a1271627fc63b739c3b409ff32
+  data.tar.gz: ed70f4c752e6f955c2a9e4da329b632f0bd86fc9071016f9881dbd68425baefb
 SHA512:
-  metadata.gz: 447a3b0cd6dd9323a75e8198265c9cb559a52693d5bb18d774d25071b39e23df5f540daa8194b5a730ce8375b948287adea0cd1b79b196a397fd5e88f79b002b
-  data.tar.gz: abead9c8e587061805d96ed5f2549ce87f0aacbe5b25d0c62b4389f4a5830015155ca298e769942375fe487102d508e4e3a2cb3537b3bf5dd219c163c146c2b2
+  metadata.gz: 2b82b1707d5c3f75d0358443b3ae67e2758d17c73a872c71cb74427a8871992b78ea32154fac1593f7fb5c6c5cdb8a169e165ca0439b68613128dbb311779d13
+  data.tar.gz: 0d1dda598ecb0bd12eef2501eddade8b02c06d3880c39eb0c53b6975563c3011470dcf485541a2dda689a35ceb44b903bf5f92c6e756d0a11d6182518714cd6f

data/lib/utopia/project/base.rb

@@ -133,7 +133,7 @@ module Utopia
 			# Format the given text in the context of the given definition and language.
 			# See {document} for details.
 			# @returns [Trenni::MarkupString]
-			def format(text, definition = nil, language: definition&.language)
+			def format(text, definition = nil, language: definition&.language, **options)
 				case text
 				when Enumerable
 					text = text.to_a.join("\n")
@@ -143,7 +143,7 @@ module Utopia
 				
 				if document = self.document(text, definition, language: language)
 					return Trenni::MarkupString.raw(
-						document.to_html
+						document.to_html(**options)
 					)
 				end
 			end

data/lib/utopia/project/document.rb

@@ -68,8 +68,8 @@ module Utopia
 				end
 			end
 			
-			def to_html(node = self.root)
-				renderer = Markly::HTMLRenderer.new(ids: true, flags: Markly::UNSAFE)
+			def to_html(node = self.root, **options)
+				renderer = Markly::HTMLRenderer.new(ids: true, flags: Markly::UNSAFE, **options)
 				Trenni::MarkupString.raw(renderer.render(node))
 			end
 			

data/lib/utopia/project/version.rb

@@ -22,6 +22,6 @@
 
 module Utopia
 	module Project
-		VERSION = "0.15.2"
+		VERSION = "0.16.0"
 	end
 end

data/pages/index.xnode

@@ -14,7 +14,11 @@
 			when :image
 				self.document.attributes[:title] ||= title.to_plaintext
 				
-				?><h1 style="text-align: center"><img src="#{title.url}" /></h1><?r
+				if title.url =~ /\.svg/
+					?><h1 style="text-align: center"><object type="image/svg+xml" data="#{title.url}"></object></h1><?r
+				else
+					?><h1 style="text-align: center"><img src="#{title.url}" /></h1><?r
+				end
 			else
 				?><content:heading>Project</content:heading><?r
 			end

data/pages/source/_discuss.xnode

@@ -0,0 +1,24 @@
+<?r 
+	repo = ENV['UTOPIA_PROJECT_GISCUS_REPO']
+	repo_id = ENV['UTOPIA_PROJECT_GISCUS_REPO_ID']
+	category = ENV['UTOPIA_PROJECT_GISCUS_CATEGORY']
+	category_id = ENV['UTOPIA_PROJECT_GISCUS_CATEGORY_ID']
+
+	if repo
+?>
+<section>
+<h2>Discussion</h2>
+<script src="https://giscus.app/client.js"
+	data-repo="#{repo}"
+	data-repo-id="#{repo_id}"
+	data-category="#{category}"
+	data-category-id="#{category_id}"
+	data-mapping="title"
+	data-reactions-enabled="0"
+	data-emit-metadata="0"
+	data-theme="preferred_color_scheme"
+	crossorigin="anonymous"
+	async>
+</script>
+</section>
+<?r end ?>

data/pages/source/_pragmas.xnode

@@ -0,0 +1,17 @@
+<?r
+base = self[:base]
+
+symbol = attributes[:symbol] 
+documentation = symbol.documentation
+
+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}">
+			#{pragma.directive}
+		</li>
+	<?r end ?>
+</ul>
+<?r end ?>

data/pages/source/index.xnode

@@ -1,5 +1,5 @@
 <content:page>
-	<content:heading>Source</content:heading>
+	<content:heading>Overview</content:heading>
 	
 	<?r
 	base = controller[:base]
@@ -11,10 +11,14 @@
 			
 			if documentation = symbol.documentation or symbol.container?
 				?><li>
-					<a href="#{base.link_for(symbol)}"><code class="language-#{symbol.language.name}">#{symbol.long_form}</code></a>
-					
-					<?r if documentation and text = documentation.text ?>
-						#{base.format(text.first, symbol)}
+					<?r if symbol.container? ?>
+						<a href="#{base.link_for(symbol)}"><code class="language-#{symbol.language.name}">#{symbol.long_form}</code></a>
+						
+						#{partial 'content:pragmas', symbol: symbol, class: 'inline'}
+						
+						<?r if documentation and text = documentation.text ?>
+							#{base.format(text.first, symbol)}
+						<?r end ?>
 					<?r end ?>
 					
 					<?r if symbol.container?

data/pages/source/show.xnode

@@ -14,6 +14,8 @@
 	end
 	?>
 	
+	#{partial 'content:signature', symbol: symbol}
+	
 	<?r
 	nested = node.children.map{|name, child| base.best(child.values)}.select{|symbol| symbol.container?}
 	
@@ -42,6 +44,7 @@
 				?><section id="#{base.id_for(symbol)}"><h3><code class="language-#{symbol.language.name}">#{symbol.long_form}</code></h3><?r
 				
 				if documentation = symbol.documentation
+					?>#{partial 'content:pragmas', symbol: symbol}<?r
 					?>#{base.format(documentation.text, symbol)}<?r
 					?>#{partial 'content:signature', symbol: symbol}<?r
 				end
@@ -58,4 +61,6 @@
 	end
 	?>
 	</section>
+	
+	<content:discuss/>
 </content:page>

data/public/_static/site.css

@@ -1,4 +1,6 @@
 
+* {box-sizing: border-box;}
+
 html {
 	font-family: "PT Sans", Verdana, Helvetica, Arial, sans-serif;
 	font-size: 16px;
@@ -135,6 +137,11 @@ h1, h2, h3, h4, h5, h6, p, pre, ul, dl, ol {
 	margin: 1rem;
 }
 
+div.giscus {
+	margin: 1rem 0;
+	padding: 0 1rem;
+}
+
 pre {
 	margin: 2rem 1rem;
 }
@@ -259,3 +266,49 @@ table thead {
 table tr:hover {
 	background-color: var(--header-color);
 }
+
+ul.pragmas {
+	margin: 0 1rem;
+	padding: 0;
+	
+	font-size: 80%;
+}
+
+ul.pragmas.inline {
+	display: inline;
+}
+
+ul.pragmas li {
+	list-style: none;
+	
+	border: 1px solid #ccf;
+	border-radius: 0.5em;
+	
+	box-shadow: 0 0 2px #eee;
+	padding: 0.1rem 0.2rem;
+	
+	display: inline-block;
+}
+
+ul.pragmas li + li {
+	margin-left: 0.5rem;
+}
+
+ul.pragmas li.public {
+	border-color: #8CFF00;
+	box-shadow: 0 0 0.3rem #8CFF00;
+	color: #8CFF00;
+}
+
+ul.pragmas li.private,
+ul.pragmas li.deprecated {
+	border-color: #FF8C00;
+	box-shadow: 0 0 0.3rem #FF8C00;
+	color: #FF8C00;
+}
+
+ul.pragmas li.asynchronous {
+	border-color: #8C00FF;
+	box-shadow: 0 0 0.3rem #8C00FF;
+	color: #8C00FF;
+}

data/template/config.ru

@@ -1,6 +1,6 @@
 
 require 'utopia/setup'
-UTOPIA ||= Utopia.setup
+UTOPIA ||= Utopia.setup(Dir.pwd)
 
 require 'utopia/project'
 Utopia::Project.call(self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia-project
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decode
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: falcon
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rackula
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,8 @@ files:
 - pages/guides/show.xnode
 - pages/index.xnode
 - pages/links.yaml
+- pages/source/_discuss.xnode
+- pages/source/_pragmas.xnode
 - pages/source/_signature.xnode
 - pages/source/controller.rb
 - pages/source/index.xnode
@@ -298,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A project documentation tool based on Utopia.