utopia 0.9.28 → 0.9.29

data/lib/utopia/http_status_codes.rb

@@ -0,0 +1,38 @@
+#	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.
+
+module Utopia
+	
+	HTTP_STATUS_CODES = {
+		:success => 200,
+		:created => 201,
+		:accepted => 202,
+		:moved => 301,
+		:found => 302,
+		:see_other => 303,
+		:not_modified => 304,
+		:redirect => 307,
+		:bad_request => 400,
+		:unauthorized => 401,
+		:forbidden => 403,
+		:not_found => 404,
+		:unsupported_method => 405,
+		:gone => 410,
+		:teapot => 418,
+		:error => 500,
+		:unimplemented => 501,
+		:unavailable => 503
+	}
+	
+	HTTP_STATUS_DESCRIPTIONS = {
+		400 => "Bad Request",
+		401 => "Permission Denied",
+		403 => "Access Forbidden",
+		404 => "Resource Not Found",
+		405 => "Unsupported Method",
+		500 => "Internal Server Error",
+		501 => "Not Implemented",
+		503 => "Service Unavailable"
+	}
+end

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

@@ -141,7 +141,6 @@ module Utopia
 				end
 
 				def parent
-					# @begin_tags[-2]
 					end_tags[-2]
 				end
 
@@ -281,7 +280,7 @@ module Utopia
 					@controller.lookup_node(path)
 				end
 
-				def local_path(path, base = nil)
+				def local_path(path = ".", base = nil)
 					path = Path.create(path)
 					root = Pathname.new(@controller.root)
 					
@@ -301,7 +300,7 @@ module Utopia
 					uri_path.dirname
 				end
 
-				def links(path, options = {}, &block)
+				def links(path = ".", options = {}, &block)
 					path = uri_path.dirname + Path.create(path)
 					links = Links.index(@controller.root, path, options)
 					

data/lib/utopia/middleware/controller.rb

@@ -4,6 +4,7 @@
 
 require 'utopia/middleware'
 require 'utopia/path'
+require 'utopia/http_status_codes'
 
 class Rack::Request
 	def controller(&block)
@@ -75,29 +76,61 @@ module Utopia
 					action = lookup(path)
 
 					if action
-						action.call(path, request)
-					else
-						return nil
+						return respond_with(action.call(path, request))
 					end
-				end
-				
-				def permission_denied
-					[403, {}, ["Permission Denied!"]]
+
+					return nil
 				end
 
 				def call(env)
 					@controller.app.call(env)
 				end
 
-				def redirect(target, status=302)
-					Rack::Response.new([], status, "Location" => target.to_s).finish
+				def redirect(target, status = 302)
+					{:redirect => target, :status => status}
 				end
 
-				def permission_denied
-					[403, {}, ["Permission Denied!"]]
+				def respond_with(*args)
+					return args[0] if args[0] == nil || Array === args[0]
+
+					status = 200
+					options = nil
+
+					if Numeric === args[0] || Symbol === args[0]
+						status = args[0]
+						options = args[1] || {}
+					else
+						options = args[0]
+						status = options[:status] || status
+					end
+
+					status = Utopia::HTTP_STATUS_CODES[status] || status
+					headers = options[:headers] || {}
+
+					if options[:type]
+						headers['Content-Type'] ||= options[:type]
+					end
+
+					body = []
+					if options[:body]
+						body = options[:body]
+					elsif options[:content]
+						body = [options[:content]]
+					elsif status >= 300
+						body = [Utopia::HTTP_STATUS_DESCRIPTIONS[status] || 'Status #{status}']
+					end
+
+					if options[:redirect]
+						headers["Location"] = options[:redirect]
+						status = 302 if status < 300 || status >= 400
+					end
+
+					# Utopia::LOG.debug([status, headers, body].inspect)
+					return [status, headers, body]
 				end
 
 				def process!(path, request)
+					passthrough(path, request)
 				end
 				
 				def self.require_local(path)
@@ -112,7 +145,7 @@ module Utopia
 				LOG.info "#{self.class.name}: Running in #{@root}"
 
 				@controllers = {}
-				@cache_controllers = true
+				@cache_controllers = (UTOPIA_ENV == :production)
 
 				if options[:controller_file]
 					@controller_file = options[:controller_file]

data/lib/utopia/tags/gallery.rb

@@ -73,8 +73,6 @@ class Utopia::Tags::Gallery
 	def initialize(node, path)
 		@node = node
 		@path = path
-		
-		Utopia::LOG.debug("node: #{node.inspect} path: #{path}")
 	end
 	
 	def metadata
@@ -93,13 +91,9 @@ class Utopia::Tags::Gallery
 		paths = []
 		local_path = @node.local_path(@path)
 
-		Utopia::LOG.debug("Scanning #{local_path}")
-
 		Dir.entries(local_path).each do |filename|
 			next unless filename.match(options[:filter])
 
-			Utopia::LOG.debug("Filename #{filename} matched filter...")
-
 			fullpath = File.join(local_path, filename)
 
 			paths << ImagePath.new(@path + filename)

data/lib/utopia/version.rb

@@ -6,7 +6,7 @@ module Utopia
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 28
+    TINY  = 29
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 28
-  version: 0.9.28
+  - 29
+  version: 0.9.29
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 +12:00
+date: 2010-05-16 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - ext/utopia/xnode/fast_scanner/parser.c
 - lib/utopia/etanni.rb
 - lib/utopia/extensions.rb
+- lib/utopia/http_status_codes.rb
 - lib/utopia/link.rb
 - lib/utopia/middleware/all.rb
 - lib/utopia/middleware/benchmark.rb
@@ -117,7 +118,6 @@ files:
 - lib/utopia/middleware/static.rb
 - lib/utopia/middleware.rb
 - lib/utopia/path.rb
-- lib/utopia/response_helper.rb
 - lib/utopia/session/encrypted_cookie.rb
 - lib/utopia/tag.rb
 - lib/utopia/tags/all.rb

data/lib/utopia/response_helper.rb

@@ -1,11 +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.
-
-module Rack
-	class Response
-		def self.create(response, &block)
-			self.new(response[2], response[0], response[1], &block)
-		end
-	end
-end