nitro 0.17.0 → 0.18.0

data/lib/nitro/buffering.rb

@@ -6,6 +6,10 @@ module Nitro
 
 # The output buffering mixin. Provides php-style output
 # buffering functionality.
+#--
+# TODO: use better names but keep the ob_xxx php style methods
+# as aliases.
+#++
 
 module OutputBuffering
 	# Output buffers stack, used for php-style nested output 
@@ -37,3 +41,5 @@ module OutputBuffering
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/{builders → builder}/atom.rb

@@ -1,10 +1,6 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id$
-
 # WARNING: unfinished code, do NOT use yet.
 
-require 'nitro/builders/xml'
+require 'nitro/builder/xml'
 
 module Nitro
 

data/lib/nitro/{builders → builder}/form.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: form.rb 30 2005-04-25 12:28:02Z gmosx $
-
 require 'glue/hash'
 require 'nitro/markup'
 
@@ -25,7 +21,7 @@ module FormBuilderMixin
 	def build_form(obj, lc = nil, show_all = false)
 		str = '<dl>'
 		
-		for p in obj.class.__props
+		for p in obj.class.properties
 			unless show_all
 				next if :oid == p.symbol
 			end

data/lib/nitro/{builders → builder}/rss.rb

@@ -1,7 +1,7 @@
 require 'rss/0.9'
 
 require 'glue/string'
-require 'nitro/builders/xml'
+require 'nitro/builder/xml'
 
 module Nitro
 
@@ -100,3 +100,5 @@ class RssBuilder < String
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/{builders → builder}/table.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: table.rb 1 2005-04-11 11:04:30Z gmosx $
-
 module Nitro
 
 # The TableBuilder is a helper class that automates the creation
@@ -80,3 +76,5 @@ class TableBuilder
 end
 
 end 
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/{builders → builder}/xhtml.rb

@@ -1,8 +1,4 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: xhtml.rb 25 2005-04-18 12:31:55Z gmosx $
-
-require 'nitro/builders/xml'
+require 'nitro/builder/xml'
 
 module Nitro
 
@@ -117,3 +113,5 @@ class XhtmlBuilder
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/{builders → builder}/xml.rb

@@ -1,7 +1,3 @@
-# George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: xml.rb 25 2005-04-18 12:31:55Z gmosx $
-
 module Nitro
 
 # A helper mixin for programmatically building XML
@@ -131,3 +127,5 @@ class XmlBuilder
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/caching.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: caching.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'fileutils'
 
 require 'glue/attribute'
@@ -15,6 +11,10 @@ module Nitro
 # Adds support for caching.
 
 module Caching
+
+	# Globaly enable/disable caching.
+	
+	mattr_accessor :caching_enabled, true
 	
 	def self.append_features(base) #:nodoc:
 		super
@@ -27,3 +27,5 @@ module Caching
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/caching/output.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: output.rb 9 2005-04-13 00:08:20Z nasis $
-
 require 'fileutils'
 
 module Nitro
@@ -34,21 +30,22 @@ module Caching
 			# Enable output caching for the given actions.
 
 			def cache_output(*actions)
