nitro 0.15.0 → 0.16.0

data/lib/nitro/ui/tabs.rb

@@ -1,17 +1,11 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: tabs.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: tabs.rb 1 2005-04-11 11:04:30Z gmosx $
 
-module N; module UI
+module Nitro
 
 	# Render a tabs bar
-	#
-	# Example:
-	#
-	# #{N::UI.tabs(request,
-	#		["Page1", "Page2", "Page3"]
-	#	}
-	#
+
 	def self.tabs(request, options, param)
 		tabs = []
 	
@@ -28,4 +22,4 @@ module N; module UI
 		return %|<div class="tabs">#{tabs.join('<span class="sep">|</span>')}</div>| 
 	end
 	
-end; end # module
+end

data/lib/nitro/uri.rb

@@ -1,13 +1,13 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: uri.rb 263 2005-02-23 13:45:08Z gmosx $
+# $Id: uri.rb 1 2005-04-11 11:04:30Z gmosx $
 
-require "uri"
-require "cgi"
+require 'uri'
+require 'cgi'
 
-require "glue/string"
+require 'glue/string'
 
-module N
+module Nitro
 
 # URI utilities collection.
 #
@@ -41,7 +41,7 @@ module UriUtils
 
 #			real_path = "#{$root_dir}/#{path}"
 
-			parameters = N::UriUtils.query_string_to_hash(query_string)
+			parameters = UriUtils.query_string_to_hash(query_string)
 			path.gsub!(/\+/, " ")
 
 			return [path, type, parameters, query_string]
@@ -164,7 +164,7 @@ module UriUtils
 		hash.update(parameters)
 		query_string = self.hash_to_query_string(hash)
 
-		if N::StringUtils.valid?(query_string)
+		if Glue::StringUtils.valid?(query_string)
 			return "#{rest}?#{query_string}"
 		else
 			return rest

data/proto/doc/README

@@ -0,0 +1 @@
+Your documentation comes here.

data/proto/public/cgi.rb

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

data/proto/run.rb

@@ -2,10 +2,8 @@
 
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 331 2005-03-28 11:12:43Z gmosx $
-
-Dir.chdir File.dirname(__FILE__)
+# $Id: run.rb 1 2005-04-11 11:04:30Z gmosx $
 
 require 'nitro'
 
-N::Runner.run(:host => '127.0.0.1', :port => 9999)
+Nitro::Runner.run(:host => '127.0.0.1', :port => 9999)

data/test/nitro/adapters/tc_cgi.rb

@@ -7,7 +7,7 @@ require 'nitro/cookie'
 require 'nitro/adapters/cgi'
 
 class TC_AdaptersCgi < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 	
 	def test_parse_query_parameters
 		qs = 'name=tml;id=12354'

data/test/nitro/adapters/tc_webrick.rb

@@ -6,10 +6,9 @@ require 'ostruct'
 require 'nitro/adapters/webrick'
 
 class TC_AdaptersWebrick < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 	
 	def test_adaptor
-		# w = WebrickAdapter.new()
 	end
 
 end

data/test/nitro/builders/tc_atom.rb

@@ -0,0 +1,26 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+
+require 'test/unit'
+require 'nitro/builders/atom'
+
+class TestCaseBuildersAtom < Test::Unit::TestCase # :nodoc: all
+	include Nitro
+	
+	Blog = Struct.new(:title, :body, :view_uri, :author)
+
+	def test_render
+=begin
+		blogs = []
+		blogs << Blog.new('Hello1', 'World1', 'uri1', 'George');
+		blogs << Blog.new('Hello2', 'World2', 'uri2', 'Stella');
+		blogs << Blog.new('Hello3', 'World3', 'uri3', 'Renos');
+
+		rss = AtomBuilder.build(blogs, :link => 'http://www.navel.gr')
+
+		puts '--', rss
+=end
+		# assert_match %r{<link>http://www.navel.gr/uri1</link>}, rss
+		# assert_match %r{<link>http://www.navel.gr/uri2</link>}, rss
+	end
+
+end

data/test/nitro/builders/tc_rss.rb

@@ -4,7 +4,8 @@ require 'test/unit'
 require 'nitro/builders/rss'
 
 class TC_BuildersRss < Test::Unit::TestCase # :nodoc: all
-
+	include Nitro
+	
 	Blog = Struct.new(:title, :body, :view_uri)
 
 	def test_render
@@ -13,7 +14,7 @@ class TC_BuildersRss < Test::Unit::TestCase # :nodoc: all
 		blogs << Blog.new('Hello2', 'World2', 'uri2');
 		blogs << Blog.new('Hello3', 'World3', 'uri3');
 
-		rss = N::RssBuilder.build(blogs, :link => 'http://www.navel.gr')
+		rss = RssBuilder.build(blogs, :link => 'http://www.navel.gr')
 
 		assert_match %r{<link>http://www.navel.gr/uri1</link>}, rss
 		assert_match %r{<link>http://www.navel.gr/uri2</link>}, rss

data/test/nitro/builders/tc_table.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 require 'nitro/builders/table'
 
 class TC_BuildersTable < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 
 	User = Struct.new(:name, :password, :email)
 

data/test/nitro/builders/tc_xhtml.rb

@@ -4,9 +4,10 @@ require 'test/unit'
 require 'nitro/builders/xhtml'
 
 class TC_BuildersXhtml < Test::Unit::TestCase # :nodoc: all
+	include Nitro
 
 	def test_options
-		x = N::XhtmlString.new
+		x = XhtmlString.new
 		options = ['Male', 'Female']
 		x.select(:name => 'sex') do
 			x.options(options, 1)
@@ -15,7 +16,7 @@ class TC_BuildersXhtml < Test::Unit::TestCase # :nodoc: all
 					'<option value="1" selected="1">Female</option></select>'
 		assert_equal res, x
 
-		x = N::XhtmlString.new
+		x = XhtmlString.new
 		options = ['Male', 'Female']
 		x.select('-- Select sex --', :name => 'sex') do
 			x.options(options, 1)
@@ -25,7 +26,7 @@ class TC_BuildersXhtml < Test::Unit::TestCase # :nodoc: all
 					'<option value="1" selected="1">Female</option></select>'
 		assert_equal res, x
 
-		x = N::XhtmlString.new
+		x = XhtmlString.new
 		options = {'Male' => 'm', 'Female' => 'f'}
 		x.select(:name => 'sex') do
 			x.options(options, 'm')

data/test/nitro/builders/tc_xml.rb

@@ -4,14 +4,14 @@ require 'test/unit'
 require 'nitro/builders/xml'
 
 class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 
 	def test_string
 		x = XmlString.new
 
-		x.start_tag('html').
-			start_tag('title').text('hello').end_tag('title').
-		end_tag('html')
+		x.start_tag!('html').
+			start_tag!('title').text!('hello').end_tag!('title').
+		end_tag!('html')
 		
 		assert_equal '<html><title>hello</title></html>', x
 	end
@@ -46,9 +46,9 @@ class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
 		buffer = ''
 		x = XmlBuilder.new(buffer)
 
-		x.start_tag('html').
-			start_tag('title').text('hello').end_tag('title').
-		end_tag('html')
+		x.start_tag!('html').
+			start_tag!('title').text!('hello').end_tag!('title').
+		end_tag!('html')
 		
 		assert_equal '<html><title>hello</title></html>', buffer 
 	end

data/test/nitro/tc_context.rb

@@ -6,7 +6,7 @@ require 'ostruct'
 require 'nitro/context'
 
 class TC_Context < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 	
 	def test_context
 		conf = OpenStruct.new

data/test/nitro/tc_controller.rb

@@ -3,12 +3,14 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 require 'test/unit'
 require 'ostruct'
 
+require 'glue'
+require 'glue/logger'
 require 'nitro/context'
 require 'nitro/dispatcher'
 require 'nitro/controller'
 
 class TC_Controller < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 	
 	class Blog2Controller < Controller
 		attr_reader :aflag, :tflag
@@ -36,14 +38,14 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 		ctx.headers['REQUEST_URI'] = '/blog/list'
 		klass, action = ctx.dispatcher.dispatch(ctx.path, ctx)
 		c = klass.new(ctx)
-		p klass.before_filters, klass.after_filters
-		p '--', Controller.before_filters, Controller.after_filters
 		begin
 			c.send(action)
 		rescue RenderExit
 			# drink
 		end
 		assert_equal true, c.aflag
+		assert_equal true, $include1
+		assert_equal true, $include2
 
 		# the template is compiled
 		assert_equal true, c.tflag

data/test/nitro/tc_dispatcher.rb

@@ -4,24 +4,26 @@ require 'test/unit'
 require 'nitro/dispatcher'
 
 class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
+	include Nitro
 
-	class MainController < N::Controller
+	class MainController < Controller
 	end
 
-	class BlogController < N::Controller
+	class BlogController < Controller
 	end
 	
 	def setup
-		@d = N::Dispatcher.new({
+		@d = Dispatcher.new({
 			:root => MainController,
 			'blog' => BlogController
 		})
 
-		@dxml = N::Dispatcher.new({
+		@dxml = Dispatcher.new({
 			:root => MainController,
-			'blog' => BlogController
+			'blog' => BlogController,
+			# FIXME: this is a hack!
+			'xml:blog' => BlogController
 		})
-		@dxml.add_api('xml', 'xml')
 	end
 	
 	def teardown
@@ -29,47 +31,46 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
 	end
 
 	def test_initialize
-		d = N::Dispatcher.new(BlogController)
+		d = Dispatcher.new(BlogController)
 		assert_equal BlogController, d.controllers[:root]
 	end
 	
 	def test_dispatch
 		klass, action = @d.dispatch('/blog/list')
 		assert_equal BlogController, klass
-		assert_equal '__xhtml__list', action
+		assert_equal 'list_action', action
 		
 		klass, action = @d.dispatch('/blog/another/very_litle/list')
 		assert_equal BlogController, klass
-		assert_equal '__xhtml__another__very_litle__list', action
+		assert_equal 'another__very_litle__list_action', action
 		
 		klass, action = @d.dispatch('/another/litle/list')
 		assert_equal MainController, klass
-		assert_equal '__xhtml__another__litle__list', action
+		assert_equal 'another__litle__list_action', action
 		
-		klass, action, ctype  = @d.dispatch('/blog')
+		klass, action = @d.dispatch('/blog')
 		assert_equal BlogController, klass
-		assert_equal '__xhtml__index', action
-		assert_equal 'text/html', ctype 
+		assert_equal 'index_action', action
 		
 		klass, action, ctype = @d.dispatch('/login')
 		assert_equal MainController, klass
-		assert_equal '__xhtml__login', action
+		assert_equal 'login_action', action
 		
 		klass, action = @d.dispatch('/')
 		assert_equal MainController, klass
-		assert_equal '__xhtml__index', action
+		assert_equal 'index_action', action
 	
 		# multi-api dispatcher. 
 
 		# no xml prefix, use xhtml api.
 		klass, action = @dxml.dispatch('/blog/list')
 		assert_equal BlogController, klass
-		assert_equal '__xhtml__list', action
+		assert_equal 'list_action', action
 
 		# xml prefix, use xml api.
-		klass, action = @dxml.dispatch('/xml/blog/list')
+		klass, action = @dxml.dispatch('/xml:blog/list')
 		assert_equal BlogController, klass
-		assert_equal '__xml__list', action
+		assert_equal 'list_action', action
 	end
 
 end

data/test/nitro/tc_localization.rb

@@ -6,7 +6,7 @@ require 'ostruct'
 require 'nitro/localization'
 
 class TestCaseLocalization < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 
 	def setup
 		locale_en = {

data/test/nitro/tc_mail.rb

@@ -7,7 +7,7 @@ require 'nitro/controller'
 require 'nitro/mail'
 
 class TestCaseMail < Test::Unit::TestCase # :nodoc: all
-	include N 
+	include Nitro
 	
 	class DummyMailer < Mailer
 		def initialize 

data/test/nitro/tc_session.rb

@@ -6,7 +6,7 @@ require 'test/unit'
 require 'nitro/session'
 
 class TC_Session < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 
 	def test_create_id
 		sid = Session.new.session_id

data/test/nitro/tc_template.rb

@@ -6,7 +6,7 @@ require 'ostruct'
 require 'nitro/template'
 
 class TC_Template < Test::Unit::TestCase # :nodoc: all
-	include N
+	include Nitro
 	
 	def test_all
 		template = %q{

data/test/nitro/tc_uri.rb

@@ -1,13 +1,12 @@
-require "test/unit"
-require "nitro/uri"
-
-include N
+require 'test/unit'
+require 'nitro/uri'
 
 class Dummy # :nodoc: all
 	attr_accessor :test1, :test2
 end
 
 class TC_Uri < Test::Unit::TestCase # :nodoc: all
+	include Nitro
 
 	def test_query_string_to_hash
 		# bad query string

data/test/nitro/ui/tc_pager.rb

@@ -1,11 +1,11 @@
 # :nodoc: all
 
-require "test/unit"
+require 'test/unit'
 
-require "glue/logger"
+require 'glue/logger'
 
-require "og"
-require "nitro/ui/pager"
+require 'og'
+require 'nitro/ui/pager'
 
 class RequestMock < Hash
 	attr_accessor :query
@@ -20,12 +20,12 @@ class RequestMock < Hash
 end
 
 class TC_N_UI_Pager < Test::Unit::TestCase
-
+	include Nitro
+	
 	def setup
 	end
 
 	def teardown
-#		$og.shutdown()
 	end
 
 	def test_all
@@ -33,7 +33,7 @@ class TC_N_UI_Pager < Test::Unit::TestCase
 		count = items.size()
 		
 		request = RequestMock.new()
-		pager = N::UI::Pager.new("tst", request, 2, items)
+		pager = UI::Pager.new('tst', request, 2, items)
 		
 		assert_equal(pager.total_count, count)