nitro 0.2.0 → 0.3.0

data/test/n/{app → server}/tc_cookie.rb

@@ -2,9 +2,9 @@
 
 require "test/unit"
 
-require "n/app/cookie"
+require "n/server/cookie"
 
-include N::App
+include N
 
 
 class TC_Cookie < Test::Unit::TestCase

data/test/n/server/tc_filters.rb

@@ -0,0 +1,38 @@
+require "test/unit"
+
+require "n/server/filters"
+
+class Filter1 < N::ServerFilter
+	# :nodoc: all
+	def process(request)
+		return "filter1:#{process_next(request)}"
+	end
+end
+
+class Filter2 < ServerFilter
+	# :nodoc: all
+	def process(request)
+		return "filter2:#{process_next(request)}"
+	end
+end
+
+class TC_Server_Filter < Test::Unit::TestCase
+	# :nodoc: all
+
+	def setup
+		@filter = Filter1.new(Filter2.new)
+	end
+
+	def teardown
+		@filter = nil
+	end
+
+	def test_process_next
+		@filter = Filter1.new
+		assert_equal("filter1:", @filter.process(nil))
+
+		@filter = Filter1.new(Filter2.new)
+		assert_equal("filter1:filter2:", @filter.process(nil))
+	end
+
+end

data/test/n/{app → server}/tc_request.rb

@@ -4,10 +4,10 @@ require "test/unit"
 
 require "n/logger"; $log = Logger.new(STDERR) unless $log
 
-require "n/app/cookie"
-require "n/app/request"
+require "n/server/cookie"
+require "n/server/request"
 
-include N::App
+include N
 
 class TC_Request < Test::Unit::TestCase
 	# :nodoc: all
@@ -19,7 +19,7 @@ class TC_Request < Test::Unit::TestCase
 	end
 =begin
 	def test_parse
-		request = N::App::Request.new
+		request = N::Request.new
 
 		request.parse_cookies("nsid=293230807; nauth=gmosx:meMXs0ifW7JBQ; koko=123&345")
 
@@ -38,7 +38,7 @@ class TC_Request < Test::Unit::TestCase
 =end
 	def test_get_cookie
 		# bug: call get_cookie w/o cookies.
-		request = N::App::Request.new
+		request = N::Request.new
 		request.in_cookies = nil
 		assert_nothing_raised {
 			request.get_cookie("test")
@@ -46,7 +46,7 @@ class TC_Request < Test::Unit::TestCase
 	end
 
 	def test_tx
-		request = N::App::Request.new
+		request = N::Request.new
 		request.session = {}
 		request.parameters = {}
 		

data/test/n/{app → server}/tc_requestpart.rb

@@ -2,10 +2,10 @@
 
 require "test/unit"
 
-require "n/app/cookie"
-require "n/app/request"
+require "n/server/cookie"
+require "n/server/request"
 
-include N::App
+include N
 
 class TC_N2_Web_Server_RequestPart < Test::Unit::TestCase # :nodoc: all
 	# :nodoc: all

data/test/n/{app → server}/tc_session.rb

@@ -2,9 +2,9 @@
 
 require "test/unit"
 
-require "n/app/session"
+require "n/server/session"
 
-include N::App
+include N
 
 class TC_N2_Web_Server_Session < Test::Unit::TestCase
 	# :nodoc: all

data/test/n/tc_og.rb

@@ -0,0 +1,178 @@
+require "test/unit"
+
+require "n/logger"; $log = Logger.new(STDERR) unless $log
+require "n/og"
+
+module Test # :nodoc: all
+
+# bug: creates a table that fucksup postgres if not
+# correctly escaped.
+class User
+	prop_accessor String, :name
+	
+	def initialize(name = nil)
+		@name = name
+	end
+end
+
+class Comment; end
+
+class Article
+	has_many Test::Comment, :comments
+	prop_accessor String, :title
+	prop_accessor String, :body
+	prop_accessor Hash, :options
+	
+	def initialize(title = nil, body = nil)
+		@title = title
+		@body = body
+		@options = {"hello" => "world"}
+	end
+	
+	def og_pre_insert(conn)
+		puts "-- PRE INSERT CALLED FOR ARTICLE"
+	end
+	
+	def og_post_insert_update(conn)
+		puts "-- POST INSERT UPDATE CALLED FOR ARTICLE"
+	end
+
+	def og_post_update(conn)
+		puts "-- POST UPDATE CALLED FOR ARTICLE"
+	end
+end
+
+class Comment
+	belongs_to Test::Article, :article
+	belongs_to Test::User, :author
+	prop_accessor String, :body
+	prop_accessor Time, :create_time
+	
+	def initialize(body = nil)
+		@create_time = Time.now
+		@body = body
+	end
+	
+	def og_pre_insert(conn)
+		puts "-- PRE INSERT CALLED FOR COMMENT"
+	end
+
+	def og_post_insert(conn)
+		puts "-- POST INSERT CALLED FOR COMMENT"
+	end	
+end
+
+class TC_N_OG < Test::Unit::TestCase
+
+	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
+		
+		N::Og.drop_db!(config)
+		$og = N::Og.new(config)
+	end
+
+	def teardown
+		$og.shutdown()
+	end
+
+	# gmosx: hmm, implemented in one method to enforce order.
+	#	
+	def test_all
+		$DBG = true
+
+		$og.get_connection()
+		
+		$og.manage_classes(Article, Comment, User)
+		
+		article = Article.new("Title", "Here comes the body")
+		$og << article
+		
+		article.title = "Changed"
+		article.save!
+		
+		$og.pupdate("body='Hello'", article)
+
+		article.pupdate! "body='Hello'"
+		
+		another = Article[1]
+		assert_equal(1, another.oid)
+		# bug: yaml load problem.
+		assert_equal("world", another.options["hello"])
+		
+		# bug: YAMLing nil property
+		another.options = nil
+		another.save!
+		
+		assert_equal(nil, $og.load(30000, Article))
+		
+		articles = $og.load_all(Article)
+
+#		p articles
+#		p Article[23]
+		
+		user = User.new("gmosx")
+		user.save!
+		
+		another = User["gmosx"]
+		
+		assert_equal("gmosx", another.name)
+		
+		users1 = $og.select("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"
+		
+		assert_equal(users1.size, users2.size)
+		
+		article = Article.new("Title", "Body")
+		article.save!
+		
+		comment = Comment.new("This is a comment")
+		comment.article = article
+		comment.author = User["gmosx"]
+		comment.save!
+
+		comment = Comment.new("This is another comment")
+		comment.article = article.oid
+		comment.author = User["gmosx"]
+		comment.save!
+
+		assert_equal(article.oid, comment.article_oid)
+		
+		comments = article.comments
+		
+		assert_equal(2, comments.size)		
+
+		assert_equal("gmosx", comments[0].author.name)
+
+		Article.delete(article)
+		
+		assert_equal(nil, Comment.all)
+
+		comment.delete!		
+	end
+
+end
+
+end

data/test/n/ui/tc_pager.rb

@@ -4,7 +4,7 @@ require "test/unit"
 
 require "n/logger"; $log = Logger.new(STDERR) unless $log
 
-require "n/db"
+require "n/og"
 require "n/ui/pager"
 
 class RequestMock < Hash
@@ -17,7 +17,7 @@ class TC_N_UI_Pager < Test::Unit::TestCase
 
 	def setup
 =begin
-		$db = N::Db.new(
+		$og = N::Og.new(
 			:addres => "localhost",
 			:database => "testdb",
 			:user => "root",
@@ -28,7 +28,7 @@ class TC_N_UI_Pager < Test::Unit::TestCase
 	end
 
 	def teardown
-#		$db.shutdown()
+#		$og.shutdown()
 	end
 
 	def test_all

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2004-10-25
+  version: 0.3.0
+date: 2004-11-01
 summary: Web Engine
 require_paths: 
   - lib
@@ -33,10 +33,10 @@ files:
   - ChangeLog
   - Rakefile
   - bin/cluster.rb
-  - etc/new-project.rb
+  - bin/new_app.rb
   - examples/tiny
+  - examples/og
   - examples/simple
-  - examples/ndb
   - examples/tiny/conf
   - examples/tiny/app.rb
   - examples/tiny/logs
@@ -46,6 +46,8 @@ files:
   - examples/tiny/conf/requires.rb
   - examples/tiny/conf/config.rb
   - examples/tiny/root/index.sx
+  - examples/og/run.rb
+  - examples/og/README
   - examples/simple/conf
   - examples/simple/app.rb
   - examples/simple/install.rb
@@ -75,21 +77,18 @@ files:
   - examples/simple/lib/articles/part.rb
   - examples/simple/lib/articles/entities.rb
   - examples/simple/lib/articles/methods.rb
-  - examples/ndb/run.rb
-  - examples/ndb/README
   - doc/bugs.txt
   - doc/architecture.txt
   - lib/n
   - lib/xsl
   - lib/p
-  - lib/n/app
   - lib/n/sitemap.rb
   - lib/n/properties.rb
   - lib/n/parts.rb
   - lib/n/utils
-  - lib/n/db
   - lib/n/macros.rb
   - lib/n/shaders.rb
+  - lib/n/og
   - lib/n/sync
   - lib/n/server.rb
   - lib/n/server
@@ -98,27 +97,10 @@ files:
   - lib/n/l10n.rb
   - lib/n/ui
   - lib/n/application.rb
+  - lib/n/og.rb
   - lib/n/config.rb
   - lib/n/logger.rb
   - lib/n/std.rb
-  - lib/n/db.rb
-  - lib/n/app/filters
-  - lib/n/app/session.rb
-  - lib/n/app/handlers
-  - lib/n/app/request.rb
-  - lib/n/app/fragment.rb
-  - lib/n/app/script.rb
-  - lib/n/app/webrick-servlet.rb
-  - lib/n/app/server.rb
-  - lib/n/app/cluster.rb
-  - lib/n/app/cookie.rb
-  - lib/n/app/user.rb
-  - lib/n/app/request-part.rb
-  - lib/n/app/handlers.rb
-  - lib/n/app/webrick.rb
-  - lib/n/app/filters/autologin.rb
-  - lib/n/app/handlers/page-handler.rb
-  - lib/n/app/handlers/code-handler.rb
   - lib/n/utils/pool.rb
   - lib/n/utils/time.rb
   - lib/n/utils/mail.rb
@@ -132,20 +114,34 @@ files:
   - lib/n/utils/string.rb
   - lib/n/utils/http.rb
   - lib/n/utils/hash.rb
-  - lib/n/db/tools.rb
-  - lib/n/db/connection.rb
-  - lib/n/db/psql.rb
-  - lib/n/db/mysql.rb
-  - lib/n/db/managed.rb
-  - lib/n/db/utils.rb
-  - lib/n/db/mixins.rb
-  - lib/n/db/README
+  - lib/n/og/backends
+  - lib/n/og/connection.rb
+  - lib/n/og/backend.rb
+  - lib/n/og/meta.rb
+  - lib/n/og/backends/psql.rb
+  - lib/n/og/backends/mysql.rb
   - lib/n/sync/handler.rb
   - lib/n/sync/server.rb
   - lib/n/sync/clc.rb
-  - lib/n/server/RESEARCH.txt
-  - lib/n/server/PLAYBACK.txt
-  - lib/n/server/filter.rb
+  - lib/n/server/filters
+  - lib/n/server/session.rb
+  - lib/n/server/handlers
+  - lib/n/server/request.rb
+  - lib/n/server/requestpart.rb
+  - lib/n/server/appserver.rb
+  - lib/n/server/fragment.rb
+  - lib/n/server/dispatcher.rb
+  - lib/n/server/script.rb
+  - lib/n/server/filters.rb
+  - lib/n/server/server.rb
+  - lib/n/server/cluster.rb
+  - lib/n/server/cookie.rb
+  - lib/n/server/user.rb
+  - lib/n/server/handlers.rb
+  - lib/n/server/webrick.rb
+  - lib/n/server/filters/autologin.rb
+  - lib/n/server/handlers/page-handler.rb
+  - lib/n/server/handlers/code-handler.rb
   - lib/n/ui/popup.rb
   - lib/n/ui/select.rb
   - lib/n/ui/date-select.rb
@@ -155,18 +151,13 @@ files:
   - lib/xsl/base.xsl
   - lib/p/README
   - test/n
-  - test/n/app
-  - test/n/tc_db.rb
   - test/n/utils
+  - test/n/tc_og.rb
   - test/n/tc_sitemap.rb
+  - test/n/server
   - test/n/tc_events.rb
   - test/n/ui
-  - test/n/tc_db_mysql.rb
   - test/n/tc_properties.rb
-  - test/n/app/tc_requestpart.rb
-  - test/n/app/tc_cookie.rb
-  - test/n/app/tc_session.rb
-  - test/n/app/tc_request.rb
   - test/n/utils/tc_cache.rb
   - test/n/utils/tc_hash.rb
   - test/n/utils/tc_http.rb
@@ -174,6 +165,11 @@ files:
   - test/n/utils/tc_html.rb
   - test/n/utils/tc_uri.rb
   - test/n/utils/tc_number.rb
+  - test/n/server/tc_filters.rb
+  - test/n/server/tc_requestpart.rb
+  - test/n/server/tc_cookie.rb
+  - test/n/server/tc_session.rb
+  - test/n/server/tc_request.rb
   - test/n/ui/tc_pager.rb
 test_files: []
 rdoc_options: 
@@ -191,24 +187,4 @@ extra_rdoc_files:
 executables: []
 extensions: []
 requirements: []
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: postgres
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.7.1
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: extensions
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: "0.5"
-      version: 
+dependencies: []