utopia 0.9.58 → 0.9.59

data/lib/utopia.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #

data/lib/utopia/extensions/array.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/extensions/date.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/extensions/hash.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/extensions/rack.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/extensions/regexp.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/extensions/string.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/http_status_codes.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/link.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 
@@ -77,10 +77,10 @@ module Utopia
 			options[:content] ||= title
 			options[:class] ||= "link"
 			
-			if href == "\#"
-				"<span class=#{options[:class].dump}>#{options[:content].to_html}</span>"
-			else
+			if href?
 				"<a class=#{options[:class].dump} href=\"#{href.to_html}\">#{options[:content].to_html}</a>"
+			else
+				"<span class=#{options[:class].dump}>#{options[:content].to_html}</span>"
 			end
 		end
 		
@@ -160,6 +160,7 @@ module Utopia
 					indices = 0
 					Links.indices(fullpath) do |index|
 						index_name = File.basename(index, ".xnode")
+						# Values in indices_metadata will override values in directory_metadata:
 						index_metadata = directory_metadata.merge(indices_metadata[index_name] || {})
 
 						directory_link = Link.new(:directory, top + [filename, index_name], index_metadata)
@@ -179,7 +180,8 @@ module Utopia
 					end
 
 					if indices == 0
-						links << Link.new(:directory, top + [filename, ""], directory_metadata.merge(:uri => "\#"))
+						# We specify that no link was found, unless one was explicitly specified in directory_metadata:
+						links << Link.new(:directory, top + [filename, ""], {:uri => "\#"}.merge(directory_metadata))
 					end
 				elsif filename.match(INDEX_XNODE_FILTER) && options[:indices] == false
 					name = $1

data/lib/utopia/middleware.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/all.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/benchmark.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/content.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/content/node.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/controller.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/directory_index.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/filter.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 require 'utopia/middleware'

data/lib/utopia/middleware/localization.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/localization/name.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/logger.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/redirector.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/requester.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/middleware/static.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/path.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/session/encrypted_cookie.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/setup/config.ru

@@ -59,4 +59,4 @@ end
 
 use Utopia::Middleware::Content
 
-run lambda { [404, {}, []] }
+run lambda { |env| [404, {}, []] }

data/lib/utopia/tag.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/tags.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/tags/all.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/tags/env.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/tags/fortune.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/tags/gallery.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/tags/google_analytics.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/tags/node.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/tags/override.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/time_store.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/trenni.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/version.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 
@@ -6,7 +6,7 @@ module Utopia
 	module VERSION
 		MAJOR = 0
 		MINOR = 9
-		TINY  = 58
+		TINY  = 59
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end

data/lib/utopia/xnode.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/xnode/processor.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

data/lib/utopia/xnode/scanner.rb

@@ -1,4 +1,4 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 58
-  version: 0.9.58
+  - 59
+  version: 0.9.59
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 +13:00
+date: 2012-06-16 00:00:00 +12:00
 default_executable: utopia
 dependencies: 
 - !ruby/object:Gem::Dependency