utopia 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d5f1e4253c9897c60653875847c8c0b7497f8a
-  data.tar.gz: 7f5274d1ecaaa468bc18540064eb90264308a5eb
+  metadata.gz: 388fe83677fc504ecff20427f5838afdb1987a62
+  data.tar.gz: a60e58681a7329cf679ed40e0e95ae9e257553ff
 SHA512:
-  metadata.gz: 0cfe6d3f1de41eb4b130c260f8887b3d0999a34adcc2f21d536911c7b0cf45248e9144667ba3e49801dda4a00d3233361b99e4fdf8dfadeaf9bef33a577d8261
-  data.tar.gz: 143c2122e743a6e0bba403011319482a85275e6c442ca381306e19314ec34e66b9d8f1104010be209aad5ea16b368e88a00cc184003498e8fa0ff3e39d5f5e13
+  metadata.gz: 556d111b28b4b31ad303a762fb4bba67bf0789df8ca56baee29539de9d3d600561f970f6542aa455a5c743330eb0c1dde75fd24dd6c12dd89424c6193280019f
+  data.tar.gz: fe16120edbe602d50746e735f641139e27eee266cc6f2a4a638b376fa79c321a1a89c6ec62346cefe92dccf594b6a53ad1b4cae7507b1c5a2a41bda2358b1c32

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.0.0
   - 2.1.8
   - 2.2.4
   - 2.3.0
@@ -10,4 +9,5 @@ rvm:
 env: COVERAGE=true
 matrix:
   allow_failures:
-    - rvm: "rbx-2"
+    - rvm: rbx-2
+    - rvm: ruby-head

data/Gemfile

@@ -6,6 +6,8 @@ gemspec
 group :development do
 	gem 'pry'
 	gem 'pry-coolline'
+	
+	gem 'json'
 end
 
 group :test do

data/lib/utopia/controller.rb

@@ -26,6 +26,7 @@ require_relative 'controller/action'
 require_relative 'controller/base'
 
 require_relative 'controller/rewrite'
+require_relative 'controller/respond'
 
 require 'concurrent/map'
 

data/lib/utopia/controller/action.rb

@@ -21,15 +21,14 @@
 module Utopia
 	class Controller
 		class Action < Hash
-			def initialize
-				@path = nil
+			def initialize(options = {}, &block)
 				@options = options
-				@callback = nil
+				@callback = block
 				
-				super
+				super()
 			end
 			
-			attr_accessor :path, :callback, :options
+			attr_accessor :callback, :options
 			
 			def callback?
 				@callback != nil
@@ -40,15 +39,15 @@ module Utopia
 			end
 			
 			def eql? other
-				super and @callback.eql? other.callback and @options.eql? other.options and @path.eql? other.path 
+				super and @callback.eql? other.callback and @options.eql? other.options
 			end
 			
 			def hash
-				[super, callback, options, path].hash
+				[super, @callback, @options].hash
 			end
 			
 			def == other
-				super and @callback == other.callback and @options == other.options and @path == other.path
+				super and @callback == other.callback and @options == other.options
 			end
 			
 			protected
@@ -91,22 +90,17 @@ module Utopia
 			def define(path, **options, &callback)
 				current = self
 				
-				path.reverse.each do |name|
+				path.reverse_each do |name|
 					current = (current[name.to_sym] ||= Action.new)
 				end
 				
-				current.path = path
 				current.options = options
 				current.callback = callback
 				
 				return current
 			end
 			
-			def arity
-				@callback ? @callback.arity : 0
-			end
-			
-			def invoke!(controller, *arguments)
+			def call(controller, *arguments)
 				controller.instance_exec(*arguments, self, &@callback)
 			end
 			

data/lib/utopia/controller/base.rb

@@ -89,7 +89,7 @@ module Utopia
 				unless actions.empty?
 					return catch_response do
 						actions.each do |action|
-							action.invoke!(self, request, path)
+							action.call(self, request, path)
 						end
 					end
 				end

data/lib/utopia/controller/respond.rb

