utopia 0.9.31 → 0.9.32

data/bin/utopia

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'utopia/setup'
+require 'rake'
+
+$app = Rake.application = Rake::Application.new
+$app.init('Utopia')
+
+task :setup do
+	Utopia::Setup.copy(Dir.getwd)
+	
+	if `which thin`.strip == ""
+		$stderr.puts "Next, please install thin: `sudo gem install thin'."
+		$stderr.puts "Once you've done that, type `thin start' to start the web server."
+	else
+		$stderr.puts "Type `thin start' to start the web server."
+	end
+	
+	if `which git`.strip == ""
+		$stderr.puts "Now is a good time to learn about git : http://git-scm.com/"
+	end
+	
+	unless File.exist? '.git'
+		$stderr.puts "I recommend using git for version control."
+	end
+	
+	$stderr.puts "*** Thanks for trying out Utopia! ***"
+end
+
+task :default => :setup
+
+$app.top_level

data/lib/utopia/extensions/array.rb

@@ -0,0 +1,25 @@
+#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	Copyright 2010 Samuel Williams. All rights reserved.
+#	See <utopia.rb> for licensing details.
+
+class Array
+	def find_index(&block)
+		each_with_index do |item, index|
+			if yield(item)
+				return index
+			end
+		end
+		
+		return nil
+	end
+	
+	def split_at(&block)
+		index = find_index(&block)
+		
+		if index
+			return [self[0...index], self[index], self[index+1..-1]]
+		end
+		
+		return [[], nil, []]
+	end
+end

data/lib/utopia/extensions/date.rb

@@ -0,0 +1,20 @@
+#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	Copyright 2010 Samuel Williams. All rights reserved.
+#	See <utopia.rb> for licensing details.
+
+require 'active_support'
+
+class Date
+	alias_method :old_cmp, :<=>
+	
+	def <=> (other)
+		# Comparing a Date with something that has a time component truncates the time
+		# component, thus we need to check if the other object has a more exact comparison
+		# function.
+		if other.respond_to?(:hour)
+			return (other <=> self) * -1
+		else
+			old_cmp(other)
+		end
+	end	
+end

data/lib/utopia/extensions/hash.rb

@@ -0,0 +1,12 @@
+#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	Copyright 2010 Samuel Williams. All rights reserved.
+#	See <utopia.rb> for licensing details.
+
+class Hash
+	def symbolize_keys
+		inject({}) do |options, (key, value)|
+			options[(key.to_sym rescue key) || key] = value
+			options
+		end
+	end
+end

data/lib/utopia/extensions/rack.rb

@@ -0,0 +1,15 @@
+#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	Copyright 2010 Samuel Williams. All rights reserved.
+#	See <utopia.rb> for licensing details.
+
+class Rack::Response
+	def do_not_cache!
+		self["Cache-Control"] = "no-cache, must-revalidate"
+		self["Expires"] = Time.now.httpdate
+	end
+	
+	def cache!(duration = 3600)
+		self["Cache-Control"] = "public, max-age=#{duration}"
+		self["Expires"] = (Time.now + duration).httpdate
+	end
+end

data/lib/utopia/extensions/regexp.rb

@@ -0,0 +1,17 @@
+#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	Copyright 2010 Samuel Williams. All rights reserved.
+#	See <utopia.rb> for licensing details.
+
+class Regexp
+	def self.starts_with(string)
+		return /^#{Regexp.escape(string)}/
+	end
+
+	def self.ends_with(string)
+		return /#{Regexp.escape(string)}$/
+	end
+
+	def self.contains(string)
+		return Regexp.new(string)
+	end
+end

data/lib/utopia/extensions/string.rb

@@ -0,0 +1,20 @@
+#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
+#	Copyright 2010 Samuel Williams. All rights reserved.
+#	See <utopia.rb> for licensing details.
+
+class String
+	HTML_ESCAPE = {"&" => "&amp;", "<" => "&lt;", ">" => "&gt;", "\"" => "&quot;"}
+	HTML_ESCAPE_PATTERN = Regexp.new("[" + Regexp.quote(HTML_ESCAPE.keys.join) + "]")
+
+	def to_html
+		gsub(HTML_ESCAPE_PATTERN){|c| HTML_ESCAPE[c]}
+	end
+
+	def to_title
+		(" " + self).gsub(/[ \-_](.)/){" " + $1.upcase}.strip
+	end
+
+	def to_snake
+		self.gsub("::", "").gsub(/([A-Z]+)/){"_" + $1.downcase}.sub(/^_+/, "")
+	end
+end

