nitro 0.9.3 → 0.9.5

data/ChangeLog

@@ -1,6 +1,70 @@
 
+04-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/adaptors/fastcgi.rb: convert conf to Flexob.
+
+	* lib/nitro/adaptors/webrick.rb: added REQUEST_MUTEX to temp-fix windows bug.
+
+03-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/glue/*: cleaned up some files.
+
+	* lib/og/*: cleaned up some files.
+
+	* lib/nitro/dispatchers.rb (#initialize): accept class as input.
+
+	* Updated all examples.
+
+	* lib/nitro/context.rb: out == XhtmlString to allow convienient
+	access to the programmatic rendering functionality and make
+	the wee example cooler.
+
+	* lib/nitro/adaptors/webrick.rb (#start): better handling of conf parameters,
+	better handling of logging,
+	autoconvert conf to Flexob if needed.
+
+	* examples/wee_style/wee.rb: implemented,
+	looks cool (but useles? :-))
+
+	* examples/wee_style/README: introduced.
+
+	* examples/wee_style/*: introduced wee-style example.
+
+	* examples/blog/lib/blog.rb: updated for new RSS.
+
+	* test/nitro/builders/tc_rss.rb: introduced.
+
+	* lib/nitro/builders/rss.rb: pass parameters,
+	(#render): now alias for render_0_9
+
+	* lib/og/meta.rb (#joins): introduced new metadata macro.
+
+02-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* --- VERSION 0.9.4 ---
+
+	* lib/og/backends/sqlite.rb: introduced.
+	
+	* lib/og/backends/psql.rb: minor cleanup.
+
+	* examples/blog/root/style.css: fixes for IE, more needed.
+
+	* lib/nitro/adaptors/fastcgi.rb (#handle): restore Og connection.
+
+	* lib/nitro/adaptors/webrick.rb (#handle): restore Og connection, fixes
+	Windows deadlock. [james_b]
+
+	* examples/no_xsl_blog/lib/blog/template.rb: fixed ruby in template (login).
+
+	* changed default port to 8069, to avoid conflicts with
+	other servers (8080 was too common). [james_b]
+
 01-02-2005  George Moschovitis  <gm@navel.gr>
 
+	* updated Rubyforge page, added wiki.
+	
+	* --- VERSION 0.9.3 ---
+
 	* small fixes to make tests pass again.
 
 	* lib/nitro/adaptors/webrick.rb: update headers with req.meta_vars.

data/RELEASES

@@ -1,3 +1,16 @@
+== Version 0.9.5 was released on 04/02/2005.
+
+A bug fix release.
+
+* Fixed nasty Windows deadlock bug.
+
+* Experimental Wee-style example (will be updated in the next version).
+
+* Changed default port to 8069 (8080 was to common).
+
+* Small fixes and improvements.
+
+
 == Version 0.9.3 was released on 01/02/2005.
 
 A *very* important release. A new abstract rendering

data/examples/blog/README

@@ -24,7 +24,7 @@ ruby ctl
 
 then point your browser to:
 
-http://127.0.0.1:8080
+http://127.0.0.1:8069
 
 (if you want to change the server address/port, edit the config.rb
 file)

data/examples/blog/conf/app.conf.rb

@@ -7,8 +7,6 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 $DBG = true 
 
-require 'ostruct'
-
 require 'nitro'
 require 'glue/validation'
 require 'og'
@@ -45,12 +43,10 @@ Rendering.shader = N::XSLTShader.new("#{dispatcher.root}/style.xsl",
 
 Rendering.reload = :partial
 
-conf = {
+$conf = {
 	:name => 'Nitro Blog',
 	:host => 'localhost',
-	:port => 8080,
+	:port => 8069,
 	:dispatcher => dispatcher,
 	:og => og
 }
-
-$conf = OpenStruct.new(conf)

data/examples/blog/conf/lhttpd.conf

@@ -104,7 +104,7 @@ url.access-deny             = ( "~", ".inc" )
 ######### Options that are good to be but not neccesary to be changed #######
 
 ## bind to port (default: 80)
-server.port = 8080
+server.port = 8069
 
 ## bind to localhost (default: all interfaces)
 #server.bind                = "grisu.home.kneschke.de"

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

@@ -39,7 +39,7 @@ class BlogController < N::Controller
 	# example of generated view
 
 	def list_entry__xml
-		@out << RssBuilder.render(@entries)
+		@out << RssBuilder.render(@entries, :description => 'Blog entries', :link => context.host_url)
 	end
 	
 	def new_comment
@@ -56,7 +56,7 @@ class BlogController < N::Controller
 	# example of generated view
 
 	def list_comment__xml
-		@out << RssBuilder.render(@comments)
+		@out << RssBuilder.render(@comments, :description => 'Blog comments', :link => context.host_url)
 	end
 	
 	def login

data/examples/blog/root/style.css

@@ -30,8 +30,6 @@ input, textarea {
 }
 
 #page {
-	position: relative; top: 50%; left: 50%;
-	margin: 0px; margin-left: -400px; 
 	width: 847px;
 	background: url(m/page_bg.gif) repeat-y;
 }

data/examples/flash/conf/app.conf.rb

@@ -14,10 +14,8 @@ include N
 
 dispatcher = Dispatcher.new
 
-conf = {
+$conf = {
 	:host => 'localhost',
-	:port => 8080,
+	:port => 8069,
 	:dispatcher => dispatcher,
 }
-
-$conf = OpenStruct.new(conf)

data/examples/no_xsl_blog/README

@@ -10,3 +10,12 @@ least you shold configure the database username/password.
 
 When running on windows, the database binaries should
 be in the PATH.
+
+To see the example browse http://127.0.0.1:8069
+
+= WARNING
+
+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

@@ -7,8 +7,6 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 $DBG = true 
 
-require 'ostruct'
-
 require 'nitro'
 require 'glue/validation'
 require 'og'
@@ -16,7 +14,7 @@ require 'og'
 require 'blog'
 
 include N
-=begin
+
 og = Og::Database.new(
 	:address => 'localhost',
 	:backend => 'mysql',
@@ -25,8 +23,8 @@ og = Og::Database.new(
 	:password => 'navelrulez',
 	:connection_count => 3
 )
-=end
 
+=begin
 og = Og::Database.new(
 	:address => 'localhost',
 	:backend => 'psql',
@@ -35,6 +33,7 @@ og = Og::Database.new(
 	:password => 'navelrulez',
 	:connection_count => 3
 )
+=end
 
 controllers = {
 	:index => BlogController
@@ -46,12 +45,10 @@ apis = {
 
 dispatcher = Dispatcher.new(controllers, apis)
 
-conf = {
+$conf = {
 	:name => 'Blog sans XSLT',
 	:host => 'localhost',
-	:port => 8080,
+	:port => 8069,
 	:dispatcher => dispatcher,
 	:og => og
 }
-
-$conf = OpenStruct.new(conf)

data/examples/no_xsl_blog/conf/lhttpd.conf

@@ -104,7 +104,7 @@ url.access-deny             = ( "~", ".inc" )
 ######### Options that are good to be but not neccesary to be changed #######
 
 ## bind to port (default: 80)
-server.port = 8080
+server.port = 8069
 
 ## bind to localhost (default: all interfaces)
 #server.bind                = "grisu.home.kneschke.de"

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

@@ -32,7 +32,6 @@ class BlogController < N::Controller
 
 		unless entry.valid?
 			session[:errors] = entry.errors
-			puts '***', @context.headers.inspect, @context.referer
 			redirect_referer '#new_entry'
 		end
 
@@ -42,7 +41,7 @@ class BlogController < N::Controller
 	# example of generated view
 
 	def list_entry__xml
-		@out << RssBuilder.render(@entries)
+		@out << RssBuilder.render(@entries, :description => 'Blog entries', :link => context.host_url)
 	end
 	
 	def new_comment
@@ -59,7 +58,7 @@ class BlogController < N::Controller
 	# example of generated view
 
 	def list_comment__xml
-		@out << RssBuilder.render(@comments)
+		@out << RssBuilder.render(@comments, :description => 'Blog comments', :link => context.host_url)
 	end
 	
 	def login

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

@@ -87,11 +87,11 @@ module BlogTemplate
 						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>
+		} + unless session['owner'] then %{
 							<p><a href="login">Login</a> as owner.</p>
-						<ruby>else</ruby>
+		} else %{
 							<p><a href="logout">Logout</a>.</p>
-						<ruby>end</ruby>
+		} end + %{
 						
 						<h2>Linkage</h2>
 						<ul>

data/examples/no_xsl_blog/root/style.css

@@ -30,8 +30,6 @@ input, textarea {
 }
 
 #page {
-	position: relative; top: 50%; left: 50%;
-	margin: 0px; margin-left: -400px; 
 	width: 847px;
 	background: url(m/page_bg.gif) repeat-y;
 }

data/examples/og/mock_example.rb

@@ -3,10 +3,8 @@
 # A simple example to demonstrate how to mock Og.
 # Very useful in test units.
 #
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (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')
@@ -52,4 +50,3 @@ class SimpleTest < Test::Unit::TestCase
 	end
 
 end
-

data/examples/og/mysql_to_psql.rb

@@ -7,10 +7,8 @@
 #
 # Og makes it easier to switch to a REAL database :)
 #
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 raise 'WARNING, this example does not work yet, for the moment ' + 
@@ -22,7 +20,7 @@ require 'og'
 
 # An example managed object.
 # Looks like an ordinary Ruby object.
-#
+
 class Article
 	prop_accessor :name, :body, String
 

data/examples/tiny/README

@@ -9,6 +9,6 @@ $ cd examples/tiny
 
 $ ruby ctl 
 
-browse http://127.0.0.1:8080
+browse http://127.0.0.1:8069
 
 to stop the example press Ctrl+C 

data/examples/tiny/conf/app.conf.rb

@@ -10,12 +10,8 @@ require 'nitro'
 
 # gmosx, FIXME: make this default!
 
-require 'ostruct'
-
-conf = {
+$conf = {
 	:host => 'localhost',
-	:port => 8080,
+	:port => 8069,
 	:dispatcher => N::Dispatcher.new
 }
-
-$conf = OpenStruct.new(conf)

data/examples/tiny/conf/lhttpd.conf

@@ -104,7 +104,7 @@ url.access-deny             = ( "~", ".inc" )
 ######### Options that are good to be but not neccesary to be changed #######
 
 ## bind to port (default: 80)
-server.port = 8080
+server.port = 8069
 
 ## bind to localhost (default: all interfaces)
 #server.bind                = "grisu.home.kneschke.de"

data/examples/wee_style/README

@@ -0,0 +1,10 @@
+= Wee-style Example
+
+This is a simple example that demonstrates that writing
+Wee-style 'self-contained' web applications is easy.
+
+To run the example just issue
+
+$ ruby wee.rb
+
+in the command line to start the application.

data/examples/wee_style/wee.rb

@@ -0,0 +1,50 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id$
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'nitro'
+require 'nitro/adaptors/webrick'
+
+include N
+
+class Wee < Controller
+
+	def index
+		counter = session[:counter] || 0
+
+		(o = @out).html {
+			o.h1 'Hello world'
+			o << 'This is ' 
+			o.b { o << 'BOLD' }
+			o.p {
+				o << "Here is the counter: #{counter}"
+			}
+			o.p {
+				o << '<a href="inc_counter">Increase</a> the counter.'
+			}
+			o.p {
+				o << '<a href="reset_counter">Reset</a> the counter.'
+			}
+		}
+	end
+
+	def inc_counter
+		session[:counter] ||= 0
+		session[:counter] += 1
+	end
+	
+	def reset_counter
+		session[:counter] = 0
+	end
+
+end
+
+conf = {
+	:host => 'localhost',
+	:port => 8069,
+	:dispatcher => Dispatcher.new(Wee)
+}
+
+Webrick.start(conf)

data/lib/glue/cache.rb

@@ -1,14 +1,10 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
 # * Anastasios Koutoumanos  <ak@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: cache.rb 202 2005-01-17 10:44:13Z gmosx $
 
-module N;
+module N
 
-# = LRUCache
-#
 # A cache utilizing a simple LRU (Least Recently Used) policy.
 # The items managed by this cache must respond to the #key method.
 # Attempts to optimize reads rather than inserts!
@@ -16,36 +12,38 @@ module N;
 # LRU semantics are enforced by inserting the items in a queue.
 # The lru item is always at the tail. Two special sentinels
 # (head, tail) are used to simplify (?) the code.
-#
+
 class LRUCache < Hash
 
 	# Mix this in your class to make LRU-managable.
-	#
+	
 	module Item
 		attr_accessor :lru_key, :lru_prev, :lru_next
 	end
 
 	# head-tail sentinels
-	#
+	
 	class Sentinel; include Item; end
 
-	# the maximum number of items in the cache
+	# the maximum number of items in the cache.
+
 	attr_accessor :max_items
 
 	# the head sentinel
+	
 	attr :head
+
 	# the tail sentinel, tail.prev points to the lru item.
+
 	attr :tail
 
-	#
-	#	
 	def initialize(max_items)
 		@max_items = max_items
 		lru_clear()
 	end
 
-	# Lookup an item in the cache
-	#
+	# Lookup an item in the cache.
+	
 	def [](key)
 		if item = super
 			return lru_touch(item)
@@ -53,36 +51,36 @@ class LRUCache < Hash
 	end
 
 	# The inserted item is considered mru!
-	#
+	
 	def []=(key, item)
 		item = super
 		item.lru_key = key
 		lru_insert(item)
 	end
 
-	# Delete an item from the cache
-	#
+	# Delete an item from the cache.
+	
 	def delete(key)
 		if item = super
 			lru_delete(item)
 		end
 	end
 
-	# Clear the cache
-	#
+	# Clear the cache.
+	
 	def clear
 		super
 		lru_clear()
 	end
 
-	# The first (mru) element in the cache
-	#
+	# The first (mru) element in the cache.
+	
 	def first
 		@head.lru_next
 	end
 
-	# The last (lru) element in the cache
-	#
+	# The last (lru) element in the cache.
+	
 	def last
 		@tail.lru_prev
 	end
@@ -91,15 +89,15 @@ class LRUCache < Hash
 	private
 
 	# Delete an item from the lru list.
-	#
+	
 	def lru_delete(item)
 		lru_join(item.lru_prev, item.lru_next)
 		return item
 	end
 
-	# Join two items in the lru list
-	# Return y to allow for chaining
-	#
+	# Join two items in the lru list.
+	# Return y to allow for chaining.
+	
 	def lru_join(x, y)
 		x.lru_next = y
 		y.lru_prev = x
@@ -108,28 +106,28 @@ class LRUCache < Hash
 
 	# Append a child item to a parent item in the lru list
 	# (Re)inserts the child in the list.
-	#
+	
 	def lru_append(parent, child)
 		lru_join(child, parent.lru_next)
 		lru_join(parent, child)
 	end
 
 	# Insert an item
-	#
+
 	def lru_insert(item)
 		delete(last.lru_key) if size() > @max_items
 		lru_append(@head, item)
 	end
 	
 	# Touch an item, make mru!
-	# Returns the item
-	#
+	# Returns the item.
+	
 	def lru_touch(item)
 		lru_append(@head, lru_delete(item))
 	end
 	
-	# Clear the lru
-	#
+	# Clear the lru.
+	
 	def lru_clear
 		@head = Sentinel.new
 		@tail = Sentinel.new
@@ -137,4 +135,4 @@ class LRUCache < Hash
 	end	
 end
 
-end # module
+end