nitro 0.15.0 → 0.16.0

data/lib/nitro/render.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# (c) 2005 Navel, all rights reserved.
+# $Id: render.rb 20 2005-04-15 15:18:36Z gmosx $
 
 require 'sync'
 
@@ -11,7 +11,7 @@ require 'glue/object'
 require 'nitro/shaders'
 require 'nitro/buffering'
 
-module N
+module Nitro
 	
 # Raise this exception to stop rendering.
 
@@ -89,13 +89,10 @@ module Rendering
 	
 	def self.compile_action(klass, action, template_root)
 		@@sync.synchronize do
-			action = action.to_s.split('__')
-			action.shift
-			api = action.shift
-			action = action.join('__')
-
-			# dummy, api, action = action.to_s.split('__')
-
+			Aspects.include_advice_modules(klass)
+			
+			action = action.to_s.gsub(/_action$/, '')
+			
 			# This is not a controller action.
 
 			return false unless action
@@ -105,18 +102,14 @@ module Rendering
 			valid = false
 			
 			code = %{
-				def __#{api}__#{action}
-					old_action_name = @action_name
+				def #{action}_action
+					@parent_action_name = @action_name
 					@action_name = '#{action}'
 			}
-			
-			# call 'before' filter chain.
-			
-			if klass.respond_to?(:before_filters)
-				code << %{
-					#{klass.gen_filters_call_code(action, klass.before_filters)}
-				}
-			end
+		
+			# Inject the pre advices.
+
+			code << Aspects.gen_advice_code(action, klass.advices, :pre) 
 
 			# call the action
 			
@@ -134,37 +127,33 @@ module Rendering
 				}
 			end
 
-			# call the programmatically generated template if exists.
-
-			if klass.action_methods.include?("#{action}__#{api}")
-				valid = true
-				code << %{
-					return unless #{action}__#{api}();
-				}
-			end
-			
-			# call the template if exists.
+			# Try to call the template method if it exists. It is a nice
+			# practice to put output related code in this method instead
+			# of the main action so that this method can be overloaded
+			# separately.
+			#
+			# If no template method exists, try to convert an external
+			# template file into a template method. It is an even better
+			# practice to place the output related code in an external
+			# template file.
 			
-			if template = template_for_action(template_root, action)
+			if (template = template_for_action(template_root, action)) or 
+					klass.instance_methods.include?("#{action}_template")
 				valid = true
 				code << %{
-					return unless __#{api}__#{action}__template();
+					return unless #{action}_template;
 				}
 			end
 
 			# raise "Invalid action '#{action}' for '#{klass}'!" unless valid
 			return false unless valid
 
-			# call 'after' filter chain.
+			# Inject the post advices.
 
