RubyGems - utopia - Versions diffs - 0.12.6 → 1.0.0 - Mend

utopia 0.12.6 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (126) hide show

checksums.yaml +4 -4
data/.travis.yml +6 -2
data/Gemfile +6 -0
data/README.md +48 -14
data/Rakefile +5 -0
data/bin/utopia +132 -15
data/lib/utopia.rb +13 -10
data/lib/utopia/content.rb +140 -0
data/lib/utopia/content/link.rb +124 -0
data/lib/utopia/content/links.rb +228 -0
data/lib/utopia/content/node.rb +387 -0
data/lib/utopia/content/processor.rb +128 -0
data/lib/utopia/content/tag.rb +102 -0
data/lib/utopia/controller.rb +137 -0
data/lib/utopia/controller/action.rb +112 -0
data/lib/utopia/controller/base.rb +174 -0
data/lib/utopia/{middleware/controller → controller}/variables.rb +36 -38
data/lib/utopia/exception_handler.rb +79 -0
data/lib/utopia/extensions/array.rb +2 -2
data/lib/utopia/localization.rb +143 -0
data/lib/utopia/mail_exceptions.rb +136 -0
data/lib/utopia/middleware.rb +7 -22
data/lib/utopia/path.rb +150 -60
data/lib/utopia/redirector.rb +152 -0
data/lib/utopia/{extensions/hash.rb → session.rb} +4 -6
data/lib/utopia/session/encrypted_cookie.rb +46 -48
data/lib/utopia/{middleware/directory_index.rb → session/lazy_hash.rb} +44 -27
data/lib/utopia/static.rb +255 -0
data/lib/utopia/tags/deferred.rb +12 -8
data/lib/utopia/tags/environment.rb +18 -6
data/lib/utopia/tags/node.rb +12 -8
data/lib/utopia/tags/override.rb +12 -12
data/lib/utopia/version.rb +1 -1
data/setup/.bowerrc +3 -0
data/{lib/utopia/setup → setup}/Gemfile +1 -1
data/setup/Rakefile +4 -0
data/{lib/utopia/setup → setup}/cache/head/readme.txt +0 -0
data/{lib/utopia/setup → setup}/cache/meta/readme.txt +0 -0
data/setup/config.ru +64 -0
data/{lib/utopia/setup → setup}/lib/readme.txt +0 -0
data/{lib/utopia/setup → setup}/pages/_heading.xnode +0 -0
data/{lib/utopia/setup → setup}/pages/_page.xnode +1 -1
data/{lib/utopia/setup → setup}/pages/_static/icon.png +0 -0
data/setup/pages/_static/site.css +70 -0
data/{lib/utopia/setup → setup}/pages/errors/exception.xnode +0 -0
data/{lib/utopia/setup → setup}/pages/errors/file-not-found.xnode +0 -0
data/{lib/utopia/setup → setup}/pages/links.yaml +0 -0
data/setup/pages/welcome/index.xnode +17 -0
data/{lib/utopia/setup → setup}/public/readme.txt +0 -0
data/spec/utopia/content/link_spec.rb +108 -0
data/spec/utopia/content/links/foo/index.xnode +0 -0
data/spec/utopia/content/links/foo/links.yaml +2 -0
data/spec/utopia/content/links/foo/test.de.xnode +0 -0
data/spec/utopia/content/links/foo/test.en.xnode +0 -0
data/spec/utopia/content/links/links.yaml +9 -0
data/spec/utopia/content/links/welcome.xnode +0 -0
data/spec/utopia/content/localized/five/index.en.xnode +0 -0
data/spec/utopia/content/localized/four/index.en.xnode +0 -0
data/spec/utopia/content/localized/four/index.zh.xnode +0 -0
data/spec/utopia/content/localized/four/links.yaml +4 -0
data/spec/utopia/content/localized/links.yaml +16 -0
data/spec/utopia/content/localized/one.xnode +0 -0
data/spec/utopia/content/localized/three/index.xnode +0 -0
data/spec/utopia/content/localized/two.en.xnode +0 -0
data/spec/utopia/content/localized/two.zh.xnode +0 -0
data/spec/utopia/content/node/ordered/first.xnode +0 -0
data/spec/utopia/content/node/ordered/index.xnode +0 -0
data/spec/utopia/content/node/ordered/links.yaml +4 -0
data/spec/utopia/content/node/ordered/second.xnode +0 -0
data/spec/utopia/content/node/related/foo.en.xnode +0 -0
data/spec/utopia/content/node/related/foo.ja.xnode +0 -0
data/spec/utopia/content/node/related/links.yaml +4 -0
data/spec/utopia/content/node_spec.rb +63 -0
data/spec/utopia/{middleware/content_spec.rb → content/processor_spec.rb} +34 -23
data/spec/utopia/content_spec.rb +87 -0
data/spec/utopia/content_spec.ru +10 -0
data/spec/utopia/{middleware/controller_spec.rb → controller_spec.rb} +61 -16
data/spec/utopia/controller_spec.ru +4 -0
data/spec/utopia/extensions_spec.rb +6 -17
data/spec/utopia/localization_spec.rb +60 -0
data/spec/utopia/localization_spec.ru +11 -0
data/{lib/utopia/tags.rb → spec/utopia/middleware_spec.rb} +8 -14
data/spec/utopia/{middleware/content_root → pages}/_heading.xnode +0 -0
data/spec/utopia/pages/content/_show-value.xnode +1 -0
data/spec/utopia/pages/content/test-partial.xnode +1 -0
data/spec/utopia/pages/controller/controller.rb +28 -0
data/spec/utopia/pages/controller/index.xnode +1 -0
data/spec/utopia/pages/controller/nested/controller.rb +4 -0
data/spec/utopia/{middleware/content_root → pages}/index.xnode +0 -0
data/spec/utopia/pages/localized.de.txt +1 -0
data/spec/utopia/pages/localized.en.txt +1 -0
data/spec/utopia/pages/localized.jp.txt +1 -0
data/spec/utopia/pages/node/index.xnode +1 -0
data/spec/utopia/pages/test.txt +1 -0
data/spec/utopia/path_spec.rb +109 -0
data/spec/utopia/rack_spec.rb +2 -0
data/spec/utopia/session_spec.rb +82 -0
data/spec/utopia/session_spec.ru +20 -0
data/spec/utopia/spec_helper.rb +16 -0
data/{lib/utopia/extensions/string.rb → spec/utopia/static_spec.rb} +24 -15
data/spec/utopia/static_spec.ru +4 -0
data/utopia.gemspec +3 -3
metadata +138 -54
data/lib/utopia/extensions/regexp.rb +0 -33
data/lib/utopia/link.rb +0 -288
data/lib/utopia/middleware/all.rb +0 -33
data/lib/utopia/middleware/content.rb +0 -157
data/lib/utopia/middleware/content/node.rb +0 -386
data/lib/utopia/middleware/content/processor.rb +0 -123
data/lib/utopia/middleware/controller.rb +0 -130
data/lib/utopia/middleware/controller/action.rb +0 -121
data/lib/utopia/middleware/controller/base.rb +0 -184
data/lib/utopia/middleware/exception_handler.rb +0 -80
data/lib/utopia/middleware/localization.rb +0 -147
data/lib/utopia/middleware/localization/name.rb +0 -69
data/lib/utopia/middleware/mail_exceptions.rb +0 -138
data/lib/utopia/middleware/redirector.rb +0 -146
data/lib/utopia/middleware/requester.rb +0 -126
data/lib/utopia/middleware/static.rb +0 -295
data/lib/utopia/setup.rb +0 -60
data/lib/utopia/setup/config.ru +0 -47
data/lib/utopia/setup/pages/_static/background.png +0 -0
data/lib/utopia/setup/pages/_static/site.css +0 -48
data/lib/utopia/setup/pages/welcome/index.xnode +0 -7
data/lib/utopia/tag.rb +0 -105
data/lib/utopia/tags/all.rb +0 -34

