utopia 0.10.0 → 0.11.0

data/lib/utopia/middleware/content.rb

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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/link'
@@ -8,7 +24,8 @@ require 'utopia/path'
 require 'utopia/tags'
 
 require 'utopia/middleware/content/node'
-require 'utopia/trenni'
+require 'utopia/middleware/content/processor'
+require 'trenni/template'
 
 module Utopia
 	module Middleware
@@ -18,8 +35,6 @@ module Utopia
 				@app = app
 
 				@root = File.expand_path(options[:root] || Utopia::Middleware::default_root)
-				
-				LOG.info "** #{self.class.name}: Running in #{@root}"
 
 				# Set to hash to enable caching
 				@nodes = {}
@@ -32,7 +47,7 @@ module Utopia
 			attr :passthrough
 
 			def fetch_xml(path)
-				read_file = lambda { Trenni.new(File.read(path), path) }
+				read_file = lambda { Trenni::Template.load(path) }
 				
 				if @files
 					@files.fetch(path) do |key|

data/lib/utopia/middleware/controller.rb

@@ -1,10 +1,25 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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/path'
-require 'utopia/http_status_codes'
 
 class Rack::Request
 	def controller(&block)
@@ -18,7 +33,6 @@ end
 
 module Utopia
 	module Middleware
-
 		class Controller
 			module Direct
 				def process!(path, request)
@@ -227,8 +241,6 @@ module Utopia
 				@app = app
 				@root = options[:root] || Utopia::Middleware::default_root
 
-				LOG.info "** #{self.class.name}: Running in #{@root}"
-
 				@controllers = {}
 				@cache_controllers = (UTOPIA_ENV == :production)
 

data/lib/utopia/middleware/directory_index.rb

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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/path'

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

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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

data/lib/utopia/middleware/localization.rb

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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'

data/lib/utopia/middleware/logger.rb

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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/time_store'

data/lib/utopia/middleware/redirector.rb

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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'
@@ -139,8 +155,6 @@ module Utopia
 				@patterns = normalize_patterns(@patterns)
 
 				@errors = options[:errors]
-
-				LOG.info "** #{self.class.name}: Running with #{@strings.size + @patterns.size} rules"
 			end
 
 			def redirect(uri, match_data)

data/lib/utopia/middleware/requester.rb

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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'
 

data/lib/utopia/middleware/static.rb

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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/path'
@@ -184,6 +200,7 @@ module Utopia
 			end
 
 			public
+
 			def initialize(app, options = {})
 				@app = app
 				@root = options[:root] || Utopia::Middleware::default_root
@@ -195,9 +212,6 @@ module Utopia
 				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
 
 			def fetch_file(path)

data/lib/utopia/middleware.rb

@@ -1,11 +1,28 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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 'pathname'
 require 'logger'
 
-require 'utopia/http_status_codes'
+require 'utopia/http'
+
 require 'utopia/extensions/rack'
 
 module Utopia
@@ -18,7 +35,7 @@ module Utopia
 		end
 		
 		def self.failure(status = 500, message = "Non-specific error")
