nitro 0.11.0 → 0.12.0

data/test/nitro/tc_dispatcher.rb

@@ -5,7 +5,7 @@ require 'nitro/dispatcher'
 
 class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
 
-	class MainController
+	class MainController < N::Controller
 	end
 
 	class BlogController < N::Controller

data/test/nitro/tc_template.rb

@@ -0,0 +1,32 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'nitro/template'
+
+class TC_Template < Test::Unit::TestCase # :nodoc: all
+	include N
+	
+	def test_all
+		template = %q{
+			Hello #{user}
+
+			dont forget the following todo items:
+			
+			<?r for item in items ?>
+				<li>#{item}</li>
+			<?r end ?>
+		}
+
+		user = 'gmosx'
+		items = %w{ nitro is really great }
+		out = ''
+
+		Template.process(template, :out, binding)
+
+		assert_match %r{\<li\>nitro\</li\>}, out
+		assert_match %r{\<li\>really\</li\>}, out
+		assert_match %r{Hello gmosx}, out
+	end
+end

data/test/og/tc_many_to_many.rb

@@ -0,0 +1,62 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+
+class TC_OgManyToMany < Test::Unit::TestCase # :nodoc: all
+	include N
+
+	class Attribute
+		property :name, String
+		
+		def initialize(name = nil)
+			@name = name
+		end
+	end
+
+	class Klass
+		property :name, String
+		many_to_many :observed_attributes, Attribute, :linkback => :klass_observers
+		many_to_many :controlled_attributes, Attribute, :linkback => :klass_controllers
+
+		def initialize(name = nil)
+			@name = name
+		end
+	end
+
+	def test_all
+		config = {
+			:adapter => 'psql',
+			:database => 'test',
+			:user => 'postgres',
+			:password => 'navelrulez',
+			:connection_count => 2
+		}
+
+		Og::Database.drop_db!(config)
+		og = Og::Database.new(config)
+
+		og.get_connection
+
+		k = Klass.create('klass1')
+		a1 = Attribute.create('attr1')
+		a2 = Attribute.create('attr2')
+
+		k.add_observed_attribute(a1)
+		k.add_observed_attribute(a2)
+
+		assert_equal 2, k.observed_attributes.size
+		assert_equal 1, a1.klass_observers.size
+
+		k.add_controlled_attribute(a1)
+
+		assert_equal 1, k.controlled_attributes.size
+		assert_equal 1, a1.klass_controllers.size
+
+		og.put_connection
+		og.shutdown
+	end
+
+end

data/test/og/tc_observer.rb

@@ -0,0 +1,85 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+
+class TC_OgObserver < Test::Unit::TestCase # :nodoc: all
+	include N
+
+	class User
+		property :name
+	end
+
+	class Article
+		property :name, String
+		property :age, Fixnum
+
+		def initialize (name = nil, age = nil)
+			@name, @age = name, age
+		end
+	end
+
+	# Example of a simple class that acts as an observer.
+
+	class ArticleObserver
+		attr :count
+
+		def initialize
+			@count = 0
+		end
+		
+		def og_pre_insert(conn, obj)
+			@count += 1
+		end
+	end
+
+	# Rails style observer, baaah...
+
+	class MultiObserver < Og::Observer
+		observe Article, User
+
+		attr :count
+		
+		def initialize
+			@count = 0
+		end
+		
+		def og_pre_insert(conn, obj)
+			@count += 1
+		end
+	end
+	
+	def setup
+	end
+
+	def teardown
+	end
+
+	def test_all
+		config = {
+			:adapter => 'psql',
+			:database => 'test',
+			:user => 'postgres',
+			:password => 'navelrulez',
+			:connection_count => 2
+		}
+
+		Og::Database.drop_db!(config)
+		og = Og::Database.new(config)
+
+		og.get_connection
+
+		ao = ArticleObserver.new
+		Article.add_observer(ao)
+		Article.create('Hello', 5)
+
+		assert_equal 1, ao.count
+		assert_equal 1, MultiObserver.instance.count
+
+		og.put_connection
+		og.shutdown
+	end
+
+end

data/test/tc_og.rb

@@ -11,7 +11,7 @@ module Test # :nodoc: all
 # bug: creates a table that fucks-up postgres if not
 # correctly escaped.
 class User
-	prop_accessor :name, String
+	prop_accessor :name, String, :unique => true
 	prop_accessor :banned, TrueClass
 
 	def initialize(name = nil)
@@ -212,6 +212,20 @@ class TC_N_OG < Test::Unit::TestCase
 		article = Article.new("Title", "Body")
 		article.save!
 
+		# advanced finder
+
+		users3 = User.find_by_banned(true)
+		assert users3.empty? 
+
+		user3 = User.find_by_name('gmosx')
+		assert_equal 'gmosx', user3.name
+
+		user3.banned = true
+		user3.save
+
+		users3 = User.find_by_banned(true)
+		assert !users3.empty? 
+
 		comment = Comment.new("This is a comment")
 		comment.article = article
 		comment.author = User["gmosx"]
@@ -330,7 +344,7 @@ class TC_N_OG < Test::Unit::TestCase
 
 		og = Og::Database.new(config)
 
-		user = User.new("gmosx")
+		user = User.new("kokoriko")
 		user.save!
 		
 		og.shutdown

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.6
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
-date: 2005-02-28
+  version: 0.12.0
+date: 2005-03-07
 summary: Nitro Web Engine
 require_paths: 
   - lib
@@ -30,15 +30,12 @@ authors:
 files: 
   - Rakefile
   - ChangeLog
-  - LICENSE
-  - AUTHORS
   - INSTALL
   - RELEASES
   - README
   - install.rb
   - bin/nitro
   - bin/new_app.rb
-  - bin/cluster
   - bin/proto
   - bin/new_form.rb
   - bin/proto/ctl
@@ -80,7 +77,6 @@ files:
   - examples/blog
   - examples/README.windows
   - examples/og
-  - examples/wiki.yml
   - examples/no_xsl_blog/log
   - examples/no_xsl_blog/conf
   - examples/no_xsl_blog/root
@@ -121,7 +117,6 @@ files:
   - examples/no_xsl_blog/lib/blog/template.rb
   - examples/no_xsl_blog/lib/blog/model.rb
   - examples/no_xsl_blog/lib/blog/controller.rb
-  - examples/why_wiki/wiki.yml
   - examples/why_wiki/run.rb
   - examples/why_wiki/README
   - examples/flash/log
@@ -158,6 +153,7 @@ files:
   - examples/blog/conf/apache.conf
   - examples/blog/conf/lhttpd.conf
   - examples/blog/root/login.xhtml
+  - examples/blog/root/error.xhtml
   - examples/blog/root/index.xhtml
   - examples/blog/root/style.css
   - examples/blog/root/entry_form.xhtml
@@ -165,6 +161,7 @@ files:
   - examples/blog/root/fcgi.rb
   - examples/blog/root/comments.xhtml
   - examples/blog/root/style.xsl
+  - examples/blog/root/base.xsl
   - examples/blog/root/recent_posts.xhtml
   - examples/blog/root/view_entry.xhtml
   - examples/blog/root/view_entry.xml
@@ -193,6 +190,8 @@ files:
   - examples/og/README
   - doc/ChangeLog.1
   - doc/config.txt
+  - doc/LICENSE
+  - doc/AUTHORS
   - doc/apache.txt
   - doc/tutorial.txt
   - doc/og_tutorial.txt
@@ -201,7 +200,6 @@ files:
   - doc/og_config.txt
   - lib/nitro
   - lib/parts
-  - lib/xsl
   - lib/glue.rb
   - lib/nitro.rb
   - lib/glue
@@ -210,6 +208,7 @@ files:
   - lib/nitro/localization.rb
   - lib/nitro/cookie.rb
   - lib/nitro/session.rb
+  - lib/nitro/routing.rb
   - lib/nitro/uri.rb
   - lib/nitro/output.rb
   - lib/nitro/runner.rb
@@ -217,6 +216,7 @@ files:
   - lib/nitro/scaffold.rb
   - lib/nitro/adapters
   - lib/nitro/context.rb
+  - lib/nitro/template.rb
   - lib/nitro/shaders.rb
   - lib/nitro/buffering.rb
   - lib/nitro/builders
@@ -245,16 +245,13 @@ files:
   - lib/nitro/session/drb.rb
   - lib/nitro/session/memory.rb
   - lib/nitro/session/drbserver.rb
-  - lib/nitro/ui/sitemap.rb
   - lib/nitro/ui/pager.rb
   - lib/nitro/ui/date-select.rb
   - lib/nitro/ui/tabs.rb
-  - lib/nitro/ui/select.rb
   - lib/nitro/ui/popup.rb
   - lib/parts/content.rb
   - lib/parts/content
   - lib/parts/README
-  - lib/xsl/base.xsl
   - lib/glue/mixins.rb
   - lib/glue/logger.rb
   - lib/glue/pool.rb
@@ -275,6 +272,7 @@ files:
   - lib/og/adapters
   - lib/og/enchant.rb
   - lib/og/connection.rb
+  - lib/og/observer.rb
   - lib/og/database.rb
   - lib/og/mock.rb
   - lib/og/meta.rb
@@ -291,6 +289,7 @@ files:
   - test/glue
   - test/og
   - test/nitro/tc_uri.rb
+  - test/nitro/tc_template.rb
   - test/nitro/tc_controller.rb
   - test/nitro/adapters
   - test/nitro/tc_session.rb
@@ -306,7 +305,6 @@ files:
   - test/nitro/builders/tc_xml.rb
   - test/nitro/builders/tc_rss.rb
   - test/nitro/ui/tc_pager.rb
-  - test/nitro/ui/tc_sitemap.rb
   - test/root/blog
   - test/root/blog/list.xhtml
   - test/glue/tc_strings.rb
@@ -320,8 +318,10 @@ files:
   - test/glue/tc_cache.rb
   - test/glue/tc_numbers.rb
   - test/og/tc_sqlite.rb
+  - test/og/tc_observer.rb
   - test/og/tc_filesys.rb
   - test/og/tc_meta.rb
+  - test/og/tc_many_to_many.rb
   - test/og/tc_lifecycle.rb
   - vendor/breakpoint_client.rb
   - vendor/sexp_processor.rb
@@ -360,8 +360,6 @@ rdoc_options:
 extra_rdoc_files: 
   - Rakefile
   - ChangeLog
-  - LICENSE
-  - AUTHORS
   - INSTALL
   - RELEASES
   - README

data/bin/cluster

@@ -1,218 +0,0 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: cluster.rb 249 2005-02-04 14:03:00Z gmosx $
-
-# WARNING: This is old code, not updated to work in the
-# latest nitro release. Will be fixed ASAP.
-
-$:.unshift 'lib'
-
-require 'drb'
-require 'monitor'
-
-require 'nitro/application'
-require 'nitro/server'
-require 'glue/cache'
-require 'nitro/server/session'
-
-module N
-
-# A Cluster manages the state of a collection of servers. The cluster 
-# synchronizes the servers and distributes the state. An older version 
-# used a polling system, ie: the servers polled the cluster to 
-# obtain the state. This version uses a push system, ie when the 
-# state is changed a delta is pushed to the clients.
-#
-# TODO: use Sync instead of Monitor
-
-class Cluster < N::Application
-
-	# The CHash 'endpoint' resides in the Cluster server
-	
-	class CHash < Hash
-		attr :mon
-		
-		# drbobject for this hash (local)
-		
-		attr_accessor :ldrb
-		
-		# the cluster, use a cluster to implement a set
-		# (one server per drb_uri)
-		
-		attr_accessor :cluster
-		
-		#
-
-		def initialize(ldrb_uri = "druby://:8000")
-			@mon = Monitor.new
-			@ldrb = DRb.start_service(ldrb_uri, self)
-			@cluster = {}
-		end
-
-		#  
-				
-		def join(sdrb_uri)
-			@mon.synchronize {
-				cluster[sdrb_uri] = DRbObject.new(nil, sdrb_uri)
-			}
-		end
-		
-		alias_method :old_set, :[]=
-
-		# Not really usefull
-				
-		def []=(key, value)
-			# store the value (useful on server restarts)
-			@mon.synchronize {
-				old_set(key, value)
-
-				puts "CLUSTER #{key} = #{value}"
-		
-				cluster.each { |uri, sdrb|
-					begin
-						sdrb.server_sync(key, value)
-					rescue => ex
-						Logger.error "Server at #{uri} is down, removing from cluster"
-						cluster.delete(uri)
-					end
-				}
-			}
-		end
-		
-		# Use this, avoids syncing the original server, and avoids a 
-		# nasty deadlock.
-		#
-		def cluster_sync(key, value, server_uri)
-			# store the value (useful on server restarts)
-			@mon.synchronize {
-				old_set(key, value)
-
-				puts "CLUSTER #{key} = #{value}"
-		
-				cluster.each { |uri, sdrb|
-					begin
-						sdrb.server_sync(key, value) unless uri == server_uri
-					rescue => ex
-						Logger.error "Server at #{uri} is down, removing from cluster"
-						cluster.delete(uri)
-					end
-				}
-			}		
-		end
-		
-		def [](key)
-			@mon.synchronize {
-				puts "LOOKUP #{key}"
-				return super
-			}
-		end
-		
-	end
-	
-	# The SHash 'endpoint' resides in the App server
-	
-	class SHash < Hash
-		attr :mon
-	
-		# drbobject for this hash (local)
-		attr_accessor :ldrb
-	
-		# drb for the cluster hash
-		attr_accessor :cdrb
-		
-		# ldrb = local drb uri
-		# cdrb = cluster drb uri
-		
-		def initialize(ldrb_uri = "druby://:9000", cdrb_uri = "druby://:8000")
-			@mon = Monitor.new
-			@ldrb_uri = ldrb_uri
-			@ldrb = DRb.start_service(ldrb_uri, self)
-			@cdrb = DRbObject.new(nil, cdrb_uri)
-			@cdrb.join(ldrb_uri)
-		end
-		
-		alias_method :old_set, :[]=
-		
-		#
-		#
-		def []=(key, value)
-			# store the value in the local hash
-			@mon.synchronize {
-				puts "LOCAL #{key} = #{value}"
-				old_set(key, value)
-				@cdrb.cluster_sync(key, value, @ldrb_uri)
-			}
-		end
-		
-		# If the key is not found in the local hash, try the 
-		# cluster hash.
-		#
-		def [](key)
-			@mon.synchronize {
-				unless value = super
-					value = @cdrb[key]
-					old_set(key, value)
-				end
-				return value
-			}
-		end
-		
-		# Called by the cluster
-		#
-		def server_sync(key, value)
-			puts "SYNC #{key} = #{value}"
-			@mon.synchronize {
-				old_set(key, value)
-			}
-		end
-			
-	end
-
-	# Cluster Last Modified Hash
-	
-	class Clm < CHash
-		def [](key)
-			@mon.synchronize {
-				unless value = super
-					puts "INIT #{key}"
-					value = Time.now.to_i
-					old_set(key, value)
-				end
-				return value
-			}
-		end
-	end
-	
-	# = Slm Server Last Modified Hash
-	
-	class Slm < SHash
-		def set!(key, lm = nil)
-			lm = Time.now.to_i unless lm
-			self[key] = lm
-			return lm
-		end
-	end
-	
-	def initialize(name = "Cluster")
-		super
-	end
-	
-	def run
-		N::Cluster::Clm.new
-		DRb.start_service("druby://:8001", N::SessionManager.new)
-	
-		while true
-			sleep(5000)
-		end
-		
-		super
-	end
-	
-end
-
-end
-
-if $0 == __FILE__
-	require 'logger'
-	N::Cluster.new.exec()
-end