nitro 0.9.5 → 0.10.0

metadata

@@ -3,17 +3,18 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
-date: 2005-02-04
-summary: Web Engine
+  version: 0.10.0
+date: 2005-02-15
+summary: Nitro Web Engine
 require_paths: 
   - lib
 email: gm@navel.gr
-homepage: http://www.navel.gr/nitro
+homepage: http://www.rubyforge.com/projects/nitro
 rubyforge_project: nitro
-description: "An efficient, yet simple engine for Web Applications"
+description: "An efficient, multiparadigm and flexible platform for rapid web application
+  development. Implements a full development stack (Model, View, Controller)."
 autorequire: nitro
-default_executable: 
+default_executable: nitro
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
@@ -21,7 +22,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - 
       - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.1
+        version: 1.8.0
   version: 
 platform: ruby
 authors: 
@@ -32,8 +33,11 @@ files:
   - ChangeLog
   - LICENSE
   - AUTHORS
+  - INSTALL
   - RELEASES
   - README
+  - install.rb
+  - bin/nitro
   - bin/new_app.rb
   - bin/cluster
   - bin/proto
@@ -64,20 +68,25 @@ files:
   - benchmark/nitro/tiny-webrick-n-200-c-5.txt
   - benchmark/nitro/tiny-webrick-n-200.txt
   - benchmark/nitro/bench.rb
+  - benchmark/og/sqlite-prepare.2.txt
+  - benchmark/og/sqlite-no-prepare.2.txt
+  - benchmark/og/sqlite-no-prepare.1.txt
+  - benchmark/og/bench.rb
+  - benchmark/og/sqlite-prepare.1.txt
   - examples/no_xsl_blog
   - examples/flash
   - examples/tiny
   - examples/wee_style
   - examples/blog
+  - examples/README.windows
   - examples/og
-  - examples/no_xsl_blog/ctl
   - examples/no_xsl_blog/log
   - examples/no_xsl_blog/conf
   - examples/no_xsl_blog/root
+  - examples/no_xsl_blog/run.rb
   - examples/no_xsl_blog/lib
   - examples/no_xsl_blog/README
   - examples/no_xsl_blog/log/README
-  - examples/no_xsl_blog/conf/apache.conf
   - examples/no_xsl_blog/conf/lhttpd.conf
   - examples/no_xsl_blog/conf/app.conf.rb
   - examples/no_xsl_blog/root/login.xhtml
@@ -110,39 +119,37 @@ files:
   - examples/no_xsl_blog/lib/blog/template.rb
   - examples/no_xsl_blog/lib/blog/model.rb
   - examples/no_xsl_blog/lib/blog/controller.rb
-  - examples/flash/ctl
   - examples/flash/log
   - examples/flash/conf
   - examples/flash/root
+  - examples/flash/run.rb
   - examples/flash/log/README
-  - examples/flash/conf/app.conf.rb
   - examples/flash/root/index.xhtml
   - examples/flash/root/show_inline_text.xhtml
-  - examples/tiny/ctl
   - examples/tiny/log
   - examples/tiny/conf
   - examples/tiny/root
+  - examples/tiny/run.rb
   - examples/tiny/README
   - examples/tiny/log/README
   - examples/tiny/conf/apache.conf
   - examples/tiny/conf/lhttpd.conf
-  - examples/tiny/conf/app.conf.rb
   - examples/tiny/root/index.xhtml
   - examples/tiny/root/nitro.png
+  - examples/tiny/root/upload.xhtml
   - examples/tiny/root/fcgi.rb
   - examples/tiny/root/include.xhtml
-  - examples/wee_style/wee.rb
+  - examples/wee_style/run.rb
   - examples/wee_style/README
-  - examples/blog/ctl
   - examples/blog/log
   - examples/blog/conf
   - examples/blog/root
+  - examples/blog/run.rb
   - examples/blog/lib
   - examples/blog/README
   - examples/blog/log/README
   - examples/blog/conf/apache.conf
   - examples/blog/conf/lhttpd.conf
-  - examples/blog/conf/app.conf.rb
   - examples/blog/root/login.xhtml
   - examples/blog/root/index.xhtml
   - examples/blog/root/style.css
@@ -192,9 +199,9 @@ files:
   - lib/nitro/cookie.rb
   - lib/nitro/session.rb
   - lib/nitro/uri.rb
-  - lib/nitro/version.rb
-  - lib/nitro/adaptors
+  - lib/nitro/runner.rb
   - lib/nitro/scaffold.rb
+  - lib/nitro/adapters
   - lib/nitro/context.rb
   - lib/nitro/shaders.rb
   - lib/nitro/buffering.rb
@@ -205,15 +212,15 @@ files:
   - lib/nitro/cluster.rb
   - lib/nitro/mail.rb
   - lib/nitro/controller.rb