data/lib/utopia/middleware/exception_handler.rb DELETED

@@ -1,80 +0,0 @@
-# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-require 'utopia/middleware'
-require 'utopia/extensions/string'
-module Utopia
-	module Middleware
-		class ExceptionHandler
-			def initialize(app, location)
-				@app = app
-				@location = location
-			end
-			def fatal_error(env, ex)
-				body = StringIO.new
-				body.puts "<!DOCTYPE html><html><head><title>Fatal Error</title></head><body>"
-				body.puts "<h1>Fatal Error</h1>"
-				body.puts "<p>While requesting resource #{env['PATH_INFO'].to_html}, a fatal error occurred.</p>"
-				body.puts "<blockquote><strong>#{ex.class.name.to_html}</strong>: #{ex.to_s.to_html}</blockquote>"
-				body.puts "<p>There is nothing more we can do to fix the problem at this point.</p>"
-				body.puts "<p>We apologize for the inconvenience.</p>"
-				body.puts "</body></html>"
-				body.rewind
-				return [400, {"Content-Type" => "text/html"}, body]
-			end
-			def redirect(env, ex)
-				return @app.call(env.merge('PATH_INFO' => @location, 'REQUEST_METHOD' => 'GET'))
-			end
-			def call(env)
-				begin
-					return @app.call(env)
-				rescue Exception => ex
-					log = ::Logger.new(env['rack.errors'])
-					log.error "Exception #{ex.to_s.dump}!"
-					ex.backtrace.each do |bt|
-						log.error bt
-					end
-					if env['PATH_INFO'] == @location
-						return fatal_error(env, ex)
-					else
-						# If redirection fails
-						begin
-							return redirect(env, ex)
-						rescue
-							return fatal_error(env, ex)
-						end
-					end
-				end
-			end
-		end
-	end
-end

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

