nitro 0.9.5 → 0.10.0

data/test/glue/tc_property.rb

@@ -12,6 +12,8 @@ end
 NotNull = {:sql => "NOT NULL"}.freeze
 Null = {:sql => "NULL"}.freeze
 
+Property.type_checking = false
+
 module Test # :nodoc: all
 
 class Msg

data/test/glue/tc_property_type_checking.rb

@@ -0,0 +1,32 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+
+require 'glue/logger'
+require 'glue/property'
+
+N::Property.type_checking = true
+
+module Test # :nodoc: all
+
+class Person 
+	prop_accessor :age, Fixnum
+	
+	def initialize(age = nil)
+		@age = age
+	end
+
+end
+
+class TC_PropertiesTypeChecking < Test::Unit::TestCase
+
+	def test_all
+		per = Person.new
+		assert_raises(RuntimeError) {
+			per.age = 'Hello'
+		}
+	end
+	
+end
+
+end

data/test/glue/tc_strings.rb

@@ -76,7 +76,7 @@ class TC_StringUtilsUtils < Test::Unit::TestCase
 		assert_equal("", N::StringUtils::wrap("", 4, " "))
 		assert_equal(nil, N::StringUtils::wrap(nil, 4, " "))
 	end
-	
+=begin
 	def test_rationalize_filename
 		filename = N::StringUtils.rationalize_filename("hello my friend!.gif")
 		assert_equal("hello-my-friend.gif", filename)
@@ -89,7 +89,7 @@ class TC_StringUtilsUtils < Test::Unit::TestCase
 		filename = N::StringUtils.rationalize_filename("image-(10).gif")
 		assert_equal("image-10.gif", filename)
 	end
-
+=end
 	def test_random_string
 		s1 = N::StringUtils.random()
 		s2 = N::StringUtils.random()

data/test/glue/tc_validation.rb

@@ -5,6 +5,8 @@ require 'test/unit'
 require 'glue'
 require 'glue/validation'
 
+Property.type_checking = false
+
 class TC_Validation < Test::Unit::TestCase # :nodoc: all
 
 	# Override the default error message

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

@@ -4,9 +4,9 @@ require 'ostruct'
 require 'test/unit'
 
 require 'nitro/cookie'
-require 'nitro/adaptors/cgi'
+require 'nitro/adapters/cgi'
 
-class TC_AdaptorsCgi < Test::Unit::TestCase # :nodoc: all
+class TC_AdaptersCgi < Test::Unit::TestCase # :nodoc: all
 	include N
 	
 	def test_parse_query_parameters
@@ -60,4 +60,13 @@ class TC_AdaptorsCgi < Test::Unit::TestCase # :nodoc: all
 		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
+=begin
+	def test_parse_multipart
+		context = OpenStruct.new
+		context.in = File.open(File.join(File.dirname(__FILE__), 'raw_post1.bin'))
+		context.headers = { 'CONTENT_LENGTH' => 11963 }
+		boundary = '---------------------------277124474474241471962886717'
+		CgiUtils.parse_multipart(context, boundary)
+	end
+=end
 end

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

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

data/test/nitro/builders/tc_xml.rb

@@ -4,9 +4,10 @@ require 'test/unit'
 require 'nitro/builders/xml'
 
 class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
+	include N
 
 	def test_string
-		x = N::XmlString.new
+		x = XmlString.new
 
 		x.start_tag('html').
 			start_tag('title').text('hello').end_tag('title').
@@ -16,26 +17,34 @@ class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
 	end
 	
 	def test_missing
-		x = N::XmlString.new
+		x = XmlString.new
 		x.b('This is bold')
 		assert_equal '<b>This is bold</b>', x
 
-		x = N::XmlString.new
+		x = XmlString.new
 		x.a('Navel', :href => 'http://www.navel.gr')
 		assert_equal '<a href="http://www.navel.gr">Navel</a>', x
 
 
-		x = N::XmlString.new
+		x = XmlString.new
 		x.b { 
 			x.i 'Hello', :class =>'new'
 			x.p 'Paragraph'
 		}
 		assert_equal '<b><i class="new">Hello</i><p>Paragraph</p></b>', x
+
+		x = XmlString.new
+		x.hr
+		assert_equal '<hr />', x
+
+		x = XmlString.new
+		x.hr(:style => 'height: 1px')
+		assert_equal '<hr style="height: 1px" />', x
 	end
 
 	def test_xml_builder
 		buffer = ''
-		x = N::XmlBuilder.new(buffer)
+		x = XmlBuilder.new(buffer)
 
 		x.start_tag('html').
 			start_tag('title').text('hello').end_tag('title').

data/test/nitro/tc_dispatcher.rb

@@ -13,12 +13,12 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
 	
 	def setup
 		@d = N::Dispatcher.new({
-			:index => MainController,
+			:root => MainController,
 			'blog' => BlogController
 		})
 
 		@dxml = N::Dispatcher.new({
-			:index => MainController,
+			:root => MainController,
 			'blog' => BlogController
 		})
 		@dxml.add_api('xml', 'xml')
