utopia 0.9.47 → 0.9.48

data/lib/utopia/trenni.rb

@@ -35,6 +35,8 @@ module Utopia
 		end
 
 		class Scanner < StringScanner
+			TEXT = /([^<#]|<(?!\?r)|#[^\{]){1,1024}/m
+			
 			def initialize(callback, string)
 				@callback = callback
 				super(string)
@@ -54,17 +56,17 @@ module Utopia
 			end
 
 			def scan_text
-				if scan_until(/(.*?)(?=\#\{|<\?r)/m) || scan(/(.*)\Z/m)
-					@callback.text(self[1]) if self[1].size > 0
+				if scan(TEXT)
+					@callback.text(matched)
 				end
 			end
 
 			def scan_expression
 				if scan(/\#\{/)
-					done = false
+					level = 1
 					code = ""
 
-					until eos? || done
+					until eos? || level == 0
 						if scan(/[^"'\{\}]+/m)
 							code << matched
 						end
@@ -77,16 +79,17 @@ module Utopia
 							code << matched
 						end
 
-						if scan(/\{[^\}]*\}/m)
+						if scan(/\{/)
 							code << matched
+							level += 1
 						end
 
 						if scan(/\}/)
-							done = true
+							level -= 1
 						end
 					end
 
-					if done
+					if level == 0
 						@callback.output(code)
 					else
 						raise StandardError.new "Could not find end of expression #{self}!"
@@ -114,7 +117,7 @@ module Utopia
 		def compile!(filename = @filename)
 			buffer = Buffer.new
 			scanner = Scanner.new(buffer, @template)
-
+			
 			scanner.parse
 			
 			@code = buffer.code

data/lib/utopia/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utopia
 version: !ruby/object:Gem::Version 
-  hash: 101
+  hash: 91
   prerelease: 
   segments: 
   - 0
   - 9
-  - 47
-  version: 0.9.47
+  - 48
+  version: 0.9.48
 platform: ruby
 authors: 
 - Samuel Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +13:00
+date: 2011-04-04 00:00:00 +12:00
 default_executable: utopia
 dependencies: 
 - !ruby/object:Gem::Dependency