utopia 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5899d352ea4513b585949a124dfba139c9bd9aa5
-  data.tar.gz: fbd5fa65a09a3b3238bc04ea1eca9d1e56c10fe8
+  metadata.gz: 27fc0800c0d44763978e981de97541dbf2d0d2ef
+  data.tar.gz: 346b6f43e6e056667c8ab6c30b8b185bfb1cdd58
 SHA512:
-  metadata.gz: deea556aa6cc2fda2e28af33e986b2b8149b1a1afb35111c3c51bbe0ed0eff1e1b3da1cae7dc14e941a7f62d39c8996c70ac56163c3dca3d5339a34cbc81fbe0
-  data.tar.gz: 22d7503edae10b6f21e694762a1d23c3502e7f23275839e1192ad4dd06ba5fe33ec28abd3f8ecd6261a4af94e94cfe7b6232f7af1302644898ca1e7cb146f3cb
+  metadata.gz: e9eedc27a561f991f9d3e637371d51770f31eeeb42d4a46a85f4461a2211b8985b5f86af4f3e5da8115ce45f6b13bfdd12fdc2eafc4b0fa9083dac44d1b6f0af
+  data.tar.gz: d9feff14bb7a57d3d0df656537751abe5e1fb9b1608f49e870a8a4e2f17650e80e41be6601b8411395b60b33faa9b980f75d3b3862455e9c77850d2a07886a4c

data/lib/utopia/controller.rb

@@ -47,17 +47,15 @@ module Utopia
 	class Controller
 		CONTROLLER_RB = 'controller.rb'.freeze
 		
-		def initialize(app, **options)
+		def initialize(app, root: nil, cache_controllers: false)
 			@app = app
-			@root = options[:root] || Utopia::default_root
+			@root = root || Utopia::default_root
 			
-			if options[:cache_controllers]
+			if cache_controllers
 				@controller_cache = Concurrent::Map.new
 			else
 				@controller_cache = nil
 			end
-			
-			self.freeze
 		end
 		
 		attr :app

data/lib/utopia/controller/base.rb

@@ -100,7 +100,7 @@ module Utopia
 			# Copy the instance variables from the previous controller to the next controller (usually only a few). This allows controllers to share effectively the same instance variables while still being separate classes/instances.
 			def copy_instance_variables(from)
 				from.instance_variables.each do |name|
-					instance_variable_set(name, from.instance_variable_get(name))
+					self.instance_variable_set(name, from.instance_variable_get(name))
 				end
 			end
 

data/lib/utopia/controller/respond.rb

@@ -23,7 +23,7 @@ require_relative '../path/matcher'
 
 module Utopia
 	class Controller
-		# This controller layer provides a convenient way to respond to different requested content types.
+		# This controller layer provides a convenient way to respond to different requested content types. The order in which you add converters matters, as it determins how the incoming Accept: header is mapped, e.g. the first converter is also defined as matching the media range */*.
 		module Respond
 			def self.prepended(base)
 				base.extend(ClassMethods)
@@ -42,11 +42,15 @@ module Utopia
 					return [status, headers, body]
 				end
 				
-				class Callback < Struct.new(:content_type, :block)
+				Callback = Struct.new(:content_type, :block) do
 					def headers
 						{HTTP::CONTENT_TYPE => self.content_type}
 					end
 					
+					def split(*args)
+						self.content_type.split(*args)
+					end
+					
 					def call(context, response, media_range)
 						Converter.update_response(response, headers) do |content|
 							context.instance_exec(content, media_range, &block)
@@ -67,6 +71,10 @@ module Utopia
 						APPLICATION_JSON
 					end
 					
+					def self.split(*args)
+						self.content_type.split(*args)
+					end
+					
 					def self.serialize(content, media_range)
 						options = {}
 						
@@ -85,67 +93,58 @@ module Utopia
 				end
 			end
 			