-			body = "#{HTTP_STATUS_DESCRIPTIONS[status] || status.to_s}: #{message}"
+			body = "#{HTTP::STATUS_DESCRIPTIONS[status] || status.to_s}: #{message}"
 			
 			return [status, {
 				"Content-Type" => "text/plain",

data/lib/utopia/path.rb

@@ -1,8 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
-
-require 'rack/utils'
+# 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
 	
@@ -21,6 +35,12 @@ module Utopia
 			create(path)
 		end
 
+		def self.unescape(string)
+			string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) {
+				[$1.delete('%')].pack('H*')
+			}
+		end
+
 		def self.create(path)
 			case path
 			when Path
@@ -28,7 +48,7 @@ module Utopia
 			when Array
 				return Path.new(path)
 			when String
-				path = Rack::Utils.unescape(path)
+				path = unescape(path)
 				# Ends with SEPARATOR
 				if path[-1,1] == SEPARATOR
 					return Path.new(path.split(SEPARATOR) << "")

data/lib/utopia/session/encrypted_cookie.rb

@@ -1,6 +1,22 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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 'openssl'
 require 'digest/sha2'

data/lib/utopia/setup/Gemfile

@@ -0,0 +1,8 @@
+
+source "http://rubygems.org"
+
+gem "utopia", "= $UTOPIA_VERSION"
+
+group :development do
+	gem "thin"
+end

data/lib/utopia/setup/config.ru

@@ -4,14 +4,11 @@ UTOPIA_ENV = (ENV['UTOPIA_ENV'] || ENV['RACK_ENV'] || :development).to_sym
 $LOAD_PATH << File.join(File.dirname(__FILE__), "lib")
 
 # It is recommended that you always explicity specify the version of the gem you are using.
-gem 'utopia', $UTOPIA_VERSION
+gem 'utopia', "= $UTOPIA_VERSION"
 require 'utopia/middleware/all'
 require 'utopia/tags/env'
 
-gem 'rack-contrib'
-require 'rack/contrib'
-
-# Utopia relies heavily on accurately caching resources
+# Utopia relies on effectively caching resources:
 gem 'rack-cache'
 require 'rack/cache'
 
@@ -19,13 +16,8 @@ if UTOPIA_ENV == :development
 	use Rack::ShowExceptions
 else
 	use Utopia::Middleware::ExceptionHandler, "/errors/exception"
-
-	# Fill out these details to receive email reports of exceptions when running in a production environment.
-	# use Rack::MailExceptions do |mail|
-	# 	mail.from $MAIL_EXCEPTIONS_FROM
-	# 	mail.to $MAIL_EXCEPTIONS_TO
-	# 	mail.subject "Website Error: %s"
-	# end
+	
+	# You might want to use the Rack::MailExceptions middleware to get notifications about problems.
 end
 
 use Rack::ContentLength
@@ -34,7 +26,6 @@ use Utopia::Middleware::Logger
 use Utopia::Middleware::Redirector, {
 	:strings => {
 		'/' => '/welcome/index',
-		'/utopia' => 'http://www.oriontransfer.co.nz/software/utopia/demo'
 	},
 	:errors => {
 		404 => "/errors/file-not-found"

data/lib/utopia/setup.rb

@@ -1,3 +1,22 @@
+# 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/version'
 require 'fileutils'
@@ -30,10 +49,12 @@ module Utopia
 				FileUtils.mkdir_p(File.join(to, path))
 			end
 			
-			$stderr.puts "Updating config.ru..."
-			config_ru = File.join(to, "config.ru")
-			buf = File.read(config_ru).gsub('$UTOPIA_VERSION', Utopia::VERSION::STRING.dump)
-			File.open(config_ru, "w") { |fp| fp.write(buf) }
+			['config.ru', 'Gemfile'].each do |configuration_file|
+				$stderr.puts "Updating #{configuration_file}..."
+				path = File.join(to, configuration_file)
+				buffer = File.read(path).gsub('$UTOPIA_VERSION', Utopia::VERSION)
+				File.open(path, "w") { |file| file.write(buffer) }
+			end
 		end
 	end
 end

data/lib/utopia/tag.rb

@@ -1,10 +1,31 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# 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
-	
 	class Tag
+		def == other
+			if Tag === other
+				[@name, @attributes, @closed] == [other.name, other.attributes, other.closed]
+			end
+		end
+		
 		def self.closed(name, attributes = {})
 			tag = Tag.new(name, attributes)
 			tag.closed = true
@@ -31,10 +52,10 @@ module Utopia
 			@content.write text
 		end
 
-		def to_html(content = nil, buf = StringIO.new)
-			write_full_html(buf, content)
+		def to_html(content = nil, buffer = StringIO.new)
+			write_full_html(buffer, content)
 			
-			return buf.string
+			return buffer.string
 		end
 		
 		def to_hash
@@ -42,41 +63,41 @@ module Utopia
 		end
 		
 		def to_s
-			buf = StringIO.new
-			write_open_html(buf)
-			return buf.string
+			buffer = StringIO.new
+			write_full_html(buffer)
+			return buffer.string
 		end
 		
-		def write_open_html(buf, terminate = false)
-			buf ||= StringIO.new 
-			buf.write "<#{name}"
+		def write_open_html(buffer, terminate = false)
+			buffer ||= StringIO.new 
+			buffer.write "<#{name}"
 
 			@attributes.each do |key, value|
 				if value
-					buf.write " #{key}=\"#{value}\""
+					buffer.write " #{key}=\"#{value}\""
 				else
-					buf.write " #{key}"
+					buffer.write " #{key}"
 				end
 			end
 			
 			if terminate
-				buf.write "/>"
+				buffer.write "/>"
 			else
-				buf.write ">"
+				buffer.write ">"
 			end
 		end
 		
-		def write_close_html(buf)
-			buf.write "</#{name}>"
+		def write_close_html(buffer)
+			buffer.write "</#{name}>"
 		end
 		
-		def write_full_html(buf, content = nil)
+		def write_full_html(buffer, content = nil)
 			if @closed && content == nil
-				write_open_html(buf, true)
+				write_open_html(buffer, true)
 			else
-				write_open_html(buf)
-				buf.write(content)
-				write_close_html(buf)
+				write_open_html(buffer)
+				buffer.write(content)
+				write_close_html(buffer)
 			end
 		end
 	end