nitro 0.9.5 → 0.10.0

data/Rakefile

@@ -2,132 +2,142 @@
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
-require "rake"
-require "rake/rdoctask"
-require "rake/gempackagetask"
-require "rake/testtask"
-require "rubygems"
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'rake/gempackagetask'
 
-project = 'nitro'
-#project = 'og'
+og = false 
 
-# ----------------------------------------------------------------------
-
-desc "Default Task"
 task :default => :package
 
-# ----------------------------------------------------------------------
-
-# Run the tests
+# Run the tests.
 
 Rake::TestTask.new do |t|
-	t.libs << "test"
-	t.test_files = FileList["test/**/tc*.rb"].exclude("**/tc*og*.rb")
+	t.libs << 'test'
+	t.test_files = FileList['test/**/tc*.rb'].exclude('**/tc*og*.rb')
 	t.verbose = true
 end
 
-# Run all tests
+# 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.libs << 'test'
+	t.test_files = FileList['test/**/tc*.rb']
 	t.verbose = true
 end
 
-# ----------------------------------------------------------------------
+# Generate RDoc documentation.
 
 Rake::RDocTask.new do |rd|
-	rd.main = "README"
-	rd.rdoc_dir = "rdoc"
-	rd.rdoc_files.include("README", "lib/**/*.rb")
+	rd.main = 'README'
+	rd.rdoc_dir = 'rdoc'
+	rd.rdoc_files.include('README', 'INSTALL', 'lib/**/*.rb')
+	rd.options << '--all --inline-source'
 end
-	
-# ----------------------------------------------------------------------
 
-if 'nitro' == project
+# Build gem.
+
+if og 
+
+spec = Gem::Specification.new do |s|
+	s.name = 'og'
+	if File.read('lib/og.rb') =~ /Version\s+=\s+'(\d+\.\d+\.\d+)'/
+		s.version = $1 
+	else
+		raise 'No version found'
+	end
+	s.summary = 'Og (ObjectGraph)'
+	s.description = 'An efficient and transparent Object-Relational mapping library'
 	
-	# Nitro GemSpec
-	#
-	require "lib/nitro/version"
+	# s.add_dependency 'postgres-pr', '>= 0.3.0'
+	# s.add_dependency 'postgres', '>= 0.7.1'
+	s.add_dependency 'extensions', '>= 0.5'
+	# s.add_dependency 'sqlite3-ruby', '>= 1.0.0'
+	#s.add_dependency 'mysql', '>= 2.5.1'
+	s.add_dependency 'flexmock', '>= 0.0.3'
+
+	s.required_ruby_version = '>= 1.8.0'
+
+	s.files = FileList[
+		'README.og', 'RELEASES.og', 'LICENSE', 'AUTHORS', 'Rakefile', 'ChangeLog*',
+		'install.rb',
+		'examples/og/*', 'lib/glue.rb', 'lib/glue/**/*', 'lib/og/**/*', 'lib/og.rb',
+		'test/*og*.rb', 'test/og/*', 'vendor/extensions/**/*'
+	].exclude('.svn/**/*').exclude('**/*.log').to_a
+
+	s.require_path = 'lib'
+	s.autorequire = 'og'
 	
-	PKG_VERSION = Nitro::Version 
-	PKG_FILES = FileList[
-		"[A-Z]*", "{bin,benchmark,etc,ext,examples,doc,lib,test,vendor}/**/*" 
-	#	"examples/*.rb"
-	].exclude(".svn/**/*").exclude("*.og").exclude("**/*.log")
+	s.has_rdoc = true
+	s.extra_rdoc_files = FileList['README.og', 'RELEASES.og', 'LICENSE', 'AUTHORS'].to_a
+	s.rdoc_options << '--main' << 'README.og' << '--title' << 'Og Documentation'
+	s.rdoc_options << '--all' << '--inline-source'
+
+	s.author = 'George Moschovitis'
+	s.email = 'gm@navel.gr'
+	s.homepage = 'http://www.rubyforge.com/projects/nitro'
+	s.rubyforge_project = 'nitro'
+end
+
+else
 	
-	spec = Gem::Specification.new do |s|
-		s.name = "nitro"
-		s.version = PKG_VERSION
-		s.summary = "Web Engine"
-		s.description = "An efficient, yet simple engine for Web Applications"
-		# s.add_dependency("postgres-pr", ">= 0.3.0")
-		#	s.add_dependency("postgres", ">= 0.7.1")
-		#	s.add_dependency("extensions", ">= 0.5")
-		s.required_ruby_version = ">= 1.8.1"
-		s.files = PKG_FILES.to_a 
-		s.require_path = "lib"
-		s.autorequire = "nitro"
-		s.has_rdoc = true
-		s.extra_rdoc_files = FileList["[A-Z]*"].exclude("*.og").to_a
-		s.rdoc_options << "--main" << "README" << "--title" << "Nitro Documentation"
-		s.test_files = []
-		s.bindir = "bin"
-		s.author = "George Moschovitis"
-		s.email = "gm@navel.gr"
-		s.homepage = "http://www.navel.gr/nitro"
-		s.rubyforge_project = "nitro"
+spec = Gem::Specification.new do |s|
+	s.name = 'nitro'
+	if File.read('lib/nitro.rb') =~ /Version\s+=\s+'(\d+\.\d+\.\d+)'/
+		s.version = $1 
+	else
+		raise 'No version found'
 	end
+	s.summary = 'Nitro Web Engine'
+	s.description = 
+		'An efficient, multiparadigm and flexible platform for rapid ' +
+		'web application development. Implements a full development stack ' +
+		'(Model, View, Controller).'
+	
+	# s.add_dependency 'postgres-pr', '>= 0.3.0'
+	# s.add_dependency 'postgres', '>= 0.7.1'
+	s.add_dependency 'extensions', '>= 0.5'
+	# s.add_dependency 'sqlite3-ruby', '>= 1.0.0'
+	# s.add_dependency 'mysql', '>= 2.5.1'
+	s.add_dependency 'flexmock', '>= 0.0.3'
 
-else
+	s.required_ruby_version = '>= 1.8.0'
+
+	s.files = FileList[
+		'[A-Z]*', 'install.rb', '{bin,benchmark,examples,doc,lib,test,vendor}/**/*' 
+	].exclude('.svn/**/*').exclude('*.og').exclude('**/*.log').to_a
 
-	# Og stand-alone GemSpec
-	#
-	require "lib/og/version"
+	s.require_path = 'lib'
+	s.autorequire = 'nitro'
 	
-	PKG_VERSION = Og::Version
-	PKG_FILES = FileList[
-		"README.og", "RELEASES.og", "LICENSE", "AUTHORS", "Rakefile", "ChangeLog*", 
-		"examples/og/*", "lib/glue.rb", "lib/glue/**/*", "lib/og/**/*", "lib/og.rb",
-		"test/*og*.rb", "test/og/*", "vendor/extensions/**/*"
-	].exclude(".svn/**/*").exclude("**/*.log")
+	s.has_rdoc = true
+	s.extra_rdoc_files = FileList['[A-Z]*'].exclude('*.og').to_a
+	s.rdoc_options << '--main' << 'README' << '--title' << 'Nitro Documentation'
+	s.rdoc_options << '--all' << '--inline-source'
+
+	s.test_files = []
 	
