utopia 0.9.61 → 0.10.0

data/lib/utopia/extensions/maybe.rb

@@ -0,0 +1,12 @@
+
+class NilClass
+	def maybe?
+	end
+end
+
+class Object
+	# A helper that allows you to avoid excessive number of i
+	def maybe?
+		yield self
+	end
+end

data/lib/utopia/extensions/string.rb

@@ -15,7 +15,7 @@ class String
 	end
 
 	def to_title
-		(" " + self).gsub(/[ \-_](.)/){" " + $1.upcase}.strip
+		self.gsub(/(^|[ \-_])(.)/){" " + $2.upcase}.strip
 	end
 
 	def to_snake

data/lib/utopia/middleware/content.rb

@@ -121,7 +121,14 @@ module Utopia
 						return [200, {}, []]
 					else
 						response = Rack::Response.new
-						node.process!(request, response)
+						
+						attributes = {}
+						
+						if request.controller
+							attributes = request.controller.to_hash
+						end
+						
+						node.process!(request, response, attributes)
 						return response.finish
 					end
 				else

data/lib/utopia/middleware/content/node.rb

@@ -21,10 +21,6 @@ module Utopia
 				attr :tag
 			end
 
-			# Nodes typically represent XNODE files on the disk.
-			# You can get a list of Links from a current directory. This comprises of all
-			# files ending in ".xnode".
-
 			class Transaction
 				class State
 					def initialize(tag, node)
@@ -37,6 +33,7 @@ module Utopia
 						@attributes = tag.to_hash
 
 						@content = nil
+						@deferred = []
 					end
 
 					attr :attributes
@@ -45,6 +42,14 @@ module Utopia
 					attr :node
 					attr :tags
 
+					attr :deferred
+
+					def defer(&block)
+						@deferred << block
+						
+						Tag.closed("deferred", :id => @deferred.size - 1).to_html
+					end
+
 					def [](key)
 						@attributes[key.to_s]
 					end
@@ -118,12 +123,12 @@ module Utopia
 
 				attr :request
 				attr :response
-				
+
 				# Begin tags represents a list from outer to inner most tag.
 				# At any point in parsing xml, begin_tags is a list of the inner most tag,
 				# then the next outer tag, etc. This list is used for doing dependent lookups.
 				attr :begin_tags
-				
+
 				# End tags represents a list of execution order. This is the order that end tags
 				# have appeared when evaluating nodes.
 				attr :end_tags
@@ -218,21 +223,22 @@ module Utopia
 					else
 						current.tag_end(tag)
 					end
-					
+
 					return nil
 				end
 
 				def render_node(node, attributes = {})
 					state = State.new(attributes, node)
 					@begin_tags << state
-					
+
 					return tag_end
 				end
 
+				# Takes an instance of Tag
 				def lookup(tag)
 					result = tag
 					node = nil
-					
+
 					@begin_tags.reverse_each do |state|
 						result = state.lookup(result)
 						
@@ -240,11 +246,11 @@ module Utopia
 
 						return result if Node === result
 					end
-					
+
 					@end_tags.reverse_each do |state|
 						return state.node.lookup(result) if state.node.respond_to? :lookup
 					end
-					
+
 					return nil
 				end
 
@@ -293,7 +299,14 @@ module Utopia
 				end
 
 				def lookup(tag)
-					return @controller.lookup_tag(tag.name, parent_path)
+					from_path = parent_path
+					
+					# If the current node is called 'foo', we can't lookup 'foo' in the current directory or we will likely have infinite recursion.
+					if tag.name == @uri_path.basename
+						from_path = from_path.dirname
+					end
+					
+					return @controller.lookup_tag(tag.name, from_path)
 				end
 
 				def parent_path
@@ -336,9 +349,9 @@ module Utopia
 					transaction.parse_xml(xml_data)
 				end
 
-				def process!(request, response)
+				def process!(request, response, attributes = {})
 					transaction = Transaction.new(request, response)
-					response.write(transaction.render_node(self))
+					response.write(transaction.render_node(self, attributes))
 				end
 			end
 			

data/lib/utopia/middleware/controller.rb

@@ -20,22 +20,70 @@ module Utopia
 	module Middleware
 
 		class Controller
+			module Direct
+				def process!(path, request)
+					return nil unless path.dirname == self.class.uri_path
+
+					passthrough(path, request)
+				end
+			end
+			
 			CONTROLLER_RB = "controller.rb"
 
 			class Variables
-				def [](key)
-					instance_variable_get("@#{key}")
+				def initialize
+					@controllers = [Object.new]
+				end
+
+				def << controller
+					@controllers << controller
+				end
+
+				def fetch(key)
+					@controllers.reverse_each do |controller|
+						if controller.instance_variables.include?(key)
+							return controller.instance_variable_get(key)
+						end
+					end
+					
+					if block_given?
+						yield key
+					else
+						raise KeyError.new(key)
+					end
+				end
+
+				def to_hash
+					attributes = {}
+
+					@controllers.each do |controller|
+						controller.instance_variables.each do |name|
+							key = name[1..-1]
+							
+							# Instance variables that start with an underscore are considered private and not exposed:
+							next if key.start_with?('_')
+							
+							attributes[key] = controller.instance_variable_get(name)
+						end
+					end
+
+					return attributes
+				end
+
+				def [] key
+					fetch("@#{key}".to_sym) { nil }
 				end
 				
-				def []=(key, value)
-					instance_variable_set("@#{key}", value)
+				# Deprecated - to support old code:
+				def []= key, value
+					@controllers.first.instance_variable_set("@#{key}".to_sym, value)
 				end
 			end
 
 			class Base
 				def initialize(controller)
-					@controller = controller
-					@actions = {}
+					@_controller = controller
+					@_actions = {}
 
 					methods.each do |method_name|
 						next unless method_name.match(/on_(.*)$/)
@@ -43,12 +91,15 @@ module Utopia
 						action($1.split("_")) do |path, request|
 							# LOG.debug("Controller: #{method_name}")
 							self.send(method_name, path, request)
+							
+							# Don't pass the result back, instead use pass! or respond!
+							nil
 						end
 					end
 				end
 
 				def action(path, options = {}, &block)
-					cur = @actions
+					cur = @_actions
 
 					path.reverse.each do |name|
 						cur = cur[name] ||= {}
@@ -58,7 +109,7 @@ module Utopia
 				end
 
 				def lookup(path)
-					cur = @actions
+					cur = @_actions
 
 					path.components.reverse.each do |name|
 						cur = cur[name]
@@ -71,23 +122,49 @@ module Utopia
 					end
 				end
 
-				# Given a request, call an associated action if one exists
+				# Given a request, call an associated action if one exists.
 				def passthrough(path, request)
 					action = lookup(path)
 
 					if action
-						return respond_with(action.call(path, request))
+						variables = request.controller
+						clone = self.dup
+						
+						variables << clone
+						
+						response = catch(:response) do
+							clone.instance_exec(path, request, &action)
+							
+							# By default give nothing - i.e. keep on processing:
+							nil
+						end
+						
+						if response
+							return clone.respond_with(*response)
+						end
 					end
 
 					return nil
 				end
 
 				def call(env)
-					@controller.app.call(env)
+					@_controller.app.call(env)
+				end
+
+				def respond! (*args)
+					throw :response, args
 				end
 
-				def redirect(target, status = 302)
-					{:redirect => target, :status => status}
+				def ignore!
+					throw :response, nil
+				end
+
+				def redirect! (target, status = 302)
+					respond! :redirect => target, :status => status
+				end
+
+				def fail!(error = :bad_request)
+					respond! error
 				end
 
 				def respond_with(*args)
@@ -133,8 +210,16 @@ module Utopia
 					passthrough(path, request)
 				end
 				
+				def self.base_path
+					self.const_get(:BASE_PATH)
+				end
+				
+				def self.uri_path
+					self.const_get(:URI_PATH)
+				end
+				
 				def self.require_local(path)
-					require(File.join(const_get('BASE_PATH'), path))
+					require File.join(base_path, path)
 				end
 			end
 
@@ -179,8 +264,8 @@ module Utopia
 
 				if File.exist?(controller_path)
 					klass = Class.new(Base)
-					klass.const_set('BASE_PATH', base_path)
-					klass.const_set('URI_PATH', uri_path)
+					klass.const_set(:BASE_PATH, base_path)
+					klass.const_set(:URI_PATH, uri_path)
 					
 					$LOAD_PATH.unshift(base_path)
 					
@@ -196,6 +281,7 @@ module Utopia
 
 			def fetch_controllers(path)
 				controllers = []
+
 				path.ascend do |parent_path|
 					controllers << lookup(parent_path)
 				end
@@ -204,7 +290,7 @@ module Utopia
 			end
 
 			def call(env)
-				env["utopia.controller"] ||= Variables.new
+				variables = (env["utopia.controller"] ||= Variables.new)
 				
 				request = Rack::Request.new(env)
 

data/lib/utopia/middleware/static.rb

@@ -32,15 +32,18 @@ module Utopia
 				:text => [
 					"html", "css", "js", "txt", "rtf", "xml", "pdf"
 				],
+				:fonts => [
+					"otf", ["eot", "application/vnd.ms-fontobject"], "ttf", "woff"
+				],
 				:archive => [
 					"zip", "tar", "tgz", "tar.gz", "tar.bz2", ["dmg", "application/x-apple-diskimage"],
 					["torrent", "application/x-bittorrent"]
 				],
 				:images => [
-					"png", "gif", "jpeg", "tiff"
+					"png", "gif", "jpeg", "tiff", "svg"
 				],
 				:default => [
-					:media, :text, :archive, :images
+					:media, :text, :archive, :images, :fonts
 				]
 			}
 

data/lib/utopia/path.rb

@@ -9,6 +9,8 @@ module Utopia
 	class Path
 		SEPARATOR = "/"
 
+		include Comparable
+
 		def initialize(components)
 			# To ensure we don't do anything stupid we freeze the components
 			@components = components.dup.freeze
@@ -191,7 +193,7 @@ module Utopia
 			end
 		end
 
-		def == other
+		def starts_with? other
 			other.components.each_with_index do |part, index|
 				return false if @components[index] != part
 			end

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

@@ -11,7 +11,7 @@
 		<?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" />
+		<link rel="stylesheet" href="/_static/site.css" type="text/css" media="screen" />
 	</head>
 
 	<body>

data/lib/utopia/tag.rb

@@ -5,6 +5,13 @@
 module Utopia
 	
 	class Tag
+		def self.closed(name, attributes = {})
+			tag = Tag.new(name, attributes)
+			tag.closed = true
+			
+			return tag
+		end
+		
 		def initialize(name, attributes = {})
 			@name = name
 			@attributes = attributes
@@ -45,7 +52,11 @@ module Utopia
 			buf.write "<#{name}"
 
 			@attributes.each do |key, value|
-				buf.write " #{key}=\"#{value}\""
+				if value
+					buf.write " #{key}=\"#{value}\""
+				else
+					buf.write " #{key}"
+				end
 			end
 			
 			if terminate

data/lib/utopia/tags/deferred.rb

@@ -0,0 +1,13 @@
+#	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 'utopia/tags'
+
+Utopia::Tags.create("deferred") do |transaction, state|
+	id = state[:id].to_i
+	
+	procedure = transaction.parent.deferred[id]
+	
+	procedure.call(transaction, state)
+end

data/lib/utopia/trenni.rb

@@ -6,6 +6,24 @@ require 'strscan'
 
 module Utopia
 	class Trenni
+		# The output variable that will be used in templates:
+		OUT = '_out'
+		
+		# Returns the output produced by calling the given block.
+		def self.capture(*args, &block)
+			out = eval(OUT, block.binding)
+			top = out.size
+			
+			block.call *args
+			
+			return out.pop(out.size - top).join
+		end
+		
+		# Returns the buffer used for capturing output.
+		def self.buffer(binding)
+			eval(OUT, binding)
+		end
+		
 		class Buffer
 			def initialize
 				@parts = []
@@ -16,7 +34,7 @@ module Utopia
 			def text(text)
 				text = text.gsub('\\', '\\\\\\').gsub('@', '\\@')
 
-				@parts << "_out << %q@#{text}@ ; "
+				@parts << "#{OUT} << %q@#{text}@ ; "
 			end
 
 			def expression(text)
@@ -24,11 +42,11 @@ module Utopia
 			end
 
 			def output(text)
-				@parts << "_out << (#{text}) ; "
+				@parts << "#{OUT} << (#{text}) ; "
 			end
 
 			def code
-				parts = ['_out = [] ; '] + @parts + ['_out.join']
+				parts = ["#{OUT} = [] ; "] + @parts + ["#{OUT}.join"]
 
 				code = parts.join
 			end

data/lib/utopia/version.rb

@@ -5,8 +5,8 @@
 module Utopia
 	module VERSION
 		MAJOR = 0
-		MINOR = 9
-		TINY  = 61
+		MINOR = 10
+		TINY  = 0
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end

data/lib/utopia/xnode/scanner.rb

@@ -26,7 +26,9 @@ module Utopia
 	
 		class Scanner < StringScanner
 			CDATA = /[^<]+/m
-			TAG_PARAMETER = /\s*([^\s=\/>]*)=((['"])(.*?)\3)/um
+			# Parse an attribute in the form of key="value" or key.
+			ATTRIBUTE_NAME = /\s*([^\s=\/>]+)/um
+			ATTRIBUTE_VALUE = /=((['"])(.*?)\2)/um
 
 			def initialize(callback, string)
 				@callback = callback
@@ -87,8 +89,13 @@ module Utopia
 			end
 		
 			def scan_attributes
-				while scan(TAG_PARAMETER)
-					@callback.attribute(self[1], self[4])
+				while scan(ATTRIBUTE_NAME)
+					name = self[1]
+					if scan(ATTRIBUTE_VALUE)
+						@callback.attribute(name, self[3])
+					else
+						@callback.attribute(name, nil)
+					end
 				end
 			end
 		

metadata

@@ -1,96 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: utopia
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 61
-  version: 0.9.61
+version: !ruby/object:Gem::Version
+  version: 0.10.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-16 00:00:00 +12:00
-default_executable: utopia
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mime-types
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-cache
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack-contrib
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: samuel.williams@oriontransfer.co.nz
-executables: 
+executables:
 - utopia
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - ext/utopia/xnode/fast_scanner/extconf.rb
 - ext/utopia/xnode/fast_scanner/parser.c
 - lib/utopia/extensions/array.rb
 - lib/utopia/extensions/date.rb
 - lib/utopia/extensions/hash.rb
+- lib/utopia/extensions/maybe.rb
 - lib/utopia/extensions/rack.rb
 - lib/utopia/extensions/regexp.rb
 - lib/utopia/extensions/string.rb
@@ -130,6 +143,7 @@ files:
 - lib/utopia/setup.rb
 - lib/utopia/tag.rb
 - lib/utopia/tags/all.rb
+- lib/utopia/tags/deferred.rb
 - lib/utopia/tags/env.rb
 - lib/utopia/tags/fortune.rb
 - lib/utopia/tags/gallery.rb
@@ -145,35 +159,29 @@ files:
 - lib/utopia/xnode.rb
 - lib/utopia.rb
 - bin/utopia
-has_rdoc: true
 homepage: http://www.oriontransfer.co.nz/software/utopia
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Utopia is a framework for building websites.
 test_files: []
-
+has_rdoc: