nitro 0.9.5 → 0.10.0

data/examples/blog/lib/blog.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: blog.rb 223 2005-01-26 17:07:40Z gmosx $
+# $Id: blog.rb 259 2005-02-15 08:54:54Z gmosx $
 
 # A simple blog to demonstrate the power of Nitro.
 
@@ -16,5 +16,5 @@ class Blog
 	
 end
 
-require 'blog/model'
-require 'blog/controller'
+require 'lib/blog/model'
+require 'lib/blog/controller'

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

@@ -6,26 +6,26 @@ require 'nitro/controller'
 require 'nitro/builders/rss'
 require 'nitro/ui/pager'
 
-require 'blog/model'
+require 'lib/blog/model'
 
 # The controller of the Blog part.
 
 class BlogController < N::Controller
 	
 	before_filter :get_errors
-	# after_filter :cache
+	after_filter :cache
 	
 	scaffold BlogEntry, :name => 'entry', :index => true
 	scaffold Comment
 
 	def list_entry
-		@pager = UI::Pager.new('entries', context, 3)
+		@pager = UI::Pager.new('entries', request, 3)
 		@entries = BlogEntry.all("ORDER BY oid DESC #{@pager.sql_limit}")
 		@pager.set(BlogEntry.count)
 	end
 	
 	def new_entry
-		entry = context.fill(BlogEntry.new)
+		entry = request.fill(BlogEntry.new)
 		entry.author = session[:username]
 
 		unless entry.valid?
@@ -43,7 +43,7 @@ class BlogController < N::Controller
 	end
 	
 	def new_comment
-		comment = context.fill(Comment.new)
+		comment = request.fill(Comment.new)
 
 		unless comment.valid?
 			session[:errors] = comment.errors
@@ -60,7 +60,7 @@ class BlogController < N::Controller
 	end
 	
 	def login
-		if password = context['password']
+		if password = request['password']
 			if password == Blog.password
 				session[:owner] = true
 				session[:username] = Blog.username
@@ -91,9 +91,7 @@ private
 	# Just an example.
 
 	def cache
-		# Call the automatically configured logger.
-
-		Logger.info "cache (after filter example)"
+		Logger.info 'cache (after filter example)'
 	end
 	
 end

data/examples/blog/root/fcgi.rb

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'conf', 'app.conf.rb')
-require 'nitro/adaptors/fastcgi'
-
-N::FastCGI.start($conf)
+ENV['NITRO_INVOKE'] = 'fcgi_proc'
+require File.join(File.dirname(__FILE__), '..', 'run.rb')

data/examples/blog/root/style.xsl

@@ -3,11 +3,9 @@
 <!--
 A Simple Shader
 
-code: 
 * George Moschovitis  <gm@navel.gr>
-
-(c) 2004 Navel, all rights reserved.
-$Id: style.xsl 225 2005-01-27 12:35:07Z gmosx $
+(c) 2004-2005 Navel, all rights reserved.
+$Id: style.xsl 259 2005-02-15 08:54:54Z gmosx $
 -->
 
 <!DOCTYPE shader
@@ -88,8 +86,8 @@ $Id: style.xsl 225 2005-01-27 12:35:07Z gmosx $
 					<div class="block side">
 						<h2>About</h2>
 						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.
+						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>

data/examples/blog/run.rb

@@ -0,0 +1,41 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: run.rb 260 2005-02-15 08:58:04Z gmosx $
+
+Dir.chdir File.dirname(__FILE__)
+
+require 'nitro'; include N
+require 'og'
+
+require 'lib/blog'
+
+runner = Runner.new.setup
+
+db = Og::Database.new(
+#	:address => 'localhost',
+#	:adapter => 'mysql',
+	:adapter => 'psql',
+#	:adapter => 'sqlite',
+	:database => 'blog',
+	:user => 'postgres',
+	:password => 'navelrulez',
+	:connection_count => 3
+)
+
+dispatcher = Dispatcher.new(BlogController, :xml => 'text/xml')
+
+Rendering.shader = XSLTShader.new("#{dispatcher.root}/style.xsl",
+	RubyShader.new(
+		CompressShader.new
+	)
+)
+
+conf = Conf.new(
+	:name => 'Nitro Blog',
+	:host => 'localhost',
+	:port => 8069,
+	:dispatcher => dispatcher,
+	:db => db
+)
+
+runner.run(conf)

data/examples/flash/run.rb

@@ -0,0 +1,9 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: run.rb 260 2005-02-15 08:58:04Z gmosx $
+
+Dir.chdir File.dirname(__FILE__)
+
+require 'nitro'
+
+N::Runner.run(:host => 'localhost', :port => 8069)

data/examples/no_xsl_blog/README

@@ -18,4 +18,3 @@ To see the example browse http://127.0.0.1:8069
 This example seems to have some problems when running
 with Internet Explorer 6. For the moment, please
 try running it with Firefox and/or Mozilla.
-

data/examples/no_xsl_blog/conf/app.conf.rb

@@ -16,34 +16,27 @@ require 'blog'
 include N
 
 og = Og::Database.new(
-	:address => 'localhost',
+#	:address => 'localhost',
 	:backend => 'mysql',
+	# :backend => 'psql',
 	:database => 'blog',
 	:user => 'root',
 	:password => 'navelrulez',
+	# :user => 'postgres',
+	# :password => 'navelrulez',
 	:connection_count => 3
 )
 
-=begin
-og = Og::Database.new(
-	:address => 'localhost',
-	:backend => 'psql',
-	:database => 'blog',
-	:user => 'postgres',
-	:password => 'navelrulez',
-	:connection_count => 3
-)
-=end
-
 controllers = {
 	:index => BlogController
+	# mount more controllers if you need.
 }
 
 apis = {
 	:xml => 'text/xml'
 }
 
-dispatcher = Dispatcher.new(controllers, apis)
+dispatcher = Dispatcher.new(BlogController, :xml => 'text/xml')
 
 $conf = {
 	:name => 'Blog sans XSLT',

data/examples/no_xsl_blog/lib/blog.rb

@@ -16,5 +16,5 @@ class Blog
 	
 end
 
-require 'blog/model'
-require 'blog/controller'
+require 'lib/blog/model'
+require 'lib/blog/controller'

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

@@ -6,8 +6,8 @@ require 'nitro/controller'
 require 'nitro/builders/rss'
 require 'nitro/ui/pager'
 
-require 'blog/model'
-require 'blog/template'
+require 'lib/blog/model'
+require 'lib/blog/template'
 
 # The controller of the Blog part.
 
@@ -21,13 +21,13 @@ class BlogController < N::Controller
 	scaffold Comment
 
 	def list_entry
-		@pager = UI::Pager.new('entries', context, 3)
+		@pager = UI::Pager.new('entries', request, 3)
 		@entries = BlogEntry.all("ORDER BY oid DESC #{@pager.sql_limit}")
 		@pager.set(BlogEntry.count)
 	end
 	
 	def new_entry
-		entry = context.fill(BlogEntry.new)
+		entry = request.fill(BlogEntry.new)
 		entry.author = session[:username]
 
 		unless entry.valid?
@@ -45,7 +45,7 @@ class BlogController < N::Controller
 	end
 	
 	def new_comment
-		comment = context.fill(Comment.new)
+		comment = request.fill(Comment.new)
 
 		unless comment.valid?
 			session[:errors] = comment.errors
@@ -62,7 +62,7 @@ class BlogController < N::Controller
 	end
 	
 	def login
-		if password = context['password']
+		if password = request['password']
 			if password == Blog.password
 				session[:owner] = true
 				session[:username] = Blog.username

data/examples/no_xsl_blog/root/fcgi.rb

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'conf', 'app.conf.rb')
-require 'nitro/adaptors/fastcgi'
-
-N::FastCGI.start($conf)
+ARGV << '--fcgi-proc'
+require File.join(File.dirname(__FILE__), '..', 'run.rb')

data/examples/no_xsl_blog/run.rb

@@ -0,0 +1,38 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: run.rb 260 2005-02-15 08:58:04Z gmosx $
+
+Dir.chdir File.dirname(__FILE__)
+
+require 'nitro'; include N
+require 'og'
+
+require 'lib/blog'
+
+runner = Runner.new.setup
+
+db = Og::Database.new(
+#	:address => 'localhost',
+	:adapter => 'mysql',
+	# :backend => 'psql',
+	:database => 'blog',
+	:user => 'root',
+	:password => 'navelrulez',
+	# :user => 'postgres',
+	# :password => 'navelrulez',
+	:connection_count => 3
+)
+
+dispatcher = Dispatcher.new(BlogController, :xml => 'text/xml')
+
+Rendering.shader = RubyShader.new(CompressShader.new)
+
+conf = Conf.new(
+	:name => 'Blog sans XSLT',
+	:host => 'localhost',
+	:port => 8069,
+	:dispatcher => dispatcher,
+	:db => db
+)
+
+runner.run(conf)