@@ -30,7 +30,7 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
 
 	def test_initialize
 		d = N::Dispatcher.new(BlogController)
-		assert_equal BlogController, d.controllers[:index]
+		assert_equal BlogController, d.controllers[:root]
 	end
 	
 	def test_dispatch

data/test/nitro/tc_uri.rb

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

data/test/og/tc_lifecycle.rb

@@ -1,43 +1,40 @@
 #! /usr/bin/env ruby
 # vim:sw=2:ai
 
-# code: 
 # * Thomas Quas  <tquas@yahoo.com>
 # * George Moschovitis  <gm@navel.gr>
-#
 # $Id$
 
 $LOAD_PATH.unshift 'lib'
 
-require "test/unit"
+require 'test/unit'
 require 'glue/logger'
 require 'og/mock'
 
 $DBG = false
-$log = Logger.new( STDERR ) unless $log
 
 class Dummy
-  prop_accessor :date
+  prop_accessor :date, Time
   attr_reader :call_stack
 
   def og_pre_insert( oid )
-    @call_stack << "pre_insert"
+    @call_stack << 'pre_insert'
   end
 
   def og_post_insert( oid )
-    @call_stack << "post_insert"
+    @call_stack << 'post_insert'
   end
 
   def og_pre_update( oid )
-    @call_stack << "pre_update"
+    @call_stack << 'pre_update'
   end
 
   def og_post_update( oid )
-    @call_stack << "post_update"
+    @call_stack << 'post_update'
   end
 
   def self.og_pre_delete( conn, oid )
-    raise "undeletable"
+    raise 'undeletable'
   end
 
   def initialize
@@ -51,8 +48,8 @@ class TC_CallbackTest < ::Test::Unit::TestCase
     obj = Dummy.new
     obj.save!
 
-    assert( obj.call_stack.shift == "pre_insert" )
-    assert( obj.call_stack.shift == "post_insert" )
+    assert( obj.call_stack.shift == 'pre_insert' )
+    assert( obj.call_stack.shift == 'post_insert' )
     assert( obj.call_stack.empty? )
   end
 
@@ -75,7 +72,7 @@ class TC_CallbackTest < ::Test::Unit::TestCase
     obj.call_stack.shift
     obj.call_stack.shift
 
-    assert_raise( RuntimeError, "undeletable" ) { obj.delete! }
+    assert_raise( RuntimeError, 'undeletable' ) { obj.delete! }
   end
 
   def setup
@@ -83,25 +80,25 @@ class TC_CallbackTest < ::Test::Unit::TestCase
 
 		if psql
 			config = {
-				:backend => "psql",
-				:address => "localhost",
-				:database => "test",
-				:user => "postgres",
-				:password => "navelrulez",
+				:adapter => 'psql',
+				#	:address => 'localhost',
+				:database => 'test',
+				:user => 'postgres',
+				:password => 'navelrulez',
 				:connection_count => 1
 			}
 		else
 			config = {
-				:backend => "mysql",
-				:address => "localhost",
-				:database => "test",
-				:user => "root",
-				:password => "navelrulez",
+				:adapter => 'mysql',
+				#	:address => 'localhost',
+				:database => 'test',
+				:user => 'root',
+				:password => 'navelrulez',
 				:connection_count => 1
 			}
 		end
-    Og::Database.drop_db!( config )
-    $og = Og::Database.new( config )
+    Og::Database.drop_db!(config)
+    $og = Og::Database.new(config)
     $og.get_connection()
   end
 end

data/test/og/tc_sqlite.rb

@@ -0,0 +1,87 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+=begin
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+require 'og/adapters/sqlite'
+
+class TC_OgSqlite3 < Test::Unit::TestCase # :nodoc: all
+	include N
+
+	# Forward declaration.
+
+	class Comment; end
+	
+	class Article
+		prop_accessor :name, String
+		prop_accessor :age, Fixnum
+		has_many :comments, Comment
+
+		def initialize (name = nil, age = nil)
+			@name, @age = name, age
+		end
+	end
+
+	class Comment
+		prop_accessor :text, String
+		belongs_to :article, Article
+
+		def initialize(text = nil)
+			@text = text
+		end
+	end
+
+	def setup
+		config = {
+			:adapter => 'sqlite',
+			:database => 'test',
+			:connection_count => 2 
+		}
+		
+		$DBG = true
+
+		Og::Database.drop_db!(config)
+		@og = Og::Database.new(config)
+	end
+
+	def teardown
+		@og.shutdown
+	end
+
+	def test_all
+		a = Article.new('gmosx', 30)
+		a.save!
+
+		a1 = Article[1]
+
+		assert_equal 'gmosx', a1.name
+		assert_equal 30, a1.age
+		assert_equal 1, a1.oid
+
+		Article.create('drak', 12)
+		Article.create('ekarak', 34)
+		Article.create('mario', 53)
+		Article.create('elathan', 34)
+
+		articles = Article.all
+
+		assert_equal 5, articles.size
+
+		a3 = Article[3]
+
+		assert_equal 'ekarak', a3.name
+
+		c1 = Comment.new('a comment')
+		c1.save!
+		a3.add_comment(c1)
+		
+		a5 = Article[3]
+		assert_equal 1, a5.comments.size
+	end
+
+end
+
+=end

