utopia 0.9.60 → 0.9.61

data/lib/utopia/link.rb

@@ -52,12 +52,12 @@ module Utopia
 		end
 
 		def href
-			if @info[:uri]
-				return @info[:uri]
-			elsif @path
-				return @path.to_s
-			else
-				nil
+			@info.fetch(:uri) do
+				if @path
+					@path.to_s
+				else
+					nil
+				end
 			end
 		end
 
@@ -161,7 +161,7 @@ module Utopia
 
 						directory_link = Link.new(:directory, top + [filename, index_name], index_metadata)
 
-						# Check for localized directory metadata and update the link
+						# Check for localized directory metadata and update the link:
 						if directory_link.locale
 							localized_metadata = metadata.delete(name + "." + directory_link.locale)
 
@@ -176,7 +176,8 @@ module Utopia
 					end
 
 					if indices == 0
-						links << Link.new(:directory, top + [filename, ""], directory_metadata)
+						# Specify a nil uri if no index could be found for the directory:
+						links << Link.new(:directory, top + [filename, ""], {'uri' => nil}.merge(directory_metadata))
 					end
 				elsif filename.match(INDEX_XNODE_FILTER) && options[:indices] == false
 					name = $1
@@ -193,8 +194,7 @@ module Utopia
 
 			if options[:virtual]
 				metadata.each do |name, details|
-					# Given a virtual named such as "welcome.cn", merge it with metadata 
-					# from "welcome" if it exists.
+					# Given a virtual named such as "welcome.cn", merge it with metadata from "welcome" if it exists:
 					basename, locale = name.split(".", 2)
 
 					if virtual_metadata[basename]

data/lib/utopia/middleware/content.rb

@@ -35,8 +35,8 @@ module Utopia
 				read_file = lambda { Trenni.new(File.read(path), path) }
 				
 				if @files
-					@files.fetch(path) do
-						@files[path] = read_file.call
+					@files.fetch(path) do |key|
+						@files[key] = read_file.call
 					end
 				else
 					read_file.call

data/lib/utopia/version.rb

@@ -6,7 +6,7 @@ module Utopia
 	module VERSION
 		MAJOR = 0
 		MINOR = 9
-		TINY  = 60
+		TINY  = 61
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 60
-  version: 0.9.60
+  - 61
+  version: 0.9.61
 platform: ruby
 authors: 
 - Samuel Williams