utopia 0.9.32 → 0.9.33

data/lib/utopia/middleware/controller.rb

@@ -111,6 +111,11 @@ module Utopia
 						headers['Content-Type'] ||= options[:type]
 					end
 
+					if options[:redirect]
+						headers["Location"] = options[:redirect]
+						status = 302 if status < 300 || status >= 400
+					end
+
 					body = []
 					if options[:body]
 						body = options[:body]
@@ -120,11 +125,6 @@ module Utopia
 						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

data/lib/utopia/middleware/redirector.rb

@@ -16,6 +16,8 @@ module Utopia
 
 				@error_path = error_path
 				@error_status = error_status
+
+				@log = Logger.new($stderr)
 			end
 
 			def to_s
@@ -53,6 +55,12 @@ module Utopia
 				begin
 					return @app.call(env)
 				rescue Exception => ex
+					@log.error "Exception #{ex.to_s.dump}!"
+					
+					ex.backtrace.each do |bt|
+						@log.error bt
+					end
+					
 					if env['PATH_INFO'] == @location
 						return fatal_error(env, ex)
 					else

data/lib/utopia/setup.rb

@@ -7,7 +7,7 @@ require 'rake'
 module Utopia
 	module Setup
 		ROOT = File.join(File.dirname(__FILE__), "setup", "")
-		DIRECTORIES = ["access_log", "cache", "cache/meta", "cache/head", "lib", "pages", "public"]
+		DIRECTORIES = ["access_log", "cache", "cache/meta", "cache/body", "lib", "pages", "public"]
 		
 		def self.copy(to, config = {})
 			$stderr.puts "Copying files from #{ROOT} to #{to}..."

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

@@ -3,5 +3,5 @@
 	
 	<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>
+	<p><a href="http://www.oriontransfer.co.nz/software/utopia/setup">Utopia Project Page &amp; Documentation</a></p>
 </page>

data/lib/utopia/tags/gallery.rb

@@ -8,23 +8,43 @@ require 'RMagick'
 require 'fileutils'
 
 class Utopia::Tags::Gallery
-	PROCESSES = {
-		:photo_thumbnail => lambda do |img|
+	module Processes
+		def self.pdf_thumbnail(img)
 			img = img.resize_to_fit(300, 300)
 
-			shadow = img.flop
-			shadow = shadow.colorize(1, 1, 1, "gray50")
-			shadow.background_color = "white"
-			shadow.border!(10, 10, "white")
-			shadow = shadow.blur_image(0, 5)
+			shadow = img.dup
+			
+			shadow = shadow.colorize(1, 1, 1, 'gray50')
+			shadow.background_color = 'transparent'
+			shadow.border!(10, 10, 'transparent')
+			
+			shadow = shadow.gaussian_blur_channel(5, 5, Magick::AlphaChannel)
       
 			shadow.composite(img, 5, 5, Magick::OverCompositeOp)
-		end,
-		:thumbnail => lambda do |img| 
+		end
+
+		def self.photo_thumbnail(img)
 			img = img.resize_to_fit(300, 300)
-		end,
-		:large => lambda{|img| img.resize_to_fit(768, 768)}
-	}
+
+			shadow = img.dup
+			
+			shadow = shadow.colorize(1, 1, 1, '#999999ff')
+			shadow.background_color = 'transparent'
+			shadow.border!(10, 10, '#99999900')
+			
+			shadow = shadow.gaussian_blur_channel(5, 5, Magick::AlphaChannel)
+      
+			shadow.composite(img, 5, 5, Magick::OverCompositeOp)
+		end
+		
+		def self.thumbnail(img)
+			img = img.resize_to_fit(300, 300)
+		end
+		
+		def self.large(img)
+			img.resize_to_fit(768, 768)
+		end
+	end
 	
 	CACHE_DIR = "_cache"
 	
@@ -32,26 +52,33 @@ class Utopia::Tags::Gallery
 		def initialize(original_path)
 			@original_path = original_path
 			@cache_root = @original_path.dirname + CACHE_DIR
+			
+			@extensions = {}
 		end
 
 		attr :cache_root
+		attr :extensions
 
 		def original
 			@original_path
 		end
 
-#		def basename
-#			@original_path.basename
-#		end
-
-		def self.append_suffix(name, suffix)
-			name.split(".").insert(-2, suffix).join(".")
+		def self.append_suffix(name, suffix, extension = nil)
+			components = name.split(".")
+			
+			components.insert(-2, suffix)
+			
+			if (extension)
+				components[-1] = extension
+			end
+			
+			return components.join(".")
 		end
 
 		def processed(process = nil)
 			if process
 				name = @original_path.basename
-				return cache_root + ImagePath.append_suffix(name, process.to_s)
+				return cache_root + ImagePath.append_suffix(name, process.to_s, @extensions[process.to_sym])
 			else
 				return @original_path
 			end
@@ -86,7 +113,7 @@ class Utopia::Tags::Gallery
 	end
 	
 	def images(options = {})
-		options[:filter] ||= /(\.jpg|\.png)$/
+		options[:filter] ||= /(jpg|png)$/
 
 		paths = []
 		local_path = @node.local_path(@path)
@@ -120,16 +147,20 @@ class Utopia::Tags::Gallery
 		local_original_path = @node.local_path(image_path.original)
 		
 		if processes.kind_of? String
-			processes = processes.split(",")
+			processes = processes.split(",").collect{|p| p.split(":")}
 		end
 		
-		processes.each do |process|
+		processes.each do |process, extension|
+			process = process.to_sym
+			image_path.extensions[process] = extension if extension
+			
 			local_processed_path = @node.local_path(image_path.processed(process))
 		
 			unless File.exists? local_processed_path
 				image = Magick::ImageList.new(local_original_path)
-
-				processed_image = PROCESSES[process.to_sym].call(image)
+				image.scene = 0
+				
+				processed_image = Processes.send(process, image)
 				processed_image.write(local_processed_path)
 			end
 		end
@@ -144,7 +175,8 @@ class Utopia::Tags::Gallery
 
 		options = {}
 		options[:process] = state["process"]
-
+		options[:filter] = Regexp.new("(#{state["filetypes"]})$") if state["filetypes"]
+		
 		filter = Regexp.new(state["filter"]) if state["filter"]
 
 		transaction.tag("div", "class" => "gallery") do |node|

data/lib/utopia/version.rb

@@ -6,7 +6,7 @@ module Utopia
   module VERSION
     MAJOR = 0
     MINOR = 9
-    TINY  = 32
+    TINY  = 33
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 32
-  version: 0.9.32
+  - 33
+  version: 0.9.33
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +12:00
+date: 2010-06-22 00:00:00 +12:00
 default_executable: utopia
 dependencies: 
 - !ruby/object:Gem::Dependency