@@ -1,147 +0,0 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-require 'utopia/middleware'
-require 'utopia/middleware/localization/name'
-module Rack
-	class Request
-		def current_locale
-			env["utopia.current_locale"]
-		end
-		def all_locales
-			localization.all_locales
-		end
-		def localization
-			env["utopia.localization"]
-		end
-	end
-end
-module Utopia
-	module Middleware
-		class Localization
-			def initialize(app, options = {})
-				@app = app
-				@default_locale = options[:default] || "en"
-				@all_locales = options[:all] || ["en"]
-				@nonlocalized = options[:nonlocalized] || []
-			end
-			def named_locale(resource_name)
-				if resource_name
-					Name.extract_locale(resource_name, @all_locales)
-				else
-					nil
-				end
-			end
-			attr :all_locales
-			attr :default_locale
-			def check_resource(resource_name, resource_locale, env)
-				localized_name = Name.localized(resource_name, resource_locale, @all_locales).join(".")
-				localized_path = Path.create(env["PATH_INFO"]).dirname + localized_name
-				localization_probe = env.dup
-				localization_probe["REQUEST_METHOD"] = "HEAD"
-				localization_probe["PATH_INFO"] = localized_path.to_s
-				# Find out if a resource exists for the requested localization
-				return [localized_path, @app.call(localization_probe)]
-			end
-			def nonlocalized?(env)
-				@nonlocalized.each do |pattern|
-					case pattern
-					when String
-						return true if pattern == env["PATH_INFO"]
-					when Regexp
-						return true if pattern.match(env["PATH_INFO"])
-					when pattern.respond_to?(:call)
-						return true if pattern.call(env)
-					end
-				end
-				return false
-			end
-			def call(env)
-				# Check for a non-localized resource.
-				if nonlocalized?(env)
-					return @app.call(env)
-				end
-				# Otherwise, we need to check if the resource has been localized based on the request and referer parameters.
-				path = Path.create(env["PATH_INFO"])
-				env["utopia.localization"] = self
-				referer_locale = named_locale(env['HTTP_REFERER'])
-				request_locale = named_locale(path.basename)
-				resource_name = Name.nonlocalized(path.basename, @all_locales).join(".")
-				response = nil
-				if request_locale
-					env["utopia.current_locale"] = request_locale
-					resource_path, response = check_resource(resource_name, request_locale, env)
-				elsif referer_locale
-					env["utopia.current_locale"] = referer_locale
-					resource_path, response = check_resource(resource_name, referer_locale, env)
-				end
-				# If the previous checks failed, i.e. there was no request/referer locale
-				# or the response was 404 (i.e. no localised resource), we check for the
-				# @default_locale
-				if response == nil || response[0] >= 400
-					env["utopia.current_locale"] = @default_locale
-					resource_path, response = check_resource(resource_name, @default_locale, env)
-				end
-				# If the response is 2xx, we have a localised resource
-				if response[0] < 300
-					# If the original request was the same as the localized request,
-					if path.basename == resource_path.basename
-						# The resource URI is correct.
-						return @app.call(env)
-					else
-						# Redirect to the correct resource URI.
-						return [307, {"Location" => resource_path.to_s}, []]
-					end
-				elsif response[0] < 400
-					# We have encountered a redirect while accessing the localized resource
-					return response
-				else
-					# A localized resource was not found, return the unlocalised resource path,
-					if path.basename == resource_name
-						return @app.call(env)
-					else
-						return [307, {"Location" => (path.dirname + resource_name).to_s}, []]
-					end
-				end
-			end
-		end
-	end
-end

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

