nitro 0.14.0 → 0.15.0

data/lib/nitro/controller.rb

@@ -86,11 +86,16 @@ class Controller
 
 	cattr_accessor :action_metadata, {} 
 
+	def initialize(context, base = nil)
+		super
+		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, @template_root)
+		if Rendering.compile_action(self.class, action, self.class.template_root)
 			send(action, *args)
 		else
 			super
@@ -101,11 +106,26 @@ class Controller
 
 		alias __old_inherited inherited
 
-		def inherited(subclass)
-			subclass.class_eval %{
-				DEF_FILE = caller[2].split(':')[-2]
-			}	
-			__old_inherited(subclass)
+		#--
+		# gmosx, FIXME: the template_root hack is temporary.
+		# this should be moved to the render.
+		#++
+		
+		def inherited(child)
+			child.class_eval %{
+				DEF_FILE = caller[2].to_s.strip.gsub( /:[0-9]+$/ , '')
+
+				@template_root = 'public'
+
+				def self.template_root
+					@template_root
+				end
+
+				def self.template_root=(root)
+					@template_root = root
+				end
+			}
+			__old_inherited(child)
 		end
 
 		# Define metadata for an action. This is a helper

data/lib/nitro/dispatcher.rb

@@ -133,36 +133,44 @@ class Dispatcher
 		end
 
 		parts = path.split('/')
+		parts.shift
 
 		case parts.size
 			when 0
 				# / -> root.index
-				#	base = @template_root 
+				base = '/' 
 				klass = controller_class_for(:root, context)
 				action = 'index'
 			
-			when 2
-				if klass = controller_class_for(parts[1], context)
+			when 1 
+				if klass = controller_class_for(parts[0], context)
 					# controller/ -> controller.index
-					#	base = "#{@template_root}/#{parts[1]}"
+					base = "/#{parts[0]}"
 					action = 'index'
 				else
 					# action/ -> root.action
-					#	base = @template_root
+					base = '/'
 					klass = controller_class_for(:root, context)
-					action = parts[1]
+					action = parts[0]
 				end
 				
-			when 3
-				# controller/action/ -> controller.action
-				# base = "#{@template_root}/#{parts[1]}"
-				klass = controller_class_for(parts[1], context)
-				action = parts[2]
+			else
+				if klass = controller_class_for(parts[0], context)
+					# controller/action -> controller.action
+					base = "/#{parts[0]}"
+					parts.shift
+					action = parts.join('__')
+				else
+					# action/ -> root.action
+					base = '/'
+					klass = controller_class_for(:root, context)
+					action = parts.join('__')
+				end
 		end
-	
+		
 		content_type = @apis[:api] || 'text/html'
 
-		return klass, "__#{api}__#{action}", content_type 
+		return klass, "__#{api}__#{action}", content_type, base
 	end
 	alias_method :split_path, :dispatch
 

data/lib/nitro/environment.rb

@@ -0,0 +1,23 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: environment.rb 340 2005-04-04 08:26:58Z gmosx $
+
+# Setup up the proposed environment. You are free
+# to skip this if you dont like it. Just set
+#
+# $NITRO_NO_ENVIRONMENT = true 
+#
+# before requiring nitro.
+#--
+# gmosx: this is temporary code.
+#++
+
+Dir.chdir(File.dirname($0))
+
+# Application code come here.
+
+$LOAD_PATH.unshift 'src'
+
+# Library code come here.
+
+$LOAD_PATH.unshift 'lib'

data/lib/nitro/filters.rb

@@ -1,13 +1,14 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: filters.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: filters.rb 335 2005-03-31 14:02:02Z gmosx $
 
 module N
 
 # Filtering functionality for renders. 
-# The design and implementation is HEAVILY influenced by Rails.
+# The design and implementation is HEAVILY influenced 
+# by Rails.
 #
-# == Examples
+# === Examples
 #
 # Filter as class:
 #
@@ -18,8 +19,9 @@ module N
 # 	before
 #		filter
 #		after
+#
 #--
-# TODO: implement inheritable filters.
+# TODO: rethink what happens with module filters.
 #++
 
 module Filtering