-			if klass.respond_to?(:after_filters)
-				code << %{
-					#{klass.gen_filters_call_code(action, klass.after_filters)}
-				}
-			end
+			code << Aspects.gen_advice_code(action, klass.advices, :post) 
 			
 			code << %{
-					@action_name = old_action_name
+					@action_name = @parent_action_name
 				
 					redirect_referer if @out.empty?
 				end
@@ -172,15 +161,22 @@ module Rendering
 			
 			if template
 				code << %{
-					def __#{api}__#{action}__template
+					def #{action}_template
 						#{transform_template(template, Rendering.shader)}
 					end
 				}
 			end
 
-			# puts '---', code, '---'
+			# puts '---', klass, '==', code, '---'
+
+			where = "Action: #{action}"
+			where += ", Template: #{template}" if template
 
-			klass.class_eval(code)
+			begin
+				klass.class_eval(code, where)
+			rescue SyntaxError => e
+				p e
+			end
 		end
 
 		return true
@@ -196,10 +192,14 @@ end
 
 module Render
 
-	# The outbut buffer. The output of a script/action is accumulated
+	# The output buffer. The output of a script/action is accumulated
 	# in this buffer.
 	
 	attr_accessor :out	
+
+	# A nice alias
+
+	alias_method :body, :out
 	
 	# The context.
 	
@@ -237,9 +237,10 @@ module Render
 	def render(path)
 		Logger.debug "Rendering '#{path}'." if $DBG
 		
-		klass, action, content_type, base = @context.dispatcher.dispatch(path, @context)
+		klass, action, base = @context.dispatcher.dispatch(path, @context)
 
-		@context.content_type = content_type
+		# FIXME: 
+		@context.content_type = klass.instance_variable_get('@content_type') || 'text/html'
 
 		raise 'No controller for action' unless klass
 		

data/lib/nitro/request.rb

@@ -1,11 +1,12 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: nitro.rb 167 2004-11-23 14:03:10Z gmosx $
+# $Id: request.rb 9 2005-04-13 00:08:20Z nasis $
 
-module N
+module Nitro
 	
 # Encapsulates a request. This is an abstract request
-# typically extended by sub-classes.
+# typically extended by sub-classes. This module
+# is included in Context
 
 module Request
 
@@ -51,7 +52,7 @@ module Request
 
 	# The path is the uri without the query string.
 
-  def path
+	def path
 		path = uri ? uri.split('?').first : ''
 	end
 
@@ -91,7 +92,7 @@ module Request
 	end
 
 	# The remote IP address. REMOTE_ADDR is the standard
-  # but will fail if the user is behind a proxy.  
+	# but will fail if the user is behind a proxy.  
 	# HTTP_CLIENT_IP and/or HTTP_X_FORWARDED_FOR are set by 
 	# proxies so check for these before falling back to 
 	# REMOTE_ADDR. HTTP_X_FORWARDED_FOR may be a comma-delimited 
@@ -101,7 +102,7 @@ module Request
 	def remote_ip
 		return @headers['HTTP_CLIENT_IP'] if @headers.include?('HTTP_CLIENT_IP')
 
-    if @headers.include?('HTTP_X_FORWARDED_FOR') then
+		if @headers.include?('HTTP_X_FORWARDED_FOR') then
 			remote_ips = @headers['HTTP_X_FORWARDED_FOR'].split(',').reject do |ip|
 				ip =~ /^unknown$|^(10|172\.16|192\.168)\./i
 			end

data/lib/nitro/response.rb

@@ -1,10 +1,10 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: nitro.rb 167 2004-11-23 14:03:10Z gmosx $
+# $Id: response.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N
+module Nitro
 	
-# HTTP Response.
+# HTTP Response. This module is included in Context.
 
 module Response
 
@@ -27,9 +27,18 @@ module Response
 	# Add a cookie to the response. Better use this
 	# method to avoid precreating the cookies array
 	# for every request.
+	#
+	# === Examples
+	#
+	# add_cookie('nsid', 'gmosx')
+	# add_cookie(Cookie.new('nsid', 'gmosx')
 	
-	def add_cookie(cookie)
-		(@response_cookies ||= []) << cookie
+	def add_cookie(cookie, value = nil)
+		if value
+			(@response_cookies ||= []) << Cookie.new(cookie, value)
+		else 
+			(@response_cookies ||= []) << cookie
+		end
 	end
 	alias_method :send_cookie, :add_cookie
 

data/lib/nitro/routing.rb

@@ -1,8 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: routing.rb 271 2005-03-07 17:56:45Z gmosx $
+# $Id: routing.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N
+module Nitro
 
 # Router mixin.
 	

data/lib/nitro/runner.rb

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
 
 # * George Moschovitis  <gm@navel.gr>
+# * James Britt  <james_b@neurogami.com>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: runner.rb 9 2005-04-13 00:08:20Z nasis $
 
 require 'optparse'
 
 require 'glue/misc'
 require 'nitro/conf'
 
-module N
+module Nitro
 
 # The Runner is a helper class that encapsulates a web 
 # application and is responsible for launching the 
@@ -126,15 +127,20 @@ class Runner
 				Logger.set(Logger.new('log/app.log'))
 			end
 
+			opts.on('--apache-cgi', 'Run as CGI (Apache)') do
+				@server = :cgi
+				Logger.set(Logger.new('log/app.log'))
+			end
+			
 			opts.on('-C', '--console', 'Start a console attached to an instance of the application.') do
 				if RUBY_PLATFORM =~ /mswin32/
-    			irb_name = 'irb.bat'
-	  		else
-		  	  irb_name = 'irb'
+					irb_name = 'irb.bat'
+				else
+					irb_name = 'irb'
 				end
 				ENV['NITRO_INVOKE'] = 'irb'
 				conf_file = File.basename(caller.last.split(':').first)
-		  	exec "#{irb_name} -r #{conf_file} -r irb/completion --noinspect"
+				exec "#{irb_name} -r #{conf_file} -r irb/completion --noinspect"
 				exit
 			end
 
@@ -187,6 +193,8 @@ class Runner
 
 		if 'fcgi_proc' == ENV['NITRO_INVOKE']
 			invoke_fcgi_proc(conf)
+		elsif 'cgi_proc' == ENV['NITRO_INVOKE']
+			invoke_cgi_proc(conf)
 		elsif 'irb' == ENV['NITRO_INVOKE']
 			invoke_irb(conf)
 		else
@@ -218,6 +226,11 @@ class Runner
 		FastCGI.start(conf)
 	end
 
+  def invoke_cgi_proc(conf)
+		require 'nitro/adapters/cgi'
+		Cgi.start(conf)
+	end
+
 	def invoke_irb(conf)
 		$conf = conf
 	end
@@ -244,17 +257,20 @@ class Runner
 			puts "\n==> Listening at #{conf.host}:#{conf.port}.\n\n"
 
 			case @server
-			when :webrick
-				require 'nitro/adapters/webrick'
-				Webrick.start(conf)
-				
-			when :lhttpd
-				require 'nitro/adapters/fastcgi'
-				`lighttpd -f conf/lhttpd.conf`
-
-			when :apache
-				require 'nitro/adapters/fastcgi'
-				`apachectl -d #{Dir.pwd} -f conf/apache.conf -k start`
+				when :webrick
+					require 'nitro/adapters/webrick'
+					Webrick.start(conf)
+					
+				when :lhttpd
+					require 'nitro/adapters/fastcgi'
+					`lighttpd -f conf/lhttpd.conf`
+
+				when :apache
+					require 'nitro/adapters/fastcgi'
+					`apachectl -d #{Dir.pwd} -f conf/apache.conf -k start`
+
+				when :cgi
+					require 'nitro/adapters/cgi'
 			end
 		
 		when :stop
@@ -279,4 +295,28 @@ class Runner
 		
 end
 
+# Helper method to start applications.
+#
+# === Example
+#
+# Nitro.run do |conf|
+# 	conf.port = 8080
+# 	conf.template_root = 'root'
+#	end
+#
+# Nitro.run do |conf|
+#		conf.update(
+#			:template_root => root,
+#			:port => 8080
+#		)
+#	end
+
+def self.run(conf = nil)
+	runner = Runner.new.setup
+	conf ||= Conf.new({})
+	$nitro_environment = conf
+	yield(conf) if block_given?
+	runner.run(conf)
+end
+
 end

data/lib/nitro/scaffold.rb

@@ -1,10 +1,16 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: scaffold.rb 335 2005-03-31 14:02:02Z gmosx $
+# $Id: scaffold.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'glue/inflector'
 
-module N
+module Nitro
+
+# The scaffolder adds default actions to a Controller.
+#--
+# FIXME: handle controller base in generated routes.
+# FIXME: better handle templates (check if action exists).
+#++
 
 module Scaffolding
 
@@ -21,16 +27,16 @@ module Scaffolding
 		def scaffold(klass, options = {})
 			
 			oid = options[:oid] || 'oid'
-			name = options[:name] || N::Inflector.name(klass.name)
-			list_name = options[:list_name] || N::Inflector.plural_name(name)
+			name = options[:name] || Inflector.name(klass.name)
+			list_name = options[:list_name] || Inflector.plural_name(name)
 			options[:nosuffix] ? suffix = nil : suffix = "_#{name}"
 
 			# Add methods to the scaffolded class.
 			
 			klass.module_eval %{ 
 				def view_uri
-					# "view#{suffix}?oid=\#\{@oid\}"
-					"view#{suffix}/\#\{@oid\}"
+					"view#{suffix}?oid=\#\{@oid\}"
+					# "view#{suffix}/\#\{@oid\}"
 				end
 			}
 			
@@ -86,7 +92,7 @@ module Scaffolding
 				def list#{suffix}
 					@#{list_name} = #{klass}.all('ORDER BY oid')
 			}
