utopia 0.9.54 → 0.9.55

data/lib/utopia/link.rb

@@ -113,7 +113,7 @@ module Utopia
 		def self.metadata(path)
 			links_path = File.join(path, LINKS_YAML)
 			if File.exist?(links_path)
-				return YAML::load(File.read(links_path))
+				return YAML::load(File.read(links_path)) || {}
 			else
 				return {}
 			end

data/lib/utopia/middleware/controller.rb

@@ -168,9 +168,11 @@ module Utopia
 
 			def load_file(path)
 				if path.directory?
-					base_path = File.join(@root, path.components)
+					uri_path = path
+					base_path = File.join(@root, uri_path.components)
 				else
-					base_path = File.join(@root, path.dirname.components)
+					uri_path = path.dirname
+					base_path = File.join(@root, uri_path.components)
 				end
 
 				controller_path = File.join(base_path, CONTROLLER_RB)
@@ -178,6 +180,7 @@ module Utopia
 				if File.exist?(controller_path)
 					klass = Class.new(Base)
 					klass.const_set('BASE_PATH', base_path)
+					klass.const_set('URI_PATH', uri_path)
 					
 					$LOAD_PATH.unshift(base_path)
 					

data/lib/utopia/middleware/static.rb

@@ -56,6 +56,7 @@ module Utopia
 				attr :path
 				attr :etag
 
+				# Fit in with Rack::Sendfile
 				def to_path
 					full_path
 				end
@@ -136,32 +137,11 @@ module Utopia
 				return result
 			end
 
-			# Accelerate the response if sendfile is configured.
-			def sendfile(request, response)
-				if @sendfile.respond_to?(:call)
-					response = @sendfile.call(request.env, response)
-				elsif @sendfile && request.env['UTOPIA_SENDFILE'] == "X-Sendfile"
-					response[1]["X-Sendfile"] = response[2].full_path
-					response[2] = []
-				elsif @sendfile && request.env['UTOPIA_SENDFILE'] == "X-Accel-Redirect"
-					response[1]["X-Accel-Redirect"] = response[2].path.to_s
-					response[2] = []
-				end
-				
-				return response
-			end
-
 			public
 			def initialize(app, options = {})
 				@app = app
 				@root = options[:root] || Utopia::Middleware::default_root
-
-				if options.key? :sendfile
-					@sendfile = options[:sendfile]
-				else
-					@sendfile = (UTOPIA_ENV == :production)
-				end
-
+				
 				if options[:types]
 					@extensions = load_mime_types(options[:types])
 				else
@@ -236,7 +216,7 @@ module Utopia
 						if file.modified?(env)
 							response_headers["Content-Length"] = file.size.to_s
 							
-							return sendfile(request, [200, response_headers, file])
+							return [200, response_headers, file]
 						else
 							return [304, response_headers, []]
 						end

data/lib/utopia/path.rb

@@ -88,6 +88,21 @@ module Utopia
 			end
 		end
 
+		# Computes the difference of the path.
+		# /a/b/c - /a/b -> c
+		# a/b/c - a/b -> c
+		def -(other)
+			i = 0
+			
+			while i < other.components.size
+				break if @components[i] != other.components[i]
+				
+				i += 1
+			end
+			
+			return Path.create(@components[i,@components.size])
+		end
+
 		def simplify
 			result = absolute? ? [""] : []
 

data/lib/utopia/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utopia
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: 
   segments: 
   - 0
   - 9
-  - 54
-  version: 0.9.54
+  - 55
+  version: 0.9.55
 platform: ruby
 authors: 
 - Samuel Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +12:00
+date: 2011-06-30 00:00:00 +12:00
 default_executable: utopia
 dependencies: 
 - !ruby/object:Gem::Dependency