utopia-project 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b54d7f25350dab0e6b2ef5078f4dcfedf0420f7169785edea0b83e10363e1c7f
-  data.tar.gz: f497a26763c3dbea3d9c39fb6f632a89891410a13f3d8ac152be4a2b1b1df4d6
+  metadata.gz: ed4ed23b57eeb76017604def95426994514086af256fa39cccb2be9a1c32110d
+  data.tar.gz: 77c47a198f7bda2e39fdb12d91aec5ae860172072dc5d75f1b8511dc2fc4c2c5
 SHA512:
-  metadata.gz: 80431d065a3c9d5d4fa111626dd42cf243911d73198edf644acf8aed6399f9332567a08c28ff3f297f73477da652bd8ab8a11c168b748de1756a61b06021e6a8
-  data.tar.gz: 3592b185830475bc40aa8a04b3a4ce1eb2645c90d673a597ca92fa33368a55fe74c67964c013f9d24593a0011c1e87361dceac7e4a4ee2c568aedc9659277ef0
+  metadata.gz: f5942678119f557444049a7191e288e951d3de941abb2b3317d873f384b08d3b7142ee14ff400379befce25dcbdf21f03fca8e39f881763c6851043b462a14b5
+  data.tar.gz: ca17f6313cc66db60779b050ca5765a95254881d0a7c4315448c59d5ed6d94d96f9bfe364d153057eec05be8cda45654cd175d9dd29c6273c154719fe245543d

data/bake/utopia/project.rb

@@ -24,7 +24,7 @@ def serve(port: nil, bind: nil)
 	end
 	
 	if port
-		opttions << "--port" << port
+		options << "--port" << port
 	end
 	
 	system("falcon", "serve", "--config", config_path, "--preload", preload_path, *options)

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 'commonmarker'
+require 'markly'
 
 module Utopia
 	module Project
@@ -37,7 +37,7 @@ module Utopia
 			end
 			
 			def root
-				@root ||= resolve(CommonMarker.render_doc(@text, [:DEFAULT]))
+				@root ||= resolve(Markly.parse(@text))
 			end
 			
 			def first_child
@@ -52,7 +52,7 @@ module Utopia
 						header = child
 						
 						# We found the matched header:
-						if header.first_child.string_content == name
+						if header.first_child.to_plaintext.include?(name)
 							# Now subsequent children:
 							current = header.next
 							while current.type != :header and following = current.next
@@ -69,35 +69,36 @@ module Utopia
 			end
 			
 			def to_html(node = self.root)
-				Trenni::MarkupString.raw(node.to_html(:UNSAFE))
+				renderer = Markly::HTMLRenderer.new(ids: true, flags: Markly::UNSAFE)
+				Trenni::MarkupString.raw(renderer.render(node))
 			end
 			
 			def paragraph_node(child)
-				node = CommonMarker::Node.new(:paragraph)
+				node = Markly::Node.new(:paragraph)
 				node.append_child(child)
 				return node
 			end
 			
 			def html_node(content, type = :html)
-				node = CommonMarker::Node.new(:html)
+				node = Markly::Node.new(:html)
 				node.string_content = content
 				return node
 			end
 			
 			def inline_html_node(content)
-				node = CommonMarker::Node.new(:inline_html)
+				node = Markly::Node.new(:inline_html)
 				node.string_content = content
 				return node
 			end
 			
 			def text_node(content)
-				node = CommonMarker::Node.new(:text)
+				node = Markly::Node.new(:text)
 				node.string_content = content
 				return node
 			end
 			
 			def link_node(title, url, child)
-				node = CommonMarker::Node.new(:link)
+				node = Markly::Node.new(:link)
 				node.title = title
 				node.url = url.to_s
 				
@@ -112,7 +113,7 @@ module Utopia
 						"<code class=\"language-#{language}\">#{Trenni::Strings.to_html(content)}</code>"
 					)
 				else
-					node = CommonMarker::Node.new(:code)
+					node = Markly::Node.new(:code)
 					node.string_content = content
 					return node
 				end

data/lib/utopia/project/linkify.rb

@@ -41,8 +41,8 @@ module Utopia
 			
 			def link_to(definition, text)
 				Trenni::Builder.fragment do |builder|
-					builder.inline('a', href: @base.link_for(definition)) do
-						builder.text(definition.qualified_name)
+					builder.inline('a', href: @base.link_for(definition), title: definition.qualified_name) do
+						builder.text(text)
 					end
 				end
 			end

data/lib/utopia/project/version.rb

@@ -22,6 +22,6 @@
 
 module Utopia
 	module Project
-		VERSION = "0.10.0"
+		VERSION = "0.12.0"
 	end
 end

data/pages/_navigation.xnode

@@ -20,4 +20,4 @@
 		end
 		?>)<?r
 	end
-?></nav>
+?></nav>

data/pages/_usage.xnode

@@ -1,5 +1,3 @@
-<h2>Usage</h2>
-
 <p>Please browse the <a href="source/">source code index</a> or refer to the guides below.</p>
 
 <?r
@@ -18,4 +16,4 @@
 	<?r end ?>
 <?r
 	end
-?>
+?>

data/pages/index.xnode

@@ -11,8 +11,8 @@
 			case title.type
 			when :text
 				?><content:heading>#{title.string_content}</content:heading><?r
-			when :img
-				?><header><img src="#{title.src}" /></header><?r
+			when :image
+				?><header><img src="#{title.url}" /></header><?r
 			else
 				?><content:heading>Project</content:heading><?r
 			end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia-project
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utopia
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: commonmarker
+  name: markly
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: decode
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - samuel.williams@oriontransfer.co.nz
 executables: []
@@ -294,7 +294,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/socketry/utopia-project/
   funding_uri: https://github.com/sponsors/ioquatix/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -310,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A project documentation tool based on Utopia.
 test_files: []