data/examples/og/mock_example.rb

@@ -7,8 +7,6 @@
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id: run.rb 185 2004-12-10 13:29:09Z gmosx $
 
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-
 require 'rubygems'
 require 'flexmock'
 require 'og'

data/examples/og/mysql_to_psql.rb

@@ -14,8 +14,6 @@
 raise 'WARNING, this example does not work yet, for the moment ' + 
 			'just have a look at the source code.'
 
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-
 require 'og'
 
 # An example managed object.

data/examples/og/run.rb

@@ -1,22 +1,17 @@
-# = Og Example 
-#
 # A simple example to demonstrate the Og library.
 #
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
 # (c) 2004 Navel, all rights reserved.
-# $Id: run.rb 202 2005-01-17 10:44:13Z gmosx $
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+# $Id: run.rb 256 2005-02-11 16:22:33Z gmosx $
 
 require 'og'
 
 # Full debug information.
+
 $DBG = true
 
-# = A child class
-#
+# A child class.
+
 class Comment
 	prop_accessor :body, String
 	
@@ -55,8 +50,8 @@ class User
 end
 
 
-# = A parent class
-#
+# A parent class.
+
 class Article
 	prop_accessor :title, String
 	prop_accessor :body, String
@@ -95,8 +90,8 @@ class Article
 	end
 end
 
-# = A parent class
-#
+# A parent class.
+
 class Category
 	prop_accessor :title, String
 	prop_accessor :body, String
@@ -110,20 +105,20 @@ class Category
 end
 
 
-# = Article comment
-#
+# Article comment.
+
 class ArticleComment < Comment
 	belongs_to :article, Article
 end
 
-# = User comment
-#
+# User comment.
+
 class UserComment < Comment
 	belongs_to :author, User
 end
 
-# = Another child class
-#
+# Another child class.
+
 class Part
 	prop_accessor :name, String
 	belongs_to :article, Article
@@ -139,14 +134,20 @@ end
 
 # Og configuration.
 config = {
-	:address => "localhost",
 	:database => "test",
-	:backend => "psql",
+	:adapter => "sqlite",
+	:connection_count => 2
+}
+=begin
+config = {
+#	:address => "localhost",
+	:database => "test",
+	:adapter => "psql",
 	:user => "postgres",
 	:password => "navelrulez",
 	:connection_count => 1
 }
-=begin
+
 config = {
 	:address => "localhost",
 	:database => "test",

data/examples/tiny/root/fcgi.rb

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'conf', 'app.conf.rb')
-require 'nitro/adaptors/fastcgi'
-
-N::FastCGI.start($conf)
+ARGV << '--fcgi-proc'
+require File.join(File.dirname(__FILE__), '..', 'run.rb')

data/examples/tiny/root/index.xhtml

@@ -5,7 +5,7 @@
 <?r 
 	# the code that populates the template comes here
 
-	unless name = context['name']
+	unless name = request['name']
 		name = 'World'
 	end
 	
@@ -20,10 +20,7 @@
 </p>
 
 
-<strong>Hello #{name}</strong>
-<!--
-<p>#{context.headers.collect { |h| "#{h}<br/>" }}</p>
--->
+<strong>#{Rendering.reload} Hello #{name}</strong>
 <p>
 <form id="my_form">
 	<strong>Enter your name:</strong>
@@ -39,4 +36,23 @@
 
 <render href="include" />
 
+<!--
+<p>#{context.headers.collect { |h| "#{h}<br/>" }}</p>
+<p>
+	<h3>Upload a picture</h3>
+	
+	<form action="upload" method="post" enctype="multipart/form-data">
+		<p>
+		<b>Title:<b><br />
+		<input type="text" name="title" />
+		</p>	
+		<p>
+		<b>File:<b><br />
+		<input type="file" name="file" />
+		</p>	
+		<input type="submit" value="Upload" />
+	</form>
+</p>
+-->
+
 </html>