utopia-project 0.13.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b83c86ddbb179ac1beb687c520072f224acccbd6b7468bf6af824d399e64e3b
-  data.tar.gz: 4a31742a497d000523c991ddaaabdd8abe28ceb990f72a7721c3fc8aa833f9c2
+  metadata.gz: c0e365f1d79016583ca1eca558712eb3e314953bc74bd6404a399628972b3168
+  data.tar.gz: a06103edc45d87120f2c531252f5399884eee051efb7f7b0b7fd6edac4de4d90
 SHA512:
-  metadata.gz: bd88c7262337a9895c038cb32b156b8350321c7e75956dc7c95d3fa1bb884792480e76873d3a55c7c2c937a6b416545c5c34f39ab4a42a5f82660b276e68901b
-  data.tar.gz: 526fd60db6623cb5b44268f0ae4595b5d7ae3030134709bdf7b2ef6412a4f41e2183615a5879f046a79ed155d36cafb386e8c486fce510f0ade571bbb021fc32
+  metadata.gz: bb1887c856a24b2360c1101b1c377eff4c15d7bb3322f8318057815a3ff056c712427a2c70164337987905b58b0bdcaad134cdad4c44ef3baedca4be0fcba85e
+  data.tar.gz: 00a55cfb9f18fd62e3e178c3fb183375d5640eedcac3f204957f6582b84a07875b458c8022ebe3bfde8ead2d9791a2905eae8fa6f2554e8d938378ad501e7f20

data/lib/utopia/project/base.md

@@ -0,0 +1,7 @@
+# Utopia::Project::Base
+
+Provides structured access to a project directory which contains source code and guides.
+
+## Usage
+
+To get an instance for the current project, use {Base#instance}.

data/lib/utopia/project/base.rb

@@ -106,6 +106,20 @@ module Utopia
 				end
 			end
 			
+			def document_for(definition)
+				document_path = File.join("lib", definition.lexical_path.map{|_| _.to_s.downcase}) + ".md"
+				
+				if File.exist?(document_path)
+					document = self.document(File.read(document_path), definition)
+					
+					if document.first_child.type == :header
+						document.first_child.delete
+					end
+					
+					return document
+				end
+			end
+			
 			def linkify(text, definition, language: definition&.language)
 				rewriter = Linkify.new(self, language, text)
 				

data/lib/utopia/project/document.rb

@@ -37,7 +37,7 @@ module Utopia
 			end
 			
 			def root
-				@root ||= resolve(Markly.parse(@text))
+				@root ||= resolve(Markly.parse(@text, extensions: [:table]))
 			end
 			
 			def first_child

data/lib/utopia/project/version.rb

@@ -22,6 +22,6 @@
 
 module Utopia
 	module Project
-		VERSION = "0.13.2"
+		VERSION = "0.15.0"
 	end
 end

data/pages/_page.xnode

@@ -18,7 +18,6 @@
 		<script src="/_components/jquery/jquery.min.js"></script>
 		<script src="/_components/jquery-syntax/jquery.syntax.min.js"></script>
 		
-		<script src="/_components/lunr/lunr.min.js"></script>
 		<script src="/_static/links.js"></script>
 		
 		<script type="text/javascript">

data/pages/index.xnode

@@ -12,7 +12,9 @@
 			when :text
 				?><content:heading>#{title.string_content}</content:heading><?r
 			when :image
-				?><header><img src="#{title.url}" /></header><?r
+				self.document.attributes[:title] ||= title.to_plaintext
+				
+				?><h1><img src="#{title.url}" /></h1><?r
 			else
 				?><content:heading>Project</content:heading><?r
 			end

data/pages/source/show.xnode

@@ -7,7 +7,9 @@
 	<content:heading><code class="language-#{symbol.language.name}">#{symbol.qualified_name}</code></content:heading>
 	
 	<?r
-	if documentation = symbol.documentation
+	if document = base.document_for(symbol)
+		?>#{document.to_html}<?r
+	elsif documentation = symbol.documentation
 		?>#{base.format(documentation.text.join("\n"), symbol)}<?r
 	end
 	?>

data/public/_components/jquery-syntax/base/jquery.syntax.brush.xml.css

@@ -16,3 +16,20 @@
   color: #666;
   background-color: #ddd;
   border-radius: 0.5em; }