data/test/tc_og.rb

@@ -85,52 +85,59 @@ class OrderItem
 end
 
 class TC_N_OG < Test::Unit::TestCase
+	def test_psql
+		config = {
+			:adapter => 'psql',
+			# :address => 'localhost',
+			:database => 'test',
+			:user => 'postgres',
+			:password => 'navelrulez',
+			:connection_count => 2
+		}
+
+		run_all_tests(config)
+	end
 
-	def setup
-		psql = true
-
-		if psql
-			config = {
-				:backend => "psql",
-				:address => "localhost",
-				:database => "test",
-				:user => "postgres",
-				:password => "navelrulez",
-				:connection_count => 1
-			}
-		else
-			config = {
-				:backend => "mysql",
-				:address => "localhost",
-				:database => "test",
-				:user => "root",
-				:password => "navelrulez",
-				:connection_count => 1
-			}
-		end
-		
-		Og::Database.drop_db!(config)
-		$og = Og::Database.new(config)
+=begin	
+	def test_mysql
+		config = {
+			:adapter => 'mysql',
+			# :address => 'localhost',
+			:database => 'test',
+			:user => 'root',
+			:password => 'navelrulez',
+			:connection_count => 2
+		}
+
+		run_all_tests(config)
 	end
 
-	def teardown
-		$og.shutdown()
+	def test_sqlite
+		config = {
+			:adapter => 'sqlite',
+			:database => 'test',
+			:connection_count => 2 
+		}
+
+		run_all_tests(config)
 	end
+=end
 
 	# gmosx: hmm, implemented in one method to enforce order.
-	#	
-	def test_all
-		$DBG = true
+		
+	def run_all_tests(config)
+		Og::Database.drop_db!(config)
+		og = Og::Database.new(config)
 
-		$og.get_connection()
+		og.get_connection
 		
 		article = Article.new("Title", "Here comes the body")
-		$og << article
+		og << article
 		
 		article.title = "Changed"
 		article.save!
 		
-		$og.pupdate("body='Hello'", article)
+		og.pupdate("body='Hello'", article)
 
 		article.update_properties "body='Hello'"
 		
@@ -143,9 +150,9 @@ class TC_N_OG < Test::Unit::TestCase
 		another.options = nil
 		another.save!
 		
-		assert_equal(nil, $og.load(30000, Article))
+		assert_equal(nil, og.load(30000, Article))
 		
-		articles = $og.load_all(Article)
+		articles = og.load_all(Article)
 
 #		p articles
 #		p Article[23]
@@ -157,9 +164,9 @@ class TC_N_OG < Test::Unit::TestCase
 		
 		assert_equal("gmosx", user.name)
 		
-		users1 = $og.select("name='gmosx' ORDER BY oid", User)
+		users1 = og.select("name='gmosx' ORDER BY oid", User)
 		
-		users = $og.select("SELECT * FROM #{User::DBTABLE} WHERE name='gmosx' ORDER BY oid", User)
+		users = og.select("SELECT * FROM #{User::DBTABLE} WHERE name='gmosx' ORDER BY oid", User)
 		
 		users2 = User.select "name='gmosx' ORDER BY oid"
 		
@@ -173,7 +180,6 @@ class TC_N_OG < Test::Unit::TestCase
 		comment.author = User["gmosx"]
 		comment.save!
 
-
 		# test automatically generated add_commnet
 		comment = Comment.new("This is another comment")
 		comment.author = User["gmosx"]
@@ -195,8 +201,10 @@ class TC_N_OG < Test::Unit::TestCase
 		article.add_comment(Comment.new("hello"))
 		article.add_comment(Comment.new("world"))
 
+		assert_equal 2, Comment.count
+
 		Article.delete(article)
-		
+
 		assert Comment.all.empty?
 
 		comment.delete!		
@@ -210,14 +218,14 @@ class TC_N_OG < Test::Unit::TestCase
 			end
 		end
 
-		assert($og.managed_classes.include?(Test::Article))
+		assert(og.managed_classes.include?(Test::Article))
 		
 		# bug: indirectly managed (includes managed Module)
-		assert($og.managed_classes.include?(Test::MyClass))
+		assert(og.managed_classes.include?(Test::MyClass))
 
 		# test create
 		article = Article.create("title", "body")
-		assert_equal(3, article.oid)
+		# assert_equal(3, article.oid)
 
 		# test refers_to
 
@@ -235,7 +243,18 @@ class TC_N_OG < Test::Unit::TestCase
 
 		user = User['gmosx']
 		assert_equal true, user.banned
+
+		og.put_connection
+		og.shutdown
+
+		# Test database allready exists
+
+		og = Og::Database.new(config)
+
+		user = User.new("gmosx")
+		user.save!
 		
+		og.shutdown
 	end
 
 end