utopia 0.9.57 → 0.9.58

data/lib/utopia/extensions/rack.rb

@@ -2,6 +2,19 @@
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 
+class Rack::Request
+	def url_with_path(path = "")
+		url = scheme + "://"
+		url << host
+
+		if scheme == "https" && port != 443 || scheme == "http" && port != 80
+			url << ":#{port}"
+		end
+
+		url << path
+	end
+end
+
 class Rack::Response
 	def do_not_cache!
 		self["Cache-Control"] = "no-cache, must-revalidate"
@@ -14,4 +27,8 @@ class Rack::Response
 			self["Expires"] = (Time.now + duration).httpdate
 		end
 	end
+	
+	def content_type!(value)
+		self["Content-Type"] = value.to_s
+	end
 end

data/lib/utopia/http_status_codes.rb

@@ -31,6 +31,7 @@ module Utopia
 		403 => "Access Forbidden",
 		404 => "Resource Not Found",
 		405 => "Unsupported Method",
+		416 => "Byte range unsatisfiable",
 		500 => "Internal Server Error",
 		501 => "Not Implemented",
 		503 => "Service Unavailable"

data/lib/utopia/middleware.rb

@@ -5,6 +5,7 @@
 require 'pathname'
 require 'logger'
 
+require 'utopia/http_status_codes'
 require 'utopia/extensions/rack'
 
 module Utopia
@@ -15,6 +16,16 @@ module Utopia
 		def self.default_root(subdir = "pages")
 			Pathname.new(Dir.pwd).join(subdir).cleanpath.to_s
 		end
+		
+		def self.failure(status = 500, message = "Non-specific error")
+			body = "#{HTTP_STATUS_DESCRIPTIONS[status] || status.to_s}: #{message}"
+			
+			return [status, {
+				"Content-Type" => "text/plain",
+				"Content-Length" => body.size.to_s,
+				"X-Cascade" => "pass"
+			}, [body]]
+		end
 	end
 end
 

data/lib/utopia/middleware/static.rb

@@ -1,6 +1,7 @@
 #	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
+
 require 'utopia/middleware'
 require 'utopia/path'
 
@@ -50,11 +51,14 @@ module Utopia
 					@root = root
 					@path = path
 					@etag = Digest::SHA1.hexdigest("#{File.size(full_path)}#{mtime_date}")
+
+					@range = nil
 				end
 
 				attr :root
 				attr :path
 				attr :etag
+				attr :range
 
 				# Fit in with Rack::Sendfile
 				def to_path
@@ -74,8 +78,15 @@ module Utopia
 				end
 
 				def each
-					File.open(full_path, "rb") do |fp|
-						while part = fp.read(8192)
+					File.open(full_path, "rb") do |file|
+						file.seek(@range.begin)
+						remaining = @range.end - @range.begin+1
+
+						while remaining > 0
+							break unless part = file.read([8192, remaining].min)
+
+							remaining -= part.length
+
 							yield part
 						end
 					end
@@ -93,6 +104,38 @@ module Utopia
 
 					return true
 				end
+
+				def serve(env, response_headers)
+					ranges = Rack::Utils.byte_ranges(env, size)
+					response = [200, response_headers, self]
+
+					# LOG.info("Requesting ranges: #{ranges.inspect} (#{size})")
+
+					if ranges.nil? || ranges.length > 1
+						# No ranges, or multiple ranges (which we don't support):
+						# TODO: Support multiple byte-ranges
+						response[0] = 200
+						response[1]["Content-Length"] = size.to_s
+						@range = 0..size-1
+					elsif ranges.empty?
+						# Unsatisfiable. Return error, and file size:
+						response = Middleware::failure(416, "Invalid range specified.")
+						response[1]["Content-Range"] = "bytes */#{size}"
+						return response
+					else
+						# Partial content:
+						@range = ranges[0]
+						response[0] = 206
+						response[1]["Content-Range"] = "bytes #{@range.begin}-#{@range.end}/#{size}"
+						response[1]["Content-Length"] = (@range.end - @range.begin+1).to_s
+						size = @range.end - @range.begin + 1
+					end
+
+					# LOG.info("Response for #{self.full_path}: #{response.inspect}")
+					LOG.info "Serving file #{full_path.inspect}, range #{@range.inspect}"
+
+					return response
+				end
 			end
 
 			def load_mime_types(types)
@@ -141,15 +184,15 @@ module Utopia
 			def initialize(app, options = {})
 				@app = app
 				@root = options[:root] || Utopia::Middleware::default_root
-				
+
 				if options[:types]
 					@extensions = load_mime_types(options[:types])
 				else
 					@extensions = load_mime_types(MIME_TYPES[:default])
 				end
-				
+
 				@cache_control = options[:cache_control] || "public, max-age=3600"
-				
+
 				LOG.info "** #{self.class.name}: Running in #{@root} with #{extensions.size} filetypes"
 				# LOG.info @extensions.inspect
 			end
@@ -203,21 +246,21 @@ module Utopia
 			def call(env)
 				request = Rack::Request.new(env)
 				ext = File.extname(request.path_info)
+
 				if @extensions.key? ext.downcase
 					path = Path.create(request.path_info).simplify
-					
+
 					if file = fetch_file(path)
 						response_headers = {
 							"Last-Modified" => file.mtime_date,
 							"Content-Type" => @extensions[ext],
 							"Cache-Control" => @cache_control,
 							"ETag" => file.etag,
+							"Accept-Ranges" => "bytes"
 						}
 
 						if file.modified?(env)
-							response_headers["Content-Length"] = file.size.to_s
-							
-							return [200, response_headers, file]
+							return file.serve(env, response_headers)
 						else
 							return [304, response_headers, []]
 						end

data/lib/utopia/setup/pages/_page.xnode

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<?r response["Content-Type"] = "text/html; charset=utf-8" ?>
-		<?r response["Cache-Control"] = "max-age=3600" ?>
+		<?r response.content_type! "text/html; charset=utf-8" ?>
+		<?r response.cache! ?>
 		
 		<?r if title = (attributes["title"] || @title) ?>
 			<title>#{title.gsub(/<.*?>/, "")} - Utopia</title>

data/lib/utopia/version.rb

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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: utopia
 version: !ruby/object:Gem::Version 
-  hash: 73
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 9
-  - 57
-  version: 0.9.57
+  - 58
+  version: 0.9.58
 platform: ruby
 authors: 
 - Samuel Williams
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 Z
+date: 2012-01-12 00:00:00 +13:00
+default_executable: utopia
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -35,11 +33,9 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -49,11 +45,9 @@ dependencies:
   name: rack-cache
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -63,11 +57,9 @@ dependencies:
   name: rack-contrib
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -77,11 +69,9 @@ dependencies:
   name: rmagick
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -155,6 +145,7 @@ files:
 - lib/utopia/xnode.rb
 - lib/utopia.rb
 - bin/utopia
+has_rdoc: true
 homepage: http://www.oriontransfer.co.nz/software/utopia
 licenses: []
 
@@ -164,27 +155,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Utopia is a framework for building websites.