@@ -0,0 +1,177 @@
+# 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 '../http'
+require_relative '../path/matcher'
+
+module Utopia
+	class Controller
+		# This controller layer provides a convenient way to respond to different requested content types.
+		module Respond
+			def self.prepended(base)
+				base.extend(ClassMethods)
+			end
+			
+			module Converter
+				def self.update_response(response, updated_headers)
+					status, headers, body = response
+					
+					# Generate a new body:
+					body = body.collect{|content| yield content}
+					
+					# Update the headers with the requested content type:
+					headers = headers.merge(updated_headers)
+					
+					return [status, headers, body]
+				end
+				
+				class Callback < Struct.new(:content_type, :block)
+					def headers
+						{HTTP::CONTENT_TYPE => self.content_type}
+					end
+					
+					def call(context, response, media_range)
+						Converter.update_response(response, headers) do |content|
+							context.instance_exec(content, media_range, &block)
+						end
+					end
+				end
+				
+				def self.new(*args)
+					Callback.new(*args)
+				end
+				
+				# To accept incoming requests with content-type JSON (e.g. POST with JSON data), consider using `Rack::PostBodyContentTypeParser`.
+				module ToJSON
+					APPLICATION_JSON = 'application/json'.freeze
+					HEADERS = {HTTP::CONTENT_TYPE => APPLICATION_JSON}.freeze
+					
+					def self.content_type
+						APPLICATION_JSON
+					end
+					
+					def self.serialize(content, media_range)
+						options = {}
+						
+						if version = media_range.parameters['version']
+							options[:version] = version.to_s
+						end
+						
+						return content.to_json(options)
+					end
+					
+					def self.call(context, response, media_range)
+						Converter.update_response(response, HEADERS) do |content|
+							self.serialize(content, media_range)
+						end
+					end
+				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
+				
+				# 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)
+					
+					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
+				end
+			end
+			
+			module ClassMethods
+				def respond
+					@responder ||= Responder.new
+				end
+				
+				def response_for(context, request, path, response)
+					if @responder
+						@responder.call(context, request, path, response)
+					else
+						response
+					end
+				end
+			end
+			
+			# Rewrite the path before processing the request if possible.
+			def passthrough(request, path)
+				if response = super
+					self.class.response_for(self, request, path, response)
+				end
+			end
+		end
+	end
+end

data/lib/utopia/controller/rewrite.rb

@@ -23,9 +23,6 @@ require_relative '../path/matcher'
 
 module Utopia
 	class Controller
-		class RewriteError < ArgumentError
-		end
-		
 		module Rewrite
 			def self.prepended(base)
 				base.extend(ClassMethods)
@@ -101,7 +98,7 @@ module Utopia
 					return path
 				end
 				
-				def invoke!(context, request, path)
+				def call(context, request, path)
 					path.components = apply(context, request, path).components
 				end
 			end
@@ -113,7 +110,7 @@ module Utopia
 				
 				def rewrite_request(controller, request, path)
 					if @rewriter
-						@rewriter.invoke!(controller, request, path)
+						@rewriter.call(controller, request, path)
 					end
 				end
 			end

data/lib/utopia/http.rb

@@ -20,8 +20,12 @@
 
 require 'rack'
 
+require 'http/accept'
+
 module Utopia
 	module HTTP
+		Accept = ::HTTP::Accept
+		
 		# A list of commonly used HTTP status codes.
 		# For help choosing the right status code, see http://racksburg.com/choosing-an-http-status-code/
 		STATUS_CODES = {
@@ -78,10 +82,11 @@ module Utopia
 			500 => 'Internal Server Error'.freeze,
 			501 => 'Not Implemented'.freeze,
 			503 => 'Service Unavailable'.freeze
-		}
+		}.merge(Rack::Utils::HTTP_STATUS_CODES)
 		
 		CONTENT_TYPE = 'Content-Type'.freeze
 		LOCATION = 'Location'.freeze
+		# ACCEPT = 'Accept'.freeze
 		
 		# A small HTTP status wrapper that verifies the status code within a given range.
 		class Status

data/lib/utopia/localization.rb

@@ -68,7 +68,7 @@ module Utopia
 		def initialize(app, **options)
 			@app = app
 			
