nitro 0.9.3 → 0.9.5

data/lib/og/connection.rb

@@ -1,8 +1,6 @@
-#-- 
-# George Moschovitis  <gm@navel.gr>
+# * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id: connection.rb 248 2005-01-31 13:38:34Z gmosx $
-#++
 
 class Og; 
 
@@ -33,7 +31,7 @@ class Connection
 
 	attr_accessor :deserialize 
 		
-	# Initialize a connection to the database
+	# Initialize a connection to the database.
 	
 	def initialize(og)
 		@og = og
@@ -42,8 +40,8 @@ class Connection
 		Logger.debug "Created DB connection." if $DBG 
 	end
 	
-	# Close the connection to the database
-	#
+	# Close the connection to the database.
+	
 	def close()
 		@db.close()
 		Logger.debug "Closed DB connection." if $DBG
@@ -51,7 +49,7 @@ class Connection
 
 	# Save an object to the database. Insert if this is a new object or
 	# update if this is already stored in the database.
-	#	
+		
 	def save(obj)
 		if obj.oid
 			# object allready inserted, update!
@@ -65,13 +63,13 @@ class Connection
 	alias_method :put, :save
 	
 	# Force insertion of managed object.
-	#
+	
 	def insert(obj)
 		obj.og_insert(self)
 	end
 
 	# Force update of managed object.
-	#
+	
 	def update(obj)
 		obj.og_update(self)
 	end
@@ -81,11 +79,11 @@ class Connection
 	# Input:
 	# sql = the sql code to updated the properties.
 	#
-	# WARNING: the object in memoryis not updated.
+	# WARNING: the object in memory is not updated.
 	#--
 	# TODO: should update the object in memory.
 	#++
-	#
+	
 	def update_properties(update_sql, obj_or_oid, klass = nil)
 		oid = obj_or_oid.to_i
 		klass = obj_or_oid.class unless klass
@@ -98,7 +96,7 @@ class Connection
 	#
 	# Input:
 	# oid = the object oid, OR the object name.
-	#
+	
 	def load(oid, klass)
 		if oid.to_i > 0 # a valid Fixnum ?
 			load_by_oid(oid, klass)
@@ -109,7 +107,7 @@ class Connection
 	alias_method :get, :load
 	
 	# Load an object by oid.
-	#
+	
 	def load_by_oid(oid, klass)
 		res = query "SELECT * FROM #{klass::DBTABLE} WHERE oid=#{oid}"
 		@deserialize? @db.deserialize_one(res, klass) : res
@@ -117,7 +115,7 @@ class Connection
 	alias_method :get_by_oid, :load_by_oid
 	
 	# Load an object by name.
-	#
+	
 	def load_by_name(name, klass)
 		res = query "SELECT * FROM #{klass::DBTABLE} WHERE name='#{name}'"
 		@deserialize? @db.deserialize_one(res, klass) : res
@@ -126,7 +124,7 @@ class Connection
 	
 	# Load all objects of the given klass.
 	# Used to be called 'collect' in an earlier version.
-	#
+	
 	def load_all(klass, extrasql = nil)
 		res = query "SELECT * FROM #{klass::DBTABLE} #{extrasql}"
 		@deserialize? @db.deserialize_all(res, klass) : res
@@ -135,7 +133,7 @@ class Connection
 	
 	# Perform a standard SQL query to the database. Deserializes the
 	# results.
-	#
+	
 	def select(sql, klass)
 		unless sql =~ /SELECT/i
 			sql = "SELECT * FROM #{klass::DBTABLE} WHERE #{sql}"
@@ -146,7 +144,7 @@ class Connection
 	end
 	
 	# Optimized for one result.
-	#
+	
 	def select_one(sql, klass)
 		unless sql =~ /SELECT/i
 			sql = "SELECT * FROM #{klass::DBTABLE} WHERE #{sql}"
@@ -157,7 +155,7 @@ class Connection
 	end	
 
 	# Perform a count query.
-	#	
+		
 	def count(sql, klass = nil)
 		unless sql =~ /SELECT/i
 			sql = "SELECT COUNT(*) FROM #{klass::DBTABLE} WHERE #{sql}"
@@ -173,21 +171,23 @@ class Connection
 	# No need to optimize here with pregenerated code. Deletes are
 	# not used as much as reads or writes.
 	#
-	# === Input:
+	# Input:
 	#
 	# obj_or_oid = Object or oid to delete.
 	# klass = Class of object (can be nil if an object is passed)
-	#
+	
 	def delete(obj_or_oid, klass = nil, cascade = true)
 		oid = obj_or_oid.to_i
 		klass = obj_or_oid.class unless klass
 
 		# this is a class callback!
+		
 		if klass.respond_to?(:og_pre_delete)
 			klass.og_pre_delete(self, oid)
 		end
 		
 		# TODO: implement this as stored procedure? naaah.
