nitro 0.15.0 → 0.16.0

data/lib/nitro/caching/stores.rb

@@ -1,12 +1,12 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: stores.rb 335 2005-03-31 14:02:02Z gmosx $
+# $Id: stores.rb 9 2005-04-13 00:08:20Z nasis $
 
 require 'fileutils'
 
 require 'glue/hash'
 
-module N
+module Nitro
 
 # Adds support for caching.
 
@@ -14,13 +14,13 @@ module Caching
 
 	# Cached fragments are stored in memory.
 
-	class MemoryStore < SafeHash
+	class MemoryStore < Glue::SafeHash
 
 		def read(name, options = {})
 			self[name]
 		end
 		
-    def write(name, content = '', options = {})
+		def write(name, content = '', options = {})
 			self[name] = content
 		end
 

data/lib/nitro/conf.rb

@@ -1,10 +1,12 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: conf.rb 302 2005-03-16 14:31:32Z gmosx $
+# $Id: conf.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'glue/flexob'
 
-module N
+require 'nitro/dispatcher'
+
+module Nitro
 	
 # Configuration.
 
@@ -18,12 +20,10 @@ class Conf < Flexob
 		# Default configuration parameters.
 
 		hash = {
-			:name => 'Nitro Application',
-			# this is accessible as localhost on windows
-			:host => '0.0.0.0',
+			:name => 'Nitro',
+			:host => '0.0.0.0', # this is accessible as localhost on windows.
 			:port => 9999,
 			:dispatcher => Dispatcher.new,
-
 			:template_root => 'templates',
 			:public_root => 'public'
 		}
@@ -33,6 +33,11 @@ class Conf < Flexob
 		super(hash)
 	end
 
+	def mount(name, options = {})
+		$nitro_mount_options = options
+		require_part(name)
+	end
+	
 end
 
 end

data/lib/nitro/context.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: context.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'nitro/request'
 require 'nitro/response'
@@ -9,7 +9,7 @@ require 'nitro/session'
 require 'nitro/output'
 require 'nitro/adapters/cgi.rb'
 
-module N
+module Nitro
 	
 # Encapsulates an HTTP processing cycle context.
 # Integrates the Request and the Response.

data/lib/nitro/controller.rb

@@ -1,13 +1,14 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# (c) 2005 Navel, all rights reserved.
+# $Id: controller.rb 20 2005-04-15 15:18:36Z gmosx $
+
+require 'glue/aspects'
 
 require 'nitro/render'
 require 'nitro/scaffold'
-require 'nitro/filters'
 require 'nitro/caching'
 
-module N
+module Nitro
 
 # Encapsulates metadata that describe an action 
 # parameter. 
@@ -77,8 +78,8 @@ end
 
 class Controller 
 	include Render
+	include Glue::Aspects
 	include Scaffolding
-	include Filtering		
 	include Caching
 
 	# A hash containing metadata for the action
