nitro 0.9.5 → 0.10.0

data/lib/nitro/controller.rb

@@ -21,14 +21,7 @@ class Controller
 	
 	def method_missing(action, *args)
 		if Rendering.compile_action(self.class, action, @base)
-			# FIXME: temp hack!
-			if :partial == Rendering.reload
-				ret = send(action, *args)
-				self.class.class_eval("remove_method :#{action}") # if $DBG
-				return ret
-			else
-				send(action, *args)
-			end
+			send(action, *args)
 		else
 			super
 		end
@@ -39,7 +32,7 @@ class Controller
 
 		def inherited(subclass)
 			subclass.class_eval %{
-				DEF_FILE = caller.first.split(':').first
+				DEF_FILE = caller[2].split(':').first
 			}	
 			__old_inherited(subclass)
 		end
@@ -47,4 +40,10 @@ class Controller
 
 end
 
+# A simple controller, only handles templates.
+# Useful to implement php/asp/jsp style applications.
+
+class SimpleController < Controller
+end
+
 end

data/lib/nitro/dispatcher.rb

@@ -28,7 +28,7 @@ class Dispatcher
 	#
 	# [+controllers+]
 	#		Either a hash of controller mappings or a single
-	#		controller that gets mapped to :index.
+	#		controller that gets mapped to :root.
 	#
 	# [+apis+]
 	# 	A hash of apis supported by the Dispatcher.
@@ -37,9 +37,9 @@ class Dispatcher
 		@root = 'root'
 		
 		if controllers and controllers.is_a?(Class) and controllers.ancestors.include?(Controller)
-			@controllers = { :index => controllers }
+			@controllers = { :root => controllers }
 		else
-			@controllers = controllers || { :index => Controller }
+			@controllers = controllers || { :root => SimpleController }
 		end
 
 		@apis = apis
@@ -57,7 +57,7 @@ class Dispatcher
 	# === Examples
 	#
 	# dispatcher.mount {
-	#		:index => MainController # mounts /
+	#		:root => MainController # mounts /
 	#		'users' => UsersController # mounts /users
 	#	}
 	
@@ -79,8 +79,14 @@ class Dispatcher
 	# Processes the path and dispatches to the corresponding
 	# controller/action pair.
 	# The base returned contains a trailing '/'.
+	#
+	# [+path+]
+	#		The path to dispatch.
+	#
+	# [:context]
+	#		The dispatching context.
 
-	def dispatch(path)
+	def dispatch(path, context)
 		api = :xhtml
 
 		if @apis
@@ -91,32 +97,53 @@ class Dispatcher
 
 		case parts.size
 			when 0
+				# / -> root.index
 				base = @root 
-				controller_class = @controllers[:index]
+				klass = controller_class_for(:root, context)
 				action = 'index'
 				
 			when 2
-				if controller_class = @controllers[parts[1]]
+				if klass = controller_class_for(parts[1], context)
+					# controller/ -> controller.index
 					base = "#{@root}/#{parts[1]}"
 					action = 'index'
 				else
+					# action/ -> root.action
 					base = @root
-					controller_class = @controllers[:index]
+					klass = controller_class_for(:root, context)
 					action = parts[1]
 				end
 				
 			when 3
+				# controller/action/ -> controller.action
 				base = "#{@root}/#{parts[1]}"
-				controller_class = @controllers[parts[1]]
+				klass = controller_class_for(parts[1], context)
 				action = parts[2]
 		end
 	
 		content_type = @apis ? @apis[:api] : 'text/html'
 
-		return controller_class, "__#{api}__#{action}", base, content_type 
+		return klass, "__#{api}__#{action}", base, content_type 
 	end
 	alias_method :split_path, :dispatch
-	
+
+	# Get the controller for the given key.
+	# Also handles reloading of controllers.
+
+	def controller_class_for(key, context)
+		klass = @controllers[key]
+
+		if context[:__RELOADED__].nil? and (:full == Rendering.reload) and klass
+			def_file = klass::DEF_FILE
+			Controller.remove_subclasses
+			load(def_file)
+			klass = @controllers[key] = Object.const_get(klass.name.intern)
+			context[:__RELOADED__] = true
+		end
+
+		return klass
+	end
+
 end
 
 end

