nitro 0.17.0 → 0.18.0

data/CHANGELOG

@@ -1,5 +1,129 @@
+01-06-2005  George Moschovitis  <gm@navel.gr>
+
+	* test/*: some fixes to make the tests pass again.
+	
+	* fixed NASTY action_metadata bug.
+
+31-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/render.rb (#redirect): fixed bug.
+
+30-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* doc/RELEASES: updated.
+	
+	* lib/nitro/render.rb (#redirect): fixed to work with gecko.
+
+	* lib/nitro/runner.rb: fixed daemonize support.
+
+29-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/caching: added global enable switch.
+
+27-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/render.rb (#redirect): fixet to work behind a 
+	proxy!
+	
+	* lib/nitro/caching/output.rb (#expire_output): begin end block
+	to be more fault tolerant.
+
+26-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/runner.rb (#daemonize): implemented.
+	
+	* lib/nitro/caching/output.rb (#expire_output): introduced.
+	
+	* lib/nitro/adapter/webrick.rb: fixed request_uri calc bug!
+
+25-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/caching/output.rb: fixed filter problem.
+	
+	* lib/nitro/markup.rb (MarkupShader): for the moment
+	a simple alias for RedCloth.
+	
+	* lib/nitro/request.rb (#host): handle proxy case (forwarded).
+	
+	* ../rpc: removed from repository.
+	
+	* lib/nitro/service/xmlrpc.rb: copied from rpc.
+	
+	* lib/nitro/service.rb: copied from rpc,
+	(Service): renamed from WebService.
+
+24-05-2005  George Moschovitis  <gm@navel.gr>
+	
+	* bin/nitrogen: the Dir.ls_r were copied to facets so this is 
+	used.
+	
+	* lib/examples/README: introduced.
+
+23-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* proto/public/error.xhtml: show exact error line in template.
+	
+	* lib/nitro/errors.rb: better presentation, 
+	reverse transform the code.
+
+22-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/template.rb: improved template expansion, allows 
+	for reverse transform (useful for error logging).
+	
+	* lib/nitro/errors.rb: introduced,
+	(ActionCompileError): introduced,
+	(TemplateCompileError): introduced.
+	(#line_number): implemented.
+	
+	* lib/nitro/render.rb (#compile_action): separately compile the
+	action and the template.
+
+21-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* changes to many files to accomodate some dir changes.
+	
+	* lib/nitro/scaffold.rb: use tha facets inflector.
+	
+	* lib/nitro/render.rb (#compile_action): also try to find
+	templates in the proto dir,
+	try to find templates in all superclasses of the controller.
+	
+	* lib/nitro/controller.rb (#inherited): simplified,
+	set template root to point into proto in the default controller.
+
+20-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* moved examples outside of the nitro distribution.
+	
+	* examples/flash/: fixed root dir. [gmary]
+	
+	--- THE REVENGE OF SITH --- 
+
+19-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* started fixing various references to the renamed directories.
+	
+	* lib/nitro/part.rb: deprecated.
+	
+	* lib/nitro/builder: renamed from builders.
+
+	* lib/nitro/adapter: renamed from adapters.
+
+17-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/element.rb (#render): post proccesing to fix 
+	elements with no text expansion problem.
+	
+	* proto/src: added.
+
+	* bin/nitrogen: reimplemented, it now works with gems. The 
+	implementation is based on mneumanns wee script [james_b].
+
 16-05-2005  George Moschovitis  <gm@navel.gr>
 
+	* --- VERSION 0.17.0 ---
+
 	* cleanup.rb: updated.
 	
 	* doc/RELEASES: updated.

data/README

@@ -116,8 +116,8 @@ A short summary of the major features:
 
 * Multiple Platforms
 
-	Runs on Linux and Windows. Has not been tested under MacOSX and
-	other Unices.
+	Runs on Linux, Windows and Mac OSX. It will probably run on other
+	Unix based system with minor modifications. 
 
 * Multiple Adapters
 

data/Rakefile

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id$
-
 require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rake/gempackagetask'
@@ -31,6 +27,8 @@ Homepage = "http://#{RubyForgeProject}.rubyforge.org/"
 
 task :default => :package
 
+$NITRO_NO_ENVIRONMENT = true
+
 # Run the tests.
 
 Rake::TestTask.new do |t|
@@ -39,14 +37,6 @@ Rake::TestTask.new do |t|
 	t.verbose = true
 end
 
-# Run all tests. (including expensive/depended tests)
-
-Rake::TestTask.new(:test_all) do |t|
-	t.libs << 'test'
-	t.test_files = FileList['test/**/tc*.rb']
-	t.verbose = true
-end
-
 # Generate RDoc documentation.
 
 Rake::RDocTask.new do |rd|
@@ -233,3 +223,5 @@ task :publish => [:package] do
     end
   end
 end
+
+# * George Moschovitis  <gm@navel.gr>

data/bin/nitro

@@ -8,5 +8,5 @@ if File.exist?('run.rb')
 	system('ruby -rubygems run.rb')
 else
 	puts 'No application found, starting default application.'
-	system('ruby -rubygems ' + File.join(Nitro::LibPath, '..', 'proto', 'run.rb'))
+	system 'ruby -rubygems ' + File.join(Nitro::LibPath, '..', 'proto', 'run.rb')
 end

data/bin/nitrogen

@@ -1,44 +1,60 @@
-#! /usr/bin/env ruby
-
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id$
-
-require 'fileutils'
-
-$NITRO_NO_ENVIRONMENT = true
+#!/usr/bin/env ruby
 
 require 'nitro'
+require 'ftools'
 
-# gmosx, TODO: move to a library
+require 'facet/dir/recurse'
 
-def ll_r(path, &block)
-  Dir.foreach(path) do |f|
-		next if [".", ".."].include?(f)  
-		fullname = path + "/" + f
-		yield(fullname) 
-		ll_r(fullname, &block) if FileTest.directory?fullname and not FileTest.symlink?fullname
-  end
-end
+PROTO_DIR = File.join(Nitro::LibPath, '..', 'proto')
 
-proto_dir = File.join(Nitro::LibPath, '..', 'proto')
+def usage
+  puts <<-USAGE
 
-if base_dir = ARGV[0]
+NAME
+     nitrogen - frontend for the Nitro generator mechanism.
 
-# remove the trailing '/' if it exists. 
+SYNOPSIS
+     nitrogen app [full path]
 
-base_dir = base_dir.gsub(/\/$/, '')
+DESCRIPTION
+     This is a frontend to the Nitro generator mechanism. Nitro 
+     generators are used to 'bootstrap' development by creating 
+     a standard directory structure and files for common tasks.
+     
+     app: This will create some basic files to get you 
+     started fleshing out your Nitro web application.
 
-# the following code is win32 compatible.
+EXAMPLE
+     nitrogen app ~/my_application
 
-FileUtils.cp_r proto_dir, base_dir
-ll_r(base_dir) { |f| FileUtils.rm_rf(f) if /\.svn$/ =~ f } 
+     This will generate a new Nitro application in the 
+     ~/my_application folder.
+USAGE
+  exit 1  
+end
 
-else
+def run
+  case command = ARGV[0] || usage()
+  when 'app'
+    path = ARGV[1] || usage()
+    path = File.expand_path(path)
+
+    if File.exists?(path)
+      STDERR.puts "ERROR: Path #{path} already exists! Aborting!"
+      exit 1
+    end
+
+		FileUtils.cp_r(PROTO_DIR, path)
+		
+		Dir.recurse(path) do |f| 
+			FileUtils.rm_rf(f) if /\.svn$/ =~ f 
+		end 
+		
+  else
+    usage()
+  end
+end
 
-puts %{
-USAGE:
-	nitrogen base_dir
-}
+run
 
-end
+# This script is based on Michael Neumann's Wee creator script.  

data/doc/AUTHORS

@@ -6,11 +6,11 @@ MAIN DEVELOPER:
 	
 IDEAS, ADDITIONAL CODING, SUPPORT:
 
-* Anastasios Koutoumanos  <ak@navel.gr>
+* Anastasios Koutoumanos <ak@navel.gr>
 	Design, additional coding.
 
-* James Britt  <james_b@neurogami.com>
+* James Britt <james_b@neurogami.com>
 	Additional code, design, bug reports.
 
-* Kostas Nasis  <kostas@nasis.com>
+* Kostas Nasis <kostas@nasis.com>
 	Ideas and bug reports.

data/doc/RELEASES