@@ -113,7 +114,11 @@ class Controller
 		
 		def inherited(child)
 			child.class_eval %{
-				DEF_FILE = caller[2].to_s.strip.gsub( /:[0-9]+$/ , '')
+				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'
 
@@ -143,7 +148,7 @@ class Controller
 		# Some dangerous methods from ancestors are removed.
 		
 		def action_methods
-    	classes = self.ancestors.reject do |a| 
+			classes = self.ancestors.reject do |a| 
 				[Object, Kernel, Render, Controller].include?(a) 
 			end
 

data/lib/nitro/cookie.rb

@@ -1,8 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: cookie.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N
+module Nitro
 
 # Encapsulates a HTTP Cookie.
 

data/lib/nitro/dispatcher.rb

@@ -1,8 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: dispatcher.rb 23 2005-04-16 18:20:00Z gmosx $
 
-module N
+module Nitro
 
 require 'nitro/controller'
 require 'nitro/routing'
@@ -11,6 +11,7 @@ require 'nitro/simple'
 # The Dispatcher manages a set of controllers.
 
 class Dispatcher 
+
 	include Router
 	
 	# The public root directory. The files in this
@@ -30,10 +31,6 @@ class Dispatcher
 
 	attr_accessor :controllers
 
-	# APIs map.
-
-	attr_accessor :apis
-
 	# Create a new Dispatcher.
 	#
 	# Input:
@@ -41,11 +38,8 @@ class Dispatcher
 	# [+controllers+]
 	#		Either a hash of controller mappings or a single
 	#		controller that gets mapped to :root.
-	#
-	# [+apis+]
-	# 	A hash of apis supported by the Dispatcher.
 	
-	def initialize(controllers = nil, apis = nil, routes = nil)
+	def initialize(controllers = nil)
 		@public_root = 'public'
 		@template_root = @public_root
 		
@@ -56,8 +50,6 @@ class Dispatcher
 		end
 
 		mount(controllers)
-
-		@apis = apis || {}
 	end
 
 	# Process the given hash and mount the 
@@ -71,10 +63,10 @@ class Dispatcher
 	#
 	# === Examples
 	#
-	# dispatcher.mount {
-	#		:root => MainController # mounts /
+	# dispatcher.mount(
+	#		:root => MainController, # mounts /
 	#		'users' => UsersController # mounts /users
-	#	}
+	#	)
 	
 	def add_controller(controllers)
 		(@controllers ||= {}).update(controllers)
@@ -82,21 +74,6 @@ class Dispatcher
 	end
 	alias_method :mount, :add_controller
 
-	# Add a new api to the dispatcher
-	#
-	# [+api+]
-	#		API symbol
-	# [+data+]
-	#		Data for this API [content_type, ..]
-	#
-	# === Example
-	#
-	# dispatcher.add_api(:xml, 'text/xml')
-	
-	def add_api(api, data)
-		(@apis ||= {})[api] = data
-	end
-
 	# Update the routes. Typically called after a new
 	# Controller is mounted.
 
@@ -123,15 +100,8 @@ class Dispatcher
 	#		The dispatching context.
 
 	def dispatch(path, context = nil)
-		api = :xhtml
-
 		path = route(path, context)
 
-		if @apis
-			# OPTIMIZE: check only if lookup fails.
-			@apis.each { |k, v| api = k if path.slice!(/#{k}\//) }
-		end
-
 		parts = path.split('/')
 		parts.shift
 
@@ -167,23 +137,46 @@ class Dispatcher
 					action = parts.join('__')
 				end
 		end
-		
-		content_type = @apis[:api] || 'text/html'
 
-		return klass, "__#{api}__#{action}", content_type, base
+		return klass, "#{action}_action", base
 	end
 	alias_method :split_path, :dispatch
 
 	# Get the controller for the given key.
 	# Also handles reloading of controllers.
+	#--
+	# gmosx, FIXME: this method is a NASTY hack, anyone can 
+	# help me fix this ?
+	#++
 
 	def controller_class_for(key, context)
 		klass = @controllers[key]
 
 		if (:full == Rendering.reload) and context and context[:__RELOADED__].nil? and klass
+=begin	
+			ancestors = [c = klass]
+			while (c = c.superclass) != Nitro::Controller
+				ancestors.unshift(c)
+			end
+
+			for c in ancestors
+				actions = c.public_instance_methods.find_all { |m| m.to_s =~ /(_action$)|(_template$)/ }
+				actions += c.action_methods
+				actions.each { |m| c.send(:remove_method, m) rescue nil }
+				c.advices = []
+				
+				Object.send(:remove_const, c) rescue nil
+				load(c::DEF_FILE)
+				c = Object.const_get(klass.name.intern) 
+			end
+=end
+#=begin	
 			def_file = klass::DEF_FILE
+			# Object.send(:remove_const, klass) rescue nil
+			#	FIXME: also reload superclasses!
 			Controller.remove_subclasses
 			load(def_file)
+#=end
 			klass = @controllers[key] = Object.const_get(klass.name.intern) 
 			context[:__RELOADED__] = true
 		end

data/lib/nitro/environment.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: environment.rb 340 2005-04-04 08:26:58Z gmosx $
+# $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

data/lib/nitro/localization.rb

@@ -1,13 +1,13 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: l10n.rb 185 2004-12-10 13:29:09Z gmosx $
+# $Id: localization.rb 17 2005-04-14 16:03:40Z gmosx $
 
 require 'yaml'
 
-require 'nitro/filters'
+require 'glue/aspects'
 require 'nitro/shaders'
 
-module N
+module Nitro
 
 # Represents a locale.
 #--
@@ -121,9 +121,9 @@ class Localization
 	
 end
 
-# Localization filter.
+# Localization Aspect.
 
-module LocalizationFilter
+module LocalizationAspect
 	def localize
 		#		@lc = @context.conf.localization[@session[:LOCALE]]
 		@lc = Localization[@context.session[:LOCALE]]
@@ -152,5 +152,3 @@ class LocalizationShader < Shader
 end
 
 end
-
-

data/lib/nitro/mail.rb

@@ -4,14 +4,14 @@
 # 
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: mail.rb 323 2005-03-24 09:43:52Z gmosx $
+# $Id: mail.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'net/smtp'
 
 require 'glue/attribute'
 require 'nitro/template'
 
-module N
+module Nitro
 
 # Encapsulates an email message.
 

data/lib/nitro/markup.rb

@@ -1,10 +1,10 @@
 # George Moschovitis  <gm@navel.gr>
 # (c) 2004 Navel, all rights reserved.
-# $Id$
+# $Id: markup.rb 7 2005-04-12 14:24:10Z gmosx $
 
 require 'glue/property'
 
-module N 
+module Nitro
 
 #--
 # Override the default PropertyUtils implementation to
@@ -18,13 +18,13 @@ module PropertyUtils
 		s = prop.symbol
 		if markup = prop.meta[:markup]
 			# if true, set to default Markup
-			markup = N::Markup if true == markup
+			markup = Nitro::Markup if true == markup
 
 			code = %{
 				def #{s}=(val)
 			}
 			
-			if N::Property.type_checking
+			if Property.type_checking
 				code << %{
 					unless String == val.class
 						raise "Invalid type, expected '#{prop.klass}', is '\#\{val.class\}'."
@@ -67,7 +67,7 @@ end
 #
 # here comes the #{obj.body} # => prints the expanded version.
 #
-#	obj.body = N::Markup.expand(@params['body'])	
+#	obj.body = Nitro::Markup.expand(@params['body'])	
 
 module Markup
 	def self.expand_html!(str)

data/lib/nitro/output.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: output.rb 267 2005-02-28 14:52:41Z gmosx $
+# $Id: output.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'nitro/builders/xml'
 require 'nitro/builders/xhtml'
@@ -8,7 +8,7 @@ require 'nitro/builders/rss'
 require 'nitro/builders/form'
 require 'nitro/builders/table'
 
-module N
+module Nitro
 	
 # The output buffer string. This buffer integrates
 # the programmatic rendering support (XhtmlBuilder)

data/lib/nitro/part.rb

@@ -1,15 +1,15 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: part.rb 339 2005-04-01 14:02:14Z gmosx $
+# (c) 2005 Navel, all rights reserved.
+# $Id: part.rb 20 2005-04-15 15:18:36Z gmosx $
 
 # UNDER CONSTRUCTION, dont use yet!
 
 require 'glue/attribute'
 
-module N
+module Nitro
 
 	class Part
-		cattr_accessor :parts_root, "/home/gmosx/navel/gen/parts"
+		cattr_accessor :parts_root, "/home/gmosx/private/plasma/parts"
 	end
 	
 end
@@ -17,7 +17,10 @@ end
 module Kernel
 	
 	def require_part(name)
-		require "#{N::Part.parts_root}/#{name}/part"
+		# gmosx: RDoc complains about this, so lets use an
+		# eval, AAAAAAAARGH!
+		# require "#{N::Part.parts_root}/#{name}/mount"
+		eval %{ require '#{Nitro::Part.parts_root}/#{name}/mount' }
 	end
 
 end