+
 		transaction do |tx|
 			tx.exec "DELETE FROM #{klass::DBTABLE} WHERE oid=#{oid}"
 			if cascade and klass.__meta.include?(:has)
@@ -202,60 +202,60 @@ class Connection
 	# Create the managed object table. The properties of the
 	# object are mapped to the table columns. Additional sql relations
 	# and constrains are created (indicices, sequences, etc).
-	#
+	
 	def create_table(klass)
 		@db.create_table(klass)
 	end
 	
 	# Drop the managed object table.
-	#
+	
 	def drop_table(klass)
 		@db.drop_table(klass)
 	end
 
 	# Execute an SQL query and return the result 
-	#
+	
 	def query(sql)
 		@db.safe_query(sql)
 	end
 	
 	# Execute an SQL query, no result returned.
-	#
+	
 	def exec(sql)
 		@db.safe_exec(sql)
 	end
 
 	# Start a new transaction.
-	#
+	
 	def start
-		@db.start()
+		@db.start
 	end
 	
 	# Commit a transaction.
-	#
+	
 	def commit
-		@db.commit()
+		@db.commit
 	end
 	
 	# Rollback transaction.
-	#
+	
 	def rollback
-		@db.rollback()
+		@db.rollback
 	end
 	
 	# Transaction helper. In the transaction block use
 	# the db pointer to the backend.
-	#
+	
 	def transaction(&block)
 		begin
-			@db.start()
+			@db.start
 			yield(@db) 
-			@db.commit()
+			@db.commit
 		rescue => ex
 			Logger.error "DB Error: ERROR IN TRANSACTION"
 			Logger.error #{ex}
 			Logger.error #{ex.backtrace}
-			@db.rollback()
+			@db.rollback
 		end
 	end
 		

data/lib/og/meta.rb

@@ -315,6 +315,14 @@ module MetaLanguage
 		}
 	end
 
+	# Declares that this class can join with another class.
+	# The join parameters are given so the join-compatible 
+	# methods are generated.
+
+	def joins(klass, options = {})
+		meta :joins, [klass, options]
+	end
+
 end
 
 end

data/lib/og/version.rb

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

data/test/nitro/builders/tc_rss.rb

@@ -0,0 +1,22 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+
+require 'test/unit'
+require 'nitro/builders/rss'
+
+class TC_BuildersRss < Test::Unit::TestCase # :nodoc: all
+
+	Blog = Struct.new(:title, :body, :view_uri)
+
+	def test_render
+		blogs = []
+		blogs << Blog.new('Hello1', 'World1', 'uri1');
+		blogs << Blog.new('Hello2', 'World2', 'uri2');
+		blogs << Blog.new('Hello3', 'World3', 'uri3');
+
+		rss = N::RssBuilder.render(blogs, :link => 'http://www.navel.gr')
+
+		assert_match %r{<link>http://www.navel.gr/uri1</link>}, rss
+		assert_match %r{<link>http://www.navel.gr/uri2</link>}, rss
+	end
+
+end

data/test/nitro/tc_dispatcher.rb

@@ -8,7 +8,7 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
 	class MainController
 	end
 
-	class BlogController
+	class BlogController < N::Controller
 	end
 	
 	def setup
@@ -27,6 +27,11 @@ class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
 	def teardown
 		@d = @dxml = nil
 	end
+
+	def test_initialize
+		d = N::Dispatcher.new(BlogController)
+		assert_equal BlogController, d.controllers[:index]
+	end
 	
 	def test_dispatch
 		klass, action = @d.dispatch('/blog/list')

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: nitro
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
-date: 2005-02-01
+  version: 0.9.5
+date: 2005-02-04
 summary: Web Engine
 require_paths: 
   - lib
@@ -67,6 +67,7 @@ files:
   - examples/no_xsl_blog
   - examples/flash
   - examples/tiny
+  - examples/wee_style
   - examples/blog
   - examples/og
   - examples/no_xsl_blog/ctl
@@ -130,6 +131,8 @@ files:
   - examples/tiny/root/nitro.png
   - examples/tiny/root/fcgi.rb
   - examples/tiny/root/include.xhtml
+  - examples/wee_style/wee.rb
+  - examples/wee_style/README
   - examples/blog/ctl
   - examples/blog/log
   - examples/blog/conf
@@ -251,6 +254,7 @@ files:
   - lib/og/meta.rb
   - lib/og/backend.rb
   - lib/og/backends/mysql.rb
+  - lib/og/backends/sqlite.rb
   - lib/og/backends/psql.rb
   - test/nitro
   - test/tc_og.rb
@@ -269,6 +273,7 @@ files:
   - test/nitro/adaptors/tc_cgi.rb
   - test/nitro/builders/tc_xhtml.rb
   - 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