og 0.9.3 → 0.9.5

data/ChangeLog

@@ -1,6 +1,70 @@
 
+04-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/adaptors/fastcgi.rb: convert conf to Flexob.
+
+	* lib/nitro/adaptors/webrick.rb: added REQUEST_MUTEX to temp-fix windows bug.
+
+03-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/glue/*: cleaned up some files.
+
+	* lib/og/*: cleaned up some files.
+
+	* lib/nitro/dispatchers.rb (#initialize): accept class as input.
+
+	* Updated all examples.
+
+	* lib/nitro/context.rb: out == XhtmlString to allow convienient
+	access to the programmatic rendering functionality and make
+	the wee example cooler.
+
+	* lib/nitro/adaptors/webrick.rb (#start): better handling of conf parameters,
+	better handling of logging,
+	autoconvert conf to Flexob if needed.
+
+	* examples/wee_style/wee.rb: implemented,
+	looks cool (but useles? :-))
+
+	* examples/wee_style/README: introduced.
+
+	* examples/wee_style/*: introduced wee-style example.
+
+	* examples/blog/lib/blog.rb: updated for new RSS.
+
+	* test/nitro/builders/tc_rss.rb: introduced.
+
+	* lib/nitro/builders/rss.rb: pass parameters,
+	(#render): now alias for render_0_9
+
+	* lib/og/meta.rb (#joins): introduced new metadata macro.
+
+02-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* --- VERSION 0.9.4 ---
+
+	* lib/og/backends/sqlite.rb: introduced.
+	
+	* lib/og/backends/psql.rb: minor cleanup.
+
+	* examples/blog/root/style.css: fixes for IE, more needed.
+
+	* lib/nitro/adaptors/fastcgi.rb (#handle): restore Og connection.
+
+	* lib/nitro/adaptors/webrick.rb (#handle): restore Og connection, fixes
+	Windows deadlock. [james_b]
+
+	* examples/no_xsl_blog/lib/blog/template.rb: fixed ruby in template (login).
+
+	* changed default port to 8069, to avoid conflicts with
+	other servers (8080 was too common). [james_b]
+
 01-02-2005  George Moschovitis  <gm@navel.gr>
 
+	* updated Rubyforge page, added wiki.
+	
+	* --- VERSION 0.9.3 ---
+
 	* small fixes to make tests pass again.
 
 	* lib/nitro/adaptors/webrick.rb: update headers with req.meta_vars.

data/README.og

@@ -1,4 +1,4 @@
-= Og 0.9.0
+= Og 0.9.3
 
 Nitro integrates the Og (ObjectGraph) object-relational mapping 
 library. Og	provides transparent serialization of object graphs to a RDBMS 
@@ -18,7 +18,7 @@ PostgreSQL and MySQL are included.
 
 Og is part of the Nitro project, released as a stand-alone library
 due to popular demand. You can find the ChangeLog in the Nitro 
-distribution (http://www.navel.gr/nitro).
+distribution (http://www.rubyforge.com/projects/nitro).
 
 
 == Features

data/examples/og/mock_example.rb

@@ -3,10 +3,8 @@
 # A simple example to demonstrate how to mock Og.
 # Very useful in test units.
 #
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: run.rb 185 2004-12-10 13:29:09Z gmosx $
 
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
@@ -52,4 +50,3 @@ class SimpleTest < Test::Unit::TestCase
 	end
 
 end
-

data/examples/og/mysql_to_psql.rb

@@ -7,10 +7,8 @@
 #
 # Og makes it easier to switch to a REAL database :)
 #
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 raise 'WARNING, this example does not work yet, for the moment ' + 
@@ -22,7 +20,7 @@ require 'og'
 
 # An example managed object.
 # Looks like an ordinary Ruby object.
-#
+
 class Article
 	prop_accessor :name, :body, String
 

data/lib/glue/cache.rb

@@ -1,14 +1,10 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
 # * Anastasios Koutoumanos  <ak@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: cache.rb 202 2005-01-17 10:44:13Z gmosx $
 
-module N;
+module N
 
-# = LRUCache
-#
 # A cache utilizing a simple LRU (Least Recently Used) policy.
 # The items managed by this cache must respond to the #key method.
 # Attempts to optimize reads rather than inserts!
@@ -16,36 +12,38 @@ module N;
 # LRU semantics are enforced by inserting the items in a queue.
 # The lru item is always at the tail. Two special sentinels
 # (head, tail) are used to simplify (?) the code.
-#
+
 class LRUCache < Hash
 
 	# Mix this in your class to make LRU-managable.
-	#
+	
 	module Item
 		attr_accessor :lru_key, :lru_prev, :lru_next
 	end
 
 	# head-tail sentinels
-	#
+	
 	class Sentinel; include Item; end
 
-	# the maximum number of items in the cache
+	# the maximum number of items in the cache.
+
 	attr_accessor :max_items
 
 	# the head sentinel
+	
 	attr :head
+
 	# the tail sentinel, tail.prev points to the lru item.
+
 	attr :tail
 
-	#
-	#	
 	def initialize(max_items)
 		@max_items = max_items
 		lru_clear()
 	end
 
-	# Lookup an item in the cache
-	#
+	# Lookup an item in the cache.
+	
 	def [](key)
 		if item = super
 			return lru_touch(item)
@@ -53,36 +51,36 @@ class LRUCache < Hash
 	end
 
 	# The inserted item is considered mru!
-	#
+	
 	def []=(key, item)
 		item = super
 		item.lru_key = key
 		lru_insert(item)
 	end
 
-	# Delete an item from the cache
-	#
+	# Delete an item from the cache.
+	
 	def delete(key)
 		if item = super
 			lru_delete(item)
 		end
 	end
 
-	# Clear the cache
-	#
+	# Clear the cache.
+	
 	def clear
 		super
 		lru_clear()
 	end
 
-	# The first (mru) element in the cache
-	#
+	# The first (mru) element in the cache.
+	
 	def first
 		@head.lru_next
 	end
 
-	# The last (lru) element in the cache
-	#
+	# The last (lru) element in the cache.
+	
 	def last
 		@tail.lru_prev
 	end
@@ -91,15 +89,15 @@ class LRUCache < Hash
 	private
 
 	# Delete an item from the lru list.
-	#
+	
 	def lru_delete(item)
 		lru_join(item.lru_prev, item.lru_next)
 		return item
 	end
 
-	# Join two items in the lru list
-	# Return y to allow for chaining
-	#
+	# Join two items in the lru list.
+	# Return y to allow for chaining.
+	
 	def lru_join(x, y)
 		x.lru_next = y
 		y.lru_prev = x
@@ -108,28 +106,28 @@ class LRUCache < Hash
 
 	# Append a child item to a parent item in the lru list
 	# (Re)inserts the child in the list.
-	#
+	
 	def lru_append(parent, child)
 		lru_join(child, parent.lru_next)
 		lru_join(parent, child)
 	end
 
 	# Insert an item
-	#
+
 	def lru_insert(item)
 		delete(last.lru_key) if size() > @max_items
 		lru_append(@head, item)
 	end
 	
 	# Touch an item, make mru!
-	# Returns the item
-	#
+	# Returns the item.
+	
 	def lru_touch(item)
 		lru_append(@head, lru_delete(item))
 	end
 	
-	# Clear the lru
-	#
+	# Clear the lru.
+	
 	def lru_clear
 		@head = Sentinel.new
 		@tail = Sentinel.new
@@ -137,4 +135,4 @@ class LRUCache < Hash
 	end	
 end
 
-end # module
+end 

data/lib/glue/number.rb

@@ -1,20 +1,14 @@
-# code:
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: number.rb 202 2005-01-17 10:44:13Z gmosx $
 
 module N;
 
-# = NumberUtils
-#
-# === Design:
-#
 # Implement as a module to avoid class polution. You can
 # still use Ruby's advanced features to include the module in your
 # class. Passing the object to act upon allows to check for nil,
 # which isn't possible if you use self.
-#
+
 module NumberUtils
 
 	# Returns the multiple ceil of a number
@@ -27,4 +21,4 @@ module NumberUtils
 
 end
 
-end # module
+end

data/lib/glue/time.rb

@@ -1,29 +1,23 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: time.rb 202 2005-01-17 10:44:13Z gmosx $
 
 require "time.rb"
 
 module N;
 
-# = Time
-#
 # General time utilities collection
 #
-# === Design:
-#
 # Implement as a module to avoid class polution. You can
 # still Ruby's advanced features to include the module in your
 # class. Passing the object to act upon allows to check for nil,
 # which isn't possible if you use self.
 #
-# === TODO:
+# == TODO
 #
 # - SOS: add test units.
 # - add aliases for those methods in Kernel ?
-#
+
 module TimeUtils
 
 	NOW = Time.now
@@ -31,13 +25,13 @@ module TimeUtils
 	ZERO = Time.mktime(1972)
 
 	# Convert the time to a nice String representation. 
-	#	
+		
 	def self.date_time(time)
 		return nil unless time 
 		return time.strftime("%d-%m-%Y %H:%M")
 	end
 	
-	# this method calculates the days extrema given two time objects.
+	# This method calculates the days extrema given two time objects.
 	# start time is the given time1 at 00:00:00
 	# end time is the given time2 at 23:59:59:999
 	#
@@ -48,7 +42,7 @@ module TimeUtils
 	# Output
 	# - the time range. you can get the start/end times using
 	#   range methods.
-	#
+	
 	def self.days_extrema(time1, time2=nil)
 		time2 = time1 if (not time2.valid? Time)
 		time2 = NEVER if (time2 <= time1)
@@ -57,24 +51,23 @@ module TimeUtils
 		return (start_time..end_time)
 	end
 
-	#
-	# set time to start of day
-	#
+	# Set time to start of day
+	
 	def self.start_of_day(time)
 		return Time.mktime(time.year, time.month, time.day, 0, 0, 0, 0)
 	end
 
-	#
-	# set time to end of day
-	#
+	
+	# Set time to end of day
+	
 	def self.end_of_day(time)
 		return Time.mktime(time.year, time.month, time.day, 23, 59, 59, 999)
 	end
 
 
-	# returns true only if day of time is included in the
+	# Returns true only if day of time is included in the
 	# range (stime..etime). Only year days are checked.
-	#
+	
 	def self.time_in_day_range(time, stime=ZERO, etime=NEVER)
 		if (etime <= stime)
 			Logger.debug "Invalid end time (#{etime} < #{stime})" if $DBG
@@ -89,5 +82,4 @@ module TimeUtils
 
 end
 
-end # module
-
+end 

data/lib/glue/validation.rb

@@ -1,11 +1,9 @@
-# George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
+# * George Moschovitis  <gm@navel.gr>
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
 module N 
 
-# = Validation
-#
 # Implements a meta-language for validating managed
 # objects. Typically used in Validator objects but can be
 # included in managed objects too.

data/lib/og/backend.rb

@@ -1,73 +1,69 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
+# (c) 2004-2005 Navel, all rights reserved.
 # $Id: backend.rb 202 2005-01-17 10:44:13Z gmosx $
 
-require "yaml"
+require 'yaml'
 
-require "og/connection"
+require 'og/connection'
 
 class Og
 
-# = Backend
-#
 # Abstract backend. A backend communicates with the RDBMS.
 # This is the base class for the various backend implementations.
-#
+
 class Backend
 	
 	# The actual connection to the database
 	attr_accessor :conn
 
 	# Intitialize the connection to the RDBMS.
-	# 	
+	 	
 	def initialize(config)
 		raise "Not implemented"
 	end
 
 	# Close the connection to the RDBMS.
-	# 	
+	 	
 	def close()
 		@conn.close()
 	end	
 
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	# Utilities
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+	# :section: Utilities
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Encode the name of the klass as an sql safe string.
 	# The Module separators are replaced with _ and NOT stripped 
 	# out so that we can convert back to the original notation if 
 	# needed. The leading module if available is removed.
-	#
+	
 	def self.encode(klass)
 		"#{klass.name.gsub(/^.*::/, "")}".gsub(/::/, "_").downcase
 	end
 
 	# The name of the SQL table where objects of this class 
 	# are stored.
-	#
+	
 	def self.table(klass)
 		"_#{Og.table_prefix}#{encode(klass)}"
 	end
 
 	# The name of the join table for the two given classes.
-	#
+	
 	def self.join_table(klass1, klass2)
 		"_#{Og.table_prefix}j_#{encode(klass1)}_#{encode(klass2)}"
 	end
 	
 	# Returns the props that will be included in the insert query.
 	# For some backends the oid should be stripped.
-	#
+	
 	def self.props_for_insert(klass)
 		klass.__props
 	end
 	
 	# Precompile the insert code for the given class.
 	# The generated code sets the oid when inserting!
-	#
+	
 	def self.eval_og_insert(klass)
 		props = props_for_insert(klass)
 		
@@ -104,7 +100,7 @@ class Backend
 
 	# Precompile the update code for the given class.
 	# Ignore the oid when updating!
-	#
+	
 	def self.eval_og_update(klass)
 		props = klass.__props.reject { |p| :oid == p.symbol }
 		
@@ -146,7 +142,7 @@ class Backend
 	# Precompile the code to read objects of the given class 
 	# from the backend. In order to allow for changing 
 	# field/attribute orders we have to use a field mapping hash.
-	#
+	
 	def self.eval_og_deserialize(klass, og)
 		calc_field_index(klass, og)
 		
@@ -169,67 +165,67 @@ class Backend
 	end				
 	
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	# Connection methods. 
+	# :section: Connection methods. 
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Create the database.
-	#
+	
 	def self.create_db(database, user = nil, password = nil)
 		Logger.info "Creating database '#{database}'."
 	end
 	
 	# Drop the database.
-	#
+	
 	def self.drop_db(database, user = nil, password = nil)
 		Logger.info "Dropping database '#{database}'."
 	end
 	
 	# Execute an SQL query and return the result. 
-	#
+	
 	def query(sql)
 		raise "Not implemented"
 	end
 	
 	# Execute an SQL query, no result returned.
-	#
+	
 	def exec(sql)
 		raise "Not implemented"
 	end
 
 	# Execute an SQL query and return the result. Wrapped in a 
 	# rescue block. 
-	#
+	
 	def safe_query(sql)
 		raise "Not implemented"
 	end
 	
 	# Execute an SQL query, no result returned. Wrapped in a 
 	# rescue block.
-	#
+	
 	def safe_exec(sql)
 		raise "Not implemented"
 	end
 	
 	# Check if it is a valid resultset.
-	#
+	
 	def valid?(res)
 		raise "Not implemented"
 	end
 
 	# Start a new transaction.
-	#
+	
 	def start
 		exec "START TRANSACTION"
 	end
 	
 	# Commit a transaction.
-	#
+	
 	def commit
 		exec "COMMIT"
 	end
 	
 	# Rollback transaction.
-	#
+	
 	def rollback
 		exec "ROLLBACK"
 	end	
@@ -239,7 +235,7 @@ class Backend
 	# If the property has an :sql metadata this overrides the 
 	# default mapping. If the property has an :extra_sql metadata 
 	# the extra sql is appended after the default mapping.
-	#
+	
 	def create_fields(klass, typemap)
 		fields = []
 		
@@ -267,35 +263,35 @@ class Backend
 	# 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)
 		return if query("SELECT * FROM #{klass::DBTABLE} LIMIT 1")
 	end
 	
 	# Drop the managed object table
-	#
+	
 	def drop_table(klass)
 		exec "DROP TABLE #{klass::DBTABLE}"
 	end
 
 	# Deserialize one row of the resultset.
-	#
+	
 	def deserialize_one(res, klass)	
-		raise "Not implemented"
+		raise 'Not implemented'
 	end
 	
 	# Deserialize all rows of the resultset.
-	#
+	
 	def deserialize_all(res, klass)	
-		raise "Not implemented"
+		raise 'Not implemented'
 	end
 	
 	# Return a single integer value from the resultset.
-	#
+	
 	def get_int(res, idx = 0)
-		raise "Not implemented"
+		raise 'Not implemented'
 	end
 
 end
 
-end # namespace 
+end