-			@all_locales = options[:locales]
+			@all_locales = HTTP::Accept::Languages::Locales.new(options[:locales])
 			
 			# Locales here are represented as an array of strings, e.g. ['en', 'ja', 'cn', 'de'].
 			unless @default_locales = options[:default_locales] 
@@ -85,8 +85,6 @@ module Utopia
 			
 			@nonlocalized = options.fetch(:nonlocalized, [])
 			
-			# puts "All:#{@all_locales.inspect} defaults:#{@default_locales.inspect} default:#{default_locale}"
-			
 			self.freeze
 		end
 		
@@ -142,9 +140,7 @@ module Utopia
 		def request_preferred_locale(env)
 			path = Path[env[Rack::PATH_INFO]]
 			
-			if @all_locales.include? path.first
-				request_locale = path.first
-				
+			if request_locale = @all_locales.patterns[path.first]
 				# Remove the localization prefix:
 				path.delete_at(0)
 				
@@ -158,12 +154,11 @@ module Utopia
 			# No user prefered languages:
 			return [] unless accept_languages
 			
-			languages = accept_languages.split(',').map { |language|
-				language.split(';q=').tap{|x| x[1] = (x[1] || 1.0).to_f}
-			}.sort{|a, b| b[1] <=> a[1]}.collect(&:first)
+			# Extract the ordered list of languages:
+			languages = HTTP::Accept::Languages.parse(accept_languages)
 			
-			# Returns available languages based on the order of the first argument:
-			return languages & @all_locales
+			# Returns available languages based on the order languages:
+			return @all_locales & languages
 		end
 		
 		def nonlocalized?(env)

data/lib/utopia/static.rb

@@ -61,7 +61,58 @@ module Utopia
 				:media, :text, :archive, :images, :fonts
 			]
 		}
-
+		
+		class MimeTypeLoader
+			def initialize(library)
+				@extensions = {}
+				@library = library
+			end
+			
+			attr :extensions
+			
+			def self.extensions_for(types, library = MIME_TYPES)
+				loader = self.new(library)
+				loader.expand(types)
+				return loader.extensions
+			end
+			
+			def extract_extensions(mime_types)
+				mime_types.select{|mime_type| !mime_type.obsolete?}.each do |mime_type|
+					mime_type.extensions.each do |ext|
+						@extensions["." + ext] = mime_type.content_type
+					end
+				end
+			end
+			
+			def expand(types)
+				types.each do |type|
+					current_count = @extensions.size
+					
+					begin
+						case type
+						when Symbol
+							self.expand(MIME_TYPES[type])
+						when Array
+							@extensions["." + type[0]] = type[1]
+						when String
+							self.extract_extensions MIME::Types.of(type)
+						when Regexp
+							self.extract_extensions MIME::Types[type]
+						when MIME::Type
+							self.extract_extensions.call([type])
+						end
+					rescue
+						LOG.error{"#{self.class.name}: Error while processing #{type.inspect}!"}
+						raise $!
+					end
+					
+					if @extensions.size == current_count
+						LOG.warn{"#{self.class.name}: Could not find any mime type for #{type.inspect}"}
+					end
+				end
+			end
+		end
+		
 		private
 
 		class LocalFile
@@ -151,59 +202,13 @@ module Utopia
 			end
 		end
 
-		def load_mime_types(types)
-			result = {}
-
-			extract_extensions = lambda do |mime_type|
-				# LOG.info "Extracting #{mime_type.inspect}"
-				mime_type.extensions.each{|ext| result["." + ext] = mime_type.content_type}
-			end
-
-			types.each do |type|
-				current_count = result.size
-				# LOG.info "Processing #{type.inspect}"
-				
-				begin
-					case type
-					when Symbol
-						result = load_mime_types(MIME_TYPES[type]).merge(result)
-					when Array
-						result["." + type[0]] = type[1]
-					when String
-						MIME::Types.of(type).select{|mime_type| !mime_type.obsolete?}.each do |mime_type|
-							extract_extensions.call(mime_type)
-						end
-					when Regexp
-						MIME::Types[type].select{|mime_type| !mime_type.obsolete?}.each do |mime_type|
-							extract_extensions.call(mime_type)
-						end
-					when MIME::Type
-						extract_extensions.call(type)
-					end
-				rescue
-					LOG.error "#{self.class.name}: Error while processing #{type.inspect}!"
-					raise $!
-				end
-				
-				if result.size == current_count
-					LOG.warn "#{self.class.name}: Could not find any mime type for #{type.inspect}"
-				end
-			end
-
-			return result
-		end
-
 		public
 
 		def initialize(app, **options)
 			@app = app
 			@root = (options[:root] || Utopia::default_root).freeze
 