+			module Passthrough
+				WILDCARD = HTTP::Accept::MediaTypes::MediaRange.new('*/*').freeze
+				
+				def self.split(*args)
+					self.media_range.split(*args)
+				end
+				
+				def self.media_range
+					WILDCARD
+				end
+				
+				def self.call(context, response, media_range)
+					return nil
+				end
+			end
+			
 			class Responder
 				HTTP_ACCEPT = 'HTTP_ACCEPT'.freeze
 				NOT_ACCEPTABLE_RESPONSE = [406, {}, []].freeze
 				
 				def initialize
 					@converters = HTTP::Accept::MediaTypes::Map.new
-					@otherwise = nil
 				end
 				
 				def freeze
 					@converters.freeze
-					@otherwise.freeze
 					
 					super
 				end
 				
-				# Parse the list of browser preferred content types and return ordered by priority.
-				def browser_preferred_media_types(env)
-					if accept_content_types = env[HTTP_ACCEPT]
-						HTTP::Accept::MediaTypes.parse(accept_content_types)
-					else
-						return []
-					end
-				end
-				
 				# Add a converter for the specified content type. Call the block with the response content if the request accepts the specified content_type.
 				def with(content_type, &block)
 					@converters << Converter::Callback.new(content_type, block)
 				end
 				
+				def with_passthrough
+					@converters << Passthrough
+				end
+				
 				# Add a converter for JSON when requests accept 'application/json'
 				def with_json
 					@converters << Converter::ToJSON
 				end
 				
-				# If the content type could not be matched, invoke the provided block and use it's result as the response.
-				def otherwise(&block)
-					@otherwise = block
-				end
-				
-				# If the content type could not be matched, ignore it and don't use the result of the controller layer.
-				def otherwise_passthrough
-					@otherwise = proc { nil }
-				end
-				
 				def call(context, request, path, response)
-					media_types = browser_preferred_media_types(request.env)
+					# Parse the list of browser preferred content types and return ordered by priority:
+					media_types = HTTP::Accept::MediaTypes.browser_preferred_media_types(request.env)
 					
 					converter, media_range = @converters.for(media_types)
 					
 					if converter
 						converter.call(context, response, media_range)
-					else
-						not_acceptable_response(context, response)
-					end
-				end
-				
-				# Generate a not acceptable response which unless customised with `otherwise`, will result in a generic 406 Not Acceptable response.
-				def not_acceptable_response(context, response)
-					if @otherwise
-						context.instance_exec(response, &@otherwise)
 					else
 						NOT_ACCEPTABLE_RESPONSE
 					end
@@ -169,7 +168,9 @@ module Utopia
 			# Rewrite the path before processing the request if possible.
 			def passthrough(request, path)
 				if response = super
-					self.class.response_for(self, request, path, response)
+					response = self.class.response_for(self, request, path, response)
+					
+					response
 				end
 			end
 		end

data/lib/utopia/controller/variables.rb

@@ -24,25 +24,34 @@ module Utopia
 			def initialize
 				@controllers = []
 			end
+			
+			def top
+				@controllers.last
+			end
 
 			def << controller
-				top = @controllers.last
+				if top = self.top
+					# This ensures that most variables will be at the top and controllers can naturally interactive with instance variables:
+					controller.copy_instance_variables(top)
+				end
 				
 				@controllers << controller
 				
-				# This ensures that most variables will be at the top and controllers can naturally interactive with instance variables.
-				controller.copy_instance_variables(top) if top
+				return self
 			end
-
-			def fetch(key)
-				@controllers.reverse_each do |controller|
+			
+			# We use self as a seninel
+			def fetch(key, default=self)
+				if controller = self.top
 					if controller.instance_variables.include?(key)
 						return controller.instance_variable_get(key)
 					end
 				end
 				
 				if block_given?
-					yield key
+					yield(key)
+				elsif !default.equal?(self)
+					return default
 				else
 					raise KeyError.new(key)
 				end
@@ -50,20 +59,20 @@ module Utopia
 
 			def to_hash
 				attributes = {}
-
-				@controllers.each do |controller|
+				
+				if controller = self.top
 					controller.instance_variables.each do |name|
 						key = name[1..-1]
 						
 						attributes[key] = controller.instance_variable_get(name)
 					end
 				end
-
+				
 				return attributes
 			end
 
 			def [] key
-				fetch("@#{key}".to_sym) { nil }
+				fetch("@#{key}".to_sym, nil)
 			end
 		end
 	end

data/lib/utopia/exception_handler.rb

@@ -37,40 +37,55 @@ module Utopia
 			
 			super
 		end
-
+		
+		private def write_exception_to_stream(stream, env, exception, include_backtrace = false)
+			buffer = []
+			
+			buffer << "While requesting resource #{env[Rack::PATH_INFO].inspect}, a fatal error occurred:"
+			
+			while exception != nil
+				buffer << "\t#{exception.class.name}: #{exception.to_s}"
+				
+				if include_backtrace
+					exception.backtrace.each do |line|
+						buffer << "\t\t#{line}"
+					end
+				end
+				
+				exception = exception.cause
+			end
+			
+			# We do this in one go so that lines don't get mixed up.
+			stream.puts buffer.join("\n")
+		end
+		
+		# Generate a very simple fatal error response. This function should be unlikely to fail. Additionally, it generates a lowest common denominator response which should be suitable as a response to any kind of request. Ideally, this response is also not good or useful for any kind of higher level browser or API client, as this is not a normal error path but one that represents broken behaviour.
 		def fatal_error(env, exception)
 			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 #{Trenni::Strings::to_html env[Rack::PATH_INFO]}, a fatal error occurred.</p>"
-			body.puts "<blockquote><strong>#{Trenni::Strings::to_html exception.class.name}</strong>: #{Trenni::Strings::to_html exception.to_s}</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>"
+			
+			write_exception_to_stream(body, env, exception)
 			body.rewind
-
-			return [400, {HTTP::CONTENT_TYPE => "text/html"}, body]
+			
+			return [500, {HTTP::CONTENT_TYPE => "text/plain"}, body]
 		end
-
+		
+		def log_exception(env, exception)
+			# An error has occurred, log it:
+			output = env['rack.errors'] || $stderr
+			write_exception_to_stream(output, env, exception, true)
+		end
+		
 		def redirect(env, exception)
 			response = @app.call(env.merge(Rack::PATH_INFO => @location, Rack::REQUEST_METHOD => Rack::GET))
 			
 			return [500, response[1], response[2]]
 		end
-
+		
 		def call(env)
 			begin
 				return @app.call(env)
 			rescue Exception => exception
-				# An error has occurred, log it:
-				log = ::Logger.new(env['rack.errors'] || $stderr)
-				
-				log.error "Exception #{exception.to_s.dump}!"
-				
-				exception.backtrace.each do |line|
-					log.error line
-				end
+				log_exception(env, exception)
 				
 				# If the error occurred while accessing the error handler, we finish with a fatal error:
 				if env[Rack::PATH_INFO] == @location

data/lib/utopia/http.rb

@@ -86,7 +86,7 @@ module Utopia
 		
 		CONTENT_TYPE = 'Content-Type'.freeze
 		LOCATION = 'Location'.freeze
-		# ACCEPT = 'Accept'.freeze
+		CACHE_CONTROL = 'Cache-Control'.freeze
 		
 		# A small HTTP status wrapper that verifies the status code within a given range.
 		class Status

data/lib/utopia/locale.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 module Utopia
-	class Locale < Struct.new(:language, :country, :variant)
+	Locale = Struct.new(:language, :country, :variant) do
 		def to_s
 			to_a.compact.join('-')
 		end
@@ -36,7 +36,7 @@ module Utopia
 			elsif instance.is_a? Array
 				return self.new(*instance)
 			elsif instance.is_a? self
-				return instance
+				return instance.frozen? ? instance : instance.dup
 			end
 		end
 	end

data/lib/utopia/middleware.rb

@@ -26,8 +26,6 @@ require_relative 'path'
 require_relative 'extensions/rack'
 
 module Utopia
-	LOG = Logger.new($stderr)
-	
 	PAGES_PATH = 'pages'.freeze
 	
 	# This is used for shared controller variables which get consumed by the content middleware:

data/lib/utopia/redirector.rb

@@ -40,20 +40,12 @@ module Utopia
 		DIRECTORY_INDEX = [/^(.*)\/$/, lambda{|prefix| [307, {HTTP::LOCATION => "#{prefix}index"}, []]}].freeze
 		
 		# 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, {HTTP::LOCATION => (destination_root + match[1]).to_s}, []]