@@ -127,9 +129,9 @@ module Filtering
 
 		alias :after_filter :append_after_filter		
 	
-		# Install an arround Filter. A filter is a class that responds
-		# to the before and after methods. Both methods are prepended to
-		# the respective lists.
+		# Install an arround Filter. A filter is a class that 
+		# responds to the before and after methods. Both methods 
+		# are prepended to the respective lists.
 		
 		def prepend_arround_filter(*args)
 			options = args.pop if args.last.is_a?(Hash)
@@ -200,7 +202,7 @@ module Filtering
 				elsif filter.respond_to?('filter')
 					code << "if #{filter}.filter(self) == false then return false end"
 				else
-					raise 'Valid filters are either a symbol, a string or a proc/method.'
+					raise 'Valid filters are either a Symbol, a String or a Proc/Method.'
 				end
 			end
 			

data/lib/nitro/localization.rb

@@ -2,41 +2,155 @@
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id: l10n.rb 185 2004-12-10 13:29:09Z gmosx $
 
+require 'yaml'
+
 require 'nitro/filters'
+require 'nitro/shaders'
 
 module N
 
-# Localization support.
+# Represents a locale.
 #--
-# TODO: use inflector to convert symbols to strings.
+# TODO: initialize translation map from a yaml file.
 #++
 
-class Localization
+class Locale
 
-	# This map gives the correct localization hash
-	# for the given locale.
+	# The localization map.
 
 	attr_accessor :map
+	
+	def initialize(map)
+		parse_hash(map)
+	end
+
+	# Transalte the given key.
+	#
+	# [+args+]
+	#		An array of arguments. The first argument
+	#		is the translation key. If additional arguments
+	#		are provided they are used for sprintf 
+	#		interpolation.
+	#--
+	# THINK: Possibly avoid the creation of the 
+	#	array by making the api less elegant.
+	#++
+
+	def translate(*args)
+		if xlated = @map[args.shift]
+			if xlated.is_a?(String)
+				args.empty? ? xlated : sprintf(xlated, *args)
+			else
+				xlated.call(*args)
+			end
+		end
+	end
+	alias_method :[], :translate
 
-	def initialize(map = {})
+	private
+
+	def parse_hash(map)
 		@map = map
 	end
 
-	# Return the localization hash for the given
-	# locale.
+	def parse_yaml(yaml)
+		raise 'Not implemented'
+	end
+	
+end
+
+# Localization support.
+#
+# === Example 
+#
+#	locale_en = {
+#		'See you' => 'See you',
+#		:long_paragraph => 'The best new books, up to 30% reduced price',
+#		:price => 'Price: %d %s',
+#		:proc_price => proc { |value, cur| "Price: #{value} #{cur}" }
+#	}
+#
+#	locale_de = {
+#		'See you' => 'Auf wieder sehen',
+#		:long_paragraph => 'Die besten neuer buecher, bis zu 30% reduziert',
+#		...
+#	}
+#
+#	Localization.add(:en => locale_en, :de => locale_de)
+#
+# lc = Localization.get
+# lc['See you'] -> See you
+# lc[:price, 100, 'euro'] -> Price: 100 euro
+# lc = Localization.get[:de]
+# lc['See you'] -> Auf wiedersehen
+#
+# To make localization even more easier, a LocalizationFilter
+# and a LocalizationShader are provided.
+
+class Localization
+
+	class << self
+		
+		# A hash of the available locales.
+
+		attr_accessor :locales
+
+		def add(map = {})
+			for key, locale in map
+				if locale.is_a?(String)
+					# this is the name of the localization file.
+					locale = YAML.load(File.read(locale))
+				end
+				@locales[key.to_s] = Locale.new(locale)
+			end
+		end
+				
+		# Return the localization hash for the given
+		# locale.
+
+		def get(locale = :en)
+			locale ||= 'en'
+			@locales[locale.to_s]
+		end
+		alias_method :locale, :get
+		alias_method :[], :get
 
-	def get(locale = 'en')
-		locale || = 'en'
-		@map[locale]
 	end
+
+	@locales = {}
+	
 end
 
-# Localization filter
+# Localization filter.
 
 module LocalizationFilter
 	def localize