data/lib/utopia/link.rb

@@ -2,7 +2,10 @@
 #	Copyright 2010 Samuel Williams. All rights reserved.
 #	See <utopia.rb> for licensing details.
 
-require 'utopia/extensions'
+require 'utopia/extensions/date'
+require 'utopia/extensions/string'
+require 'utopia/extensions/hash'
+require 'utopia/extensions/array'
 
 module Utopia
 
@@ -132,7 +135,7 @@ module Utopia
 			:virtual => true,
 			:indices => false,
 			:sort => :order,
-			:hidden => :hidden,
+			:display => :display,
 			:locale => nil
 		}
 		
@@ -196,8 +199,8 @@ module Utopia
 				end
 			end
 
-			if options[:hidden]
-				links = links.delete_if{|link| link[options[:hidden]]}
+			if options[:display]
+				links = links.delete_if{|link| link[options[:display]] == false}
 			end
 
 			if options[:name]

data/lib/utopia/middleware.rb

@@ -5,6 +5,8 @@
 require 'pathname'
 require 'logger'
 
+require 'utopia/extensions/rack'
+
 module Utopia
 	LOG = Logger.new($stderr)
 	LOG.level = Logger::DEBUG
@@ -16,7 +18,6 @@ module Utopia
 	end
 end
 
-require 'utopia/extensions'
 require 'utopia/path'
 require 'utopia/tag'
 

data/lib/utopia/middleware/content.rb

@@ -19,7 +19,7 @@ module Utopia
 
 				@root = File.expand_path(options[:root] || Utopia::Middleware::default_root)
 				
-				LOG.info "#{self.class.name}: Running in #{@root}"
+				LOG.info "** #{self.class.name}: Running in #{@root}"
 
 				# Set to hash to enable caching
 				@nodes = {}

data/lib/utopia/middleware/controller.rb

@@ -142,7 +142,7 @@ module Utopia
 				@app = app
 				@root = options[:root] || Utopia::Middleware::default_root
 
-				LOG.info "#{self.class.name}: Running in #{@root}"
+				LOG.info "** #{self.class.name}: Running in #{@root}"
 
 				@controllers = {}
 				@cache_controllers = (UTOPIA_ENV == :production)

data/lib/utopia/middleware/logger.rb

@@ -36,6 +36,10 @@ module Utopia
 				end
 
 				@log << record
+				
+				if UTOPIA_ENV != :production
+					$stderr.puts ">> #{record[:method]} #{record[:url]} -> #{response[0]}"
+				end
 			end
 
 			def initialize(app, options = {})

data/lib/utopia/middleware/redirector.rb

@@ -3,6 +3,8 @@
 #	See <utopia.rb> for licensing details.
 
 require 'utopia/middleware'
+require 'utopia/extensions/regexp'
+require 'utopia/extensions/string'
 
 module Utopia
 	module Middleware
@@ -112,7 +114,7 @@ module Utopia
 
 				@errors = options[:errors]
 
-				LOG.info "#{self.class.name}: Running with #{@strings.size + @patterns.size} rules"
+				LOG.info "** #{self.class.name}: Running with #{@strings.size + @patterns.size} rules"
 			end
 
 			def redirect(uri, match_data)

data/lib/utopia/middleware/static.rb

@@ -13,12 +13,34 @@ module Utopia
 	module Middleware
 
 		class Static