@@ -1,4 +1,53 @@
-== Version 0.17.0
+== Version 0.18.0
+
+Mainly a bug fix release. Many small improvements were 
+implemented. All reported bugs were fixed, as well as bugs found 
+during the deployment of a live application. For more information
+consult the detailed changelog. Thanks to Julien Perrot for small
+patches.
+
+Some notable changes:
+
+* Some changes to make Webrick a valid solution for powering
+	a production server. The full page output caching was improved 
+	and support for daemonizing the server was added. Support
+	for running as a proxy target (behind an apache server) was also
+	added. 
+	
+* Thread safe mode was added again in Og. This works nice with
+	the Webrick server.
+	
+* New order macro in Og to set default ordering for each
+	entity. The has_many collections respects the order setting.
+	
+* Improved error reporting.
+
+* Support for template_root overloading. Lets say you have
+	the following Controller hierarchy:
+	
+	Controller > MyController > SpecificController.
+	
+	The template roots of the 3 controller are searched in reverse
+	order. So by adding a template file in the SpecificController
+	template root you can override a default action in the base
+	Controller. For convienience the base Controller points to
+	the Proto directory. This is experimental.
+
+* Provide the examples as a separate distribution to make it
+	easier for Ruby newbies to find them.
+
+* Bug fixes in the Elements system.
+
+* Improved the nitrogen generator command. Just run
+
+	nitrogen app ~/the/target/path
+	
+	to create a skeleton application.
+	
+* Cleaned up some source files.
+
+
+== Version 0.17.0  was released on 16/05/2005. 
 
 The biggest release yet, featuring the brand new implementation
 of Og. Due to the many changes this should be considered a preview

data/examples/README

@@ -0,0 +1,7 @@
+= Examples
+
+You can find a separate distribution of Nitro examples
+on the project download page:
+
+http://rubyforge.org/projects/nitro
+

data/lib/nitro.rb

@@ -25,7 +25,7 @@ module Nitro
 	
 	# The version.
 
-	Version = '0.17.0'
+	Version = '0.18.0'
 
 	# Library path.
 
@@ -36,11 +36,12 @@ end
 # gmosx: leave them here.
 
 require 'nitro/context'
+require 'nitro/controller'
 require 'nitro/dispatcher'
 require 'nitro/render'
 require 'nitro/conf'
-require 'nitro/runner'
-require 'nitro/controller'
-require 'nitro/part'
 
+require 'nitro/runner'
 require 'nitro/environment' unless $NITRO_NO_ENVIRONMENT
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/{adapters → adapter}/cgi.rb

@@ -1,7 +1,5 @@
-# * George Moschovitis  <gm@navel.gr>
-# * James Britt  <james_b@neurogami.com>
-# (c) 2005 Navel, all rights reserved.
-# $Id: cgi.rb 41 2005-05-05 14:56:40Z gmosx $
+# * George Moschovitis <gm@navel.gr>
+# * James Britt <james_b@neurogami.com>
 
 require 'cgi'
 require 'stringio'

data/lib/nitro/{adapters → adapter}/fastcgi.rb

@@ -3,7 +3,7 @@ require 'fcgi'
 
 require 'nitro/context'
 require 'nitro/dispatcher'
-require 'nitro/adapters/cgi'
+require 'nitro/adapter/cgi'
 
 require 'glue/flexob'
 

data/lib/nitro/{adapters → adapter}/webrick.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: webrick.rb 41 2005-05-05 14:56:40Z gmosx $
-
 require 'webrick'
 require 'stringio'
 
@@ -102,9 +98,6 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 				begin
 					path = req.request_uri.path
 
-					# gmosx, TODO: move this into a filter.
-					# Og.db.get_connection if defined?(Og) and Og.db
-
 					# REQUEST_MUTEX.lock
 
 					context = Context.new(@conf)
@@ -115,7 +108,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 					req.header.each { |h, v| context.headers[h.upcase] = v.first }
 					context.headers.update(req.meta_vars)
 					# gmosx: make compatible with fastcgi.
-					context.headers['REQUEST_URI'].slice!(/http:\/\/(.*)\//)
+					context.headers['REQUEST_URI'].slice!(/http:\/\/(.*?)\//)
 					context.headers['REQUEST_URI'] << '/'
 
 					CgiUtils.parse_params(context)
@@ -131,7 +124,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 					context.close
 				ensure
 					# REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
-					# Og.db.put_connection if defined?(Og) and Og.db
+					Og.manager.put_store if defined?(Og) and Og.manager
 				end
 			end
 		end
@@ -146,7 +139,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 		if req.path == '/'
 			req.instance_variable_set(:@path_info, '/index.html') 
 		elsif req.path =~ /^([^.]+)$/
-			req.instance_variable_set(:@path_info, "#{$1}.html") 
+			req.instance_variable_set(:@path_info, "#{$1}/index.html") 
 		end
 	end
 
@@ -162,3 +155,5 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>