@@ -1,69 +0,0 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-module Utopia
-	module Middleware
-		class Localization
-			module Name
-				def self.nonlocalized(resource_name, all_locales)
-					resource_name = resource_name.split(".") unless resource_name.kind_of? Array
-					# We either have a file extension or an existing locale
-					if all_locales.include?(resource_name[-1])
-						resource_name.delete_at(-1)
-					elsif all_locales.include?(resource_name[-2])
-						resource_name.delete_at(-2)
-					end
-					resource_name
-				end
-				def self.extract_locale(resource_name, all_locales)
-					resource_name = resource_name.split(".") unless resource_name.kind_of? Array
-					# We either have a file extension or an existing locale
-					if all_locales.include?(resource_name[-1])
-						return resource_name[-1]
-					elsif all_locales.include?(resource_name[-2])
-						return resource_name[-2]
-					end
-					return nil
-				end
-				def self.localized(resource_name, locale, all_locales)
-					nonlocalized_name = nonlocalized(resource_name, all_locales)
-					if locale == nil
-						return nonlocalized_name
-					end
-					if nonlocalized_name.size == 1
-						return nonlocalized_name.push(locale)
-					else
-						return nonlocalized_name.insert(-2, locale)
-					end
-				end
-			end
-		end
-	end
-end

data/lib/utopia/middleware/mail_exceptions.rb DELETED

@@ -1,138 +0,0 @@
-# Copyright, 2013, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-require 'net/smtp'
-require 'mail'
-module Utopia
-	module Middleware
-		# Catches all exceptions raised from the app it wraps and sends a useful email with the exception, stacktrace, and contents of the environment.
-		class MailExceptions
-			# A basic local non-authenticated SMTP server.
-			LOCAL_SMTP = [:smtp, {
-				:address => "localhost",
-				:port => 25,
-				:enable_starttls_auto => false
-			}]
-			def initialize(app, config = {})
-				@app = app
-				@to = config[:to] || "postmaster"
-				@from = config.fetch(:from) {(ENV['USER'] || 'rack') + "@localhost"}
-				@subject = config[:subject] || '%{exception} [PID %{pid} : %{cwd}]'
-				@delivery_method = config.fetch(:delivery_method, LOCAL_SMTP)
-				@dump_environment = config.fetch(:dump_environment, false)
-			end
-			def call(env)
-				begin
-					return @app.call(env)
-				rescue => exception
-					send_notification exception, env
-					raise
-				end
-			end
-			private
-			REQUEST_KEYS = [:ip, :referrer, :path, :user_agent]
-			def generate_body(exception, env)
-				io = StringIO.new
-				# Dump out useful rack environment variables:
-				request = Rack::Request.new(env)
-				io.puts "#{request.request_method} #{request.url}"
-				io.puts
-				REQUEST_KEYS.each do |key|
-					value = request.send(key)
-					io.puts "request.#{key}: #{value.inspect}"
-				end
-				request.params.each do |key, value|
-					io.puts "request.params.#{key}: #{value.inspect}"
-				end
-				io.puts
-				io.puts "#{exception.class.name}: #{exception.to_s}"
-				if exception.respond_to?(:backtrace)
-					io.puts exception.backtrace
-				else
-					io.puts exception.to_s
-				end
-				return io.string
-			end
-			def generate_mail(exception, env)
-				attributes = {
-					exception: exception.class.name,
-					pid: $$,
-					cwd: Dir.getwd,
-				}
-				mail = Mail.new(
-					:from => @from,
-					:to => @to,
-					:subject => @subject % attributes
-				)
-				mail.text_part = Mail::Part.new
-				mail.text_part.body = generate_body(exception, env)
-				if body = extract_body(env) and body.size > 0
-					mail.attachments['body.bin'] = body
-				end
-				if @dump_environment
-					mail.attachments['environment.yaml'] = YAML::dump(env)
-				end
-				return mail
-			end
-			def send_notification(exception, env)
-				mail = generate_mail(exception, env)
-				mail.delivery_method(*@delivery_method) if @delivery_method
-				mail.deliver
-			rescue => mail_exception
-				$stderr.puts mail_exception.to_s
-				$stderr.puts mail_exception.backtrace
-			end
-			def extract_body(env)
-				if io = env['rack.input']
-					io.rewind if io.respond_to?(:rewind)
-					io.read
-				end
-			end
-		end
-	end
-end

