content.rb in utopia-0.11.0

- old
+ new

@@ -1,27 +1,42 @@
-#	This file is part of the "Utopia Framework" project, and is released under the MIT license.
-#	Copyright 2010 Samuel Williams. All rights reserved.
-#	See <utopia.rb> for licensing details.
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.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 OR COPYRIGHT HOLDERS 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 'utopia/middleware'
 require 'utopia/link'
 require 'utopia/path'
 require 'utopia/tags'
 
 require 'utopia/middleware/content/node'
-require 'utopia/trenni'
+require 'utopia/middleware/content/processor'
+require 'trenni/template'
 
 module Utopia
 	module Middleware
 	
 		class Content
 			def initialize(app, options = {})
 				@app = app
 
 				@root = File.expand_path(options[:root] || Utopia::Middleware::default_root)
-				
-				LOG.info "** #{self.class.name}: Running in #{@root}"
 
 				# Set to hash to enable caching
 				@nodes = {}
 				@files = nil
 
@@ -30,10 +45,10 @@
 
 			attr :root
 			attr :passthrough
 
 			def fetch_xml(path)
-				read_file = lambda { Trenni.new(File.read(path), path) }
+				read_file = lambda { Trenni::Template.load(path) }
 				
 				if @files
 					@files.fetch(path) do |key|
 						@files[key] = read_file.call
 					end