utopia 0.9.17 → 0.9.18

data/lib/utopia/middleware/directory_index.rb

@@ -23,9 +23,9 @@ module Utopia
 			def initialize(app, options = {})
 				@app = app
 				@root = options[:root] || Utopia::Middleware::default_root
-				
+
 				@files = ["index.html"]
-				
+
 				@default = "index"
 			end
 
@@ -36,14 +36,12 @@ module Utopia
 					# Check to see if one of the files exists in the requested directory
 					@files.each do |file|
 						if File.exist?(File.join(@root, path.components, file))
-							env["PATH_INFO"] = (path + file).to_s
-							return @app.call(env)
+							return [307, {"Location" => (path + file).to_s}, []]
 						end
 					end
 				
 					# Use the default path
-					env["PATH_INFO"] = (path + @default).to_s
-					return @app.call(env)
+					return [307, {"Location" => (path + @default).to_s}, []]
 				else
 					return @app.call(env)
 				end

data/lib/utopia/middleware/static.rb

@@ -18,6 +18,7 @@ require 'utopia/path'
 
 require 'time'
 
+require 'digest/sha1'
 require 'mime/types'
 
 module Utopia
@@ -36,9 +37,11 @@ module Utopia
 			class FileReader
 				def initialize(path)
 					@path = path
+					@etag = Digest::SHA1.hexdigest("#{File.size(@path)}#{mtime_date}")
 				end
 
 				attr :path
+				attr :etag
 
 				def to_path
 					@path
@@ -59,6 +62,19 @@ module Utopia
 						end
 					end
 				end
+
+				def modified?(env)
+					if modified_since = env['HTTP_IF_MODIFIED_SINCE']
+						return false if File.mtime(@path) <= Time.parse(modified_since)
+					end
+
+					if etags = env['HTTP_IF_NONE_MATCH']
+						etags = etags.split(/\s*,\s*/)
+						return false if etags.include?(etag) || etags.include?('*')
+					end
+
+					return true
+				end
 			end
 
 			def load_mime_types(types)
@@ -112,6 +128,8 @@ module Utopia
 					@extensions = load_mime_types(DEFAULT_TYPES)
 				end
 				
+				@cache_control = options[:cache_control] || "public, max-age=3600"
+				
 				LOG.info "#{self.class.name}: Running in #{@root} with #{extensions.size} filetypes"
 			end
 
@@ -168,10 +186,16 @@ module Utopia
 						response_headers = {
 							"Last-Modified" => file.mtime_date,
 							"Content-Type" => @extensions[ext],
-							"Content-Length" => file.size.to_s
+							"Cache-Control" => @cache_control,
+							"ETag" => file.etag
 						}
 
-						return [200, response_headers, file]
+						if file.modified?(env)
+							response_headers["Content-Length"] = file.size.to_s
+							return [200, response_headers, file]
+						else
+							return [304, response_headers, []]
+						end
 					elsif redirect = lookup_relative_file(path)
 						return [307, {"Location" => redirect}, []]
 					end

data/lib/utopia/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 17
-  version: 0.9.17
+  - 18
+  version: 0.9.18
 platform: ruby
 authors: 
 - Samuel Williams