utopia-project 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f3f6b2768ba6df0776d91d43bfac90d9c19f28a0d45292e4733174ab032c8d
-  data.tar.gz: ac2f58975b03909a892c537e09cf6f4cea594d57111dbd3eabeb79440c4082fe
+  metadata.gz: 2a926206a323a14c9bdce2078971b6fbfb594efa217edd10c4667bea84b0d8a1
+  data.tar.gz: 2d19b86b00a9535d4db4b46e0960cdad33f2c7b181d8556dc844d42a8457b551
 SHA512:
-  metadata.gz: 20c2c5633566b13eeaaa751dddf625ac90b1db577657d18a4600c34eeee9d00ba387f2037d0c325352486933abcb29bdbdcfe92e54522ef89947a56693ddd6c4
-  data.tar.gz: e4f6fef8e60be8fddd21484fe86b0c729af66fd1541929615ae90872c91975b36ad126b9a1bf6389797bbea99f647a3de83c49ba66475f8a9a872dd34027687c
+  metadata.gz: 19d52ab955df5cd9dc015094828b75f7ec023693c1f207893edefaf962d4bf914a45edc5374f49b352aa1920b2ed3ee4af20c0153b69ef0d15faf808a30e19f6
+  data.tar.gz: 493aa1b337ca8b4406913c4edb4d27b9ea69d33bca1149f2a9e3bc850e40ff3256754ccbd2802af66ecc8fe15a122c34beeaa38035e09d6c163d4a4dd2a5c5c9

data/lib/utopia/project/base.rb

@@ -107,29 +107,37 @@ module Utopia
 					return nil
 				end
 				
-				if language
-					text = text&.gsub(/{(.*?)}/) do |match|
-						linkify($1, symbol, language: language)
-					end
+				if document = self.document(text, symbol, language: language)
+					return Trenni::MarkupString.raw(
+						document.to_html
+					)
+				end
+			end
+			
+			def document(text, symbol = nil, language: symbol&.language)
+				text = text&.gsub(/{(.*?)}/) do |match|
+					linkify($1, symbol, language: language)
 				end
 				
-				return Trenni::MarkupString.raw(
-					Kramdown::Document.new(text, syntax_highlighter: nil).to_html
-				)
+				return Kramdown::Document.new(text, syntax_highlighter: nil)
 			end
 			
 			def linkify(text, symbol = nil, language: symbol&.language)
-				reference = language.reference(text)
+				reference = @index.languages.parse_reference(text, default_language: language)
 				
 				Trenni::Builder.fragment do |builder|
-					if definition = @index.lookup(reference, relative_to: symbol)&.first
+					if reference and definition = @index.lookup(reference, relative_to: symbol)&.first
 						builder.inline('a', href: link_for(definition)) do
 							builder.inline('code', class: "language-#{definition.language.name}") do
 								builder.text definition.short_form
 							end
 						end
+					elsif reference
+						builder.inline('code', class: "language-#{reference.language.name}") do
+							builder.text text
+						end
 					else
-						builder.inline('code', class: "language-#{symbol.language.name}") do
+						builder.inline('code') do
 							builder.text text
 						end
 					end

data/lib/utopia/project/guide.rb

@@ -59,9 +59,15 @@ module Utopia
 				File.exist?(readme_path)
 			end
 			
+			def readme_document
+				content = File.read(self.readme_path)
+				
+				return @base.document(content)
+			end
+			
 			def document
 				if self.readme?
-					@document ||= Kramdown::Document.new(File.read(self.readme_path), syntax_highlighter: nil).tap do |document|
+					@document ||= self.readme_document.tap do |document|
 						root = document.root
 						if element = root.children.first
 							if element.type == :header
@@ -112,7 +118,7 @@ module Utopia
 				return to_enum(:sources) unless block_given?
 				
 				files.each do |path|
-					if source = Decode::Source.for?(path)
+					if source = @base.index.languages.source_for(path)
 						yield source
 					end
 				end

data/lib/utopia/project/version.rb

@@ -22,6 +22,6 @@
 
 module Utopia
 	module Project
-		VERSION = "0.6.2"
+		VERSION = "0.7.0"
 	end
 end

data/utopia-project.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 	# spec.add_dependency "utopia-gallery"
 	
 	spec.add_dependency "kramdown"
-	spec.add_dependency "decode", "~> 0.9"
+	spec.add_dependency "decode", "~> 0.13"
 	spec.add_dependency "rackula"
 	spec.add_dependency "falcon"
 	spec.add_dependency "thread-local"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia-project
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utopia
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rackula
   requirement: !ruby/object:Gem::Requirement