nitro 0.8.0 → 0.9.3

data/lib/og/mock.rb

@@ -1,8 +1,6 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
 # * Thomas Quas  <tquas@yahoo.com>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 require 'og'
@@ -12,15 +10,12 @@ require_gem 'flexmock'
 
 class Og
 	
-# = MockDatabase
-#
 # A utility object to Mock a Database in test units.
 # Extends the standard FlexMock object.
-#
 #--
 # TODO: Factor out common functionality with Database
 # to avoid code duplication.
-#++
+
 class MockDatabase < ::FlexMock 
 	include Og::Enchant
 
@@ -40,16 +35,19 @@ class MockDatabase < ::FlexMock
 	end
 
 	# hash of configuration options.
+	
 	attr_accessor :config
 
 	# Pool of connections to the backend.
+	
 	attr_accessor :connection_pool
 
 	# Managed classes.
+
 	attr_accessor :managed_classes
 
 	# Initialize the database interface.
-	#
+	
 	def initialize
 		# Initialize FlexMock
 		super
@@ -61,6 +59,7 @@ class MockDatabase < ::FlexMock
 		if Og.auto_manage_classes
 			# automatically manage classes with properties and metadata.
 			# gmosx: Any idea how to optimize this?
+
 			classes_to_manage = []
 			ObjectSpace.each_object(Class) do |c|
 				if c.respond_to?(:__props) and c.__props
@@ -73,31 +72,32 @@ class MockDatabase < ::FlexMock
 		end
 
 		# use the newly created database.
+
 		Og.use(self)
 	end
 		
 	# Shutdown the database interface.
-	#
+	
 	def shutdown
 	end
 	alias_method :close, :shutdown
 
 	# Get a connection from the pool to access the database.
 	# Stores the connection in a thread-local variable.
-	#
+	
 	def get_connection
 		# nop
 	end
 	alias_method :connection, :get_connection
 	
 	# Restore an unused connection to the pool.
-	#
+	
 	def put_connection
 		# nop
 	end	
 
 	# Register a standard Ruby class as managed.
-	#
+	
 	def manage(klass)
 		return if managed?(klass) or klass.ancestors.include?(Og::Unmanageable)
 		
@@ -111,7 +111,7 @@ class MockDatabase < ::FlexMock
 	end
 	
 	# Helper method to set multiple managed classes.
-	#
+	
 	def manage_classes(*klasses)
 		for klass in klasses
 			manage(klass)
@@ -119,19 +119,19 @@ class MockDatabase < ::FlexMock
 	end
 	
 	# Stop managing a Ruby class
-	#
+	
 	def unmanage(klass)
 		@managed_classes.delete(klass)
 	end
 	
 	# Is this class managed?
-	#	
+		
 	def managed?(klass)
 		return @managed_classes.include?(klass)
 	end
 	
 	# Add standard og functionality to the class
-	#
+	
 	def convert(klass)
 		klass.class_eval %{
 			DBTABLE = "#{Og::Backend.table(klass)}"
@@ -144,7 +144,7 @@ class MockDatabase < ::FlexMock
 	end
 
 	# Automatically wrap connection methods.
-	#
+	
 	def self.wrap_method(method, args)
 		args = args.split(/,/)
 		class_eval %{
@@ -163,4 +163,4 @@ class MockDatabase < ::FlexMock
 	end
 end
 
-end # namespace 
+end 

data/lib/og/version.rb

@@ -1,9 +1,11 @@
 #-- 
 # George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: version.rb 198 2004-12-22 11:26:59Z gmosx $
+# $Id: version.rb 248 2005-01-31 13:38:34Z gmosx $
 #++
 
-# The version of Og.
-
-$og_version = '0.8.0'
+class Og
+	# The version of Og.
+	
+	Version = '0.9.0'
+end

data/lib/parts/content.rb

@@ -1,21 +1,17 @@
-# = Content
-#
-# Content management foundation.
-#
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 # (c) 2004 Navel, all rights reserved.
 # $Id$
 
 require 'nitro/markup'
 
-module N
+module N 
 
 # = BaseContent
 #
 # The foundamental Content Unit.
 #
 module BaseContent
-	include N::Markup
+	include Markup
 
 	prop_accessor :title, String
 	prop_accessor :body, String, :markup => true, :ui => :textarea
@@ -57,7 +53,7 @@ end
 # = Category
 
 class Category 
-	include N::BaseContent
+	include BaseContent
 end
 
 # = ACL

data/test/glue/tc_logger.rb

@@ -31,6 +31,9 @@ class TC_Logger < Test::Unit::TestCase # :nodoc: all
 		Logger.get.level = Logger::INFO
 		Logger.debug 'world'
 		assert_equal("DEBUG: hello\n", @io.string)
+
+		# bug:
+		Logger.error 'Have forgotten that :)'
 	end
 
 end

data/test/glue/tc_property.rb

@@ -1,8 +1,16 @@
-require "test/unit"
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
-require "glue/logger"; $log = Logger.new(STDERR) unless $log
+require 'test/unit'
 
-require "glue/property"
+require 'og'
+require 'glue/logger'
+require 'glue/property'
+
+def VarChar(size)
+	return String, :sql => "VARCHAR(#{ size })"
+end
+NotNull = {:sql => "NOT NULL"}.freeze
+Null = {:sql => "NULL"}.freeze
 
 module Test # :nodoc: all
 
@@ -18,6 +26,9 @@ class Msg
 
 	# a marshaled property
 	prop_accessor Array, :options
+
+	# property with macro arguments!
+	prop_accessor :address, VarChar(30), NotNull
 	
 	def initialize
 		@create_time = Time.now
@@ -65,6 +76,11 @@ class TC_N_Properties < Test::Unit::TestCase
 		@msg1.__force_count(2.4)
 		assert_equal(Fixnum, @msg1.count.class)		
 	end
+
+	def test_macro_params
+		sql = Msg.__props.find { |p| :address == p.symbol }.meta[:sql]
+		assert_equal 'VARCHAR(30) NOT NULL', sql
+	end
 	
 end
 

data/test/nitro/adaptors/tc_cgi.rb

@@ -0,0 +1,63 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+
+require 'ostruct'
+require 'test/unit'
+
+require 'nitro/cookie'
+require 'nitro/adaptors/cgi'
+
+class TC_AdaptorsCgi < Test::Unit::TestCase # :nodoc: all
+	include N
+	
+	def test_parse_query_parameters
+		qs = 'name=tml;id=12354'
+		params = CgiUtils.parse_query_string(qs)
+		assert_equal 2, params.size
+		assert_equal 'tml', params['name']
+		
+		qs = ''
+		params = CgiUtils.parse_query_string(qs)
+		assert_equal 0, params.size
+		
+		qs = nil
+		params = CgiUtils.parse_query_string(qs)
+		assert_equal 0, params.size
+		
+		qs = 'name=tml;arr[]=1;arr[]=2;arr[]=3'
+		params = CgiUtils.parse_query_string(qs)
+		assert_equal 2, params.size
+		arr = params['arr']
+		assert_equal Array, arr.class
+		assert_equal 3, arr.size
+	end
+
+	def test_parse_cookies
+		context = OpenStruct.new
+		context.env = {}
+		context.env['HTTP_COOKIE'] = 'nsid=123; nauth=gmosx:passwd'
+		CgiUtils.parse_cookies(context)
+		assert_equal 2, context.cookies.size
+		assert_equal '123', context.cookies['nsid']
+		
+		context.env = {}
+		context.env['HTTP_COOKIE'] = 'nsid=123; nsid=23123'
+		cookies = CgiUtils.parse_cookies(context)
+		assert_equal 1, context.cookies.size
+		assert_equal "123" + "\0" + "23123", context.cookies['nsid']
+	end
+
+	def test_response_headers
+		ctx = OpenStruct.new
+		ctx.status = 200
+		ctx.response_cookies = {
+			'nsid' => Cookie.new('nsid', '1233'),
+			'nauth' => Cookie.new('nauth', 'gmosx')
+		}
+		ctx.response_headers = { 
+			'Content-Type' => 'text/html' 
+		}
+
+		res = "HTTP/1.1 200 OK \r\nContent-Type: text/html\r\nSet-Cookie: nauthnauth=gmosx\r\nSet-Cookie: nsidnsid=1233\r\n\r\n"
+		assert_equal res, CgiUtils.response_headers(ctx)
+	end
+end

data/test/nitro/adaptors/tc_webrick.rb

@@ -0,0 +1,15 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'nitro/adaptors/webrick'
+
+class TC_Webrick < Test::Unit::TestCase # :nodoc: all
+	include N
+	
+	def test_adaptor
+		# w = WebrickAdaptor.new()
+	end
+
+end

data/test/nitro/builders/tc_xml.rb

@@ -21,8 +21,8 @@ class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
 		assert_equal '<b>This is bold</b>', x
 
 		x = N::XmlString.new
-		x.a('Navel', :href => 'http://www.navel.gr', :target => '_blank')
-		assert_equal '<a target="_blank" href="http://www.navel.gr">Navel</a>', x
+		x.a('Navel', :href => 'http://www.navel.gr')
+		assert_equal '<a href="http://www.navel.gr">Navel</a>', x
 
 
 		x = N::XmlString.new

data/test/nitro/tc_context.rb

@@ -0,0 +1,13 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'nitro/context'
+
+class TC_Context < Test::Unit::TestCase # :nodoc: all
+	include N
+	
+	def test_context
+	end
+end

data/test/nitro/tc_controller.rb

@@ -0,0 +1,47 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'nitro/context'
+require 'nitro/dispatcher'
+require 'nitro/controller'
+
+class TC_Controller < Test::Unit::TestCase # :nodoc: all
+	include N
+	
+	class BlogController < Controller
+		attr_accessor :aflag, :tflag
+
+		def list
+			@aflag = true 
+		end
+	end
+	
+	def setup
+		@disp = Dispatcher.new({
+			'blog' => BlogController,
+		})
+		@disp.root = File.join(File.dirname(__FILE__), '..', 'root')
+		@conf = OpenStruct.new
+		@conf.dispatcher = @disp
+	end
+	
+	def test_render
+		ctx = Context.new(@conf)
+		ctx.headers = {}
+		puts '=', ctx.dispatcher.root
+		klass, action, base = ctx.dispatcher.dispatch('/blog/list')
+		c = klass.new(ctx, base)
+		begin
+		c.send(action)
+		rescue RenderExit
+			# drink
+		end
+		assert_equal true, c.aflag
+
+		# the template is compiled
+		assert_equal true, c.tflag
+	end
+
+end

data/test/nitro/tc_dispatcher.rb

@@ -0,0 +1,64 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'nitro/dispatcher'
+
+class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
+
+	class MainController
+	end
+
+	class BlogController
+	end
+	
+	def setup
+		@d = N::Dispatcher.new({
+			:index => MainController,
+			'blog' => BlogController
+		})
+
+		@dxml = N::Dispatcher.new({
+			:index => MainController,
+			'blog' => BlogController
+		})
+		@dxml.add_api('xml', 'xml')
+	end
+	
+	def teardown
+		@d = @dxml = nil
+	end
+	
+	def test_dispatch
+		klass, action = @d.dispatch('/blog/list')
+		assert_equal BlogController, klass
+		assert_equal '__xhtml__list', action
+		
+		klass, action, base = @d.dispatch('/blog')
+		assert_equal BlogController, klass
+		assert_equal '__xhtml__index', action
+		assert_equal 'root/blog', base
+		
+		klass, action, base = @d.dispatch('/login')
+		assert_equal MainController, klass
+		assert_equal '__xhtml__login', action
+		assert_equal 'root', base
+		
+		klass, action, base = @d.dispatch('/')
+		assert_equal MainController, klass
+		assert_equal '__xhtml__index', action
+		assert_equal 'root', base
+	
+		# multi-api dispatcher. 
+
+		# no xml prefix, use xhtml api.
+		klass, action = @dxml.dispatch('/blog/list')
+		assert_equal BlogController, klass
+		assert_equal '__xhtml__list', action
+
+		# xml prefix, use xml api.
+		klass, action = @dxml.dispatch('/xml/blog/list')
+		assert_equal BlogController, klass
+		assert_equal '__xml__list', action
+	end
+
+end