nitro 0.15.0 → 0.16.0

data/examples/blog/test/tc_blog.rb

@@ -0,0 +1,43 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', 'src')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+require 'glue/validation'
+require 'nitro/testing'
+
+require 'blog'
+
+class TC_Blog < Test::Unit::TestCase # :nodoc: all
+	include Nitro
+
+	def setup
+		@conf = Conf.new(
+			:dispatcher => Dispatcher.new(BlogController, :xml => 'text/xml')
+		)
+	end
+
+	def test_context
+		handle(
+			'/login', 
+			request = { 'password' => Blog.password }
+		)
+		assert_redirect
+		assert_session_has(:owner)
+		assert_session_equal(:username, 'George Moschovitis')
+		assert_has_cookie('nauth')
+		assert_has_no_cookie('wow')
+		assert_cookie_equal('nauth', 'just an example, not used :)')
+
+		ctx = handle(
+			'/login', 
+			request = { 'password' => 'dunno' }
+		)
+		assert_no_redirect
+		assert_output_contains('Invalid password')
+		assert_status_ok
+	end
+
+end

data/examples/flash/run.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
+# $Id: run.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'nitro'
 
-N::Runner.run(:host => '127.0.0.1', :port => 9999)
+Nitro::Runner.run(:host => '127.0.0.1', :port => 9999)

data/examples/no_xsl_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 1 2005-04-11 11:04:30Z gmosx $
 
 # A simple blog to demonstrate the power of Nitro.
 

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

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: controller.rb 21 2005-04-15 15:41:20Z gmosx $
 
 require 'nitro/controller'
 require 'nitro/builders/rss'
@@ -12,12 +12,11 @@ require 'lib/blog/template'
 
 # The controller of the Blog part.
 
-class BlogController < N::Controller
+class BlogController < Nitro::Controller
 	include BlogTemplate
 	
-	before_filter LocalizationFilter
-	before_filter :get_errors
-	# after_filter :cache
+	pre :get_errors
+	wrap Nitro::LocalizationAspect, :pre => :localize
 	
 	scaffold BlogEntry, :name => 'entry', :index => true
 	scaffold Comment
@@ -40,12 +39,6 @@ class BlogController < N::Controller
 		entry.save!
 	end	
 
-	# example of generated view
-
-	def list_entry__xml
-		@out.build_rss(@entries, :description => 'Blog entries', :link => context.host_url)
-	end
-	
 	def new_comment
 		comment = request.fill(Comment.new)
 
@@ -57,12 +50,6 @@ class BlogController < N::Controller
 		comment.save!
 	end
 
-	# example of generated view
-
-	def list_comment__xml
-		@out.build_rss(@comments, :description => 'Blog comments', :link => context.host_url)
-	end
-	
 	def login
 		if password = request['password']
 			if password == Blog.password
@@ -109,3 +96,25 @@ private
 	end
 	
 end
+
+# A special controller for that presents
+# the blog content using XML (RSS). This controller
+# reuses the BlogController actions but adds
+# XML templates.
+
+class XmlController < BlogController
+	@base = 'xml'
+	@content_type = 'text/xml'
+	@template_root = 'src/views/xml'
+	
+	def list_entry
+		super
+		o.build_rss(@entries, :description => 'Blog entries', :link => context.host_url)
+	end
+
+	def list_comment
+		super
+		o.build_rss(@comments, :description => 'Blog comments', :link => context.host_url)
+	end
+end
+

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

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: model.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'lib/content'
 
@@ -15,8 +15,8 @@ class Comment; end
 # the markup expanding/compacting for the body.
 
 module Common
-	include N::BaseContent
-	include N::CreateTime
+	include BaseContent
+	include CreateTime
 
 	prop_accessor :author, String
 	validate_value :body

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

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: template.rb 1 2005-04-11 11:04:30Z gmosx $
 
 # A simple templating system. This demonstrates how
 # easily you can replace the XSLT templating system

