RubyGems - nitro - Versions diffs - 0.15.0 → 0.16.0 - Mend

nitro 0.15.0 → 0.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (111) hide show

data/CHANGELOG +218 -0
data/INSTALL +3 -0
data/README +4 -2
data/Rakefile +150 -8
data/benchmark/bench.rb +1 -1
data/doc/AUTHORS +2 -8
data/doc/RELEASES +63 -1
data/examples/ajax/controller.rb +2 -2
data/examples/ajax/public/index.xhtml +3 -1
data/examples/ajax/run.rb +3 -3
data/examples/blog/README +8 -0
data/examples/blog/cache/entriesadmintrue +3 -0
data/examples/blog/run.rb +38 -40
data/examples/blog/src/blog.rb +2 -1
data/examples/blog/src/controller.rb +40 -20
data/examples/blog/src/mailer.rb +2 -2
data/examples/blog/src/models/blog.rb +2 -1
data/examples/blog/src/models/content.rb +4 -33
data/examples/blog/src/views/error.xhtml +1 -1
data/examples/blog/src/xsl/style.xsl +1 -1
data/examples/blog/test/tc_blog.rb +43 -0
data/examples/flash/run.rb +2 -2
data/examples/no_xsl_blog/lib/blog.rb +1 -1
data/examples/no_xsl_blog/lib/blog/controller.rb +26 -17
data/examples/no_xsl_blog/lib/blog/model.rb +3 -3
data/examples/no_xsl_blog/lib/blog/template.rb +1 -1
data/examples/no_xsl_blog/lib/content.rb +3 -7
data/examples/no_xsl_blog/run.rb +34 -34
data/examples/tiny/public/deep/dir/hello.xhtml +2 -0
data/examples/tiny/run.rb +2 -2
data/examples/wee_style/run.rb +5 -3
data/examples/why_wiki/run.rb +5 -3
data/install.rb +1 -1
data/lib/nitro.rb +10 -9
data/lib/nitro/adapters/cgi.rb +27 -2
data/lib/nitro/adapters/fastcgi.rb +6 -2
data/lib/nitro/adapters/webrick.rb +11 -9
data/lib/nitro/buffering.rb +2 -2
data/lib/nitro/builders/atom.rb +78 -0
data/lib/nitro/builders/form.rb +2 -2
data/lib/nitro/builders/rss.rb +4 -4
data/lib/nitro/builders/table.rb +2 -2
data/lib/nitro/builders/xhtml.rb +5 -8
data/lib/nitro/builders/xml.rb +38 -14
data/lib/nitro/caching.rb +2 -2
data/lib/nitro/caching/actions.rb +2 -2
data/lib/nitro/caching/fragments.rb +2 -2
data/lib/nitro/caching/invalidation.rb +2 -28
data/lib/nitro/caching/output.rb +3 -3
data/lib/nitro/caching/stores.rb +4 -4
data/lib/nitro/conf.rb +11 -6
data/lib/nitro/context.rb +2 -2
data/lib/nitro/controller.rb +12 -7
data/lib/nitro/cookie.rb +2 -2
data/lib/nitro/dispatcher.rb +33 -40
data/lib/nitro/environment.rb +1 -1
data/lib/nitro/localization.rb +5 -7
data/lib/nitro/mail.rb +2 -2
data/lib/nitro/markup.rb +5 -5
data/lib/nitro/output.rb +2 -2
data/lib/nitro/part.rb +8 -5
data/lib/nitro/render.rb +46 -45
data/lib/nitro/request.rb +7 -6
data/lib/nitro/response.rb +14 -5
data/lib/nitro/routing.rb +2 -2
data/lib/nitro/runner.rb +57 -17
data/lib/nitro/scaffold.rb +14 -8
data/lib/nitro/session.rb +7 -4
data/lib/nitro/session/drb.rb +2 -2
data/lib/nitro/session/drbserver.rb +2 -2
data/lib/nitro/session/memory.rb +2 -2
data/lib/nitro/shaders.rb +8 -7
data/lib/nitro/simple.rb +4 -1
data/lib/nitro/template.rb +8 -8
data/lib/nitro/testing.rb +6 -0
data/lib/nitro/testing/assertions.rb +102 -0
data/lib/nitro/testing/context.rb +52 -0
data/lib/nitro/testing/testcase.rb +55 -0
data/lib/nitro/ui/pager.rb +3 -3
data/lib/nitro/ui/popup.rb +8 -13
data/lib/nitro/ui/tabs.rb +4 -10
data/lib/nitro/uri.rb +7 -7
data/proto/doc/README +1 -0
data/proto/public/cgi.rb +5 -0
data/proto/run.rb +2 -4
data/test/nitro/adapters/tc_cgi.rb +1 -1
data/test/nitro/adapters/tc_webrick.rb +1 -2
data/test/nitro/builders/tc_atom.rb +26 -0
data/test/nitro/builders/tc_rss.rb +3 -2
data/test/nitro/builders/tc_table.rb +1 -1
data/test/nitro/builders/tc_xhtml.rb +4 -3
data/test/nitro/builders/tc_xml.rb +7 -7
data/test/nitro/tc_context.rb +1 -1
data/test/nitro/tc_controller.rb +5 -3
data/test/nitro/tc_dispatcher.rb +19 -18
data/test/nitro/tc_localization.rb +1 -1
data/test/nitro/tc_mail.rb +1 -1
data/test/nitro/tc_session.rb +1 -1
data/test/nitro/tc_template.rb +1 -1
data/test/nitro/tc_uri.rb +3 -4
data/test/nitro/ui/tc_pager.rb +7 -7
data/test/public/blog/inc1.xhtml +2 -0
data/test/public/blog/inc2.xhtml +1 -0
data/test/public/blog/list.xhtml +3 -0
metadata +180 -203
data/examples/blog/cache/entriesadmin +0 -12
data/lib/nitro/cluster.rb +0 -218
data/lib/nitro/component.rb +0 -15
data/lib/nitro/filters.rb +0 -215
data/lib/nitro/ui/date-select.rb +0 -69
data/test/nitro/tc_filters.rb +0 -111

data/doc/RELEASES CHANGED

@@ -1,4 +1,66 @@
-== Version 0.15.0 was released on 4/03/2005.
+== Version 0.16.0
+A snapshot of the latest developments. Many, many subtle improvements,
+new features and a major cleanup of the source code. Thanks to
+James Britt for significantly contributing to this release.
+Most notable attitions:
+* Aspect Oriented Programming support. This new system
+	is used to reimplement features such as Controller filters,
+	Og callbacks and Og observers. By using this unified
+	system you can now add Observers to controllers and use
+	a metalanguage for wraping Og object callbacks:
+	class Controller
+ 		pre :force_login, :where => :prepend
+ 		wrap Benchmark, :on => :index
+ 		post :taraa, :on => login
+	end
+	module Timestamped
+ 		pre :on => :og_insert { |this| this.create_time = Time.now }
+		pre :on => :og_update { |this| this.update_time = Time.now }
+		pre :on => [:og_insert, :og_update] { |this| this.create_time = Time.now }
+	end
+	This feature will be used extensivelly  in future versions
+	to improve logging, the shaders and more.
+* Added support for Test Driven Development. Many helpers
+	and utility methods are added to the standard TestCase
+	class, more will come in a future version:
+	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 :)')
+* CGI adapter (by James Britt)
+* Major cleanup of the source. Converted the N namespace to
+	Nitro, to be more compatible with other Ruby projects.
+* Add Og Timestamped mixin.
+* Og improvements.
+* Improved runner helper.
+* Improved reloading support.
+* Improved the Gem installation process.
+* Fixed all reported bugs.
+== Version 0.15.0 was released on 04/04/2005.
 A great release. Many cool new features and tons of subtle
 improvements. We also welcome a new core developer, Anastastios

data/examples/ajax/controller.rb CHANGED

@@ -1,12 +1,12 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: controller.rb 301 2005-03-16 13:24:25Z gmosx $
+# $Id: controller.rb 1 2005-04-11 11:04:30Z gmosx $
 require 'nitro/controller'
 COUNTRIES = %w{ Greece USA England Germany Italy Canada France Japan Australia Holland }
-class AjaxController < N::Controller
+class AjaxController < Nitro::Controller
 	def hit
 		puts "-----------------------------> hit #{request['val']}"
 	end

data/examples/ajax/public/index.xhtml CHANGED

@@ -60,7 +60,9 @@ function getWord(input, evt) {
 <body>
 <h1>Server side autocompletion</h1>
 <form>
-Enter a Country: <input type="text" id="country" name="country" value="" onkeyup="getWord(this,event)" autocomplete="off" />
+<b>Enter a Country:</b> <input type="text" id="country" name="country" value="" onkeyup="getWord(this,event)" autocomplete="off" />
+<br />
+try one of #{COUNTRIES.join(', ')}
 </form>
 <h1>Send data to a server action</h1>
 <p>

data/examples/ajax/run.rb CHANGED

@@ -1,13 +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 1 2005-04-11 11:04:30Z gmosx $
 require 'nitro'
 require 'controller'
-include N
+include Nitro
-Runner.new.setup.run(
+Nitro.run(
 	:host => '127.0.0.1',
 	:port => 9999,
 	:dispatcher => Dispatcher.new(AjaxController)

data/examples/blog/README CHANGED

@@ -25,6 +25,10 @@ Exec the following command:
 $ ruby run.rb
+or with gems
+$ ruby -rubygems run.rb
 then point your browser to:
 http://127.0.0.1:9999
@@ -51,6 +55,10 @@ debugging information.
 $ ruby run.rb --debug
+or with gems
+$ ruby -rubygems run.rb --debug
 In debug mode the view files (xhtml/xsl/etc) are automatically
 reloaded. The controller classes are also relaoded.

data/examples/blog/cache/entriesadmintrue ADDED

@@ -0,0 +1,3 @@
+<div class="entry"><h2 class="date">April 18, 2005</h2><div class="post"><h3 class="title">fdsfsdfs</h3>dfdsfdsf<div class="footer">posted by George Moschovitis at <a href="view_entry?oid=3">10:15 AM</a> | <a href="view_entry?oid=3#comments">0 comments</a>.[<a href="del_entry?oid=3">del</a>]</div></div></div><div class="entry"><h2 class="date">April 18, 2005</h2><div class="post"><h3 class="title">fsfdsf</h3>sdfsfs<div class="footer">posted by George Moschovitis at <a href="view_entry?oid=2">00:19 AM</a> | <a href="view_entry?oid=2#comments">0 comments</a>.[<a href="del_entry?oid=2">del</a>]</div></div></div><div class="entry"><h2 class="date">April 17, 2005</h2><div class="post"><h3 class="title">dfdsfds</h3>fdsfdsfds<div class="footer">posted by George Moschovitis at <a href="view_entry?oid=1">11:28 AM</a> | <a href="view_entry?oid=1#comments">1 comments</a>.[<a href="del_entry?oid=1">del</a>]</div></div></div><div class="pager"><ul>
+					<li class="active">1</li>
+				</ul><div class="clear">.</div></div>

data/examples/blog/run.rb CHANGED

@@ -1,50 +1,48 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 339 2005-04-01 14:02:14Z gmosx $
+# (c) 2005 Navel, all rights reserved.
+# $Id: run.rb 1 2005-04-11 11:04:30Z gmosx $
 require 'nitro'
 require 'og'
 require 'blog'
-require 'mailer'
-include N
-# Og.create_schema = false
-# 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(
-#	:address => 'localhost',
-#	:adapter => 'mysql',
-	:adapter => 'psql',
-#	:adapter => 'sqlite',
-	:database => 'blog',
-	:user => 'postgres',
-	:password => 'navelrulez',
-	:connection_count => 3
-)
-Rendering.shader = XSLTShader.new('src/xsl/style.xsl',
-	LocalizationShader.new(
-		RubyShader.new(
-			CompressShader.new
+include Nitro
+Nitro.run do |conf|
+	# Og.create_schema = false
+	# Session.store_type = :drb
+	Caching::Fragments.store = Caching::FileStore.new
+	Localization.add(
+		:en => 'conf/locales/en.yml',
+		:de => 'conf/locales/de.yml'
+	)
+	Og.connect(
+		:adapter => 'psql',
+		:database => 'blog',
+		:user => 'postgres',
+		:password => 'navelrulez',
+		:connection_count => 3
+	)
+	Rendering.shader = XSLTShader.new('src/xsl/style.xsl',
+		LocalizationShader.new(
+			RubyShader.new(
+				CompressShader.new
+			)
 		)
 	)
-)
-conf = Conf.new(
-	:name => 'Nitro Blog',
-	:host => '127.0.0.1',
-	:port => 9999,
-	:dispatcher => Dispatcher.new(BlogController, :xml => 'text/xml')
-)
+	conf.dispatcher = Dispatcher.new(
+		:root => BlogController,
+		'xml' => XmlController
+	)
-runner.run(conf)
+	conf.set(
+		:name => 'Nitro Blog',
+		:host => '127.0.0.1',
+		:port => 9999
+	)
+end

data/examples/blog/src/blog.rb CHANGED

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: blog.rb 313 2005-03-16 19:18:09Z gmosx $
+# $Id: blog.rb 1 2005-04-11 11:04:30Z gmosx $
 # A simple blog to demonstrate the power of Nitro.
@@ -17,4 +17,5 @@ class Blog
 end
 require 'controller'
+require 'mailer'
 require 'models/blog'

data/examples/blog/src/controller.rb CHANGED

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: controller.rb 335 2005-03-31 14:02:02Z gmosx $
+# (c) 2005 Navel, all rights reserved.
+# $Id: controller.rb 20 2005-04-15 15:18:36Z gmosx $
 require 'nitro/controller'
 require 'nitro/ui/pager'
@@ -11,13 +11,18 @@ require 'models/blog'
 # The controller of the Blog part.
-class BlogController < N::Controller
+class BlogController < Nitro::Controller
-	before_filter LocalizationFilter
-	before_filter :get_errors
-	after_filter :cache_invalidate, :only => [ :new_entry, :new_comment ]
+	pre :get_errors
+	post :cache_invalidate, :on => [ :new_entry, :new_comment, :del_entry, :del_comment ]
+	wrap Nitro::LocalizationAspect, :pre => :localize
+	# generate default BlogEntry related actions.
 	scaffold BlogEntry, :name => 'entry', :index => true # , :nosuffix => true
+	# generate default Comment related actions.
 	scaffold Comment
 	# as an example of full page caching.
@@ -56,12 +61,6 @@ class BlogController < N::Controller
 	end
 	action :myview, :route => /view\/(.*)/, 'oid' => 1
-	# example of generated view
-	def list_entry__xml
-		o.build_rss(@entries, :description => 'Blog entries', :link => context.host_url)
-	end
 	def mail_entry
 		entry = BlogEntry[request['oid']]
 		BlogMailer.deliver_blog_entry_email(request['to'], entry)
@@ -77,18 +76,13 @@ 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
 				session[:owner] = true
 				session[:username] = Blog.username
+				request.add_cookie 'nauth', 'just an example, not used :)'
 				redirect '/'
 			else
 				@error = 'Invalid password'
@@ -129,7 +123,33 @@ private
 		# gmosx: will be improved.
 		expire_fragment('entriesadmin')
 		expire_fragment('entriesadmintrue')
-		Logger.info 'cache (after filter example)'
 	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'
+	# This is the prefered way to add programmatically
+	# generated output. The method list_entry_template is
+	# called after list_entry.
+	def list_entry_template
+		o.build_rss(@entries, :description => 'Blog entries', :link => context.host_url)
+	end
+	# Another way to overload the method for RSS output.
+	# Not that flexible though.
+	def list_comment
+		super
+		o.build_rss(@comments, :description => 'Blog comments', :link => context.host_url)
+	end
+end

data/examples/blog/src/mailer.rb CHANGED

@@ -1,12 +1,12 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: mailer.rb 334 2005-03-29 11:44:38Z gmosx $
+# $Id: mailer.rb 1 2005-04-11 11:04:30Z gmosx $
 require 'nitro/mail'
 # A simple mailer.
-class BlogMailer < N::Mailer
+class BlogMailer < Nitro::Mailer
 	def initialize(*p)
 		super(*p)

data/examples/blog/src/models/blog.rb CHANGED

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: blog.rb 313 2005-03-16 19:18:09Z gmosx $
+# $Id: blog.rb 20 2005-04-15 15:18:36Z gmosx $
 require 'models/content'
@@ -15,6 +15,7 @@ class Comment; end
 module Common
 	include BaseContent
 	include CreateTime
 	prop_accessor :author, String
 	validate_value :body
 end

data/examples/blog/src/models/content.rb CHANGED

@@ -1,15 +1,13 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: content.rb 313 2005-03-16 19:18:09Z gmosx $
+# $Id: content.rb 23 2005-04-16 18:20:00Z gmosx $
 require 'nitro/markup'
-include N
 # The foundamental Content Unit.
 module BaseContent
-	include Markup
+	include Nitro::Markup
 	prop_accessor :title, String
 	prop_accessor :body, String, :markup => true, :ui => :textarea
 end
@@ -19,34 +17,7 @@ end
 module CreateTime
 	prop_accessor :create_time, Time
 	prop_accessor :update_time, Time
-	def og_pre_insert(conn)
-		@create_time = @update_time = Time.now
-	end
-	def og_pre_update(conn)
-		@update_time = Time.now
-	end
+	pre "@create_time = @update_time = Time.now", :on => :og_insert
+	pre "@update_time = Time.now", :on => :og_update
 end
-# The foundamental Content Unit.
-#--
-# THINK: rename this to Entity?
-#++
-module Content
-	include BaseContent
-	prop_accessor :name, String
-	prop_accessor :ctime, Time
-	prop_accessor :mtime, Time
-	def initialize(*args)
-		@ctime = @mtime = Time.now
-	end
-end
-# A Category.
-class Category
-	include BaseContent
-end

data/examples/blog/src/views/error.xhtml CHANGED

@@ -28,7 +28,7 @@
 <?r	for error, path in @context.rendering_errors ?>
 			<div class="path"><strong>Path:</strong> #{path}</div>
-			<div class="error"><strong>#{error.class.name}:</strong> #{N::Markup.expand(error.to_s)}</div>
+			<div class="error"><strong>#{error.class.name}:</strong> #{Nitro::Markup.expand(error.to_s)}</div>
 			<div class="load">Click here to <strong><a href="#{request.uri}">reload</a></strong>.</div>
 			<div class="load">Click here to go to the <strong><a href="#{request.referer}">referer</a></strong>.</div>
 			<h2><a href="#" onclick="document.getElementById('trace').style.display = 'block'; return false">Stack Trace</a></h2>

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

@@ -5,7 +5,7 @@ A Simple Shader
 * George Moschovitis  <gm@navel.gr>
 (c) 2004-2005 Navel, all rights reserved.
-$Id: style.xsl 335 2005-03-31 14:02:02Z gmosx $
+$Id: style.xsl 1 2005-04-11 11:04:30Z gmosx $
 -->
 <!DOCTYPE shader