-	spec = Gem::Specification.new do |s|
-		s.name = 'og'
-		s.version = PKG_VERSION
-		s.summary = 'Og (ObjectGraph)'
-		s.description = 'An efficient and transparent Object-Relational mapping library'
-		#	s.add_dependency("postgres", ">= 0.7.1")
-		#	s.add_dependency("extensions", ">= 0.5")
-		# s.add_dependency("builder")
-		s.required_ruby_version = ">= 1.8.1"
-		s.files = PKG_FILES.to_a 
-		s.require_path = "lib"
-		s.autorequire = "og"
-		s.has_rdoc = true
-		s.extra_rdoc_files = FileList["README.og", "RELEASES.og", "LICENSE", "AUTHORS"].to_a
-		s.rdoc_options << "--main" << "README.og" << "--title" << "Og Documentation"
-		s.test_files = []
-		s.bindir = "bin"
-		s.author = "George Moschovitis"
-		s.email = "gm@navel.gr"
-		s.homepage = "http://www.navel.gr/og"
-		s.rubyforge_project = "nitro"
-	end
+	s.bindir = 'bin'
+	s.executables = ['nitro']
+	s.default_executable = 'nitro'
+
+	s.author = 'George Moschovitis'
+	s.email = 'gm@navel.gr'
+	s.homepage = 'http://www.rubyforge.com/projects/nitro'
+	s.rubyforge_project = 'nitro'
+end
 
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.package_dir = "dist"
+  pkg.package_dir = 'dist'
   pkg.need_zip = true
   pkg.need_tar = true
 end
 
-# ----------------------------------------------------------------------
+# Manual install (not recommended).
 
-desc "Install the gem"
-task :install => :repackage do
-  sh "gem install --local --no-rdoc dist/nitro-#{PKG_VERSION}.gem"
+task :install do
+  ruby 'install.rb'
 end
 
-# vim: ft=ruby

data/benchmark/og/bench.rb

@@ -0,0 +1,74 @@
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: bench.rb 255 2005-02-10 12:45:32Z gmosx $
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'og'
+
+GC.disable
+
+config = {
+	:adapter => 'sqlite',
+	:database => 'test',
+	:connection_count => 5 
+}
+
+class Article
+	prop_accessor :title, String
+	prop_accessor :body, String
+	prop_accessor :hits, Fixnum
+	prop_accessor :rate, Fixnum
+
+	def initialize(title = nil, body = nil)
+		@title = title
+		@body = body
+		@hits = rand(5)
+		@rate = rand(100)
+	end
+end
+
+Og::Database.drop_db!(config)
+db = Og::Database.new(config)
+
+# Benchmark the insert speed. Useful for finding
+# the improvement when using prepared statements.
+
+articles = []
+
+500.times do |i|
+	articles << Article.new("Title#{i}", "Body#{i}")
+end
+
+sum = 0
+min = 999999
+max = -min
+
+10.times do |i|
+
+	db.exec "DELETE FROM #{Article::DBTABLE}"
+
+	for article in articles
+		article.oid = nil
+	end
+
+	Article.create("Dummy", "Dummy")
+	
+	t1 = Time.now
+	articles.each do |a|
+		a.save!
+	end
+	t2 = Time.now
+
+	d = t2 - t1
+	sum += d
+	min = d if d < min
+	max = d if d > max
+	
+	puts "Insert test #{i}: #{d} seconds"
+
+end
+
+puts "Min: #{min}"
+puts "Max: #{max}"
+puts "Average: #{sum/10}"

data/benchmark/og/sqlite-no-prepare.1.txt

@@ -0,0 +1,13 @@
+Insert test 0: 3.53403 seconds
+Insert test 1: 4.222878 seconds
+Insert test 2: 3.84379 seconds
+Insert test 3: 3.877513 seconds
+Insert test 4: 3.793392 seconds
+Insert test 5: 3.725927 seconds
+Insert test 6: 3.814542 seconds
+Insert test 7: 3.760054 seconds
+Insert test 8: 3.936868 seconds
+Insert test 9: 4.061833 seconds
+Min: 3.53403
+Max: 4.222878
+Average: 3.8570827

data/benchmark/og/sqlite-no-prepare.2.txt

@@ -0,0 +1,13 @@
+Insert test 0: 4.050384 seconds
+Insert test 1: 4.098912 seconds
+Insert test 2: 3.739213 seconds
+Insert test 3: 4.030227 seconds
+Insert test 4: 4.061516 seconds
+Insert test 5: 3.963748 seconds
+Insert test 6: 4.088462 seconds
+Insert test 7: 4.047734 seconds
+Insert test 8: 3.966496 seconds
+Insert test 9: 3.948346 seconds
+Min: 3.739213
+Max: 4.098912
+Average: 3.9995038

data/benchmark/og/sqlite-prepare.1.txt

@@ -0,0 +1,13 @@
+Insert test 0: 3.578891 seconds
+Insert test 1: 4.257714 seconds
+Insert test 2: 3.535036 seconds
+Insert test 3: 3.742329 seconds
+Insert test 4: 3.874829 seconds
+Insert test 5: 3.608657 seconds
+Insert test 6: 3.843804 seconds
+Insert test 7: 3.688756 seconds
+Insert test 8: 3.858303 seconds
+Insert test 9: 3.739155 seconds
+Min: 3.535036
+Max: 4.257714
+Average: 3.7727474

data/benchmark/og/sqlite-prepare.2.txt

@@ -0,0 +1,13 @@
+Insert test 0: 3.859916 seconds
+Insert test 1: 4.321912 seconds
+Insert test 2: 3.836067 seconds
+Insert test 3: 4.077798 seconds
+Insert test 4: 4.171512 seconds
+Insert test 5: 4.148027 seconds
+Insert test 6: 3.841498 seconds
+Insert test 7: 3.94367 seconds
+Insert test 8: 3.758128 seconds
+Insert test 9: 4.25072 seconds
+Min: 3.758128
+Max: 4.321912
+Average: 4.0209248

data/bin/cluster

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: cluster.rb 234 2005-01-27 13:01:40Z gmosx $
+# $Id: cluster.rb 249 2005-02-04 14:03:00Z gmosx $
 
 # WARNING: This is old code, not updated to work in the
 # latest nitro release. Will be fixed ASAP.

data/bin/nitro

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+puts 'Not implemented!'

data/bin/proto/conf/app.conf.rb

@@ -1,22 +1,14 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: app.rb 197 2004-12-21 13:50:17Z gmosx $
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+# $Id$
 
 # $DBG = true 
 
 require 'nitro'
 require 'nitro/session'
 
-# gmosx, FIXME: make this default!
-
-require 'ostruct'
-
-conf = {
+$conf = {
 	:host => 'localhost',
 	:port => 8080,
 	:dispatcher => N::Dispatcher.new
 }
-
-$conf = OpenStruct.new(conf)

data/examples/README.windows

@@ -0,0 +1,9 @@
+= Windows
+
+If you are running under windows, first run the
+tiny, og, wee_style and no_xsl_blog examples. The blog 
+example needs special libraries that are harder to 
+setup under Windows.
+
+The example no_xsl_blog is a stripped down version
+of the blog example without xsl support.

data/examples/blog/README

@@ -6,6 +6,9 @@ A simple blog.
 
 Edit the configuration files  in conf/* as needed. 
 
+You can also edit the application configuration parameters
+in run.rb.
+
 Dont forget to set your name and the password in the 
 lib/blog.rb file:
 
@@ -20,7 +23,7 @@ and LIVE configurations.
 
 Exec the following command:
 
-ruby ctl
+$ ruby run.rb
 
 then point your browser to:
 
@@ -39,9 +42,18 @@ And start adding blog entries :)
 
 The bulk of the code is in the file lib/blog.rb.
 If you want to modify the example it is a nice idea to switch
-to debug mode. Edit the following line in the file app.rb:
+to debug mode. Just run the application in debug mode
+to enable autoreloading of actions/templates and extra
+debugging information.
 
-$DBG = true
+$ ruby run.rb --debug
 
 In debug mode the view files (xhtml/xsl/etc) are automatically
-reloaded.
+reloaded. The controller classes are also relaoded.
+
+You can also attach to a running instance of the blog application
+using irb. Just open a new window and issue the following
+command:
+
+$ ruby run.rb --console
+