utopia 0.9.24 → 0.9.25

data/lib/utopia/extensions.rb

@@ -39,7 +39,7 @@ class String
 	end
 
 	def to_title
-		(" " + self).gsub(/[ \-_](.)/){" " + $1.upcase}
+		(" " + self).gsub(/[ \-_](.)/){" " + $1.upcase}.strip
 	end
 
 	def to_snake

data/lib/utopia/link.rb

@@ -239,15 +239,26 @@ module Utopia
 			end
 			
 			if options[:sort]
+				sort_key = options[:sort]
+				sort_default = options[:sort_default] || 0
+				
 				links = links.sort do |a, b|
 					result = nil
+
+					lhs = a[sort_key] || sort_default
+					rhs = b[sort_key] || sort_default
+					
 					begin
-						result ||= (a[options[:sort]] <=> b[options[:sort]])
+						result ||= lhs <=> rhs
 					rescue
 						# LOG.debug("Invalid comparison between #{a.path} and #{b.path} using key #{options[:sort]}!")
 					end
 					
-					result ||= (a.title <=> b.title)
+					if result == 0 || result == nil
+						a.title <=> b.title
+					else
+						result
+					end
 				end
 			end
 			

data/lib/utopia/middleware/content.rb

@@ -115,7 +115,13 @@ module Utopia
 				directory_path = File.join(@root, path.dirname.components, name)
 
 				if File.directory? directory_path
-					return [307, {"Location" => path.dirname.join([name, "index.#{extensions}"]).to_s}, []]
+					if extensions
+						index_path = [name, "index.#{extensions}"]
+					else
+						index_path = [name, "index"]
+					end
+					
+					return [307, {"Location" => path.dirname.join(index_path).to_s}, []]
 				end
 
 				# Otherwise look up the node

data/lib/utopia/version.rb

@@ -17,7 +17,7 @@ module Utopia
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 24
+    TINY  = 25
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 24
-  version: 0.9.24
+  - 25
+  version: 0.9.25
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +12:00
+date: 2010-04-18 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency