nitro 0.10.0 → 0.11.0

data/test/nitro/tc_context.rb

@@ -9,5 +9,9 @@ class TC_Context < Test::Unit::TestCase # :nodoc: all
 	include N
 	
 	def test_context
+		conf = OpenStruct.new
+		conf.dispatcher = nil
+		c = Context.new(conf)
+		assert_equal 200, c.status
 	end
 end

data/test/nitro/tc_controller.rb

@@ -11,7 +11,7 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 	include N
 	
 	class BlogController < Controller
-		attr_accessor :aflag, :tflag
+		attr_reader :aflag, :tflag
 
 		def list
 			@aflag = true 
@@ -30,8 +30,9 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 	def test_render
 		ctx = Context.new(@conf)
 		ctx.headers = {}
+		ctx.params = {}
 		puts '=', ctx.dispatcher.root
-		klass, action, base = ctx.dispatcher.dispatch('/blog/list')
+		klass, action, base = ctx.dispatcher.dispatch('/blog/list', ctx)
 		c = klass.new(ctx, base)
 		begin
 		c.send(action)
@@ -44,4 +45,10 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
 		assert_equal true, c.tflag
 	end
 
+	def test_action_methods
+		# aflag/tflag are counted too!
+		assert_equal 3, BlogController.action_methods.size
+		assert BlogController.action_methods.include?('list')
+	end
+
 end

data/test/og/tc_filesys.rb

@@ -0,0 +1,83 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+require 'og/adapters/filesys'
+
+class TC_OgFilesys < Test::Unit::TestCase # :nodoc: all
+	include N, Og
+
+	# 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 => 'filesys',
+			:database => 'fstest',
+		}
+		
+		$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)
+=begin
+		articles = Article.all
+
+		assert_equal 5, articles.size
+=end
+		a3 = Article[3]
+
+		assert_equal 'ekarak', a3.name
+
+		c1 = Comment.new('a comment')
+		c1.save!
+		a3.add_comment(c1)
+=begin
+		a5 = Article[3]
+		assert_equal 1, a5.comments.size
+=end
+	end
+
+end

data/test/og/tc_meta.rb

@@ -0,0 +1,55 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+
+class TC_OgMeta < Test::Unit::TestCase # :nodoc: all
+	include N
+
+	# Forward declaration.
+
+	class Comment; end
+	
+	class Article
+		property :name, String
+		property :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
+	end
+
+	def teardown
+	end
+
+	def test_all
+		par = Article.__meta[:props_and_relations]
+		assert_equal 3, par.size
+		assert_equal N::Property, par[1].class
+		assert_equal Og::HasMany, par[2].class
+
+		par = Comment.__meta[:props_and_relations]
+		assert_equal 3, par.size
+		assert_equal N::Property, par[0].class
+		assert_equal Og::BelongsTo, par[1].class
+		assert_equal 'article_oid', par[1].meta[:property].to_s
+		assert_equal String, par[0].klass
+		assert_equal Article, par[1].foreign_class
+	end
+
+end

data/test/tc_og.rb

@@ -1,5 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
+$DBG = true
+
 require 'test/unit'
 
 require 'og'
@@ -19,15 +21,24 @@ end
 
 class Role
 	prop_accessor :title, String
+	property :chk_not_null, Fixnum, :default => 2
 end
 
 class Comment; end
+class Article; end
+
+class Category
+	prop_accessor :title, String
+	many_to_many :articles, Article
+end
 
 class Article
 	prop_accessor :title, String
 	prop_accessor :body, String
 	prop_accessor :owner_oid, Fixnum, :sql_index => true
 	prop_accessor :another_oid, Fixnum
+	property :create_time, Time
+	property :rate, Float
 	sql_index 'owner_oid, another_oid'
 	prop_accessor :options, Hash
 	has_many :comments, Test::Comment
@@ -80,48 +91,69 @@ class MyClass
 end
 
 class OrderItem
-	prop_accessor :number, Fixnum
+	prop_accessor :onumber, Fixnum
 	refers_to :article, Article
 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
 
-=begin	
-	def test_mysql
-		config = {
-			:adapter => 'mysql',
-			# :address => 'localhost',
-			:database => 'test',
-			:user => 'root',
-			:password => 'navelrulez',
-			:connection_count => 2
-		}
-
-		run_all_tests(config)
-	end
+	@@adapter = :psql
+
+	case @@adapter
 
-	def test_sqlite
-		config = {
-			:adapter => 'sqlite',
-			:database => 'test',
-			:connection_count => 2 
-		}
+	when :psql
+		def test_psql
+			config = {
+				:adapter => 'psql',
+				# :address => 'localhost',
+				:database => 'test',
+				:user => 'postgres',
+				:password => 'navelrulez',
+				:connection_count => 2
+			}
+
+			run_all_tests(config)
+		end
 
-		run_all_tests(config)
+	when :mysql
+		def test_mysql
+			config = {
+				:adapter => 'mysql',
+				# :address => 'localhost',
+				:database => 'test',
+				:user => 'root',
+				:password => 'navelrulez',
+				:connection_count => 2
+			}
+
+			run_all_tests(config)
+		end
+
+	when :oracle
+		def test_oracle
+			config = {
+				:adapter => 'oracle',
+				# :address => 'localhost',
+				:database => 'test',
+				:user => 'root',
+				:password => 'navelrulez',
+				:connection_count => 2
+			}
+
+			run_all_tests(config)
+		end
+
+	when :sqlite
+		def test_sqlite
+			config = {
+				:adapter => 'sqlite',
+				:database => 'test',
+				:connection_count => 2 
+			}
+
+			run_all_tests(config)
+		end
 	end
-=end
 
 	# gmosx: hmm, implemented in one method to enforce order.
 		
@@ -132,6 +164,8 @@ class TC_N_OG < Test::Unit::TestCase
 		og.get_connection
 		
 		article = Article.new("Title", "Here comes the body")
+		article.create_time = now = Time.now
+		article.rate = rate = 12.33
 		og << article
 		
 		article.title = "Changed"
@@ -143,6 +177,9 @@ class TC_N_OG < Test::Unit::TestCase
 		
 		another = Article[1]
 		assert_equal(1, another.oid)
+		assert_equal now.to_i, another.create_time.to_i
+		assert_equal rate, another.rate
+		
 		# bug: yaml load problem.
 		assert_equal("world", another.options["hello"])
 		
@@ -180,17 +217,44 @@ class TC_N_OG < Test::Unit::TestCase
 		comment.author = User["gmosx"]
 		comment.save!
 
-		# test automatically generated add_commnet
+		# test automatically generated add_comment
 		comment = Comment.new("This is another comment")
 		comment.author = User["gmosx"]
 		article.add_comment(comment)
 
+		# test add_comment with block.
+		article.add_comment do |c|
+			c.body = 'Another one'
+			c.author = User['gmosx']
+		end
+		
 		assert_equal(article.oid, comment.article_oid)
 		
 		comments = article.comments
 		
-		assert_equal(2, comments.size)		
+		assert_equal(3, comments.size)		
+
+		# test many_to_many relations.
+
+		category = Category.create
+		category.add_article(article)
+
+		assert_equal 1, category.articles.size
+
+		# bug: test many_to_many with non-saved object.
+	
+		ans = Article.new
+		ans.title = 'non saved'
+		category.add_article(ans)
+
+		category.add_article do |a|
+			a.title = 'another'
+		end
 
+		assert_equal 3, category.articles.size
+
+		assert_equal 1, article.categories.size
+	
 		assert_equal("gmosx", comments[0].author.name)
 
 		article.delete_all_comments
@@ -244,6 +308,21 @@ class TC_N_OG < Test::Unit::TestCase
 		user = User['gmosx']
 		assert_equal true, user.banned
 
+		# test not null
+
+		role = Role.new
+
+		begin
+			role.save
+		rescue Exception, StandardError
+			# drink it
+		end
+		
+		role = Role[1]
+
+		# not saved due to not nul constraint.
+		assert_equal nil, role
+		
 		og.put_connection
 		og.shutdown
 

data/vendor/README

@@ -1,6 +1,12 @@
-Libraries from other vendors belong here.
+= Extensions and Libraries from other vendors.
+
+Libraries from other vendors belong here. This file
+
+=== Included libraries
+
+* extensions
+* breakpointer
+* dev-utils
+* postgres-pr
+* ParseTree
 
-extensions
-breakpointer
-dev-utils
-postgres-pr

data/vendor/breakpoint.rb

@@ -21,6 +21,9 @@ require 'drb'
 require 'drb/acl'
 
 module Breakpoint
+  id = %q$Id: breakpoint.rb 92 2005-02-04 22:35:53Z flgr $
+  Version = id.split(" ")[2].to_i
+
   extend self
 
   # This will pop up an interactive ruby session at a
@@ -119,6 +122,7 @@ module Breakpoint
     # in the context of the client.
     class Client
       def initialize(eval_handler) # :nodoc:
+        eval_handler.untaint
         @eval_handler = eval_handler
       end
 
@@ -133,15 +137,23 @@ module Breakpoint
       end
 
       # Will execute the specified statement at the client.
-      def method_missing(method, *args)
-        if args.empty?
-          result = eval("#{method}")
+      def method_missing(method, *args, &block)
+        if args.empty? and not block
+          result = eval "#{method}"
         else
-          result = eval("#{method}(*Marshal.load(#{Marshal.dump(args).inspect}))")
-        end
-
-        unless [true, false, nil].include?(result)
-          result.extend(DRbUndumped) rescue nil
+          # This is a bit ugly. The alternative would be using an
+          # eval context instead of an eval handler for executing
+          # the code at the client. The problem with that approach
+          # is that we would have to handle special expressions
+          # like "self", "nil" or constants ourself which is hard.
+          remote = eval %{
+            result = lambda { |block, *args| #{method}(*args, &block) }
+            def result.call_with_block(*args, &block)
+              call(block, *args)
+            end
+            result
+          }
+          remote.call_with_block(*args, &block)
         end
 
         return result
@@ -175,6 +187,7 @@ module Breakpoint
     #   client.File.open("temp.txt", "w") { |f| f.puts "Hello" } 
     def client()
       if Breakpoint.use_drb? then
+        sleep(0.5) until Breakpoint.drb_service.eval_handler
         Client.new(Breakpoint.drb_service.eval_handler)
       else
         Client.new(lambda { |code| eval(code, TOPLEVEL_BINDING) })
@@ -276,10 +289,12 @@ module Breakpoint
     def collision
       sleep(0.5) until @collision_handler
 
+      @collision_handler.untaint
+
       @collision_handler.call
     end
 
-    def ping; end
+    def ping() end
 
     def add_breakpoint(context, message)
       workspace = IRB::WorkSpace.new(context)
@@ -287,34 +302,11 @@ module Breakpoint
 
       sleep(0.5) until @handler
 
+      @handler.untaint
       @handler.call(workspace, message)
     end
 
-    def register_handler(&block)
-      @handler = block
-    end
-
-    def unregister_handler
-      @handler = nil
-    end
-
-    attr_reader :eval_handler
-
-    def register_eval_handler(&block)
-      @eval_handler = block
-    end
-
-    def unregister_eval_handler
-      @eval_handler = lambda { }
-    end
-
-    def register_collision_handler(&block)
-      @collision_handler = block
-    end
-
-    def unregister_collision_handler
-      @collision_handler = lambda { }
-    end
+    attr_accessor :handler, :eval_handler, :collision_handler
   end
 
   # Will run Breakpoint in DRb mode. This will spawn a server
@@ -441,7 +433,11 @@ module IRB # :nodoc:
     @CONF[:MAIN_CONTEXT] = irb.context
 
     old_sigint = trap("SIGINT") do
-      irb.signal_handle
+      begin
+        irb.signal_handle
+      rescue RubyLex::TerminateLineInput
+        # ignored
+      end
     end
     
     catch(:IRB_EXIT) do
@@ -464,6 +460,7 @@ module IRB # :nodoc:
       old_CurrentContext
     end
   end
+  def IRB.parse_opts() end
 
   class Context
     alias :old_evaluate :evaluate
@@ -485,7 +482,7 @@ module IRB # :nodoc:
         if args[0] != :no_proxy and
           not [true, false, nil].include?(result)
         then
-          result.extend(DRbUndumped) if result
+          result.extend(DRbUndumped) rescue nil
         end
         return result
       else
@@ -506,8 +503,8 @@ end
 
 module DRb # :nodoc:
   class DRbObject
-    undef :inspect
-    undef :clone
+    undef :inspect if method_defined?(:inspect)
+    undef :clone if method_defined?(:clone)
   end
 end