-			if options[:types]
-				@extensions = load_mime_types(options[:types])
-			else
-				@extensions = load_mime_types(MIME_TYPES[:default])
-			end
+			@extensions = MimeTypeLoader.extensions_for(options[:types] || MIME_TYPES[:default])
 
 			@cache_control = (options[:cache_control] || "public, max-age=3600")
 			

data/lib/utopia/version.rb

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

data/setup/site/.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory" : "public/_static/components"
+}
+

data/setup/site/pages/_static/utopia.svg

@@ -0,0 +1 @@
+../../../../materials/utopia.svg

data/setup/site/pages/errors/controller.rb

@@ -0,0 +1,9 @@
+
+prepend Respond
+
+respond.with_json
+respond.otherwise_passthrough
+
+on 'file-not-found' do
+	fail! 404, {message: 'File not found'}
+end

data/setup/site/public/_static

@@ -0,0 +1 @@
+../pages/_static

data/spec/utopia/controller/action_spec.rb

@@ -24,6 +24,20 @@ require 'utopia/controller'
 
 module Utopia::Controller::ActionSpec
 	describe Utopia::Controller::Action do
+		it "should be a hash key" do
+			a = Utopia::Controller::Action.new
+			b = Utopia::Controller::Action.new
+			c = Utopia::Controller::Action.new {sleep}
+			
+			expect(a).to be == b
+			expect(a.hash).to be == b.hash
+			expect(a).to be_eql b
+			
+			expect(a).to_not be == c
+			expect(a.hash).to_not be == c.hash
+			expect(a).to_not be_eql c
+		end
+		
 		it "should resolve callbacks" do
 			actions = Utopia::Controller::Action.new
 			

data/spec/utopia/controller/respond_spec.rb

@@ -0,0 +1,123 @@
+#!/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 'rack/test'
+require 'rack/mock'
+require 'json'
+
+require 'utopia/content'
+require 'utopia/controller'
+
+module Utopia::Controller::RespondSpec
+	describe Utopia::Controller do
+		class TestController < Utopia::Controller::Base
+			prepend Utopia::Controller::Respond
+			
+			respond.with("application/json") do |content|
+				JSON::dump(content)
+			end
+			
+			respond.with("text/plain") do |content|
+				content.inspect
+			end
+			
+			on 'fetch' do |request, path|
+				success! content: {user_id: 10}
+			end
+			
+			def self.uri_path
+				Utopia::Path['/']
+			end
+		end
+		
+		let(:controller) {TestController.new}
+		
+		def mock_request(*args)
+			request = Rack::Request.new(Rack::MockRequest.env_for(*args))
+			return request, Utopia::Path[request.path_info]
+		end
+		
+		it "should serialize response as JSON" do
+			request, path = mock_request("/fetch")
+			relative_path = path - controller.class.uri_path
+			
+			request.env['HTTP_ACCEPT'] = "application/json"
+			
+			status, headers, body = controller.process!(request, relative_path)
+			
+			expect(status).to be == 200
+			expect(headers['Content-Type']).to be == "application/json"
+			expect(body.join).to be == '{"user_id":10}'
+		end
+		
+		it "should serialize response as text" do
+			request, path = mock_request("/fetch")
+			relative_path = path - controller.class.uri_path
+			
+			request.env['HTTP_ACCEPT'] = "text/*"
+			
+			status, headers, body = controller.process!(request, relative_path)
+			
+			expect(status).to be == 200
+			expect(headers['Content-Type']).to be == "text/plain"
+			expect(body.join).to be == '{:user_id=>10}'
+		end
+	end
+	
+	describe Utopia::Controller do
+		include Rack::Test::Methods
+		
+		let(:app) {Rack::Builder.parse_file(File.expand_path('respond_spec.ru', __dir__)).first}
+		
+		it "should get html error page" do
+			get '/errors/file-not-found'
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.headers['Content-Type']).to be == 'text/html'
+			expect(last_response.body).to be_include "<heading>File Not Found</heading>"
+		end
+		
+		it "should get json error response" do
+			get '/errors/file-not-found', nil, {'HTTP_ACCEPT' => "application/json"}
+			
+			expect(last_response.status).to be == 404
+			expect(last_response.headers['Content-Type']).to be == 'application/json'
+			expect(last_response.body).to be == '{"message":"File not found"}'
+		end
+		
+		it "should get version 1 response" do
+			get '/api/fetch', nil, {'HTTP_ACCEPT' => "application/json;version=1"}
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.headers['Content-Type']).to be == 'application/json'
+			expect(last_response.body).to be == '{"message":"Hello World"}'
+		end
+		
+		it "should get version 2 response" do
+			get '/api/fetch', nil, {'HTTP_ACCEPT' => "application/json;version=2"}
+			
+			expect(last_response.status).to be == 200
+			expect(last_response.headers['Content-Type']).to be == 'application/json'
+			expect(last_response.body).to be == '{"message":"Goodbye World"}'
+		end
+	end
+end