+
+@media (prefers-color-scheme: dark) {
+  .syntax-theme-base .xml .cdata-content {
+    color: #a46; }
+  .syntax-theme-base .xml .xml-tag, .syntax-theme-base .xml .cdata {
+    color: #c59de7; }
+  .syntax-theme-base .xml .tag-name, .syntax-theme-base .xml .cdata-tag {
+    color: #9ae; }
+  .syntax-theme-base .xml .namespace {
+    color: #c59de7; }
+  .syntax-theme-base .xml .attribute {
+    color: #c59de7; }
+  .syntax-theme-base .xml .instruction {
+    color: #c59de7; }
+  .syntax-theme-base .xml .entity, .syntax-theme-base .xml .percent-escape {
+    color: #999;
+    background-color: #333; } }

data/public/_components/jquery-syntax/jquery.syntax.core.js

@@ -9,8 +9,8 @@ Syntax.lib.camelCaseType={pattern:/\b_*[A-Z][\w]*\b/g,klass:"type"};Syntax.lib.c
 Syntax.lib.doubleQuotedString={pattern:/"([^\\"\n]|\\.)*"/g,klass:"string"};Syntax.lib.singleQuotedString={pattern:/'([^\\'\n]|\\.)*'/g,klass:"string"};Syntax.lib.multiLineDoubleQuotedString={pattern:/"([^\\"]|\\.)*"/g,klass:"string"};Syntax.lib.multiLineSingleQuotedString={pattern:/'([^\\']|\\.)*'/g,klass:"string"};Syntax.lib.stringEscape={pattern:/\\./g,klass:"escape",only:["string"]};
 Syntax.Match=function(b,a,c,d){this.offset=b;this.endOffset=b+a;this.length=a;this.expression=c;this.value=d;this.children=[];this.next=this.parent=null};Syntax.Match.prototype.shift=function(b,a){this.adjust(b,null,a);for(var c=0;c<this.children.length;c++)this.children[c].shift(b,a)};Syntax.Match.prototype.adjust=function(b,a,c){this.offset+=b;this.endOffset+=b;a&&(this.length=a,this.endOffset=this.offset+a);c&&(this.value=c.substr(this.offset,this.length))};
 Syntax.Match.sort=function(b,a){return b.offset-a.offset||a.length-b.length};Syntax.Match.prototype.contains=function(b){return b.offset>=this.offset&&b.endOffset<=this.endOffset};Syntax.Match.defaultReduceCallback=function(b,a){"string"===typeof b&&(b=document.createTextNode(b));a.appendChild(b)};
-Syntax.Match.prototype.reduce=function(b,a){var c=this.offset,d=document.createElement("span");b=b||Syntax.Match.defaultReduceCallback;this.expression&&this.expression.klass&&(0<d.className.length&&(d.className+=" "),d.className+=this.expression.klass);this.className&&(d.className+=" ",d.className+=this.className);for(var e=0;e<this.children.length;e+=1){var f=this.children[e],g=f.offset;f.offset<this.offset&&console.log("Syntax Warning: Offset of child",f,"is before offset of parent",this);c=this.value.substr(c-
-this.offset,g-c);b(c,d);b(f.reduce(b,a),d);c=f.endOffset}c===this.offset?b(this.value,d):c<this.endOffset?b(this.value.substr(c-this.offset,this.endOffset-c),d):c>this.endOffset&&console.log("Syntax Warning: Start position "+c+" exceeds end of value "+this.endOffset);a&&(d=a(d,this));return d};
+Syntax.Match.prototype.reduce=function(b,a){var c=this.offset;var d=this.expression&&this.expression.element?this.expression.element.cloneNode(!1):document.createElement("span");b=b||Syntax.Match.defaultReduceCallback;this.expression&&this.expression.klass&&(0<d.className.length&&(d.className+=" "),d.className+=this.expression.klass);this.className&&(d.className+=" ",d.className+=this.className);for(var e=0;e<this.children.length;e+=1){var f=this.children[e],g=f.offset;f.offset<this.offset&&console.log("Syntax Warning: Offset of child",
+f,"is before offset of parent",this);c=this.value.substr(c-this.offset,g-c);b(c,d);b(f.reduce(b,a),d);c=f.endOffset}c===this.offset?b(this.value,d):c<this.endOffset?b(this.value.substr(c-this.offset,this.endOffset-c),d):c>this.endOffset&&console.log("Syntax Warning: Start position "+c+" exceeds end of value "+this.endOffset);a&&(d=a(d,this));return d};
 Syntax.Match.prototype.canContain=function(b){return b.expression.force?!0:this.complete?!1:b.expression.only?!0:"undefined"===typeof this.expression.allow||jQuery.isArray(this.expression.disallow)&&-1!==jQuery.inArray(b.expression.klass,this.expression.disallow)?!1:"*"===this.expression.allow||jQuery.isArray(this.expression.allow)&&-1!==jQuery.inArray(b.expression.klass,this.expression.allow)?!0:!1};
 Syntax.Match.prototype.canHaveChild=function(b){if(b=b.expression.only){for(var a=this;null!==a;){if(-1!==jQuery.inArray(a.expression.klass,b))return!0;if((a=a.parent)&&a.complete)break}return!1}return!0};Syntax.Match.prototype._splice=function(b,a){return this.canHaveChild(a)?(this.children.splice(b,0,a),a.parent=this,a.expression.owner||(a.expression.owner=this.expression.owner),this):null};
 Syntax.Match.prototype.insert=function(b,a){if(!this.contains(b))return null;if(a){a=this;for(var c=0;c<a.children.length;)a.children[c].contains(b)?(a=a.children[c],c=0):c+=1;return a._insertWhole(b)}return this._insert(b)};

data/public/_static/site.css

@@ -48,7 +48,7 @@ html {
 	--main-color: #111;
 	--main-background-color: #fff;
 	
-	--header-color: #bed1f0;
+	--header-color: #dfebff;
 	--underlay-color: #ddd;
 	
 	--accent-color: #1a73e8;
@@ -131,7 +131,10 @@ footer {
 
 h1, h2, h3, h4, h5, h6, p, pre, ul, dl, ol {
 	margin: 1rem;
-	border-radius: 0.5rem;
+}
+
+pre {
+	margin: 2rem 1rem;
 }
 
 h1 span {
@@ -237,3 +240,20 @@ figure.youtube-wrapper iframe {
 	height: 100%;
 	border: 0;
 }
+
+table {
+	width: 100%;
+	margin: 1rem;
+	
+	border-collapse: collapse;
+	width: calc(100% - 2rem);
+}
+
+table thead {
+	background-color: var(--header-color);
+	border-bottom: 0.2rem solid var(--accent-color);
+}
+
+table tr:hover {
+	background-color: var(--header-color);
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia-project
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utopia
@@ -187,6 +187,7 @@ extra_rdoc_files: []
 files:
 - bake/utopia/project.rb
 - lib/utopia/project.rb
+- lib/utopia/project/base.md
 - lib/utopia/project/base.rb
 - lib/utopia/project/document.rb
 - lib/utopia/project/guide.rb