nitro 0.17.0 → 0.18.0

data/lib/nitro/testing.rb

@@ -1,6 +1,2 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: testing.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'nitro/testing/assertions'
 require 'nitro/testing/testcase'

data/proto/public/error.xhtml

@@ -17,6 +17,11 @@
 				padding: 5px;
 				color: #555;
 			}
+			.source {
+				border: 1px solid #ccc; 
+				padding: 10px;
+				margin-top: 10px; margin-bottom: 10px;
+			}
 			h2 {
 				padding-left: 5px;
 				background: #eee;
@@ -28,9 +33,26 @@
 
 		<?r	for error, path in @context.rendering_errors ?>
 			<div class="path"><strong>Path:</strong> #{path}</div>
-			<div class="error"><strong>#{error.class.name}:</strong> #{Nitro::Markup.expand(error.to_s)}</div>
+			<div class="error"><strong>#{error.to_s}</strong></div>
 			<div class="load">Click here to <strong><a href="#{request.uri}">reload</a></strong>.</div>
-			<div class="load">Click here to go to the <strong><a href="#{request.referer}">referer</a></strong>.</div>
+			<div class="load">Click here to go to the <strong><a href="#{request.referer}">referer</a></strong> or the <strong><a href="/">home page</a></strong>.</div>
+			<?r if error.respond_to?(:source_extract) ?>
+				<div class="source">
+				<?r 
+					extract = error.source_extract.split("\n")
+					extract.each_with_index do |line, idx|
+						line = Nitro::Markup.expand(line)
+						if 4 == idx
+				?>
+						<div style="background: #eee">#{line}</div>
+				<?r	else ?>
+						<div>#{line}</div>
+				<?r	
+						end 
+					end
+				?>
+				</div>
+			<?r end ?>
 			<h2><a href="#" onclick="document.getElementById('trace').style.display = 'block'; return false">Stack Trace</a></h2>
 			<p id="trace" style="display: none">#{error.backtrace.join('<br />')}</p>
 		<?r end ?>
@@ -52,5 +74,8 @@
 		<div id="session" style="display: none">
 			<p><strong>Values:</strong> #{session.inspect}</p>	
 		</div>
+		
+		<br /><br />
+		Powered by <a href="http://www.nitrohq.com">Nitro</a> version #{Nitro::Version}
 	</body>
 </html>

data/test/nitro/{adapters → adapter}/tc_cgi.rb

@@ -5,7 +5,7 @@ require 'ostruct'
 require 'test/unit'
 
 require 'nitro/cookie'
-require 'nitro/adapters/cgi'
+require 'nitro/adapter/cgi'
 
 class TC_AdaptersCgi < Test::Unit::TestCase # :nodoc: all
 	include Nitro

data/test/nitro/{adapters → adapter}/tc_webrick.rb

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 require 'test/unit'
 require 'ostruct'
 
-require 'nitro/adapters/webrick'
+require 'nitro/adapter/webrick'
 
 class TC_AdaptersWebrick < Test::Unit::TestCase # :nodoc: all
 	include Nitro

data/test/nitro/{builders → builder}/tc_atom.rb

@@ -1,7 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'test/unit'
-require 'nitro/builders/atom'
+require 'nitro/builder/atom'
 
 class TestCaseBuildersAtom < Test::Unit::TestCase # :nodoc: all
 	include Nitro

data/test/nitro/{builders → builder}/tc_rss.rb

@@ -1,7 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'test/unit'
-require 'nitro/builders/rss'
+require 'nitro/builder/rss'
 
 class TC_BuildersRss < Test::Unit::TestCase # :nodoc: all
 	include Nitro

data/test/nitro/{builders → builder}/tc_table.rb

@@ -1,7 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'test/unit'
-require 'nitro/builders/table'
+require 'nitro/builder/table'
 
 class TC_BuildersTable < Test::Unit::TestCase # :nodoc: all
 	include Nitro

data/test/nitro/{builders → builder}/tc_xhtml.rb

@@ -1,7 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'test/unit'
-require 'nitro/builders/xhtml'
+require 'nitro/builder/xhtml'
 
 class TC_BuildersXhtml < Test::Unit::TestCase # :nodoc: all
 	include Nitro

data/test/nitro/{builders → builder}/tc_xml.rb

@@ -1,7 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'test/unit'
-require 'nitro/builders/xml'
+require 'nitro/builder/xml'
 
 class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
 	include Nitro

data/test/nitro/tc_caching.rb

@@ -0,0 +1,18 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+
+require 'nitro/caching'
+
+class TC_Caching < Test::Unit::TestCase # :nodoc: all
+	include Nitro
+	
+	class DummyCa
+		include Nitro::Caching
+	end
+
+	def test_all
+		p Caching.public_instance_methods
+		p DummyCa.public_instance_methods
+	end
+end

data/test/nitro/tc_controller.rb

@@ -26,7 +26,7 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 		@disp = Dispatcher.new({
 			'blog' => Blog2Controller,
 		})
-		@disp.template_root = File.join(File.dirname(__FILE__), '..', 'public')
+		@disp.template_root = 'test/public/root'
 		@conf = OpenStruct.new
 		@conf.dispatcher = @disp
 	end

data/test/nitro/tc_mail.rb

@@ -1,9 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
+$NITRO_NO_ENVIRONMENT = true
+
 require 'test/unit'
 require 'ostruct'
 
-require 'nitro/controller'
+require 'nitro'
 require 'nitro/mail'
 
 class TestCaseMail < Test::Unit::TestCase # :nodoc: all

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.17.0
-date: 2005-05-16
+  version: 0.18.0
+date: 2005-06-01
 summary: Nitro Web Engine
 require_paths: 
   - lib
@@ -42,147 +42,7 @@ files:
   - benchmark/tiny-lhttpd-n-200-c-5.txt
   - benchmark/static-webrick-n-200.txt
   - benchmark/simple-webrick-n-200.txt
-  - examples/wee_style
-  - examples/tiny
-  - examples/ajax
-  - examples/blog
-  - examples/no_xsl_blog
-  - examples/why_wiki
-  - examples/flash
-  - examples/README.windows
-  - examples/wee_style/run.rb
-  - examples/wee_style/README
-  - examples/tiny/log
-  - examples/tiny/conf
-  - examples/tiny/public
-  - examples/tiny/run.rb
-  - examples/tiny/README
-  - examples/tiny/log/apache.error_log
-  - examples/tiny/log/README
-  - examples/tiny/conf/lhttpd.conf
-  - examples/tiny/conf/apache.conf
-  - examples/tiny/public/deep
-  - examples/tiny/public/include.xhtml
-  - examples/tiny/public/upload.xhtml
-  - examples/tiny/public/index.xhtml
-  - examples/tiny/public/fcgi.rb
-  - examples/tiny/public/nitro.png
-  - examples/tiny/public/deep/dir
-  - examples/tiny/public/deep/dir/hello.xhtml
-  - examples/ajax/public
-  - examples/ajax/controller.rb
-  - examples/ajax/run.rb
-  - examples/ajax/public/js
-  - examples/ajax/public/index.xhtml
-  - examples/ajax/public/js/ajax.js
-  - examples/blog/test
-  - examples/blog/log
-  - examples/blog/conf
-  - examples/blog/src
-  - examples/blog/public
-  - examples/blog/run.rb
-  - examples/blog/README
-  - examples/blog/test/tc_blog.rb
-  - examples/blog/log/apache.error_log
-  - examples/blog/log/rewrite_log
-  - examples/blog/log/README
-  - examples/blog/conf/locales
-  - examples/blog/conf/apache.conf.new
-  - examples/blog/conf/lhttpd.conf
-  - examples/blog/conf/apache.conf
-  - examples/blog/conf/locales/en.yml
-  - examples/blog/conf/locales/de.yml
-  - examples/blog/src/models
-  - examples/blog/src/xsl
-  - examples/blog/src/views
-  - examples/blog/src/mailer.rb
-  - examples/blog/src/blog.rb
-  - examples/blog/src/controller.rb
-  - examples/blog/src/models/content.rb
-  - examples/blog/src/models/blog.rb
-  - examples/blog/src/xsl/style.xsl
-  - examples/blog/src/xsl/base.xsl
-  - examples/blog/src/views/recent_posts.xhtml
-  - examples/blog/src/views/entry_form.xhtml
-  - examples/blog/src/views/comments.xhtml
-  - examples/blog/src/views/index.xhtml
-  - examples/blog/src/views/view_entry.xhtml
-  - examples/blog/src/views/login.xhtml
-  - examples/blog/src/views/error.xhtml
-  - examples/blog/src/views/blog_entry_email.xhtml
-  - examples/blog/src/views/view_entry.xml
-  - examples/blog/public/m
-  - examples/blog/public/style.css
-  - examples/blog/public/base.xsl
-  - examples/blog/public/fcgi.rb
-  - examples/blog/public/m/header_bg.gif
-  - examples/blog/public/m/nitro.gif
-  - examples/blog/public/m/obull.gif
-  - examples/blog/public/m/side_title_bg.gif
-  - examples/blog/public/m/bubbles.gif
-  - examples/blog/public/m/sidebar_bg.gif
-  - examples/blog/public/m/h1_bg.gif
-  - examples/blog/public/m/garrow.gif
-  - examples/blog/public/m/footer_bg.gif
-  - examples/blog/public/m/page_bg.gif
-  - examples/blog/public/m/gbull.gif
-  - examples/blog/public/m/grbull.gif
-  - examples/blog/public/m/rss.gif
-  - examples/blog/public/m/down.gif
-  - examples/blog/public/m/comments_curve.gif
-  - examples/no_xsl_blog/log
-  - examples/no_xsl_blog/conf
-  - examples/no_xsl_blog/lib
-  - examples/no_xsl_blog/public
-  - examples/no_xsl_blog/run.rb
-  - examples/no_xsl_blog/README
-  - examples/no_xsl_blog/log/apache.error_log
-  - examples/no_xsl_blog/log/README
-  - examples/no_xsl_blog/conf/locales
-  - examples/no_xsl_blog/conf/lhttpd.conf
-  - examples/no_xsl_blog/conf/apache.conf
-  - examples/no_xsl_blog/conf/locales/en.yml
-  - examples/no_xsl_blog/conf/locales/de.yml
-  - examples/no_xsl_blog/lib/blog
-  - examples/no_xsl_blog/lib/content.rb
-  - examples/no_xsl_blog/lib/blog.rb
-  - 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/no_xsl_blog/public/m
-  - examples/no_xsl_blog/public/recent_posts.xhtml
-  - examples/no_xsl_blog/public/entry_form.xhtml
-  - examples/no_xsl_blog/public/comments.xhtml
-  - examples/no_xsl_blog/public/index.xhtml
-  - examples/no_xsl_blog/public/login.xhtml
-  - examples/no_xsl_blog/public/view_entry.xhtml
-  - examples/no_xsl_blog/public/style.css
-  - examples/no_xsl_blog/public/fcgi.rb
-  - examples/no_xsl_blog/public/view_entry.xml
-  - examples/no_xsl_blog/public/m/header_bg.gif
-  - examples/no_xsl_blog/public/m/nitro.gif
-  - examples/no_xsl_blog/public/m/obull.gif
-  - examples/no_xsl_blog/public/m/side_title_bg.gif
-  - examples/no_xsl_blog/public/m/bubbles.gif
-  - examples/no_xsl_blog/public/m/sidebar_bg.gif
-  - examples/no_xsl_blog/public/m/h1_bg.gif
-  - examples/no_xsl_blog/public/m/garrow.gif
-  - examples/no_xsl_blog/public/m/footer_bg.gif
-  - examples/no_xsl_blog/public/m/page_bg.gif
-  - examples/no_xsl_blog/public/m/gbull.gif
-  - examples/no_xsl_blog/public/m/grbull.gif
-  - examples/no_xsl_blog/public/m/rss.gif
-  - examples/no_xsl_blog/public/m/down.gif
-  - examples/no_xsl_blog/public/m/comments_curve.gif
-  - examples/why_wiki/run.rb
-  - examples/why_wiki/README
-  - examples/flash/log
-  - examples/flash/root
-  - examples/flash/conf
-  - examples/flash/run.rb
-  - examples/flash/log/README
-  - examples/flash/root/index.xhtml
-  - examples/flash/root/show_inline_text.xhtml
+  - examples/README
   - doc/architecture.txt
   - doc/apache.txt
   - doc/tutorial.txt
@@ -198,6 +58,7 @@ files:
   - proto/conf
   - proto/doc
   - proto/public
+  - proto/src
   - proto/run.rb
   - proto/README
   - proto/conf/lhttpd.conf
@@ -212,15 +73,14 @@ files:
   - proto/public/fcgi.rb
   - proto/public/media/nitro.png
   - proto/public/js/prototype.js
-  - proto/public/js/ajax.js
   - lib/nitro
   - lib/nitro.rb
-  - lib/nitro/adapters
+  - lib/nitro/builder
   - lib/nitro/testing
   - lib/nitro/session
-  - lib/nitro/shaders
+  - lib/nitro/adapter
   - lib/nitro/caching
-  - lib/nitro/builders
+  - lib/nitro/element
   - lib/nitro/ui
   - lib/nitro/controller.rb
   - lib/nitro/scaffold.rb
@@ -245,37 +105,41 @@ files:
   - lib/nitro/environment.rb
   - lib/nitro/shaders.rb
   - lib/nitro/response.rb
+  - lib/nitro/errors.rb
   - lib/nitro/runner.rb
   - lib/nitro/template.rb
   - lib/nitro/element.rb
-  - lib/nitro/adapters/fastcgi.rb
-  - lib/nitro/adapters/cgi.rb
-  - lib/nitro/adapters/webrick.rb
+  - lib/nitro/service.rb
+  - lib/nitro/service
+  - lib/nitro/builder/xhtml.rb
+  - lib/nitro/builder/xml.rb
+  - lib/nitro/builder/form.rb
+  - lib/nitro/builder/rss.rb
+  - lib/nitro/builder/table.rb
+  - lib/nitro/builder/atom.rb
   - lib/nitro/testing/assertions.rb
   - lib/nitro/testing/context.rb
   - lib/nitro/testing/testcase.rb
   - lib/nitro/session/drbserver.rb
   - lib/nitro/session/drb.rb
   - lib/nitro/session/memory.rb
+  - lib/nitro/adapter/fastcgi.rb
+  - lib/nitro/adapter/cgi.rb
+  - lib/nitro/adapter/webrick.rb
   - lib/nitro/caching/invalidation.rb
   - lib/nitro/caching/stores.rb
   - lib/nitro/caching/actions.rb
   - lib/nitro/caching/output.rb
   - lib/nitro/caching/fragments.rb
-  - lib/nitro/builders/xhtml.rb
-  - lib/nitro/builders/xml.rb
-  - lib/nitro/builders/form.rb
-  - lib/nitro/builders/rss.rb
-  - lib/nitro/builders/table.rb
-  - lib/nitro/builders/atom.rb
   - lib/nitro/ui/pager.rb
   - lib/nitro/ui/popup.rb
   - lib/nitro/ui/tabs.rb
+  - lib/nitro/service/xmlrpc.rb
   - test/nitro
   - test/public
-  - test/nitro/adapters
-  - test/nitro/builders
+  - test/nitro/builder
   - test/nitro/ui
+  - test/nitro/adapter
   - test/nitro/tc_localization.rb
   - test/nitro/tc_template.rb
   - test/nitro/tc_uri.rb
@@ -285,15 +149,16 @@ files:
   - test/nitro/tc_context.rb
   - test/nitro/tc_dispatcher.rb
   - test/nitro/tc_element.rb
-  - test/nitro/adapters/raw_post1.bin
-  - test/nitro/adapters/tc_cgi.rb
-  - test/nitro/adapters/tc_webrick.rb
-  - test/nitro/builders/tc_rss.rb
-  - test/nitro/builders/tc_table.rb
-  - test/nitro/builders/tc_xhtml.rb
-  - test/nitro/builders/tc_xml.rb
-  - test/nitro/builders/tc_atom.rb
+  - test/nitro/tc_caching.rb
+  - test/nitro/builder/tc_rss.rb
+  - test/nitro/builder/tc_table.rb
+  - test/nitro/builder/tc_xhtml.rb
+  - test/nitro/builder/tc_xml.rb
+  - test/nitro/builder/tc_atom.rb
   - test/nitro/ui/tc_pager.rb
+  - test/nitro/adapter/raw_post1.bin
+  - test/nitro/adapter/tc_cgi.rb
+  - test/nitro/adapter/tc_webrick.rb
   - test/public/blog
   - test/public/dummy_mailer
   - test/public/blog/inc1.xhtml
@@ -327,7 +192,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.17.0
+            version: 0.18.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: og
@@ -337,7 +202,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.17.0
+            version: 0.18.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: facets