utopia-project 0.19.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8479ac4dc2baa64e5fe601e243bdc451a27a98683af099ef13e4168d93abbc9
-  data.tar.gz: 1d342b29f3dfd70a50bccf60b7bf1c3eee37720a077150339eea0621f9cb540a
+  metadata.gz: a592172db272c2789de44f49c0b441741a3d269f19f849ef5718aaf3c5a7152e
+  data.tar.gz: 66078c8df37cbff16f1dc674d18b05efef27f910894d258647189f4944d83b40
 SHA512:
-  metadata.gz: e1ec234ec399889c920da17113f1baab77b55ac935b1cf6842b1c81e45dc437a31bd90176cac228a482f3bc198fe635bba9bee77491940dfe1bfec6eb54e60e2
-  data.tar.gz: 862859d180cae34afb36623166b3bd876375d857fd9a2af0d58bd20c8b8587533bbb56e37fa88f2330744103b7577cb03189d2bc7dd6ad0906637d3d315d80eb
+  metadata.gz: 1ce5ea33622890abb90b9192be7a546219f5e0b8f94cf193fe3640b1177f9c2a17ec0c0a3a037f52be677addfa255b6529a40059f1b063de9fd74e4e3224eae0
+  data.tar.gz: 01f392ac81d5d68117298bf3d803bc7d1f3171bde53a9c670e2eb9e737e7d09b24b122505b1fcfa970f526525232bd7e13c4a357730055594c262bfd3e7e7232

data/lib/utopia/project/base.rb

@@ -42,7 +42,7 @@ module Utopia
 				instance = self.new
 				
 				source_files = Dir.glob(
-					File.expand_path("lib/**/*.rb", instance.root)
+					File.expand_path("{lib,app}/**/*.rb", instance.root)
 				)
 				
 				instance.update(source_files)

data/lib/utopia/project/document.rb

@@ -55,9 +55,11 @@ module Utopia
 						if header.first_child.to_plaintext.include?(name)
 							# Now subsequent children:
 							current = header.next
-							while current.type != :header and following = current.next
+
+							# Delete everything in the section until we encounter another header:
+							while current && current.type != :header
 								current.delete
-								current = following
+								current = current.next
 							end
 							
 							return yield(header)

data/lib/utopia/project/version.rb

@@ -22,6 +22,6 @@
 
 module Utopia
 	module Project
-		VERSION = "0.19.1"
+		VERSION = "0.20.2"
 	end
 end

data/pages/_header.xnode

@@ -12,7 +12,20 @@
 			?> &rsaquo; <span>#{path.last}</span><?r
 		end
 	end
-	
+
+	if lexical_path = controller[:lexical_path]
+		current = []
+		lexical_path.each do |part|
+			current << part
+
+			?> &rsaquo; <a href="/source/#{current.join('/')}/index">#{part}</a> <?r
+		end
+	end
+
+	if guide = controller[:guide]
+		?> &rsaquo; <a href="/guides/#{guide.name}/index">#{guide.title}</a> <?r
+	end
+
 	if localization.localized?
 		?> &bull; (<?r
 		localization.all_locales.each.with_index do |locale, index|

data/pages/source/controller.rb

@@ -8,11 +8,11 @@ end
 on '**/*/index' do |request, path|
 	@base = Utopia::Project::Base.instance
 	
-	lexical_path = path.components.dup
+	@lexical_path = path.components.dup
 	# Remove the last "index" part:
-	lexical_path.pop
+	@lexical_path.pop
 	
-	@node, @symbol = @base.lookup(lexical_path)
+	@node, @symbol = @base.lookup(@lexical_path)
 	
 	unless @symbol
 		fail! :not_found

data/pages/source/index.xnode

@@ -12,7 +12,7 @@
 			if documentation = symbol.documentation or symbol.container?
 				?><li>
 					<?r if symbol.container? ?>
-						<a href="#{base.link_for(symbol)}"><code class="language-#{symbol.language.name}">#{symbol.long_form}</code></a>
+						<a href="#{base.link_for(symbol)}"><code class="language-#{symbol.language.name}">#{symbol.short_form}</code></a>
 						
 						#{partial 'content:pragmas', symbol: symbol, class: 'inline'}
 						

data/pages/source/show.xnode

@@ -3,8 +3,12 @@
 	base = self[:base]
 	node = self[:node]
 	symbol = self[:symbol]
+	document.attributes[:title] ||= symbol.qualified_name
 	?>
-	<content:heading><code class="language-#{symbol.language.name}">#{symbol.qualified_name}</code></content:heading>
+
+	<h1>
+		<code class="language-#{symbol.language.name}">#{symbol.short_form}</code>
+	</h1>
 	
 	<?r
 	if document = base.document_for(symbol)
@@ -13,33 +17,39 @@
 		?>#{base.format(text.join("\n"), symbol)}<?r
 	end
 	?>
-	
 	#{partial 'content:signature', symbol: symbol}
-	
 	<?r
-	nested = node.children.map{|name, child| base.best(child.values)}.select{|symbol| symbol.container?}
+	nested = node.children.map do |name, child|
+		base.best(child.values)
+	end.select do |symbol|
+		symbol.container?
+	end
 	
 	if nested.any?
 	?>
 	<section>
-	<h2>Nested</h2>
-	
-	<ul>
-		<?r nested.each do |symbol| ?>
-		<li><a href="#{base.link_for(symbol)}"><code class="language-#{symbol.language.name}">#{symbol.qualified_name}</code></a></li>
-		<?r end ?>
-	</ul>
+		<h2>Nested</h2>
+		
+		<ul>
+			<?r nested.each do |symbol| ?>
+			<li><a href="#{base.link_for(symbol)}"><code class="language-#{symbol.language.name}">#{symbol.nested_name}</code></a></li>
+			<?r end ?>
+		</ul>
 	</section>
 	<?r
 	end
-	?>
 	
+	definitions = node.children.map do |name, child|
+		child.values.select{|symbol| symbol.documentation and !symbol.container?}
+	end.flatten
+
+	if definitions.any?
+	?>
 	<section>
-	<h2>Definitions</h2>
-	
-	<?r
-	node.children.each do |name, child|
-		child.values.each do |symbol|
+		<h2>Definitions</h2>
+		
+		<?r
+		definitions.each do |symbol|
 			if symbol.documentation and !symbol.container?
 				?><section id="#{base.id_for(symbol)}"><h3><code class="language-#{symbol.language.name}">#{symbol.long_form}</code></h3><?r
 				
@@ -58,9 +68,10 @@
 				?></section><?r
 			end
 		end
+		?>
+	</section>
+	<?r
 	end
 	?>
-	</section>
-	
 	<content:discuss/>
 </content:page>