-		@lc = @context.conf.lc.get(@session[:LC])
+		#		@lc = @context.conf.localization[@session[:LOCALE]]
+		@lc = Localization[@context.session[:LOCALE]]
 	end
 end
+
+# Localization shader.
+#
+# === Examples
+#
+# <h1>[[Welcome]]</h1>
+# <h1>[[:welcome]]</h1>
+
+class LocalizationShader < Shader
 	
+	def process(hash, text)
+		# handle symbols
+		text.gsub!(/\[\[\:(.*?)\]\]/, '#{@lc[\1]}')
+
+		# handle strings 
+		text.gsub!(/\[\[(.*?)\]\]/, '#{@lc["\1"]}')
+
+		process_next(hash, text)
+	end
+
 end
+
+end
+
+

data/lib/nitro/part.rb

@@ -0,0 +1,24 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: part.rb 339 2005-04-01 14:02:14Z gmosx $
+
+# UNDER CONSTRUCTION, dont use yet!
+
+require 'glue/attribute'
+
+module N
+
+	class Part
+		cattr_accessor :parts_root, "/home/gmosx/navel/gen/parts"
+	end
+	
+end
+
+module Kernel
+	
+	def require_part(name)
+		require "#{N::Part.parts_root}/#{name}/part"
+	end
+
+end
+

data/lib/nitro/render.rb

@@ -56,17 +56,17 @@ module Rendering
 		# attempt to find a template of the form
 		# template_root/action.xhtml
 
-		path = "#{template_root}/#{action}.#{ext}".squeeze('/')
-
+		path = "#{template_root}/#{action.gsub(/__/, '/')}.#{ext}".squeeze('/')
+	
 		unless File.exist?(path)
 
 			# attempt to find a template of the form
 			# template_root/action/index.xhtml
 
-			path = "#{template_root}/#{action}/#{Rendering.default_template}.#{ext}".squeeze('/')
-	
+			path = "#{template_root}/#{action.gsub(/__/, '/')}/#{Rendering.default_template}.#{ext}".squeeze('/')
+
 			unless File.exist?(path)
-				# No template founD!
+				# No template found!
 				path = nil
 			end
 		end
@@ -89,7 +89,12 @@ module Rendering
 	
 	def self.compile_action(klass, action, template_root)
 		@@sync.synchronize do
-			dummy, api, action = action.to_s.split('__')
+			action = action.to_s.split('__')
+			action.shift
+			api = action.shift
+			action = action.join('__')
+
+			# dummy, api, action = action.to_s.split('__')
 
 			# This is not a controller action.
 
@@ -173,7 +178,7 @@ module Rendering
 				}
 			end
 
-			# puts '---', code, '---' if action.to_s == 'index'
+			# puts '---', code, '---'
 
 			klass.class_eval(code)
 		end
@@ -184,6 +189,10 @@ module Rendering
 end
 
 # The rendering mixin. 
+#--
+# TODO: handle template_root here instead of the
+# controller.
+#++
 
 module Render
 
@@ -210,20 +219,15 @@ module Render
 	# The name of the currently executing action.
 
 	attr_accessor :action_name
-	
-	# The template root for this render.
-
-	cattr_accessor :template_root
 
 	# Initialize the render.
 	#
 	# [+context+]
 	#		A parent render/controller acts as the context.
 
-	def initialize(context)
+	def initialize(context, base = nil)
 		@request = @context = context
 		@out = context.out
-		@template_root = @context.dispatcher.template_root
 	end
 
 	# Renders the action denoted by path. The path
@@ -233,7 +237,7 @@ module Render
 	def render(path)
 		Logger.debug "Rendering '#{path}'." if $DBG
 		
-		klass, action, content_type = @context.dispatcher.dispatch(path, @context)
+		klass, action, content_type, base = @context.dispatcher.dispatch(path, @context)
 
 		@context.content_type = content_type
 
@@ -242,7 +246,7 @@ module Render
 		if self.class == klass 
 			self.send(action)
 		else
-			klass.new(self).send(action)
+			klass.new(self, base).send(action)
 		end
 
 	rescue RenderExit => e