-			unless Rendering.template_for_action(self.template_root, "form#{suffix}")
+			unless Rendering.template_for_action(self.template_root, "list#{suffix}")
 				code << %{
 					o.ul {
 						for item in @#{list_name}
@@ -102,7 +108,7 @@ module Scaffolding
 					# @#{name} = #{klass}[@context['#{oid}']]
 					@#{name} = #{klass}[@#{oid}]
 				end
-				action :view#{suffix}, :route => \%r\{view#{suffix}/(.*)\}, 'oid' => 1
+				action :view#{suffix}, :route => \%r\{#{@base}/view#{suffix}/(.*)\}, 'oid' => 1
 				
 				def save#{suffix}
 					if oid = request['oid']

data/lib/nitro/session.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: session.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'md5'
 require 'webrick'
@@ -9,7 +9,7 @@ require 'glue/hash'
 require 'glue/attribute'
 require 'nitro/cookie'
 
-module N
+module Nitro
 	
 # A web application session. 
 #
@@ -35,7 +35,7 @@ class Session < Hash
 	# The sessions store. By default sessions are 
 	# stored in memory.
 
-	cattr_accessor :store; @@store = N::SafeHash.new 
+	cattr_accessor :store; @@store = Glue::SafeHash.new 
 
 	# Set the session store. The following options are
 	# available:
@@ -47,7 +47,10 @@ class Session < Hash
 	# * :file (not available yet)
 
 	def self.store_type=(store_type)
-		require "nitro/session/#{store_type}"
+		# gmosx: RDoc complains about this, so lets use an
+		# eval, AAAAAAAARGH!
+		# require "nitro/session/#{store_type}"
+		eval %{ require 'nitro/session/#{store_type}' }
 	end
 
 	# Lookup the session in the store by using the session