utopia 0.9.20 → 0.9.21

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

@@ -162,11 +162,11 @@ module Utopia
 
 				def tag(name, attributes, &block)
 					tag = Tag.new(name, attributes)
-					
+
 					node = tag_begin(tag)
-					
+
 					yield node if block_given?
-					
+
 					tag_end(tag)
 				end
 
@@ -186,7 +186,6 @@ module Utopia
 				end
 
 				def tag_begin(tag, node = nil)
-					# LOG.debug("tag_begin: #{tag}")
 					node ||= lookup(tag)
 
 					if node
@@ -206,7 +205,6 @@ module Utopia
 				end
 
 				def cdata(text)
-					# LOG.debug("cdata: #{text}")
 					current.cdata(text)
 				end
 
@@ -214,8 +212,6 @@ module Utopia
 					top = current
 
 					if top.tags.empty?
-						# LOG.debug("tag_end: #{top.inspect}")
-
 						if top.node.respond_to? :tag_end
 							top.node.tag_end(self, top)
 						end
@@ -232,7 +228,6 @@ module Utopia
 
 						return buffer
 					else
-						# LOG.debug("tag_end: #{tag}")
 						current.tag_end(tag)
 					end
 					

data/lib/utopia/tags/gallery.rb

@@ -51,6 +51,10 @@ class Utopia::Tags::Gallery
 			@original_path
 		end
 
+#		def basename
+#			@original_path.basename
+#		end
+
 		def self.append_suffix(name, suffix)
 			name.split(".").insert(-2, suffix).join(".")
 		end
@@ -161,9 +165,12 @@ class Utopia::Tags::Gallery
 		filter = Regexp.new(state["filter"]) if state["filter"]
 
 		transaction.tag("div", "class" => "gallery") do |node|
-			images = gallery.images(options).sort_by do |path|
-				name = path.original.basename
-				metadata[name]["order"] || name
+			images = gallery.images(options).sort do |a, b|
+				if (metadata[a.original.basename]["order"] && metadata[b.original.basename]["order"])
+					metadata[a.original.basename]["order"] <=> metadata[b.original.basename]["order"]
+				else
+					a.original.basename <=> b.original.basename
+				end
 			end
 
 			images.each do |path|

data/lib/utopia/version.rb

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

data/lib/utopia/xnode/processor.rb

@@ -49,7 +49,6 @@ module Utopia
 			end
 		
 			def cdata(text)
-				# $stderr.puts "\tcdata: #{text}"
 				@delegate.cdata(text)
 			end
 		
@@ -58,7 +57,6 @@ module Utopia
 			end
 
 			def begin_tag(tag_name, begin_tag_type)
-				# $stderr.puts "begin_tag: #{tag_name}, #{begin_tag_type}"
 				if begin_tag_type == OPENED_TAG
 					@stack << [Tag.new(tag_name, {}), @scanner.pos]
 				else
@@ -73,12 +71,11 @@ module Utopia
 			end
 
 			def finish_tag(begin_tag_type, end_tag_type)
-				# $stderr.puts "finish_tag: #{begin_tag_type} #{end_tag_type}"
 				if begin_tag_type == OPENED_TAG # <...
 					if end_tag_type == CLOSED_TAG # <.../>
 						cur, pos = @stack.pop
 						cur.closed = true
-				
+
 						@delegate.tag_complete(cur)
 					elsif end_tag_type == OPENED_TAG # <...>
 						cur, pos = @stack.last
@@ -89,9 +86,12 @@ module Utopia
 			end
 
 			def attribute(name, value)
-				# $stderr.puts "\tattribute: #{name} = #{value}"
 				@stack.last[0].attributes[name] = value
 			end
+
+			def instruction(content)
+				cdata("<?#{content}?>")
+			end
 		end
 	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 20
-  version: 0.9.20
+  - 21
+  version: 0.9.21
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +13:00
+date: 2010-03-26 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency