utopia 0.9.43 → 0.9.45

data/lib/utopia/extensions/string.rb

@@ -10,6 +10,10 @@ class String
 		gsub(HTML_ESCAPE_PATTERN){|c| HTML_ESCAPE[c]}
 	end
 
+	def to_quoted_string
+		'"' + self.gsub('"', '\\"').gsub(/\r/, "\\r").gsub(/\n/, "\\n") + '"'
+	end
+
 	def to_title
 		(" " + self).gsub(/[ \-_](.)/){" " + $1.upcase}.strip
 	end

data/lib/utopia/middleware/content.rb

@@ -8,7 +8,7 @@ require 'utopia/path'
 require 'utopia/tags'
 
 require 'utopia/middleware/content/node'
-require 'utopia/etanni'
+require 'utopia/trenni'
 
 module Utopia
 	module Middleware
@@ -32,7 +32,7 @@ module Utopia
 			attr :passthrough
 
 			def fetch_xml(path)
-				read_file = lambda { TemplateCache.new(path, Etanni) }
+				read_file = lambda { Trenni.new(File.read(path), path) }
 				
 				if @files
 					@files.fetch(path) do

data/lib/utopia/trenni.rb

@@ -0,0 +1,127 @@
+#	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.
+
+require 'strscan'
+
+module Utopia
+	class Trenni
+		class Buffer
+			def initialize
+				@parts = []
+			end
+
+			attr :parts
+
+			def text(text)
+				text = text.gsub('\\', '\\\\\\').gsub('@', '\\@')
+
+				@parts << "_out << %q@#{text}@ ; "
+			end
+
+			def expression(text)
+				@parts << "#{text} ; "
+			end
+
+			def output(text)
+				@parts << "_out << #{text} ; "
+			end
+
+			def code
+				parts = ['_out = [] ; '] + @parts + ['_out.join']
+
+				code = parts.join
+			end
+		end
+
+		class Scanner < StringScanner
+			def initialize(callback, string)
+				@callback = callback
+				super(string)
+			end
+
+			def parse
+				until eos?
+					pos = self.pos
+
+					scan_text
+					scan_expression
+
+					if pos == self.pos
+						raise StandardError.new "Could not scan current input #{self.pos} #{eos?}!"
+					end
+				end
+			end
+
+			def scan_text
+				if scan_until(/(.*?)(?=\#\{|<\?r)/m) || scan(/(.*)\Z/m)
+					@callback.text(self[1]) if self[1].size > 0
+				end
+			end
+
+			def scan_expression
+				if scan(/\#\{/)
+					done = false
+					code = ""
+
+					until eos? || done
+						if scan(/[^"'\{\}]+/m)
+							code << matched
+						end
+
+						if scan(/"(\\"|[^"])*"/m)
+							code << matched
+						end
+
+						if scan(/'(\\'|[^'])*'/m)
+							code << matched
+						end
+
+						if scan(/\{[^\}]*\}/m)
+							code << matched
+						end
+
+						if scan(/\}/)
+							done = true
+						end
+					end
+
+					if done
+						@callback.output(code)
+					else
+						raise StandardError.new "Could not find end of expression #{self}!"
+					end
+				elsif scan(/<\?r/)
+					if scan_until(/(.*?)\?>/m)
+						@callback.expression(self[1])
+					else
+						raise StandardError.new "Could not find end of expression #{self}!"
+					end
+				end
+			end
+		end
+
+		def self.load(path)
+			return self.new(File.read(path), path)
+		end
+
+		def initialize(template, filename = '<Trenni>')
+			@template = template
+			@filename = filename
+			compile!
+		end
+
+		def compile!(filename = @filename)
+			buffer = Buffer.new
+			scanner = Scanner.new(buffer, @template)
+
+			scanner.parse
+			
+			@code = buffer.code
+		end
+
+		def result(binding)
+			eval(@code, binding, @filename)
+		end
+	end
+end

data/lib/utopia/version.rb

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

data/lib/utopia/xnode/scanner.rb

@@ -74,6 +74,8 @@ module Utopia
 				if scan(/</)
 					if scan(/\//)
 						scan_tag_normal(CLOSED_TAG)
+					elsif scan(/!\[CDATA\[/)
+						scan_tag_cdata
 					elsif scan(/!/)
 						scan_tag_comment
 					elsif scan(/\?/)
@@ -115,7 +117,15 @@ module Utopia
 					raise ScanError.new("Invalid tag!", self)
 				end
 			end
-		
+			
+			def scan_tag_cdata
+				if scan_until(/(.*?)\]\]>/m)
+					@callback.cdata(self[1].to_html)
+				else
+					raise ScanError.new("CDATA tag is not closed!", self)
+				end
+			end
+			
 			def scan_tag_comment
 				if scan(/--/)
 					if scan_until(/(.*?)-->/m)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utopia
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 97
   prerelease: false
   segments: 
   - 0
   - 9
-  - 43
-  version: 0.9.43
+  - 45
+  version: 0.9.45
 platform: ruby
 authors: 
 - Samuel Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +13:00
+date: 2011-02-09 00:00:00 +13:00
 default_executable: utopia
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,7 +99,6 @@ extra_rdoc_files: []
 files: 
 - ext/utopia/xnode/fast_scanner/extconf.rb
 - ext/utopia/xnode/fast_scanner/parser.c
-- lib/utopia/etanni.rb
 - lib/utopia/extensions/array.rb
 - lib/utopia/extensions/date.rb
 - lib/utopia/extensions/hash.rb
@@ -147,6 +146,7 @@ files:
 - lib/utopia/tags/override.rb
 - lib/utopia/tags.rb
 - lib/utopia/time_store.rb
+- lib/utopia/trenni.rb
 - lib/utopia/version.rb
 - lib/utopia/xnode/processor.rb
 - lib/utopia/xnode/scanner.rb

data/lib/utopia/etanni.rb

@@ -1,85 +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.
-
-# [Etanni] Copyright (c) 2008 Michael Fellinger <m.fellinger@gmail.com>
-#  
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#  
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#  
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'digest/md5'
-
-module Utopia
-
-	class Etanni
-		SEPARATOR = Digest::MD5.hexdigest(Time.new.to_s)
-		START = "\n_out_ << <<#{SEPARATOR}.chomp!\n"
-		STOP = "\n#{SEPARATOR}\n"
-		REPLACEMENT = "#{STOP}\\1#{START}"
-
-		def initialize(template, compiled = false)
-			if compiled
-				@compiled = template
-			else
-				@template = template
-				compile!
-			end
-		end
-
-		def compile!
-			temp = @template.dup
-			temp.strip!
-			temp.gsub!(/<\?r\s+(.*?)\s+\?>/m, REPLACEMENT)
-			@compiled = "_out_ = [<<#{SEPARATOR}.chomp!]\n#{temp}#{STOP}_out_"
-		end
-
-		def result(binding, filename = '<Etanni>')
-			eval(@compiled, binding, filename).join
-		end
-		
-		attr :compiled
-	end
-	
-	class TemplateCache
-		CACHE_PREFIX = ".cache."
-		CACHE_ENABLED = true
-		
-		def self.cache_path(path)
-			File.join(File.dirname(path), CACHE_PREFIX + File.basename(path))
-		end
-		
-		def self.mtime(path)
-			File.symlink?(path) ? File.lstat(file_name).mtime : File.mtime(path)
-		end
-		
-		def initialize(path, template_class = Etanni)
-			@path = path
-			@cache_path = TemplateCache.cache_path(@path)
-			
-			if !File.exist?(@cache_path) || (TemplateCache.mtime(@path) > TemplateCache.mtime(@cache_path))
-				@template = template_class.new(File.read(@path))
-				File.open(@cache_path, "w") { |f| f.write(@template.compiled) }
-			else
-				@template = template_class.new(File.read(@cache_path), true)
-			end
-		end
-		
-		def result(binding)
-			@template.result(binding, @cache_path)
-		end
-	end
-end