data/examples/no_xsl_blog/lib/content.rb

@@ -1,15 +1,13 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004 Navel, all rights reserved.
-# $Id: content.rb 297 2005-03-10 14:23:00Z gmosx $
+# $Id: content.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'nitro/markup'
 
-module N 
-
 # The foundamental Content Unit.
 
 module BaseContent
-	include Markup
+	include Nitro::Markup
 
 	prop_accessor :title, String
 	prop_accessor :body, String, :markup => true, :ui => :textarea
@@ -36,7 +34,7 @@ end
 #++
 
 module Content
-	include N::BaseContent
+	include BaseContent
 	prop_accessor :name, String
 	prop_accessor :ctime, Time
 	prop_accessor :mtime, Time
@@ -51,5 +49,3 @@ end
 class Category 
 	include BaseContent
 end
-
-end

data/examples/no_xsl_blog/run.rb

@@ -1,42 +1,42 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
+# $Id: run.rb 21 2005-04-15 15:41:20Z gmosx $
 
-require 'nitro'; include N
+require 'nitro'
 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',
-	# :backend => 'psql',
-	:database => 'blog',
-	:user => 'root',
-	:password => 'navelrulez',
-	# :user => 'postgres',
-	# :password => 'navelrulez',
-	:connection_count => 3
-)
-
-dispatcher = Dispatcher.new(BlogController, :xml => 'text/xml')
-
-Rendering.shader = LocalizationShader.new(RubyShader.new(CompressShader.new))
-
-conf = Conf.new(
-	:name => 'Blog sans XSLT',
-	:host => '127.0.0.1',
-	:port => 9999,
-	:dispatcher => dispatcher,
-	:db => db
-)
-
-runner.run(conf)
+include Nitro
+
+Nitro.run do |conf|
+	Localization.add(
+		:en => 'conf/locales/en.yml',
+		:de => 'conf/locales/de.yml'
+	)
+
+	Og.connect(
+	#	:address => 'localhost',
+		:adapter => 'mysql',
+		# :backend => 'psql',
+		:database => 'blog',
+		:user => 'root',
+		:password => 'navelrulez'
+		# :user => 'postgres',
+		# :password => 'navelrulez',
+	)
+
+	conf.dispatcher = Dispatcher.new(
+		:root => BlogController,
+		'xml' => XmlController
+	)
+
+	Rendering.shader = LocalizationShader.new(RubyShader.new(CompressShader.new))
+
+	conf = Conf.new(
+		:name => 'Blog sans XSLT',
+		:host => '127.0.0.1',
+		:port => 9999
+	)
+end

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

@@ -1 +1,3 @@
 <b>This is another include (deep).</b>
+<br />
+Included from #{@parent_action_name}

data/examples/tiny/run.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
+# $Id: run.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'nitro'
 
-N::Runner.run(:host => '127.0.0.1', :port => 9999)
+Nitro.run(:host => '127.0.0.1', :port => 9999)

data/examples/wee_style/run.rb

@@ -1,11 +1,13 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
+# $Id: run.rb 18 2005-04-15 09:17:08Z gmosx $
 
-require 'nitro'; include N
+require 'nitro'
 require 'nitro/adapters/webrick'
 
-class Wee < Component
+include Nitro
+
+class Wee < Controller
 
 	def index
 		counter = session[:counter] || 0

data/examples/why_wiki/run.rb

@@ -1,13 +1,15 @@
 # * George Moschovitis  <gm@navel.gr>
-# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
+# $Id: run.rb 18 2005-04-15 09:17:08Z gmosx $
 
 require 'cgi'
 require 'redcloth'
 require 'yaml/store'
  
-require 'nitro'; include N
+require 'nitro'
 require 'nitro/adapters/webrick'
 
+include Nitro
+
 # A simple wiki. A straight conversion of the redhanded.hobix.com
 # example. Original code by why the lucky stiff.
 # This is just a cool example, not the preffered way to write