-				return unless caching_enabled
+				return unless (caching_enabled and Caching.caching_enabled)
 
 				str = actions.collect { |a| ":#{a}" }.join(', ')
 
 				module_eval %{
-					after_filter "do_cache_output", :only => [ #{str} ]
+					post "do_cache_output", :only => [ #{str} ]
 				}
 			end
 
 			private
 
 			def output_cache_path(path)
-				filename = ((path.empty? || path == '/') ? '/index' : path)
-				filename << '.html' unless (name.split('/').last || name).include? '.'
-				return output_cache_root + filename 										
+				filename = ((path.empty? || path == '/') ? '/index' : path.dup)
+#				filename.gsub!(/\/$/, '')
+				filename << 'index.html' unless (name.split('/').last || name).include? '.'
+				return output_cache_root + '/' + filename 										
 			end
 			
 		end
@@ -56,11 +53,19 @@ module Caching
 		private
 
 		def do_cache_output
-			if caching_enabled and caching_allowed?
-				self.class.do_cache_output(@request.path, @out)
+			if caching_enabled and Caching.caching_enabled and caching_allowed?
+				self.class.do_cache_output(@request.uri, @out)
 			end
 		end
 
+		def expire_output(name)
+			begin
+				FileUtils.rm("#{context.dispatcher.public_root}/#{name}/index.html")
+			rescue Object
+				# gmosx: is this the right thing to do?
+			end
+		end
+		
 		def caching_allowed?
 			!@request.post?
 		end
@@ -70,3 +75,5 @@ module Caching
 end
 
 end
+
+# * George Moschovitis  <gm@navel.gr>

data/lib/nitro/context.rb

@@ -3,7 +3,7 @@ require 'nitro/response'
 require 'nitro/render'
 require 'nitro/session'
 require 'nitro/output'
-require 'nitro/adapters/cgi.rb'
+require 'nitro/adapter/cgi.rb'
 
 module Nitro
 	
@@ -100,3 +100,5 @@ class Context
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/controller.rb

@@ -1,5 +1,6 @@
 require 'glue/aspects'
 
+require 'nitro'
 require 'nitro/render'
 require 'nitro/scaffold'
 require 'nitro/caching'
@@ -81,18 +82,27 @@ class Controller
 	# A hash containing metadata for the action
 	# methods.
 
-	cattr_accessor :action_metadata, {} 
+	def self.action_metadata
+		# FIXME: improve this.
+		@action_metadata ||= {}
+		@action_metadata
+	end
+
+	# The directory where the templates for this controller
+	# reside.
+	
+	@template_root = File.join(Nitro::LibPath, '..', 'proto', 'public')	
 
 	def initialize(context, base = nil)
 		super
-		self.class.template_root ||= "#{@context.dispatcher.template_root}#{base}"
+#		self.class.template_root ||= "#{@context.dispatcher.template_root}#{base}"
 	end
 
 	# Use the method_missing hook to compile the actions
 	# for this controller.
 	
 	def method_missing(action, *args)
-		if Rendering.compile_action(self.class, action, self.class.template_root)
+		if Rendering.compile_action(self.class, action)
 			send(action, *args)
 		else
 			super
@@ -100,32 +110,30 @@ class Controller
 	end
 
 	class << self 
+		attr_accessor :template_root
 
 		alias __old_inherited inherited
-
+		
 		#--
 		# gmosx, FIXME: the template_root hack is temporary.
 		# this should be moved to the render.
 		#++
 		
 		def inherited(child)
+#			child.template_root = template_root
+			child.template_root = 'public'		
+					
+			# Calculate the name of the file where this controller
+			# is defined. Currently used for reloading.
+			
 			child.class_eval %{
 				if caller[2].to_s.split(':').last =~ /[0-9]+/
 					DEF_FILE = caller[2].to_s.strip.gsub( /:[0-9]+$/ , '')
 				else
 					DEF_FILE = caller[3].to_s.strip.gsub( /:[0-9]+$/ , '')
 				end
-
-				@template_root = 'public'
-
-				def self.template_root
-					@template_root
-				end
-
-				def self.template_root=(root)
-					@template_root = root
-				end
 			}
+			
 			__old_inherited(child)
 		end
 
@@ -133,10 +141,10 @@ class Controller
 		# macro.
 
 		def action(name, options)
-			if meta = @@action_metadata[name]
+			if meta = action_metadata[name]
 				meta.update(options)
 			else
-				@@action_metadata[name] = ActionMeta.new(options)
+				action_metadata[name] = ActionMeta.new(options)
 			end
 		end
 
@@ -145,7 +153,7 @@ class Controller
 		
 		def action_methods
 			classes = self.ancestors.reject do |a| 
-				[Object, Kernel, Render, Controller].include?(a) 
+				[Object, Kernel, Render, Controller, Caching].include?(a) 
 			end
 
 			classes.delete(PP::ObjectMixin) if defined?(PP::ObjectMixin)
@@ -159,7 +167,10 @@ class Controller
 			return methods
 		end
 
-	end
+	end	
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>
+# * James Britt <james_b@neurogami.com>

data/lib/nitro/dispatcher.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: dispatcher.rb 30 2005-04-25 12:28:02Z gmosx $
-
 module Nitro
 
 require 'nitro/controller'
@@ -187,3 +183,5 @@ class Dispatcher
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/element.rb

@@ -144,6 +144,8 @@ class ElementProcessor # :nodoc: all
 	def render(source)
 		listener = Listener.new
 		REXML::Document.parse_stream(source, listener)
+		# gmosx, FIXME: optimize this, how?
+		listener.buffer.gsub! /<(.*) ([^>]*)><\/\1>/, '<\1 \2 />'
 		return listener.buffer
 	end
 end

data/lib/nitro/environment.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: environment.rb 1 2005-04-11 11:04:30Z gmosx $
-
 # Setup up the proposed environment. You are free
 # to skip this if you dont like it. Just set
 #
@@ -21,3 +17,5 @@ $LOAD_PATH.unshift 'src'
 # Library code come here.
 
 $LOAD_PATH.unshift 'lib'
+
+# * George Moschovitis  <gm@navel.gr>

data/lib/nitro/errors.rb

@@ -0,0 +1,69 @@
+require 'facet/string/demodulize'
+
+module Nitro
+
+class ActionCompileError < SyntaxError
+	SOURCE_CODE_RADIUS = 5
+
+	attr_accessor :original_excpetion
+		
+	def initialize(source_code, filename, original_exception)
+		@source_code = source_code.split("\n")
+		@filename = filename
+		@original_exception = original_exception
+	end
+	
+	def line_number
+		trace = @original_exception.backtrace.join
+    
+		if trace.include?(":in `class_eval'")
+    	trace.scan(/:([0-9]*):in `class_eval'/).first.first.to_i
+    else
+    	1
+    end
+	end
+	
+  def source_extract(indent = 0)
+  	ln = line_number
+    start_line = [ln - SOURCE_CODE_RADIUS, 0].max
+    end_line = [ln + SOURCE_CODE_RADIUS - 1, @source_code.length].min
+
+    number = start_line
+    extract = @source_code[start_line..end_line].collect do |line| 
+      number += 1
+      line = line.gsub(/; @out << %\^/, ' ?>').gsub(/\^;/, '<?r ')
+      if number == line_number
+	      "#{' ' * indent}#{number}: #{line}"
+	    else
+	      "#{' ' * indent}#{number}: #{line}"
+	    end
+    end
+
+    return extract.join("\n")
+  end
+
+	def backtrace	
+		@original_exception.backtrace.collect do |line|
+#			unless line =~ /\/usr/
+				line.gsub("#{Nitro::LibPath}/", '')
+#			else 
+#				nil
+#			end
+		end.compact
+	end
+
+	def to_s
+		"#{self.class.to_s.demodulize} (#{@original_exception.class}): '#@filename' at line ##{line_number}"
+	end
+	
+	def message
+		"#{to_s}\n#{source_extract}"
+	end
+end
+	
+class TemplateCompileError < ActionCompileError
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/mail.rb

@@ -1,10 +1,6 @@
 # Based on original code from the RubyOnRails project.
 # http://www.rubyonrails.com
 # Copyright (c) 2004 David Heinemeier Hansson
-# 
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: mail.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'net/smtp'
 
@@ -270,3 +266,5 @@ class Mailer < Mail
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>