data/spec/utopia/controller/respond_spec.ru

@@ -0,0 +1,6 @@
+
+use Utopia::Controller, root: File.expand_path('respond_spec', __dir__)
+
+use Utopia::Content, root: File.expand_path('respond_spec', __dir__)
+
+run lambda {|env| [404, {}, []]}

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

@@ -0,0 +1,26 @@
+
+prepend Respond
+
+respond.with_json
+
+class VersionedResponse
+	def to_json(options = {})
+		JSON::dump(self.as_json(options))
+	end
+	
+	# Modelled after http://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html
+	def as_json(options = {})
+		if options[:version] == '1'
+			{"message" => "Hello World"}
+		elsif options[:version] == '2'
+			{"message" => "Goodbye World"}
+		end
+	end
+end
+
+# To get different verions of the response, use:
+# Accept: application/json;version=1
+# Accept: application/json;version=2
+on 'fetch' do
+	success! content: VersionedResponse.new
+end

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

@@ -0,0 +1,9 @@
+
+prepend Respond
+
+respond.with_json
+respond.otherwise_passthrough
+
+on 'file-not-found' do
+	fail! 404, {message: 'File not found'}
+end

data/spec/utopia/controller/respond_spec/errors/file-not-found.xnode

@@ -0,0 +1,7 @@
+<page>
+	<?r response.content_type = 'text/html' ?>
+	
+	<heading>File Not Found</heading>
+	
+	<p>The file you requested is unfortunately not available at this time!</p>
+</page>

data/utopia.gemspec

@@ -30,7 +30,9 @@ Gem::Specification.new do |spec|
 	spec.add_dependency 'rack', '~> 1.6'
 	spec.add_dependency 'rack-cache', '~> 1.2.0'
 	
-	spec.add_dependency 'mail', '~> 2.6.1'
+	spec.add_dependency 'http-accept', '~> 1.1.3'
+	
+	spec.add_dependency 'mail', '~> 2.6.3'
 	
 	spec.add_dependency 'concurrent-ruby', '~> 1.0.0'
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: http-accept
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +196,7 @@ files:
 - lib/utopia/controller.rb
 - lib/utopia/controller/action.rb
 - lib/utopia/controller/base.rb
+- lib/utopia/controller/respond.rb
 - lib/utopia/controller/rewrite.rb
 - lib/utopia/controller/variables.rb
 - lib/utopia/exception_handler.rb
@@ -209,6 +224,7 @@ files:
 - materials/utopia.svg
 - setup/.bowerrc
 - setup/server/git/hooks/post-receive
+- setup/site/.bowerrc
 - setup/site/Gemfile
 - setup/site/README.md
 - setup/site/Rakefile
@@ -222,10 +238,12 @@ files:
 - setup/site/pages/_static/site.css
 - setup/site/pages/_static/utopia-background.svg
 - setup/site/pages/_static/utopia.svg