data/lib/utopia/middleware/redirector.rb DELETED

@@ -1,146 +0,0 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-require 'utopia/middleware'
-require 'utopia/extensions/regexp'
-require 'utopia/extensions/string'
-module Utopia
-	module Middleware
-		class FailedRequestError < StandardError
-			def initialize(resource_path, resource_status, error_path, error_status)
-				@resource_path = resource_path
-				@resource_status = resource_status
-				@error_path = error_path
-				@error_status = error_status
-			end
-			def to_s
-				"Requested resource #{@resource_path} resulted in a #{@resource_status} error. Requested error handler #{@error_path} resulted in a #{@error_status} error."
-			end
-		end
-		class Redirector
-			# Redirects a whole source tree to a destination tree, given by the roots.
-			def self.moved(source_root, destination_root)
-				return [
-					/^#{Regexp.escape(source_root)}(.*)$/,
-					lambda do |match|
-						[301, {"Location" => (destination_root + match[1]).to_s}, []]
-					end
-				]
-			end
-			private
-			def normalize_strings(strings)
-				normalized = {}
-				strings.each_pair do |key, value|
-					if Array === key
-						key.each { |s| normalized[s] = value }
-					else
-						normalized[key] = value
-					end
-				end
-				return normalized
-			end
-			def normalize_patterns(patterns)
-				normalized = []
-				patterns.each do |pattern|
-					uri = pattern.pop
-					pattern.each do |key|
-						normalized.push([key, uri])
-					end
-				end
-				return normalized
-			end
-			public
-			def initialize(app, options = {})
-				@app = app
-				@strings = options[:strings] || {}
-				@patterns = options[:patterns] || []
-				@patterns.collect! do |rule|
-					if Symbol === rule[0]
-						self.class.send(*rule)
-					else
-						rule
-					end
-				end
-				@strings = normalize_strings(@strings)
-				@patterns = normalize_patterns(@patterns)
-				@errors = options[:errors]
-			end
-			def redirect(uri, match_data)
-				if uri.respond_to? :call
-					return uri.call(match_data)
-				else
-					return [301, {"Location" => uri.to_s}, []]
-				end
-			end
-			def call(env)
-				base_path = env['PATH_INFO']
-				if uri = @strings[base_path]
-					return redirect(@strings[base_path], base_path)
-				end
-				@patterns.each do |pattern, uri|
-					if match_data = pattern.match(base_path)
-						result = redirect(uri, match_data)
-						return result if result != nil
-					end
-				end
-				response = @app.call(env)
-				if @errors && response[0] >= 400 && uri = @errors[response[0]]
-					error_request = env.merge("PATH_INFO" => uri, "REQUEST_METHOD" => "GET")
-					error_response = @app.call(error_request)
-					if error_response[0] >= 400
-						raise FailedRequestError.new(env['PATH_INFO'], response[0], uri, error_response[0])
-					else
-						# Feed the error code back with the error document
-						error_response[0] = response[0]
-						return error_response
-					end
-				else
-					return response
-				end
-			end
-		end
-	end
-end