nitro 0.14.0 → 0.15.0

data/examples/ajax/run.rb

@@ -1,8 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 301 2005-03-16 13:24:25Z gmosx $
-
-Dir.chdir File.dirname(__FILE__)
+# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
 
 require 'nitro'
 require 'controller'

data/examples/blog/cache/entriesadmin

@@ -1,4 +1,4 @@
-<div class="entry"><h2 class="date">March 28, 2005</h2><div class="post"><h3 class="title">kokok</h3>lalal<div class="footer">posted by George Moschovitis at <a href="view_entry/14">11:32 AM</a> | <a href="view_entry/14#comments">1 comments</a>.</div></div></div><div class="entry"><h2 class="date">March 28, 2005</h2><div class="post"><h3 class="title">UNCACHE</h3>it bastard<div class="footer">posted by  at <a href="view_entry/13">11:31 AM</a> | <a href="view_entry/13#comments">0 comments</a>.</div></div></div><div class="entry"><h2 class="date">March 28, 2005</h2><div class="post"><h3 class="title">UNCACHE</h3>it bastard<div class="footer">posted by George Moschovitis at <a href="view_entry/12">11:26 AM</a> | <a href="view_entry/12#comments">0 comments</a>.</div></div></div><div class="pager">
+<div class="entry"><h2 class="date">March 28, 2005</h2><div class="post"><h3 class="title">kokok</h3>lalal<div class="footer">posted by George Moschovitis at <a href="view_entry/14">11:32 AM</a> | <a href="view_entry/14#comments">4 comments</a>.</div></div></div><div class="entry"><h2 class="date">March 28, 2005</h2><div class="post"><h3 class="title">UNCACHE</h3>it bastard<div class="footer">posted by  at <a href="view_entry/13">11:31 AM</a> | <a href="view_entry/13#comments">0 comments</a>.</div></div></div><div class="entry"><h2 class="date">March 28, 2005</h2><div class="post"><h3 class="title">UNCACHE</h3>it bastard<div class="footer">posted by George Moschovitis at <a href="view_entry/12">11:26 AM</a> | <a href="view_entry/12#comments">0 comments</a>.</div></div></div><div class="pager">
 				<div class="last"><a href="/?__pgentries=4">Last</a></div>
 				<div class="next"><a href="/?__pgentries=2">Next</a></div>
 			<ul>

data/examples/blog/conf/locales/de.yml

@@ -0,0 +1,4 @@
+---
+posted by: gesendet durch 
+Language: Sprache
+:see_you: Auf wieder sehen

data/examples/blog/conf/locales/en.yml

@@ -0,0 +1,4 @@
+---
+posted by: posted by
+Language: Language
+:see_you: See you

data/examples/blog/public/fcgi.rb

@@ -1,6 +1,5 @@
 #!/usr/local/bin/ruby
 
-puts %x{pwd}
-
 ENV['NITRO_INVOKE'] = 'fcgi_proc'
-require File.join(File.dirname(__FILE__), '..', 'run.rb')
+$0 = File.join(File.dirname(__FILE__), '..', 'run.rb')
+require $0 

data/examples/blog/run.rb

@@ -1,8 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 323 2005-03-24 09:43:52Z gmosx $
-
-Dir.chdir File.dirname(__FILE__); $:.unshift 'src'
+# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
 
 require 'nitro'
 require 'og'
@@ -16,6 +14,11 @@ include N
 # Session.store_type = :drb
 Caching::Fragments.store = Caching::FileStore.new
 