+  - lib/nitro/conf.rb
   - lib/nitro/dispatcher.rb
   - lib/nitro/request.rb
   - lib/nitro/filters
   - lib/nitro/markup.rb
   - lib/nitro/filters.rb
-  - lib/nitro/adaptors/runner.rb
-  - lib/nitro/adaptors/cgi.rb
-  - lib/nitro/adaptors/fastcgi.rb
-  - lib/nitro/adaptors/webrick.rb
+  - lib/nitro/adapters/cgi.rb
+  - lib/nitro/adapters/fastcgi.rb
+  - lib/nitro/adapters/webrick.rb
   - lib/nitro/builders/xhtml.rb
   - lib/nitro/builders/form.rb
   - lib/nitro/builders/rss.rb
@@ -238,7 +245,6 @@ files:
   - lib/glue/time.rb
   - lib/glue/property.rb
   - lib/glue/misc.rb
-  - lib/glue/macro.rb
   - lib/glue/flexob.rb
   - lib/glue/cache.rb
   - lib/glue/string.rb
@@ -246,16 +252,17 @@ files:
   - lib/glue/array.rb
   - lib/glue/validation.rb
   - lib/glue/attribute.rb
-  - lib/og/backends
-  - lib/og/version.rb
+  - lib/og/adapter.rb
+  - lib/og/adapters
   - lib/og/enchant.rb
   - lib/og/connection.rb
+  - lib/og/database.rb
   - lib/og/mock.rb
   - lib/og/meta.rb
   - lib/og/backend.rb
-  - lib/og/backends/mysql.rb
-  - lib/og/backends/sqlite.rb
-  - lib/og/backends/psql.rb
+  - lib/og/adapters/mysql.rb
+  - lib/og/adapters/sqlite.rb
+  - lib/og/adapters/psql.rb
   - test/nitro
   - test/tc_og.rb
   - test/root
@@ -263,14 +270,15 @@ files:
   - test/og
   - test/nitro/tc_uri.rb
   - test/nitro/tc_controller.rb
-  - test/nitro/adaptors
+  - test/nitro/adapters
   - test/nitro/tc_session.rb
   - test/nitro/builders
   - test/nitro/ui
   - test/nitro/tc_context.rb
   - test/nitro/tc_dispatcher.rb
-  - test/nitro/adaptors/tc_webrick.rb
-  - test/nitro/adaptors/tc_cgi.rb
+  - test/nitro/adapters/tc_webrick.rb
+  - test/nitro/adapters/tc_cgi.rb
+  - test/nitro/adapters/raw_post1.bin
   - test/nitro/builders/tc_xhtml.rb
   - test/nitro/builders/tc_xml.rb
   - test/nitro/builders/tc_rss.rb
@@ -279,6 +287,7 @@ files:
   - test/root/blog
   - test/root/blog/list.xhtml
   - test/glue/tc_strings.rb
+  - test/glue/tc_property_type_checking.rb
   - test/glue/tc_logger.rb
   - test/glue/tc_validation.rb
   - test/glue/tc_property.rb
@@ -287,6 +296,7 @@ files:
   - test/glue/tc_property_mixins.rb
   - test/glue/tc_cache.rb
   - test/glue/tc_numbers.rb
+  - test/og/tc_sqlite.rb
   - test/og/tc_lifecycle.rb
   - vendor/breakpoint_client.rb
   - vendor/extensions
@@ -317,15 +327,39 @@ rdoc_options:
   - README
   - "--title"
   - Nitro Documentation
+  - "--all"
+  - "--inline-source"
 extra_rdoc_files: 
   - Rakefile
   - ChangeLog.1
   - ChangeLog
   - LICENSE
   - AUTHORS
+  - INSTALL
   - RELEASES
   - README
-executables: []
+executables: 
+  - nitro
 extensions: []
 requirements: []
-dependencies: []
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: extensions
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: "0.5"
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: flexmock
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.0.3
+      version: 

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

@@ -1,52 +0,0 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id$
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-$DBG = true 
-
-require 'nitro'
-require 'glue/validation'
-require 'og'
-
-require 'blog'
-
-include N
-
-og = Og::Database.new(
-	:address => 'localhost',
-#	:backend => 'mysql',
-	:backend => 'psql',
-	:database => 'blog',
-	:user => 'postgres',
-	:password => 'navelrulez',
-	:connection_count => 3
-)
-
-controllers = {
-	:index => BlogController
-}
-
-apis = {
-	:xml => 'text/xml'
-}
-
-dispatcher = Dispatcher.new(controllers, apis)
-
-Rendering.shader = N::XSLTShader.new("#{dispatcher.root}/style.xsl",
-	N::RubyShader.new(
-		N::CompressShader.new
-	)
-)
-
-Rendering.reload = :partial
-
-$conf = {
-	:name => 'Nitro Blog',
-	:host => 'localhost',
-	:port => 8069,
-	:dispatcher => dispatcher,
-	:og => og
-}

data/examples/blog/ctl

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-require 'nitro/adaptors/runner'

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

@@ -1,21 +0,0 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id$
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-$DBG = true 
-
-require 'ostruct'
-
-require 'nitro'
-
-include N
-
-dispatcher = Dispatcher.new
-
-$conf = {
-	:host => 'localhost',
-	:port => 8069,
-	:dispatcher => dispatcher,
-}

data/examples/flash/ctl

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-require 'nitro/adaptors/runner'

data/examples/no_xsl_blog/ctl

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-require 'nitro/adaptors/runner'

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

@@ -1,17 +0,0 @@
-# * 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')
-
-$DBG = true 
-
-require 'nitro'
-
-# gmosx, FIXME: make this default!
-
-$conf = {
-	:host => 'localhost',
-	:port => 8069,
-	:dispatcher => N::Dispatcher.new
-}

data/examples/tiny/ctl

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-require 'nitro/adaptors/runner'

data/lib/glue/macro.rb

@@ -1,56 +0,0 @@
-# = Macros
-#
-# A powerfull macro implementation for Ruby. Allows definition
-# of new macro.
-#
-# EXPERIMENTAL, not fully working yet
-#
-# code: 
-# George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: macro.rb 165 2004-11-18 12:04:04Z gmosx $
-
-$__macros__ = {}
-$__required__ = {}
-
-module Kernel
-
-alias_method :old_require, :require
-def require(path)
-	return if $__required__[path]
-	
-	source = File.read(path)
-	
-	# parse macro
-	source.gsub!(/defmacro\s*\/(.*?)\/\s(.*?)endmacro/m) {
-		$__macros__[Regexp.new($1)] = $2 ; ""
-	}
-	
-	# expand macros	
-	$__macros__.each { |match, replace|
-		source.gsub!(match, replace)
-	}
-	
-	$__required__[path] = true
-
-	eval(source)
-end
-
-end
-
-require "nitro/test1.rb"
-require "nitro/test2.rb"
-
-__END__
-
-Examples:
-
-defmacro /my_macro\((.*)\)/
-	begin 
-		my_function(\1)
-	rescue => ex
-		puts ex
-	end 
-endmacro
-

data/lib/nitro/adaptors/runner.rb

@@ -1,123 +0,0 @@
-#!/usr/bin/env ruby
-
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id$
-
-require 'optparse'
-
-module N
-
-# The Runner is a helper class that encapsulates a web 
-# application and is responsible for launching the 
-# application using different adaptors. Default arguments
-# parsing is also provided.
-#
-# You can implement your own, custom version of the Runner
-# to run your custom web applications.
-#
-#--
-# TODO: find a better name
-#++
-
-class Runner
-
-	# Parse the arguments and run the web application
-	# using the declared environment and adaptor
-	
-	def self.run(argv)
-
-		# :start, :stop, :restart.
-
-		action = :start
-
-		# :webrick, :lhttp, :apache 
-
-		server = :webrick
-
-		# daemonize? (in webrick only)
-
-		daemon = false
-
-		# log to file ?
-
-		log_to_file = false
-
-		# Parse the arguments.
-
-		parser = OptionParser.new do |opts|
-
-			opts.banner = 'Usage: ctl [options]'
-			opts.separator ''
-			opts.separator 'Specific options:'
-
-			opts.on("-s", "--start", "Start application.") do 
-				action = :start	
-			end
-
-			opts.on("-S", "--stop", "Stop application.") do
-				action = :stop
-			end
-
-			opts.on("-r", "--restart", "Restart application.") do
-				action = :restart
-			end
-
-			opts.on("-d", "--daemon", "Run application as a daemon.") do
-				daemon = true
-				log_to_file = true
-			end
-			
-			opts.on("-D", "--debug", "Run application in debug mode.") do
-				$DBG = true
-			end
-
-			opts.on("-w", "--webrick", "Use a webrick server [default].") do
-				server = :webrick
-			end
-
-			opts.on("-l", "--lhttpd", "Use a webrick server [default].") do
-				server = :lhttpd
-				log_to_file = true
-			end
-
-			opts.on_tail("-v", "--version", "Show version.") do 
-				require 'nitro/version'
-				puts "Nitro #{Nitro::Version}"
-				exit
-			end
-
-			opts.on_tail("-?", "--help", "Show this message.") do
-				puts opts
-				exit
-			end
-			
-		end
-
-		parser.parse!(ARGV)
-
-		require 'conf/app.conf.rb'
-
-		if log_to_file
-			Logger.set(Logger.new('log/app.log'))
-		end
-		
-		case server
-
-		when :webrick
-			require 'nitro/adaptors/webrick'
-			N::Webrick.start($conf)
-			
-		when :lhttpd
-			require 'nitro/adaptors/fastcgi'
-			`lighttpd -f conf/lhttpd.conf`
-		end
-	end
-
-end
-
-# Run the app!
-
-Runner.run(ARGV)
-
-end