+- setup/site/pages/errors/controller.rb
 - setup/site/pages/errors/exception.xnode
 - setup/site/pages/errors/file-not-found.xnode
 - setup/site/pages/links.yaml
 - setup/site/pages/welcome/index.xnode
+- setup/site/public/_static
 - setup/site/public/readme.txt
 - setup/site/tmp/readme.txt
 - spec/utopia/content/link_spec.rb
@@ -265,6 +283,11 @@ files:
 - spec/utopia/controller/middleware_spec/empty/controller.rb
 - spec/utopia/controller/middleware_spec/redirect/controller.rb
 - spec/utopia/controller/middleware_spec/redirect/test/controller.rb
+- spec/utopia/controller/respond_spec.rb
+- spec/utopia/controller/respond_spec.ru
+- spec/utopia/controller/respond_spec/api/controller.rb
+- spec/utopia/controller/respond_spec/errors/controller.rb
+- spec/utopia/controller/respond_spec/errors/file-not-found.xnode
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
 - spec/utopia/exception_handler_spec.rb
@@ -314,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.
@@ -356,6 +379,11 @@ test_files:
 - spec/utopia/controller/middleware_spec/empty/controller.rb
 - spec/utopia/controller/middleware_spec/redirect/controller.rb
 - spec/utopia/controller/middleware_spec/redirect/test/controller.rb
+- spec/utopia/controller/respond_spec.rb
+- spec/utopia/controller/respond_spec.ru
+- spec/utopia/controller/respond_spec/api/controller.rb
+- spec/utopia/controller/respond_spec/errors/controller.rb
+- spec/utopia/controller/respond_spec/errors/file-not-found.xnode
 - spec/utopia/controller/rewrite_spec.rb
 - spec/utopia/controller/sequence_spec.rb
 - spec/utopia/exception_handler_spec.rb

data/setup/site/pages/_static/utopia.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 420 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><rect x="0" y="0" width="420" height="56" style="fill:#f79433;"/><rect x="0" y="56" width="420" height="24" style="fill:#4e8dd8;"/><g><path d="M75.145,70.819c2.37,-3.097 4.173,-6.921 5.111,-11.365c0.91,-4.318 1.498,-9.261 1.498,-14.692l0,-44.762l-62.754,0l0,44.762c0,2.628 0.244,5.333 0.407,8.035c0.168,2.782 0.674,5.515 1.345,8.118c0.68,2.644 1.739,5.173 3.067,7.517c1.363,2.405 3.263,4.526 5.609,6.303c2.319,1.755 5.245,3.163 8.677,4.172c1.617,0.478 3.416,1.093 5.354,1.093l13.856,0c3.071,0 5.797,-1.058 8.131,-2.001c4.042,-1.631 7.305,-4.049 9.699,-7.18Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M151.481,18.701l0,-18.701l-62.754,-0.022l0,18.723l22.246,0l0.02,61.299l17.93,0l-0.02,-61.299l22.578,0Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M229.926,39.999c0,-22.051 -16.979,-39.992 -37.852,-39.992c-20.872,0 -37.851,17.942 -37.851,39.992c0,22.054 16.979,39.994 37.851,39.994c20.873,0 37.852,-17.94 37.852,-39.994Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M269.238,50.909c9.717,0 17.181,-2.066 22.183,-6.395c5.087,-4.399 7.667,-10.942 7.667,-19.575c0,-3.257 -0.393,-5.962 -1.167,-8.476c-0.778,-2.528 -1.883,-4.934 -3.281,-6.814c-1.401,-1.882 -3.098,-3.458 -5.045,-4.703c-1.895,-1.21 -4.003,-2.198 -6.264,-2.943c-2.239,-0.737 -4.64,-1.263 -7.139,-1.56c-2.464,-0.292 -5.016,-0.443 -7.587,-0.443l-29.468,0l0,80l17.93,0l0,-29.091l12.171,0Z" style="fill:#fff;fill-rule:nonzero;"/><rect x="304.879" y="0" width="17.93" height="80" style="fill:#fff;"/><path d="M362.589,0l-29.477,80l75.888,0l-31.247,-80l-15.164,0Z" style="fill:#fff;fill-rule:nonzero;"/></g></g></svg>