+Localization.add(
+	:en => 'conf/locales/en.yml',
+	:de => 'conf/locales/de.yml'
+)
+
 runner = Runner.new.setup
 
 db = Og::Database.new(
@@ -30,8 +33,10 @@ db = Og::Database.new(
 )
 
 Rendering.shader = XSLTShader.new('src/xsl/style.xsl',
-	RubyShader.new(
-		CompressShader.new
+	LocalizationShader.new(
+		RubyShader.new(
+			CompressShader.new
+		)
 	)
 )
 

data/examples/blog/src/controller.rb

@@ -1,9 +1,10 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: controller.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: controller.rb 335 2005-03-31 14:02:02Z gmosx $
 
 require 'nitro/controller'
 require 'nitro/ui/pager'
+require 'nitro/localization'
 
 require 'mailer'
 require 'models/blog'
@@ -11,20 +12,20 @@ require 'models/blog'
 # The controller of the Blog part.
 
 class BlogController < N::Controller
-	
+
+	before_filter LocalizationFilter
 	before_filter :get_errors
-	after_filter :cache_invalidator, :only => [ :new_entry, :new_comment ]
+	after_filter :cache_invalidate, :only => [ :new_entry, :new_comment ]
 	
 	scaffold BlogEntry, :name => 'entry', :index => true # , :nosuffix => true
 	scaffold Comment
 
 	# as an example of full page caching.
 	# cache_output :index
-	
-	def initialize(context)
-		super
-		@template_root = 'src/views'
-	end
+
+	# Override the template root for this controller.
+
+	@template_root = 'src/views'
 
 	def list_entry
 		@pager = UI::Pager.new('entries', request, 3)
@@ -99,7 +100,17 @@ class BlogController < N::Controller
 		session.delete(:owner)
 		session.delete(:username)
 	end	
-	
+
+	def toggle_locale
+		cache_invalidate
+
+		if session[:LOCALE] == :de
+			session[:LOCALE] = :en
+		else
+			session[:LOCALE] = :de
+		end
+	end
+
 private
 
 	# A helper prefilter, autocleans session errors.
@@ -114,7 +125,7 @@ private
 
 	# Invalidates the cache.
 
-	def cache_invalidator
+	def cache_invalidate
 		# gmosx: will be improved.
 		expire_fragment('entriesadmin')
 		expire_fragment('entriesadmintrue')

data/examples/blog/src/mailer.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: mailer.rb 334 2005-03-29 11:44:38Z gmosx $
 
 require 'nitro/mail'
 

data/examples/blog/src/views/index.xhtml

@@ -14,7 +14,7 @@
 					<h3 class="title">#{entry.title}</h3>
 					#{entry.body}
 					<div class="footer">
-						posted by #{entry.author} at <a href="#{entry.view_uri}">#{entry.create_time.strftime('%R %p')}</a> | 
+						[[posted by]] #{entry.author} at <a href="#{entry.view_uri}">#{entry.create_time.strftime('%R %p')}</a> | 
 						<a href="#{entry.view_uri}#comments">#{entry.comments_count} comments</a>.
 <?r	if session[:owner] ?>			
 						[<a href="del_entry?oid=#{entry.oid}">del</a>]
@@ -36,7 +36,7 @@
 	
 <?r end ?>
 
-<?r	if session[:owner] ?>
+<?r if session[:owner] ?>
 	<render href="entry_form" />
 <?r end ?>
 	

data/examples/blog/src/xsl/style.xsl

@@ -5,7 +5,7 @@ A Simple Shader
 
 * George Moschovitis  <gm@navel.gr>
 (c) 2004-2005 Navel, all rights reserved.
-$Id: style.xsl 313 2005-03-16 19:18:09Z gmosx $
+$Id: style.xsl 335 2005-03-31 14:02:02Z gmosx $
 -->
 
 <!DOCTYPE shader
@@ -88,11 +88,16 @@ $Id: style.xsl 313 2005-03-16 19:18:09Z gmosx $
 						This is a simple blog powered by <a href="http://www.navel.gr/nitro">
 						Nitro</a> Web Engine. Have a look at the source code and enjoy the 
 						power of Ruby.
+
 						<ruby>unless session[:owner]</ruby>
 							<p><a href="login">Login</a> as owner.</p>
 						<ruby>else</ruby>
 							<p><a href="logout">Logout</a>.</p>
 						<ruby>end</ruby>
+
+						<p>
+							<b>[[Language]]</b>: #{session[:LOCALE] || :en} (<a href="toggle_locale">change</a>)
+						</p>
 						
 						<xsl:apply-templates select="x:cell[@id='side']" />
 						

data/examples/flash/run.rb

@@ -1,8 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
-
-Dir.chdir File.dirname(__FILE__)
+# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
 
 require 'nitro'
 

data/examples/no_xsl_blog/conf/locales/de.yml

@@ -0,0 +1,4 @@
+---
+posted by: gesendet durch 
+Language: Sprache
+:see_you: Auf wieder sehen

data/examples/no_xsl_blog/conf/locales/en.yml

@@ -0,0 +1,4 @@
+---
+posted by: posted by
+Language: Language
+:see_you: See you

data/examples/no_xsl_blog/lib/blog/controller.rb

@@ -5,6 +5,7 @@
 require 'nitro/controller'
 require 'nitro/builders/rss'
 require 'nitro/ui/pager'
+require 'nitro/localization'
 
 require 'lib/blog/model'
 require 'lib/blog/template'
@@ -14,6 +15,7 @@ require 'lib/blog/template'
 class BlogController < N::Controller
 	include BlogTemplate
 	
+	before_filter LocalizationFilter
 	before_filter :get_errors
 	# after_filter :cache
 	
@@ -78,6 +80,14 @@ class BlogController < N::Controller
 		session.delete(:username)
 	end	
 	
+	def toggle_locale
+		if session[:LOCALE] == :de
+			session[:LOCALE] = :en
+		else
+			session[:LOCALE] = :de
+		end
+	end
+	
 private
 
 	# A helper prefilter, autocleans session errors.

data/examples/no_xsl_blog/lib/blog/template.rb

@@ -93,6 +93,10 @@ module BlogTemplate
 							<p><a href="logout">Logout</a>.</p>
 		} end + %{
 						
+						<p>
+							<b>Language</b>: #{session[:LOCALE] || :en} (<a href="toggle_locale">change</a>)
+						</p>
+						
 						<h2>Linkage</h2>
 						<ul>
 							<li><a target="_new" href="http://www.navel.gr">Navel Ltd</a></li>

data/examples/no_xsl_blog/public/fcgi.rb

@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
 
 ENV['NITRO_INVOKE'] = 'fcgi_proc'
-require File.join(File.dirname(__FILE__), '..', 'run.rb')
+$0 = File.join(File.dirname(__FILE__), '..', 'run.rb')
+require $0 

data/examples/no_xsl_blog/public/index.xhtml

@@ -12,7 +12,7 @@
 					<h3 class="title">#{entry.title}</h3>
 					#{entry.body}
 					<div class="footer">
-						posted by #{entry.author} at <a href="#{entry.view_uri}">#{entry.create_time.strftime('%R %p')}</a> | 
+						[[posted by]] #{entry.author} at <a href="#{entry.view_uri}">#{entry.create_time.strftime('%R %p')}</a> | 
 						<a href="#{entry.view_uri}#comments">#{entry.comments_count} comments</a>.
 <?r	if session[:owner] ?>			
 						[<a href="del_entry?oid=#{entry.oid}">del</a>]

data/examples/no_xsl_blog/run.rb

@@ -1,16 +1,20 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
-
-Dir.chdir File.dirname(__FILE__)
+# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
 
 require 'nitro'; include N
 require 'og'
 
+require 'nitro/localization'
 require 'lib/blog'
 
 runner = Runner.new.setup
 
+Localization.add(
+	:en => 'conf/locales/en.yml',
+	:de => 'conf/locales/de.yml'
+)
+
 db = Og::Database.new(
 #	:address => 'localhost',
 	:adapter => 'mysql',
@@ -25,7 +29,7 @@ db = Og::Database.new(
 
 dispatcher = Dispatcher.new(BlogController, :xml => 'text/xml')
 
-Rendering.shader = RubyShader.new(CompressShader.new)
+Rendering.shader = LocalizationShader.new(RubyShader.new(CompressShader.new))
 
 conf = Conf.new(
 	:name => 'Blog sans XSLT',

data/examples/tiny/public/deep/dir/hello.xhtml

@@ -0,0 +1 @@
+<b>This is another include (deep).</b>

data/examples/tiny/public/fcgi.rb

@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
 
 ENV['NITRO_INVOKE'] = 'fcgi_proc'
-require File.join(File.dirname(__FILE__), '..', 'run.rb')
+$0 = File.join(File.dirname(__FILE__), '..', 'run.rb')
+require $0 

data/examples/tiny/public/index.xhtml

@@ -33,16 +33,19 @@
 	Counter: #{session[:counter]}
 </p>
 <render href="include" />
+<p>
+</p>
+<render href="deep/dir/hello" />
 <p>
 	<h3>Upload a picture</h3>
 	
 	<form action="upload" method="post" enctype="multipart/form-data">
 		<p>
-		<b>Title:<b><br />
+		<b>Title:</b><br />
 		<input type="text" name="title" />
 		</p>	
 		<p>
-		<b>File:<b><br />
+		<b>File:</b><br />
 		<input type="file" name="file" />
 		</p>	
 		<input type="submit" value="Upload" />

data/examples/tiny/run.rb

@@ -1,8 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 300 2005-03-16 13:23:10Z gmosx $
-
-Dir.chdir File.dirname(__FILE__)
+# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
 
 require 'nitro'
 

data/examples/wee_style/run.rb

@@ -1,8 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
-
-Dir.chdir File.dirname(__FILE__)
+# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
 
 require 'nitro'; include N
 require 'nitro/adapters/webrick'

data/examples/why_wiki/run.rb

@@ -1,7 +1,5 @@
 # * George Moschovitis  <gm@navel.gr>
-# $Id: run.rb 270 2005-03-07 17:52:16Z gmosx $
-
-Dir.chdir File.dirname(__FILE__)
+# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
 
 require 'cgi'
 require 'redcloth'

data/lib/nitro.rb

@@ -12,7 +12,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: nitro.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: nitro.rb 340 2005-04-04 08:26:58Z gmosx $
 
 require 'glue'
 require 'glue/logger'
@@ -23,7 +23,7 @@ module Nitro
 
 	# The version.
 
-	Version = '0.14.0'
+	Version = '0.15.0'
 
 	# Library path.
 
@@ -39,3 +39,6 @@ require 'nitro/render'
 require 'nitro/conf'
 require 'nitro/runner'
 require 'nitro/component'
+require 'nitro/part'
+
+require 'nitro/environment' unless $NITRO_NO_ENVIRONMENT

data/lib/nitro/builders/form.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: form.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: form.rb 335 2005-03-31 14:02:02Z gmosx $
 
 require 'glue/hash'
 require 'nitro/markup'
@@ -67,9 +67,14 @@ module FormBuilderMixin
 		<input type="checkbox" id="#{p.name}" name="#{p.name}" />
 	</dd>
 				}
-=begin
 			elsif p.klass.ancestors.include?(Time)
-				return %|#\{@#{p.symbol} ? "'#\{Og::Utils.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
+				str << %{
+	<dt><label for="#{p.name}">#{p.name}</label></dt>
+	<dd>
+		<input type="text" id="#{p.name}" name="#{p.name}" value="#{obj.send(p.symbol)}" />
+	</dd>
+				}
+=begin
 			elsif p.klass.ancestors.include?(Date)
 				return %|#\{@#{p.symbol} ? "'#\{Og::Utils.date(@#{p.symbol})\}'" : 'NULL'\}|
 			else 

data/lib/nitro/caching/stores.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: stores.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: stores.rb 335 2005-03-31 14:02:02Z gmosx $
 
 require 'fileutils'
 
@@ -36,8 +36,8 @@ module Caching
 	class FileStore
 		cattr_accessor :cache_root, 'cache'
 		
-		def initialize(cache_root = @@cache_root)
-			@cache_root = FileStore.cache_root
+		def initialize(cache_root = FileStore.cache_root)
+			@cache_root = cache_root
 		end
 		
 		def read(name, options = {})