-			DEFAULT_TYPES = [
-				"html", "css", "js", "txt", "rtf", "xml",
-				"pdf", "zip", "tar", "tgz", "tar.gz", "tar.bz2", "dmg",
-				"mp3", "mp4", "wav", "aiff", ["aac", "audio/x-aac"], "mov", "avi", "wmv",
-				/^image/
-			]
+			MIME_TYPES = {
+				:xiph => {
+					"ogx" => "application/ogg",
+					"ogv" => "video/ogg",
+					"oga" => "audio/ogg",
+					"ogg" => "audio/ogg",
+					"spx" => "audio/ogg",
+					"flac" => "audio/flac",
+					"anx" => "application/annodex",
+					"axa" => "audio/annodex",
+					"xspf" => "application/xspf+xml",
+				},
+				:media => [
+					:xiph, "mp3", "mp4", "wav", "aiff", ["aac", "audio/x-aac"], "mov", "avi", "wmv", "mpg"
+				],
+				:text => [
+					"html", "css", "js", "txt", "rtf", "xml", "pdf"
+				],
+				:archive => [
+					"zip", "tar", "tgz", "tar.gz", "tar.bz2", ["dmg", "application/x-apple-diskimage"]
+				],
+				:images => [
+					"png", "gif", "jpeg", "tiff"
+				],
+				:default => [
+					:media, :text, :archive, :images
+				]
+			}
 
 			private
 
@@ -69,16 +91,18 @@ module Utopia
 				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 :defaults
-							result = load_mime_types(DEFAULT_TYPES).merge(result)
+						when Symbol
+							result = load_mime_types(MIME_TYPES[type]).merge(result)
 						when Array
 							result["." + type[0]] = type[1]
 						when String
@@ -98,7 +122,7 @@ module Utopia
 					end
 					
 					if result.size == current_count
-						LOG.warn "#{self.class.name}: Could not find any mime type for file extension #{type.inspect}"
+						LOG.warn "#{self.class.name}: Could not find any mime type for #{type.inspect}"
 					end
 				end
 
@@ -113,12 +137,13 @@ module Utopia
 				if options[:types]
 					@extensions = load_mime_types(options[:types])
 				else
-					@extensions = load_mime_types(DEFAULT_TYPES)
+					@extensions = load_mime_types(MIME_TYPES[:default])
 				end
 				
 				@cache_control = options[:cache_control] || "public, max-age=3600"
 				
-				LOG.info "#{self.class.name}: Running in #{@root} with #{extensions.size} filetypes"
+				LOG.info "** #{self.class.name}: Running in #{@root} with #{extensions.size} filetypes"
+				# LOG.info @extensions.inspect
 			end
 
 			def fetch_file(path)

data/lib/utopia/setup.rb

@@ -0,0 +1,39 @@
+
+require 'utopia/version'
+require 'fileutils'
+require 'find'
+require 'rake'
+
+module Utopia
+	module Setup
+		ROOT = File.join(File.dirname(__FILE__), "setup", "")
+		DIRECTORIES = ["access_log", "cache", "cache/meta", "cache/head", "lib", "pages", "public"]
+		
+		def self.copy(to, config = {})
+			$stderr.puts "Copying files from #{ROOT} to #{to}..."
+			Find.find(ROOT) do |src|
+				dst = File.join(to, src[ROOT.size..-1])
+				
+				if File.directory?(src)
+					FileUtils.mkdir_p(dst)
+				else
+					if File.exist? dst
+						$stderr.puts "File already exists: #{dst}!"
+					else
+						$stderr.puts "Copying #{src} to #{dst}..."
+						FileUtils.cp(src, dst)
+					end
+				end
+			end
+			
+			DIRECTORIES.each do |path|
+				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) }
+		end
+	end
+end

data/lib/utopia/setup/config.ru

@@ -0,0 +1,59 @@
+#!/usr/bin/env rackup
+
+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
+require 'utopia/middleware/all'
+require 'utopia/tags/env'
+
+gem 'rack-contrib'
+require 'rack/contrib'
+
+# Utopia relies heavily on accurately caching resources
+gem 'rack-cache'
+require 'rack/cache'
+
+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
+end
+
+use Rack::ContentLength
+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"
+	}
+}
+
+use Utopia::Middleware::Requester
+use Utopia::Middleware::DirectoryIndex
+use Utopia::Middleware::Controller
+use Utopia::Middleware::Static
+
+if UTOPIA_ENV == :production
+	use Rack::Cache, {
+		:metastore   => "file:#{Utopia::Middleware::default_root("cache/meta")}",
+		:entitystore => "file:#{Utopia::Middleware::default_root("cache/body")}",
+		:verbose => false
+	}
+end
+
+use Utopia::Middleware::Content
+
+run lambda { [404, {}, []] }

data/lib/utopia/setup/lib/readme.txt

@@ -0,0 +1 @@
+You can add additional code for your application in this directory, and require it directly from the config.ru.

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

@@ -0,0 +1,2 @@
+<?r @title ||= content ?>
+<h1><content/></h1>

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

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<?r response["Content-Type"] = "text/html; charset=utf-8" ?>
+		<?r response["Cache-Control"] = "max-age=3600" ?>
+		
+		<?r if title = (attributes["title"] || @title) ?>
+			<title>#{title.gsub(/<.*?>/, "")} - Utopia</title>
+		<?r else ?>
+			<title>Utopia</title>
+		<?r end ?>
+		
+		<link rel="icon" type="image/png" href="/_static/icon.png" />
+		<link rel="stylesheet" href="/_static/site.css" type="text/css" media="screen" charset="utf-8" />
+	</head>
+
+	<body class="ledlighting">
+		<div id="header">
+		</div>
+
+		<div id="page">
+			<content />
+		</div>
+	</body>
+</html>

data/lib/utopia/setup/pages/_static/site.css

@@ -0,0 +1,51 @@
+/* Copyright (c) 2010 Orion Transfer Ltd. All Rights Reserved. */
+
+body, p, ol, ul, blockquote {
+	font-family: "Skia", verdana, arial, helvetica, sans-serif;
+	line-height: 18px;
+	
+	color: #339;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	font-family: menlo, monospace;
+	color: #303;
+	
+	margin-top: 2em;
+	margin-bottom: 1em;
+}
+
+body {
+	background: url(/_static/background.png) #fff center no-repeat fixed;
+	padding: 50px;
+}
+
+img {
+	border: none;
+}
+
+a {
+	color: #33a;
+}
+
+a:hover {
+	color: #55c;
+}
+
+p, dl, h3 {
+	line-height: 1.4em;
+	margin: 1em;
+}
+
+h3 {
+	border-bottom: 1px solid #ccf;
+}
+
+ul {
+	line-height: 1.4em;
+	margin-bottom: 1em;
+}
+
+h3, h4, h5, h6 {
+	font-weight: normal;
+}

data/lib/utopia/setup/pages/errors/exception.xnode

@@ -0,0 +1,5 @@
+<page>
+	<heading>Exception</heading>
+	
+	<p>It seems like something didn't quite work out as expected!</p>
+</page>

data/lib/utopia/setup/pages/errors/file-not-found.xnode

@@ -0,0 +1,5 @@
+<page>
+	<heading>File Not Found</heading>
+	
+	<p>The file you requested is unfortunately not available at this time!</p>
+</page>

data/lib/utopia/setup/pages/links.yaml

@@ -0,0 +1,2 @@
+errors:
+    display: false

data/lib/utopia/setup/pages/welcome/index.xnode

@@ -0,0 +1,7 @@
+<page>
+	<heading>Welcome to Utopia</heading>
+	
+	<p>Utopia is designed to simply your life. It is not an application development framework. It is not a content management system. It does not require a database. It isn't model view controller. It is simply a platform on which websites can be easily developed with a minimum of effort.</p>
+	
+	<p><a href="http://www.oriontransfer.co.nz/utopia/setup">Utopia Project Page &amp; Documentation</a></p>
+</page>

data/lib/utopia/setup/public/readme.txt

@@ -0,0 +1 @@
+This directory is required by Apache/Phusion Passenger.

data/lib/utopia/version.rb

@@ -3,10 +3,10 @@
 #	See <utopia.rb> for licensing details.
 
 module Utopia
-  module VERSION #:nodoc:
+  module VERSION
     MAJOR = 0
     MINOR = 9
-    TINY  = 31
+    TINY  = 32
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 31
-  version: 0.9.31
+  - 32
+  version: 0.9.32
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 +12:00
-default_executable: 
+date: 2010-05-19 00:00:00 +12:00
+default_executable: utopia
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -91,8 +91,8 @@ dependencies:
   version_requirements: *id006
 description: 
 email: samuel.williams@oriontransfer.co.nz
-executables: []
-
+executables: 
+- utopia
 extensions: []
 
 extra_rdoc_files: []
@@ -101,7 +101,12 @@ files:
 - ext/utopia/xnode/fast_scanner/extconf.rb
 - ext/utopia/xnode/fast_scanner/parser.c
 - lib/utopia/etanni.rb
-- lib/utopia/extensions.rb
+- lib/utopia/extensions/array.rb
+- lib/utopia/extensions/date.rb
+- lib/utopia/extensions/hash.rb
+- lib/utopia/extensions/rack.rb
+- lib/utopia/extensions/regexp.rb
+- lib/utopia/extensions/string.rb
 - lib/utopia/http_status_codes.rb
 - lib/utopia/link.rb
 - lib/utopia/middleware/all.rb
@@ -119,6 +124,19 @@ files:
 - lib/utopia/middleware.rb
 - lib/utopia/path.rb
 - lib/utopia/session/encrypted_cookie.rb
+- lib/utopia/setup/config.ru
+- lib/utopia/setup/lib/readme.txt
+- lib/utopia/setup/pages/_heading.xnode
+- lib/utopia/setup/pages/_page.xnode
+- lib/utopia/setup/pages/_static/background.png
+- lib/utopia/setup/pages/_static/icon.png
+- lib/utopia/setup/pages/_static/site.css
+- lib/utopia/setup/pages/errors/exception.xnode
+- lib/utopia/setup/pages/errors/file-not-found.xnode
+- lib/utopia/setup/pages/links.yaml
+- lib/utopia/setup/pages/welcome/index.xnode
+- lib/utopia/setup/public/readme.txt
+- lib/utopia/setup.rb
 - lib/utopia/tag.rb
 - lib/utopia/tags/all.rb
 - lib/utopia/tags/env.rb
@@ -134,6 +152,7 @@ files:
 - lib/utopia/xnode/scanner.rb
 - lib/utopia/xnode.rb
 - lib/utopia.rb
+- bin/utopia
 has_rdoc: true
 homepage: http://www.oriontransfer.co.nz/software/utopia
 licenses: []

data/lib/utopia/extensions.rb

@@ -1,90 +0,0 @@
-#	This file is part of the "Utopia Framework" project, and is licensed under the GNU AGPLv3.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
-
-require 'active_support'
-
-class Date
-	alias_method :old_cmp, :<=>
-	
-	def <=> (other)
-		# Comparing a Date with something that has a time component truncates the time
-		# component, thus we need to check if the other object has a more exact comparison
-		# function.
-		if other.respond_to?(:hour)
-			return (other <=> self) * -1
-		else
-			old_cmp(other)
-		end
-	end	
-end
-
-class Regexp
-	def self.starts_with(string)
-		return /^#{Regexp.escape(string)}/
-	end
-
-	def self.ends_with(string)
-		return /#{Regexp.escape(string)}$/
-	end
-
-	def self.contains(string)
-		return Regexp.new(string)
-	end
-end
-
-class String
-	HTML_ESCAPE = {"&" => "&amp;", "<" => "&lt;", ">" => "&gt;", "\"" => "&quot;"}
-	HTML_ESCAPE_PATTERN = Regexp.new("[" + Regexp.quote(HTML_ESCAPE.keys.join) + "]")
-
-	def to_html
-		gsub(HTML_ESCAPE_PATTERN){|c| HTML_ESCAPE[c]}
-	end
-
-	def to_title
-		(" " + self).gsub(/[ \-_](.)/){" " + $1.upcase}.strip
-	end
-
-	def to_snake
-		self.gsub("::", "").gsub(/([A-Z]+)/){"_" + $1.downcase}.sub(/^_+/, "")
-	end
-end
-
-class Hash
-	def symbolize_keys
-		inject({}) do |options, (key, value)|
-			options[(key.to_sym rescue key) || key] = value
-			options
-		end
-	end
-end
-
-class Array
-	def find_index(&block)
-		each_with_index do |item, index|
-			if yield(item)
-				return index
-			end
-		end
-		
-		return nil
-	end
-	
-	def split_at(&block)
-		index = find_index(&block)
-		
-		if index
-			return [self[0...index], self[index], self[index+1..-1]]
-		end
-		
-		return [[], nil, []]
-	end
-end
-
-if defined? Rack
-	class Rack::Request
-		def self.new(*args)
-			super(*args)
-		end
-	end
-end