nitro 0.10.0 → 0.11.0

data/examples/blog/root/fcgi.rb

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

data/examples/blog/run.rb

@@ -1,6 +1,8 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 260 2005-02-15 08:58:04Z gmosx $
+# $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
+
+# $:.unshift '/home/gmosx/navel/nitro/lib'
 
 Dir.chdir File.dirname(__FILE__)
 
@@ -9,6 +11,10 @@ require 'og'
 
 require 'lib/blog'
 
+# Nitro.resolve_action_arguments = true
+# Og.create_schema = false
+# Session.store_type = :drb
+
 runner = Runner.new.setup
 
 db = Og::Database.new(
@@ -32,8 +38,8 @@ Rendering.shader = XSLTShader.new("#{dispatcher.root}/style.xsl",
 
 conf = Conf.new(
 	:name => 'Nitro Blog',
-	:host => 'localhost',
-	:port => 8069,
+	:host => '127.0.0.1',
+	:port => 9999,
 	:dispatcher => dispatcher,
 	:db => db
 )

data/examples/flash/run.rb

@@ -1,9 +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 $
+# $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
 
 Dir.chdir File.dirname(__FILE__)
 
 require 'nitro'
 
-N::Runner.run(:host => 'localhost', :port => 8069)
+N::Runner.run(:host => '127.0.0.1', :port => 9999)

data/examples/no_xsl_blog/conf/apache.conf

@@ -0,0 +1,30 @@
+# Apache configuration file.
+# Change as appropriate for your apache configuration.
+# $Id$
+
+Listen 9999 
+
+PidFile /var/tmp/httpd.pid
+TypesConfig /etc/mime.types
+DocumentRoot /home/gmosx/navel/nitro/examples/no_xsl_blog/root
+
+# The error log.
+ErrorLog log/apache.error_log
+CustomLog log/access_log combined
+
+# Load dynamic modules.
+LoadModule fastcgi_module /usr/local/apache2/modules/mod_fastcgi.so
+# LoadModule rewrite_module /usr/local/apache2/modules/mod_rewrite.so
+
+FastCgiIpcDir /var/tmp/fcgi
+# gmosx: if you have installed the distribution the -I is not needed.
+FastCgiConfig -initial-env 'RUBYOPT=-rubygems -I/home/gmosx/navel/nitro/lib'
+AddHandler fastcgi-script fcgi rb
+Options +FollowSymLinks +ExecCGI
+
+RewriteEngine On
+RewriteRule ^/([\/\-_a-zA-Z0-9]+)?$ /fcgi.rb [QSA,L]
+RewriteRule	^/([\/\-_a-zA-Z0-9]+)?\?([\-_a-zA-Z0-9=;&%]*)$ /fcgi.rb?$2 [QSA,L]
+
+# You can also point these error messages to a controller/action
+# ErrorDocument 500 /500.html

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 = 8069
+server.port = 9999 
 
 ## bind to localhost (default: all interfaces)
 #server.bind                = "grisu.home.kneschke.de"

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

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

data/examples/no_xsl_blog/log/apache.error_log

@@ -0,0 +1,68 @@
+[Sun Feb 27 14:41:24 2005] [notice] Digest: generating secret for digest authentication ...
+[Sun Feb 27 14:41:24 2005] [notice] Digest: done
+[Sun Feb 27 14:41:25 2005] [notice] FastCGI: process manager initialized (pid 4716)
+[Sun Feb 27 14:41:25 2005] [notice] Apache/2.0.53 (Unix) DAV/2 mod_fastcgi/2.4.2 configured -- resuming normal operations
+[Sun Feb 27 14:41:31 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" started (pid 4722)
+/usr/bin/env: ruby: No such file or directory
+[Sun Feb 27 14:41:32 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" (pid 4722) terminated by calling exit with status '127'
+/usr/bin/env: ruby: No such file or directory
+[Sun Feb 27 14:41:36 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" restarted (pid 4724)
+[Sun Feb 27 14:41:36 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" (pid 4724) terminated by calling exit with status '127'
+[Sun Feb 27 14:41:41 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" restarted (pid 4725)
+/usr/bin/env: ruby: No such file or directory
+[Sun Feb 27 14:41:41 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" (pid 4725) terminated by calling exit with status '127'
+[Sun Feb 27 14:41:46 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" restarted (pid 4726)
+/usr/bin/env: ruby: No such file or directory
+[Sun Feb 27 14:41:46 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" (pid 4726) terminated by calling exit with status '127'
+[Sun Feb 27 14:41:46 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:41:47 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:41:50 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:41:53 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:41:56 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:41:59 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:42:02 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:42:05 2005] [error] [client 127.0.0.1] FastCGI: comm with (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" aborted: (first read) idle timeout (30 sec), referer: http://0.0.0.0:9999/
+[Sun Feb 27 14:42:05 2005] [error] [client 127.0.0.1] FastCGI: incomplete headers (0 bytes) received from server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb", referer: http://0.0.0.0:9999/
+[Sun Feb 27 14:42:05 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:42:52 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:42:56 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:42:59 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:43:02 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:43:05 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:43:08 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:43:11 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:43:12 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" has failed to remain running for 30 seconds given 3 attempts, its restart interval has been backed off to 600 seconds
+[Sun Feb 27 14:43:12 2005] [notice] caught SIGTERM, shutting down
+[Sun Feb 27 14:43:21 2005] [notice] Digest: generating secret for digest authentication ...
+[Sun Feb 27 14:43:21 2005] [notice] Digest: done
+[Sun Feb 27 14:43:22 2005] [notice] FastCGI: process manager initialized (pid 4736)
+[Sun Feb 27 14:43:22 2005] [notice] Apache/2.0.53 (Unix) DAV/2 mod_fastcgi/2.4.2 configured -- resuming normal operations
+[Sun Feb 27 14:43:25 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/no_xsl_blog/root/fcgi.rb" started (pid 4742)
+ INFO: Connecting to database 'blog' using the 'mysql' adapter.
+DEBUG: Og auto manages the following classes:
+DEBUG: [BlogEntry, N::Category, Comment]
+DEBUG: Rendering '/'.
+DEBUG: Compiling action 'root/index'
+DEBUG: Transforming 'root/index.xhtml'
+DEBUG: SELECT * FROM og_blogentry ORDER BY oid DESC LIMIT 3
+DEBUG: SELECT COUNT(*) FROM og_blogentry
+DEBUG: Rendering '/'.
+DEBUG: Compiling action 'root/index'
+DEBUG: Transforming 'root/index.xhtml'
+DEBUG: SELECT * FROM og_blogentry ORDER BY oid DESC LIMIT 3
+DEBUG: SELECT COUNT(*) FROM og_blogentry
+DEBUG: Rendering '/login'.
+DEBUG: Compiling action 'root/login'
+DEBUG: Transforming 'root/login.xhtml'
+DEBUG: Rendering '/login'.
+DEBUG: Compiling action 'root/login'
+DEBUG: Transforming 'root/login.xhtml'
+DEBUG: Rendering '/'.
+DEBUG: Compiling action 'root/index'
+DEBUG: Transforming 'root/index.xhtml'
+DEBUG: SELECT * FROM og_blogentry ORDER BY oid DESC LIMIT 3
+DEBUG: SELECT COUNT(*) FROM og_blogentry
+DEBUG: Rendering '/entry_form'.
+DEBUG: Compiling action 'root/entry_form'
+DEBUG: Transforming 'root/entry_form.xhtml'
+[Sun Feb 27 14:44:37 2005] [notice] caught SIGTERM, shutting down

data/examples/no_xsl_blog/root/fcgi.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/local/bin/ruby
 
-ARGV << '--fcgi-proc'
+ENV['NITRO_INVOKE'] = 'fcgi_proc'
 require File.join(File.dirname(__FILE__), '..', 'run.rb')

data/examples/no_xsl_blog/run.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 260 2005-02-15 08:58:04Z gmosx $
+# $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
 
 Dir.chdir File.dirname(__FILE__)
 
@@ -29,8 +29,8 @@ Rendering.shader = RubyShader.new(CompressShader.new)
 
 conf = Conf.new(
 	:name => 'Blog sans XSLT',
-	:host => 'localhost',
-	:port => 8069,
+	:host => '127.0.0.1',
+	:port => 9999,
 	:dispatcher => dispatcher,
 	:db => db
 )

data/examples/og/run.rb

@@ -2,7 +2,7 @@
 #
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004 Navel, all rights reserved.
-# $Id: run.rb 256 2005-02-11 16:22:33Z gmosx $
+# $Id: run.rb 263 2005-02-23 13:45:08Z gmosx $
 
 require 'og'
 

data/examples/tiny/conf/apache.conf

@@ -1,5 +1,30 @@
-# Nitro: Apache-FastCGI configuration.
-#
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
+# Apache configuration file.
+# Change as appropriate for your apache configuration.
 # $Id$
+
+Listen 9999 
+
+PidFile /var/tmp/httpd.pid
+TypesConfig /etc/mime.types
+DocumentRoot /home/gmosx/navel/nitro/examples/tiny/root
+
+# The error log.
+ErrorLog log/apache.error_log
+CustomLog log/access_log combined
+
+# Load dynamic modules.
+LoadModule fastcgi_module /usr/local/apache2/modules/mod_fastcgi.so
+# LoadModule rewrite_module /usr/local/apache2/modules/mod_rewrite.so
+
+FastCgiIpcDir /var/tmp/fcgi
+# gmosx: if you have installed the distribution the -I is not needed.
+FastCgiConfig -initial-env 'RUBYOPT=-rubygems -I/home/gmosx/navel/nitro/lib'
+AddHandler fastcgi-script fcgi rb
+Options +FollowSymLinks +ExecCGI
+
+RewriteEngine On
+RewriteRule ^/([\/\-_a-zA-Z0-9]+)?$ /fcgi.rb [QSA,L]
+RewriteRule	^/([\/\-_a-zA-Z0-9]+)?\?([\-_a-zA-Z0-9=;&%]*)$ /fcgi.rb?$2 [QSA,L]
+
+# You can also point these error messages to a controller/action
+# ErrorDocument 500 /500.html

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 = 8069
+server.port = 9999 
 
 ## bind to localhost (default: all interfaces)
 #server.bind                = "grisu.home.kneschke.de"

data/examples/tiny/log/apache.error_log

@@ -0,0 +1,30 @@
+[Sun Feb 27 14:59:50 2005] [notice] Digest: generating secret for digest authentication ...
+[Sun Feb 27 14:59:50 2005] [notice] Digest: done
+[Sun Feb 27 14:59:51 2005] [notice] FastCGI: process manager initialized (pid 4783)
+[Sun Feb 27 14:59:51 2005] [notice] Apache/2.0.53 (Unix) DAV/2 mod_fastcgi/2.4.2 configured -- resuming normal operations
+[Sun Feb 27 14:59:52 2005] [warn] FastCGI: (dynamic) server "/home/gmosx/navel/nitro/examples/tiny/root/fcgi.rb" started (pid 4789)
+DEBUG: Rendering '/'.
+DEBUG: Compiling action 'root/index'
+DEBUG: Transforming 'root/index.xhtml'
+DEBUG: Rendering '/include'.
+DEBUG: Compiling action 'root/include'
+DEBUG: Transforming 'root/include.xhtml'
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+DEBUG: Rendering '/'.
+DEBUG: Rendering '/include'.
+[Sun Feb 27 15:00:15 2005] [notice] caught SIGTERM, shutting down

data/examples/tiny/root/fcgi.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/local/bin/ruby
 
-ARGV << '--fcgi-proc'
+ENV['NITRO_INVOKE'] = 'fcgi_proc'
 require File.join(File.dirname(__FILE__), '..', 'run.rb')

data/examples/tiny/root/index.xhtml

@@ -20,7 +20,7 @@
 </p>
 
 
-<strong>#{Rendering.reload} Hello #{name}</strong>
+<strong>Hello #{name}</strong>
 <p>
 <form id="my_form">
 	<strong>Enter your name:</strong>

data/examples/tiny/run.rb

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

data/examples/wee_style/run.rb

@@ -1,18 +1,16 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 260 2005-02-15 08:58:04Z gmosx $
+# $Id: run.rb 266 2005-02-28 14:50:48Z gmosx $
 
-require 'nitro'
+require 'nitro'; include N
 require 'nitro/adapters/webrick'
 
-include N
-
-class Wee < Controller
+class Wee < Component
 
 	def index
 		counter = session[:counter] || 0
 
-		(o = @out).html {
+		o.html {
 			o.comment 'This is a comment!'
 			o.h1 'Hello world'
 			o.text 'This is ' 
@@ -22,7 +20,7 @@ class Wee < Controller
 			o.br.br
 			o.p "Here is the counter: #{counter}"
 			o.p {
-				o.a('Increase', :href => 'inc_counter').text(' the counter.')
+				o.a('Increase', :href => :inc_counter).text(' the counter.')
 			}
 			o.p '<a href="reset_counter">Reset</a> the counter.'
 			o.hr
@@ -42,8 +40,8 @@ class Wee < Controller
 end
 
 conf = {
-	:host => 'localhost',
-	:port => 8069,
+	:host => '127.0.0.1',
+	:port => 9999,
 	:dispatcher => Dispatcher.new(Wee)
 }
 

data/examples/why_wiki/README

@@ -0,0 +1,5 @@
+= Why's wiki
+
+Original example from Why's excellent Blog,
+http://redhanded.hobix.com
+

data/examples/why_wiki/run.rb

@@ -0,0 +1,57 @@
+# * George Moschovitis  <gm@navel.gr>
+# $Id: run.rb 267 2005-02-28 14:52:41Z gmosx $
+
+require 'cgi'
+require 'redcloth'
+require 'yaml/store'
+ 
+require 'nitro'; include N
+
+# 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
+# Nitro applications.
+
+class Wiki < Component
+  HP = 'HomePage'
+  WIKI = YAML::Store.new('wiki.yml')
+
+	def index
+		request['p'] = HP 
+		show	
+	end
+	
+	def show
+		p = request['p'].to_s
+		o.h1(p)
+		o.a(HP, :href => '/') unless p == HP 
+		WIKI.transaction do
+			if WIKI[p]
+				o << RedCloth.new(WIKI[p]).to_html.gsub(/([A-Z]\w+){2}/) { "<a href='show?p=#$&'>#$&</a>" }
+				o.a 'Edit', :href => "edit?p=#{p}"
+			else
+				o.p("No page #{p}. ").a('Create?', :href => "edit?p=#{p}")
+			end
+		end
+	end
+
+	def edit
+		p = request['p'].to_s
+		if c = request['c']
+			WIKI.transaction { WIKI[p] = c.to_s } 
+			redirect "show?p=#{p}"
+		end
+		WIKI.transaction do
+			o.h1 "Editing #{p}"
+			o.a('Show', :href => "show?p=#{p}").br.br
+			o.form(:method => 'post') { 
+				o.input :type => 'hidden', :name => 'p', :value => p
+				o.textarea WIKI[p].to_s, :name => 'c', :style => 'width: 90%; height: 200px'
+				o.br.br.submit
+			}
+		end
+	end
+end
+
+require 'nitro/adapters/webrick'
+Webrick.start(:dispatcher => Dispatcher.new(Wiki))

data/examples/why_wiki/wiki.yml

@@ -0,0 +1,6 @@
+--- 
+HomePage: "fasfdasfdfsadfdsa\\]\r
+
+  \r
+
+  fas AmigaRule"

data/examples/wiki.yml

@@ -0,0 +1 @@
+--- {}

data/lib/glue/array.rb

@@ -1,15 +1,14 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2002-2005 Navel, all rights reserved.
-# $Id: array.rb 259 2005-02-15 08:54:54Z gmosx $
+# $Id: array.rb 266 2005-02-28 14:50:48Z gmosx $
 
 require 'sync'
 
 module N
 
-# A thread-safe array. We use a sync object instead of a mutex,
-# because it is re-entrant.
-# An exclusive lock is needed when writing, a shared lock IS NEEDED
-# when reading
+# A thread-safe array. We use a sync object instead of a 
+# mutex, because it is re-entrant. An exclusive lock is 
+# needed when writing, a shared lock IS NEEDED when reading.
 
 class SafeArray < Array
 	
@@ -18,61 +17,43 @@ class SafeArray < Array
 	# gmosx: delegator is not used.
 	
 	def initialize(delegator = nil)
-		@sync = ::Sync.new()
+		@sync = Sync.new()
 	end
 
 	def << (value)
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}		
+		return @sync.synchronize(Sync::SH) { super }		
 	end
 	
 	def delete_if(&block) 
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}				
+		return @sync.synchronize(Sync::SH) { super }				
 	end
 	
 	def [](key)
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		return @sync.synchronize(Sync::SH) { super }
 	end
 
 	def []=(key, value)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		return @sync.synchronize(Sync::EX) { super }
 	end
 
 	def delete(key)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		return @sync.synchronize(Sync::EX) { super }
 	end
 
 	def clear
-		@sync.synchronize(::Sync::EX) {
-			super
-		}
+		@sync.synchronize(Sync::EX) {	super }
 	end
 
 	def size
-		return @sync.synchronize(::Sync::SH) {
-			super
-		}
+		return @sync.synchronize(Sync::SH) { super }
 	end
 
 	def shift
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		return @sync.synchronize(::Sync::EX) { super }
 	end
 
 	def unshift(el)
-		return @sync.synchronize(::Sync::EX) {
-			super
-		}
+		return @sync.synchronize(::Sync::EX) { super }
 	end
 		
 end