-				end
-			]
+		def self.moved(source_root, destination_root, max_age = 3600*24)
+			return [/^#{Regexp.escape(source_root)}(.*)$/, lambda{|match| destination_root + match[1]}]
 		end
 		
 		def self.starts_with(source_root, destination_uri)
-			return [
-				/^#{Regexp.escape(source_root)}/,
-				destination_uri
-			]
+			return [/^#{Regexp.escape(source_root)}/, destination_uri]
 		end
 		
 		private
@@ -117,13 +109,23 @@ module Utopia
 			
 			super
 		end
-
-		def redirect(uri, match_data)
+		
+		def cache_control(max_age)
+			# http://jacquesmattheij.com/301-redirects-a-dangerous-one-way-street
+			"max-age=#{max_age}"
+		end
+		
+		# We cache 301 redirects for 24 hours.
+		DEFAULT_MAX_AGE = 3600*24
+		
+		def redirect(uri, match_data, status: 301, max_age: DEFAULT_MAX_AGE)
+			cache_control = self.cache_control(max_age)
+			
 			if uri.respond_to? :call
-				return uri.call(match_data)
-			else
-				return [301, {HTTP::LOCATION => uri.to_s}, []]
+				uri = uri.call(match_data)
 			end
+			
+			return [status, {HTTP::LOCATION => uri.to_s, HTTP::CACHE_CONTROL => cache_control}, []]
 		end
 
 		def call(env)

data/lib/utopia/static.rb

@@ -84,6 +84,9 @@ module Utopia
 				end
 			end
 			
+			class ExpansionError < ArgumentError
+			end
+			
 			def expand(types)
 				types.each do |type|
 					current_count = @extensions.size
@@ -102,12 +105,11 @@ module Utopia
 							self.extract_extensions.call([type])
 						end
 					rescue
-						LOG.error{"#{self.class.name}: Error while processing #{type.inspect}!"}
-						raise $!
+						raise ExpansionError.new("#{self.class.name}: Error while processing #{type.inspect}!")
 					end
 					
 					if @extensions.size == current_count
-						LOG.warn{"#{self.class.name}: Could not find any mime type for #{type.inspect}"}
+						raise ExpansionError.new("#{self.class.name}: Could not find any mime type for #{type.inspect}")
 					end
 				end
 			end
@@ -178,7 +180,7 @@ module Utopia
 				ranges = Rack::Utils.byte_ranges(env, size)
 				response = [200, response_headers, self]
 
-				# LOG.info("Requesting ranges: #{ranges.inspect} (#{size})")
+				# puts "Requesting ranges: #{ranges.inspect} (#{size})"
 
 				if ranges == nil or ranges.size != 1
 					# No ranges, or multiple ranges (which we don't support).
@@ -196,7 +198,7 @@ module Utopia
 					response[1]["Content-Range"] = "bytes #{@range.min}-#{@range.max}/#{size}"
 				end
 
-				# LOG.debug {"Serving file #{full_path.inspect}, range #{@range.inspect}"}
+				# puts "Serving file #{full_path.inspect}, range #{@range.inspect}"
 
 				return response
 			end

data/lib/utopia/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "1.3.1"
+	VERSION = "1.3.2"
 end

data/spec/utopia/controller/respond_spec.rb

@@ -89,6 +89,9 @@ module Utopia::Controller::RespondSpec
 		let(:app) {Rack::Builder.parse_file(File.expand_path('respond_spec.ru', __dir__)).first}
 		
 		it "should get html error page" do
+			# Standard web browser header:
+			header 'Accept', 'text/html, text/*, */*'
+			
 			get '/errors/file-not-found'
 			
 			expect(last_response.status).to be == 200
@@ -97,7 +100,9 @@ module Utopia::Controller::RespondSpec
 		end
 		
 		it "should get json error response" do
-			get '/errors/file-not-found', nil, {'HTTP_ACCEPT' => "application/json"}
+			header 'Accept', 'application/json'
+			
+			get '/errors/file-not-found'
 			
 			expect(last_response.status).to be == 404
 			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
@@ -105,7 +110,9 @@ module Utopia::Controller::RespondSpec
 		end
 		
 		it "should get version 1 response" do
-			get '/api/fetch', nil, {'HTTP_ACCEPT' => "application/json;version=1"}
+			header 'Accept', 'application/json;version=1'
+			
+			get '/api/fetch'
 			
 			expect(last_response.status).to be == 200
 			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
@@ -113,11 +120,22 @@ module Utopia::Controller::RespondSpec
 		end
 		
 		it "should get version 2 response" do
-			get '/api/fetch', nil, {'HTTP_ACCEPT' => "application/json;version=2"}
+			header 'Accept', 'application/json;version=2'
+			
+			get '/api/fetch'
 			
 			expect(last_response.status).to be == 200
 			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
 			expect(last_response.body).to be == '{"message":"Goodbye World"}'
 		end
+		
+		
+		it "should work even if no accept header specified" do
+			get '/api/fetch'
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.headers['Content-Type']).to be == 'application/json; charset=utf-8'
+			expect(last_response.body).to be == '{}'
+		end
 	end
 end

data/spec/utopia/controller/respond_spec/api/controller.rb

@@ -1,6 +1,5 @@
 
 prepend Respond
-
 respond.with_json
 
 class VersionedResponse
@@ -14,6 +13,8 @@ class VersionedResponse
 			{"message" => "Hello World"}
 		elsif options[:version] == '2'
 			{"message" => "Goodbye World"}
+		else
+			{}
 		end
 	end
 end

data/spec/utopia/controller/respond_spec/errors/controller.rb

@@ -1,9 +1,13 @@
 
 prepend Respond
 
+# If the request doesn't match application/json specifically, it would be passed through:
+respond.with_passthrough
 respond.with_json
-respond.otherwise_passthrough
 
+# The reason why this test is important is that it tests the behaviour of error handling. Normally, if a request comes into the middleware and fails due to an unhandled exception, this is passed along by Utopia::ExceptionHandler. If the client is expecting JSON, they should get a JSON error response.
 on 'file-not-found' do
 	fail! 404, {message: 'File not found'}
 end
+
+# Accept: text/html, application/json, */*

data/spec/utopia/controller/sequence_spec.rb

@@ -93,7 +93,7 @@ module Utopia::Controller::SequenceSpec
 		
 			result = controller.process!(request, Utopia::Path["/variable"])
 			expect(result).to be == nil
-			expect(variables.to_hash).to be == {"variable"=>:value}
+			expect(variables.to_hash).to be == {"variable" => :value}
 		end
 		
 		it "should call direct controller methods" do

data/spec/utopia/controller/variables_spec.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env rspec
+
+# 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/controller/variables'
+
+RSpec.describe Utopia::Controller::Variables do
+	class TestController
+		attr_accessor :x, :y, :z
+		
+		def copy_instance_variables(from)
+			from.instance_variables.each do |name|
+				self.instance_variable_set(name, from.instance_variable_get(name))
+			end
+		end
+	end
+	
+	let(:a) {TestController.new.tap{|controller| controller.x = 10}}
+	let(:b) {TestController.new.tap{|controller| controller.y = 20}}
+	let(:c) {TestController.new.tap{|controller| controller.z = 30}}
+	
+	it "should fetch a key" do
+		subject << a
+		
+		expect(subject[:x]).to be == 10
+	end
+	
+	it "should give a default when key is not found" do
+		subject << a
+		
+		expect(subject.fetch(:y, :default)).to be == :default
+		expect(subject.fetch(:y){:default}).to be == :default
+	end
+	
+	it "should convert to hash" do
+		subject << a << b
+		
+		expect(subject.to_hash).to be == {'x' => 10, 'y' => 20}
+	end
+end

data/spec/utopia/exception_handler_spec.rb

@@ -33,10 +33,13 @@ module Utopia::ExceptionHandlerSpec
 		let(:app) {Rack::Builder.parse_file(File.expand_path('exception_handler_spec.ru', __dir__)).first}
 		
 		it "should successfully call the controller method" do
+			# This request will raise an exception, and then redirect to the /exception url which will fail again, and cause a fatal error.
+			
 			get "/blow?fatal=true"
 			
-			expect(last_response.status).to be == 400
-			expect(last_response.body).to be_include 'Fatal Error'
+			expect(last_response.status).to be == 500
+			expect(last_response.headers['Content-Type']).to be == 'text/plain'
+			expect(last_response.body).to be_include 'fatal error'
 		end
 		
 		it "should fail with a 500 error" do

data/spec/utopia/exception_handler_spec/controller.rb

@@ -6,6 +6,7 @@ on 'blow' do
 	raise TharSheBlows.new("Arrrh!")
 end
 
+# The ExceptionHandler middleware will redirect here when an exception occurs. If this also fails, things get ugly.
 on 'exception' do |request|
 	if request['fatal']
 		raise TharSheBlows.new("Yarrh!")

data/spec/utopia/http/status_spec.rb

@@ -0,0 +1,42 @@
+# Copyright, 2016, 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/http'
+
+RSpec.describe Utopia::HTTP::Status.new(:found) do
+	it "should load symbolic status" do
+		expect(subject.to_i).to be == 302
+	end
+	
+	it "gives a status string" do
+		expect(subject.to_s).to be == "Found"
+	end
+	
+	it "can be used as a response body" do
+		body = subject.to_enum(:each).next
+		expect(body).to be == "Found"
+	end
+end
+
+RSpec.describe Utopia::HTTP::Status do
+	it "should fail when given invalid code" do
+		expect{Utopia::HTTP::Status.new(1000)}.to raise_error(ArgumentError)
+	end
+end

data/spec/utopia/locale_spec.rb

@@ -21,28 +21,36 @@
 
 require 'utopia/locale'
 
-module Utopia::LocaleSpec
-	describe Utopia::Locale do
-		it "should load from string" do
-			locale = Utopia::Locale.load('en-US')
-			
-			expect(locale.language).to be == 'en'
-			expect(locale.country).to be == 'US'
-			expect(locale.variant).to be == nil
-		end
-		
-		it "should load from nil and return nil" do
-			expect(Utopia::Locale.load(nil)).to be == nil
-		end
+RSpec.shared_examples Utopia::Locale do |input|
+	it "should load locale #{input.inspect}" do
+		expect(Utopia::Locale.load(input)).to be_kind_of(Utopia::Locale)
+	end
+end
+
+RSpec.describe Utopia::Locale do
+	it_behaves_like Utopia::Locale, 'en-US'
+	it_behaves_like Utopia::Locale, ['en', 'US']
+	it_behaves_like Utopia::Locale, Utopia::Locale.load('en-US')
+	
+	it "should load from string" do
+		locale = Utopia::Locale.load('en-US')
 		
-		it "should dump nil and give nil" do
-			expect(Utopia::Locale.dump(nil)).to be == nil
-		end
+		expect(locale.language).to be == 'en'
+		expect(locale.country).to be == 'US'
+		expect(locale.variant).to be == nil
+	end
+	
+	it "should load from nil and return nil" do
+		expect(Utopia::Locale.load(nil)).to be == nil
+	end
+	
+	it "should dump nil and give nil" do
+		expect(Utopia::Locale.dump(nil)).to be == nil
+	end
+	
+	it "should dump locale and give string" do
+		locale = Utopia::Locale.new('en', 'US')
 		
-		it "should dump locale and give string" do
-			locale = Utopia::Locale.new('en', 'US')
-			
-			expect(Utopia::Locale.dump(locale)).to be == 'en-US'
-		end
+		expect(Utopia::Locale.dump(locale)).to be == 'en-US'
 	end
 end

data/spec/utopia/rack_helper.rb

@@ -0,0 +1,27 @@
+# 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 'rack/test'
+
+RSpec.shared_context "rack app" do |rackup_path|
+	include Rack::Test::Methods
+	
+	let(:app) {Rack::Builder.parse_file(File.expand_path(rackup_path, __dir__)).first}
+end

data/spec/utopia/redirector_spec.rb

@@ -0,0 +1,53 @@
+# Copyright, 2016, 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_relative 'rack_helper'
+require 'utopia/redirector'
+
+RSpec.describe Utopia::Redirector do
+	include_context "rack app", "redirector_spec.ru"
+	
+	it "should be permanently moved" do
+		get "/a"
+		
+		expect(last_response.status).to be == 301
+		expect(last_response.headers['Location']).to be == '/b'
+		expect(last_response.headers['Cache-Control']).to include("max-age=86400")
+	end
+	
+	it "should be permanently moved" do
+		get "/"
+		
+		expect(last_response.status).to be == 301
+		expect(last_response.headers['Location']).to be == '/c'
+		expect(last_response.headers['Cache-Control']).to include("max-age=86400")
+	end
+	
+	it "should redirect on 404" do
+		get "/foo"
+		
+		expect(last_response.status).to be == 404
+		expect(last_response.body).to be == "File not found :("
+	end
+	
+	it "should blow up if internal error redirect also fails" do
+		expect{get "/teapot"}.to raise_error Utopia::FailedRequestError
+	end
+end

data/spec/utopia/redirector_spec.ru

@@ -0,0 +1,26 @@
+
+use Utopia::Redirector,
+	patterns: [
+		Utopia::Redirector::DIRECTORY_INDEX,
+		[:moved, "/a", "/b"],
+	],
+	strings: {
+		'/' => '/c',
+	},
+	errors: {
+		404 => "/error",
+		418 => "/teapot",
+	}
+
+def error_handler(env)
+	request = Rack::Request.new(env)
+	if request.path_info == "/error"
+		[200, {}, ["File not found :("]]
+	elsif request.path_info == "/teapot"
+		[418, {}, ["I'm a teapot!"]]
+	else
+		[404, {}, []]
+	end
+end
+
+run self.method(:error_handler)

data/utopia.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency 'rack', '~> 1.6'
 	spec.add_dependency 'rack-cache', '~> 1.2.0'
 	
-	spec.add_dependency 'http-accept', '~> 1.2.0'
+	spec.add_dependency 'http-accept', '~> 1.4.0'
 	
 	spec.add_dependency 'mail', '~> 2.6.3'
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -290,10 +290,12 @@ files:
 - spec/utopia/controller/respond_spec/errors/file-not-found.xnode
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
+- spec/utopia/controller/variables_spec.rb
 - spec/utopia/exception_handler_spec.rb
 - spec/utopia/exception_handler_spec.ru
 - spec/utopia/exception_handler_spec/controller.rb
 - spec/utopia/extensions_spec.rb
+- spec/utopia/http/status_spec.rb
 - spec/utopia/locale_spec.rb
 - spec/utopia/localization_spec.rb
 - spec/utopia/localization_spec.ru
@@ -312,7 +314,10 @@ files:
 - spec/utopia/pages/test.txt
 - spec/utopia/path/matcher_spec.rb
 - spec/utopia/path_spec.rb
+- spec/utopia/rack_helper.rb
 - spec/utopia/rack_spec.rb
+- spec/utopia/redirector_spec.rb
+- spec/utopia/redirector_spec.ru
 - spec/utopia/session_spec.rb
 - spec/utopia/session_spec.ru
 - spec/utopia/static_spec.rb
@@ -386,10 +391,12 @@ test_files:
 - spec/utopia/controller/respond_spec/errors/file-not-found.xnode
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
+- spec/utopia/controller/variables_spec.rb
 - spec/utopia/exception_handler_spec.rb
 - spec/utopia/exception_handler_spec.ru
 - spec/utopia/exception_handler_spec/controller.rb
 - spec/utopia/extensions_spec.rb
+- spec/utopia/http/status_spec.rb
 - spec/utopia/locale_spec.rb
 - spec/utopia/localization_spec.rb
 - spec/utopia/localization_spec.ru
@@ -408,7 +415,10 @@ test_files:
 - spec/utopia/pages/test.txt
 - spec/utopia/path/matcher_spec.rb
 - spec/utopia/path_spec.rb
+- spec/utopia/rack_helper.rb
 - spec/utopia/rack_spec.rb
+- spec/utopia/redirector_spec.rb
+- spec/utopia/redirector_spec.ru
 - spec/utopia/session_spec.rb
 - spec/utopia/session_spec.ru
 - spec/utopia/static_spec.rb