@@ -15,7 +17,7 @@ require 'nitro/adapters/webrick'
 
 WIKI = YAML::Store.new('wiki.yml')
 
-class Wiki < Component
+class Wiki < Controller
 
 	def index
 		@p = 'Home' 

data/install.rb

@@ -2,7 +2,7 @@
 
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: install.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'rbconfig'
 require 'ftools'

data/lib/nitro.rb

@@ -1,10 +1,11 @@
 # = Nitro 
 #
-# Nitro is an efficient, yet simple engine for developing professional 
-# Web Applications using the Ruby language. Nitro aims to provide a 
-# robust infrastructure for scalable web applications that can be 
-# distributed over a server cluster. However, Nitro can also power 
-# simple web applications for deployment on intranets or even personal 
+# Nitro is an efficient, yet simple engine for developing 
+# professional Web Applications using the Ruby language. 
+# Nitro aims to provide a robust infrastructure for scalable 
+# web applications that can be distributed over a server 
+# cluster. However, Nitro can also power simple web 
+# applications for deployment on intranets or even personal 
 # computers. 
 #
 # Nitro integrates the powerful Og Object-Relational mapping 
@@ -12,7 +13,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: nitro.rb 340 2005-04-04 08:26:58Z gmosx $
+# $Id: nitro.rb 20 2005-04-15 15:18:36Z gmosx $
 
 require 'glue'
 require 'glue/logger'
@@ -20,10 +21,10 @@ require 'glue/logger'
 # Define Nitro namespace.
 
 module Nitro
-
+	
 	# The version.
 
-	Version = '0.15.0'
+	Version = '0.16.0'
 
 	# Library path.
 
@@ -38,7 +39,7 @@ require 'nitro/dispatcher'
 require 'nitro/render'
 require 'nitro/conf'
 require 'nitro/runner'
-require 'nitro/component'
+require 'nitro/controller'
 require 'nitro/part'
 
 require 'nitro/environment' unless $NITRO_NO_ENVIRONMENT

data/lib/nitro/adapters/cgi.rb

@@ -1,6 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
+# * James Britt  <james_b@neurogami.com>
 # (c) 2005 Navel, all rights reserved.
-# $Id$
+# $Id: cgi.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'cgi'
 require 'stringio'
@@ -8,7 +9,11 @@ require 'tempfile'
 
 require 'glue/attribute'
 
-module N
+# Speeds things up, more comaptible with OSX.
+
+Socket.do_not_reverse_lookup = true
+
+module Nitro
 
 class Cgi
 	# Maximum content length allowed in requests.
@@ -18,6 +23,26 @@ class Cgi
 	# Multipart parsing buffer size.
 
 	cattr_accessor :buffer_size, (10 * 1024)
+
+	def self.start( conf )
+		cgi = CGI.new
+		conf = Flexob.new(conf) unless conf.is_a?(Flexob)
+		context = Context.new(conf)
+		context.headers = ENV
+		
+		CgiUtils.parse_params(context)
+		CgiUtils.parse_cookies(context)
+
+		# gmosx, TODO: move this into a filter.
+		Og.db.get_connection if defined?(Og) and Og.db
+
+		context.render(  context.path)
+
+		Og.db.put_connection if defined?(Og) and Og.db
+
+		cgi.print(CgiUtils.response_headers(context))
+		cgi.print(context.out)
+	end
 end
 
 # CGI utility methods.

data/lib/nitro/adapters/fastcgi.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id$
+# $Id: fastcgi.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'cgi'
 require 'fcgi'
@@ -11,7 +11,11 @@ require 'nitro/adapters/cgi'
 
 require 'glue/flexob'
 
-module N
+# Speeds things up, more comaptible with OSX.
+
+Socket.do_not_reverse_lookup = true
+
+module Nitro
 
 # FastCGI Adaptor. FastCGI is a language independent, 
 # scalable, open extension to CGI that provides high