data/lib/nitro/filters.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: filters.rb 215 2005-01-24 10:44:05Z gmosx $
+# $Id: filters.rb 249 2005-02-04 14:03:00Z gmosx $
 
 module N
 

data/lib/nitro/markup.rb

@@ -20,8 +20,19 @@ module PropertyUtils
 			# if true, set to default Markup
 			markup = N::Markup if true == markup
 
-			return %{
+			code = %{
 				def #{s}=(val)
+			}
+			
+			if N::Property.type_checking
+				code << %{
+					unless String == val.class
+						raise "Invalid type, expected '#{prop.klass}', is '\#\{val.class\}'."
+					end
+				}
+			end
+
+			code << %{
 					@#{s} = #{markup}.expand(val)
 				end
 
@@ -29,6 +40,8 @@ module PropertyUtils
 					#{markup}.compact(@#{s})
 				end
 			}
+
+			return code
 		else
 			return %{
 				def #{s}=(val)

data/lib/nitro/render.rb

@@ -53,7 +53,7 @@ module Rendering
 		# base/action.xhtml
 
 		path = "#{base}/#{action}.#{ext}".squeeze('/')
-		
+	
 		unless File.exist?(path)
 
 			# attempt to find a template of the form
@@ -178,8 +178,11 @@ module Render
 	attr_accessor :context
 	alias_method :ctx, :context
 	alias_method :ctx=, :context=
-	alias_method :request, :context
 	
+	# Alias for context.
+
+	attr_accessor :request
+
 	# An array holding the rendering errors for this
 	# request.
 	
@@ -191,7 +194,7 @@ module Render
 	#		A parent render/controller acts as the context.
 
 	def initialize(context, base)
-		@context = context
+		@request = @context = context
 		@out = context.out
 		@base = base
 	end
@@ -203,14 +206,8 @@ module Render
 	def render(path)
 		Logger.debug "Rendering '#{path}'." if $DBG
 		
-		klass, action, base, ctype = @context.dispatcher.dispatch(path)
+		klass, action, base, ctype = @context.dispatcher.dispatch(path, @context)
 
-		if :full == Rendering.reload
-			def_file = klass::DEF_FILE
-			Controller.remove_subclasses
-			load(def_file)
-		end
-			
 		@context.content_type = ctype
 
 		raise 'No controller for action' unless klass

data/lib/nitro/runner.rb

@@ -0,0 +1,232 @@
+#!/usr/bin/env ruby
+
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id$
+
+require 'optparse'
+
+require 'nitro/conf'
+
+module N
+
+# The Runner is a helper class that encapsulates a web 
+# application and is responsible for launching the 
+# application in differnt modes. 
+#
+# The runner provides default parsing of command line
+# and environment parameters. 
+#
+# The default execution modes are:
+#
+# :debug, :stage, :live
+#
+# You can implement your own, custom version of the Runner
+# to run your custom web applications.
+
+class Runner
+
+	# Execution mode = (:debug, :stage, :live) 
+	#
+	# [:debug]
+	#		useful when debugging, extra debug information
+	#		is emmited, actions, templates and shaders are
+	#		reloaded, etc. The execution speed of the application
+	#		is impaired.
+	#
+	# [:stage]
+	#		test the application with live parameters 
+	#		(typically on a staging server).
+	#
+	#	[:live]
+	#		use the parameters for the live (production)
+	#		server. Optimized for speed.
+	#
+	# The default mode is :debug
+
+	attr_accessor :mode
+	
+	# :start, :stop, :restart
+
+	attr_accessor :action
+	
+	# The server used to run this web application.
+	# :webrick, :nitro, :lhttp, :apache, :mod_apache 
+	#
+	# At the moment only :webrick and :lhttp are available.
+	
+	attr_accessor :server
+
+	# Parse the command line arguments and the environment 
+	# parameters to setup the application.
+	
+	def setup
+
+		@mode = :debug
+		@action = :start
+		@server = :webrick
+		@daemon = false
+
+		parser = OptionParser.new do |opts|
+
+			opts.banner = 'Usage: run.rb [options]'
+			opts.separator ''
+			opts.separator 'Specific options:'
+
+			opts.on('-s', '--start', 'Start application.') do 
+				@action = :start	
+			end
+
+			opts.on('-S', '--stop', 'Stop application.') do
+				@action = :stop
+			end
+
+			opts.on('-r', '--restart', 'Restart application.') do
+				@action = :restart
+			end
+
+			opts.on('-d', '--daemon', 'Run application as a daemon.') do
+				@daemon = true
+			end
+			
+			opts.on('-D', '--debug', 'Run application in debug mode.') do
+				@mode = :debug
+			end
+
+			opts.on('-T', '--stage', 'Run application in stage mode.') do
+				@mode = :stage
+			end
+
+			opts.on('-L', '--live', 'Run application in live mode.') do
+				@mode = :live
+			end
+
+			opts.on('-w', '--webrick', 'Use a webrick server [default].') do
+				@server = :webrick
+			end
+
+			opts.on('-l', '--lhttpd', 'Use a lighttpd server.') do
+				@server = :lhttpd
+				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'
+				end
+				ENV['NITRO_INVOKE'] = 'irb'
+				conf_file = File.basename(caller.last.split(':').first)
+		  	exec "#{irb_name} -r #{conf_file} -r irb/completion --noinspect"
+				exit
+			end
+
+			opts.on('-l', '--lhttpd', 'Use a lighttpd server.') do
+				@server = :lhttpd
+				Logger.set(Logger.new('log/app.log'))
+			end
+
+			opts.on_tail('-v', '--version', 'Show version.') do 
+				puts "Nitro #{Nitro::Version}"
+				exit
+			end
+
+			opts.on_tail('-h', '--help', 'Show this message.') do
+				puts opts
+				exit
+			end
+			
+		end
+
+		parser.parse!(ARGV)
+
+		return self
+	end
+
+	# Run the application in the declared execution mode,
+	# using the passed configuration parameters.
+	
+	def run(conf)
+
+		if conf.is_a?(Hash)
+			conf = Conf.new(conf)
+		end
+
+		case @mode
+		when :debug
+			setup_debug(conf)
+
+		when :stage
+			setup_stage(conf)
+			
+		when :live
+			setup_live(conf)
+		end
+
+		if 'fcgi_proc' == ENV['NITRO_INVOKE']
+			invoke_fcgi_proc(conf)
+		elsif 'irb' == ENV['NITRO_INVOKE']
+			invoke_irb(conf)
+		else
+			invoke_server(conf)
+		end
+
+	end
+
+	def setup_debug(conf)
+		$DBG = true
+		Rendering.reload = :full
+	end
+
+	def setup_stage(conf)
+		$DBG = false
+		Rendering.reload = false 
+		Logger.set(Logger.new('log/app.log'))
+	end
+
+	def setup_live(conf)
+		$DBG = false
+		Rendering.reload = false 
+		Logger.set(Logger.new('log/app.log'))
+	end
+	alias_method :setup_production, :setup_live
+	
+	def invoke_fcgi_proc(conf)
+		require 'nitro/adapters/fastcgi'
+		FastCGI.start(conf)
+	end
+
+	def invoke_irb(conf)
+		$conf = conf
+	end
+
+	def invoke_server(conf)
+		case @action
+		when :start
+			
+			case @server
+
+			when :webrick
+				require 'nitro/adapters/webrick'
+				Webrick.start(conf)
+				
+			when :lhttpd
+				require 'nitro/adapters/fastcgi'
+				`lighttpd -f conf/lhttpd.conf`
+			end
+		
+		when :stop
+
+		end
+	end
+
+	# Helper method.
+
+	def self.run(conf)
+		runner = Runner.new.setup.run(conf)
+	end
+		
+end
+
+end