nitro 0.16.0 → 0.17.0

data/CHANGELOG

@@ -1,5 +1,98 @@
-18-04-2005  George Moschovitis  <gm@navel.gr>
+16-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* cleanup.rb: updated.
+	
+	* doc/RELEASES: updated.
+	
+	* Rakefile: updated facets dependency.
+	
+15-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* doc/RELEASES: updated.
+
+13-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/shaders.rb (ElementShader): Yeah, it passes an
+	example page.
+	
+	* lib/nitro/element.rb: reimplemented render using the
+	StreamParser,
+	handles processing instructions,
+	yeah, it works again!,
+	added _view, _rendered attributes in element,
+	fixed nesting bug,
+	yeah, use render for template, it works!
+	fixed more nesting bugs.
+
+12-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/shaders.rb (ElementShader): implemented,
+	yeah, this parses a simple page.
+	
+	* test/nitro/tc_element.rb: implemented.
+	
+	* lib/nitro/element.rb: introduced,
+	(Element): introduced.
+	(ElementRender): introduced.
+	(#parse): implemented.
+	(StaticElement): implemented,
+	It works!!
+	better handle elements without attributes.
+
+11-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* examples/no_xsl_blog/*: changes to make it work with new Og.
+	
+	* examples/blog/*: changes to make it work with new Og,
+	use hals if ...each trick in comments,
+	yeah it works.
+
+05-05-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/adapters/fastcgi.rb: use ensure to be more fault
+	tolerant.
+
+	* lib/nitro/adapters/webrick.rb: updated for new Og.
 	
+	* examples/blog/*: converted to new og code.
+
+30-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/render.rb (#compile_action): better syntax error
+	handling, no infinite loops [drak].
+
+26-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/render.rb: hack-fixed :stop bug.
+
+21-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* proto/public/js/prototype.js: added.
+
+20-04-2005  George Moschovitis  <gm@navel.gr>
+
+	*	lib/nitro/render.rb: allow view overload.
+ 
+19-04-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/scaffold.rb: view_uri -> to_href.
+
+	* Rakefile: added facets dependency.
+
+	*	lib/nitro/render.rb (ActionExit): introduced.
+	catch stop.
+	(#compile_action): added param calculation code,
+	no return from template.
+
+18-04-2005  George Moschovitis  <gm@navel.gr>
+
+	*	lib/nitro/render.rb: response alias for context.
+	(#print): added as convenience method.
+
+	*	lib/nitro/request.rb (#raw_body): implemented.
+ 
+	* --- VERSION 0.16.0 ---
+		
 	* small fixes to make tests pass again.
 
 17-04-2005  George Moschovitis  <gm@navel.gr>

data/INSTALL

@@ -65,6 +65,9 @@ Put the libray dir in the Ruby path (Unix example):
 
 $ export RUBYOPT='-I path/to/nitro/lib'
 
+or, at windows
+
+> set RUBYOPT=Ic:\dev\nitro\lib;c:\dev\og\lib;c:\dev\glue\lib
 
 = Additional libraries
 

data/README

@@ -1,4 +1,4 @@
-= Nitro 0.16.0 README
+= Nitro 0.17.0 README
 
 Nitro is an efficient, yet simple engine for developing professional Web 
 Applications using the Ruby language. Nitro aims to provide a robust 
@@ -241,6 +241,14 @@ A short summary of the major features:
 	web applications.
 
 
+== What's new
+
+For information about the latest changes please consult the
+file
+
+doc/RELEASES
+
+
 == Download
 
 The latest version of Nitro can be found at

data/Rakefile

@@ -72,7 +72,8 @@ spec = Gem::Specification.new do |s|
 
 	s.add_dependency 'glue', "= #{s.version}"
 	s.add_dependency 'og', "= #{s.version}"
-	# s.add_dependency 'ruby-breakpoint', '>= 0.5'
+	s.add_dependency 'facets', '>= 0.7.1'
+	s.add_dependency 'ruby-breakpoint', '>= 0.5'
 
 	s.required_ruby_version = '>= 1.8.2'
 

data/doc/RELEASES

@@ -1,10 +1,191 @@
-== Version 0.16.0
+== Version 0.17.0
+
+The biggest release yet, featuring the brand new implementation
+of Og. Due to the many changes this should be considered a preview
+release, a stabilized version is expected shortly. Bug reports and
+comments on the new features are especially appreciated. Many 
+thanks to Michael Neumann, Dan Yoder and other hackers on the mailing 
+list for ideas and suggestions that made this version possible.
+
+Most notable Og additions:
+
+* Extremely clean source code. Better names are used thorougout.
+	Extra care was taken to make all features more orthogonal.
+	
+* Brand new relation mechanism. The 'enchanting' of entities 
+	(managed classes) happens in multiple passes to be more
+	flexible. Totaly separated graph/metadata creation and serialization
+	code generation. The Graph metadata can be used for advanced
+	scaffolding, testing and more.
+
+* Support for fully customizable primary keys. You are no longer
+	forced to use xxx_oid primary keys. Appart from the extra 
+	flexibility this feature provides, this is an essential step
+	towards the planed 'reverse engineering' mode that will allow the
+	use of existing schemas with Og.
+	
+* More elegant inspection mechanism. Example:
+
+	Article.relation(:user) # => Og::BelongsTo(...)
+	Article.relations # => [...]
+	Article.properties # => [...]
+
+* Joins_many relation, as an alias for one way, join table relations.
+
+* Support for 'active' collections. Active collection are
+	synchronized with the backend Store and provide a more elegant
+	interface and the opportunity for 'session' caching:
+	
+	article.comments << Comment.new
+	
+	instead of 
+	
+	article.add_comment(Comment.new) # this is also allowed though.
+	
+	p article.comments
+	p article.comments.size # the results of the first query is cached
+
+* Eager relations.
+
+	comments = Article.comments(:include => User)
+
+	for comment in comments
+		p comment.user.name
+	end
+	
+	Elegantly solves the N+1 query problem by using one join
+	query.
+
+* No need for forward references when defining relations. Now,
+	the following code magically works:
+	
+	class User
+	  has_many Comment # works even though Comment is not defined!
+	end
+	
+	class Comment
+		belongs_to User
+	end
+	 
+* Use inflection where possible to infer missing configuration
+	options. For example
+	
+	class Article
+		belongs_to User # infects relation name :user
+		...
+		
+* New, lean and mean Store interface. The code needed to teach 
+	Og how to  serialize objects to backend store is dramatically
+	reduced. The new interface is SQL agnostic, so non SQL-RDBM's 
+	stores are possible.
+	
+* SQL agnostic querying interface, compatible with non-sql 
+	Stores. Here is an example:
+	
+	Article.find(
+		:condition => 'hits > 2 AND rate > 3', 
+		:order => 'title',
+		:offset => 30,
+		:limit => 10
+	)
+
+* More elegant (and non-sql store compatible) way for selective 
+	updates:
+
+	article.title = 'Changed'
+	article.hits += 1
+	article.update(:title, :hits)
+
+* New, in-memory store that support all features. This is a pure
+	ruby solution useful for experimentation. It will also serve
+	as the base for the forthcoming madeleine Store implementation.
+
+* Allow for multiple stores in one application. A great example,
+	mysql_to_psql is provided. This example uses Og's powerfull
+	features to automatically convert a Mysql database to a 
+	PostgreSQL database. Database migration was never easier.
+	
+* Uses the excellent Facets utility collection to further
+	clenup and minimize the code.
+
+* Managed classes or Entities should include the EntityMixin
+	or extend the Entity class. Example:
+	
+	class Article < Entity
+		..
+	end
+	
+	class Article 
+		include EntityMixin
+	end
+	
+	This is done to avoid the Module module like in earlier
+	versions of Og. However, Og is can infer the need to include
+	the Managed mixin in typical cases:
+	
+	class Article
+		property :title, String 
+		# when a property is defined Og automatically converts the
+		# class to an Entity
+	end
+	
+	class Article < AnExistingManagedEntity
+		# also includes the mixin
+		...
+		
+	class Article
+		include AModuleThatDefinesProperties
+		...
+
+* Improved support for og_delete interception.
+
+* Support for nested transactions.
+
+Check out the file test/og/tc_store.rb for a demonstration of
+the new features.
+
+And some Nitro additions:
+
+* Integrated the Facets library, and started donating some Glue
+	code to this project.
+	
+* Integrated the Prototype object oriented javascript library.
+
+* Included a preview implementation of the new tag library 
+	system, called Elements. This is based on an original idea
+	by Dan Yoder. This feature is expected to change substantially
+	in the next version. In the meantime here is an example:
+	
+	<Page>
+	  Here is a <b>nice</b> page.
+	  <br />
+	  <Box>
+		  This is #{variable}.
+		  <?r if admin ?>
+		  	hello admin
+		  <?r end ?>
+		</Box>
+	</Page>
+	
+	The tags <Page> and <Box> automatically instantiate objects
+	of class Page and Box that handle the rendering. This is an
+	alternative to the XSLT templating system and can also be used
+	to implement some reusable components. The hierarchical structure
+	of the elements is available to each object to facilitate 
+	advanced rendering tricks. Just like the XSLT shader the Elements
+	transformation is preapplied to the page to avoid the overhead
+	at runtime.
+	
+* Fixed many reported bugs.
+
+
+== Version 0.16.0 was released on 16/04/2005.
 
 A snapshot of the latest developments. Many, many subtle improvements,
 new features and a major cleanup of the source code. Thanks to 
 James Britt for significantly contributing to this release.
 
-Most notable attitions:
+Most notable additions:
 
 * Aspect Oriented Programming support. This new system
 	is used to reimplement features such as Controller filters,

data/examples/blog/run.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: run.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'nitro'
 require 'og'
 
@@ -19,12 +15,11 @@ Nitro.run do |conf|
 		:de => 'conf/locales/de.yml'
 	)
 
-	Og.connect(
-		:adapter => 'psql',
-		:database => 'blog',
+	Og.setup(
+		:store => 'psql',
+		:name => 'blog',
 		:user => 'postgres',
-		:password => 'navelrulez',
-		:connection_count => 3
+		:password => 'navelrulez'
 	)
 
 	Rendering.shader = XSLTShader.new('src/xsl/style.xsl',

data/examples/blog/src/controller.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2005 Navel, all rights reserved.
-# $Id: controller.rb 20 2005-04-15 15:18:36Z gmosx $
-
 require 'nitro/controller'
 require 'nitro/ui/pager'
 require 'nitro/localization'
@@ -34,7 +30,7 @@ class BlogController < Nitro::Controller
 
 	def list_entry
 		@pager = UI::Pager.new('entries', request, 3)
-		@entries = BlogEntry.all("ORDER BY oid DESC #{@pager.sql_limit}")
+		@entries = BlogEntry.all(:order => 'oid DESC', :extra => @pager.sql_limit)
 		@pager.set(BlogEntry.count)
 	end
 	

data/examples/blog/src/models/blog.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: blog.rb 20 2005-04-15 15:18:36Z gmosx $
-
 require 'models/content'
 
 # Forward reference to the Comment definition. 
@@ -24,7 +20,7 @@ end
 
 class BlogEntry 
 	include Common
-	has_many :comments, Comment, :linkback => 'entry_oid'
+	has_many :comments, Comment, :foreign_name => 'entry'
 	validate_value :title, :msg => 'Please provide a title'
 end
 

data/examples/blog/src/models/content.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: content.rb 23 2005-04-16 18:20:00Z gmosx $
-
 require 'nitro/markup'
 
 # The foundamental Content Unit.
@@ -20,4 +16,3 @@ module CreateTime
 	pre "@create_time = @update_time = Time.now", :on => :og_insert
 	pre "@update_time = Time.now", :on => :og_update
 end
-

data/examples/blog/src/views/comments.xhtml

@@ -2,11 +2,8 @@
 
 <root xmlns:x="http://www.navel.gr/xml/shader.xsd">
 
-<h2>#{@entry.comments_count} Comments:</h2>			
-<?r	
-if comments = @entry.comments
-	for comment in comments
-?>
+<h2>#{@entry.comments.size} Comments:</h2>			
+<?r	if @entry.comments.each do |comment| ?>
 	<div class="comment">
 		#{comment.body}
 		<div class="footer">
@@ -16,12 +13,10 @@ if comments = @entry.comments
 <?r end ?>
 		</div>
 	</div>
-<?r		
-	end
-else
-?>
-no comments.
-<?r		end ?>
+<?r	end.empty? then ?>
+	no comments.
+<?r	end ?>
+
 <form id="new_comment" action="new_comment" method="post">
 	<input type="hidden" name="entry_oid" value="#{@entry.oid}" />
 	<p>

data/examples/blog/src/views/index.xhtml

@@ -14,8 +14,8 @@
 					<h3 class="title">#{entry.title}</h3>
 					#{entry.body}
 					<div class="footer">
-						[[posted by]] #{entry.author} at <a href="#{entry.view_uri}">#{entry.create_time.strftime('%R %p')}</a> | 
-						<a href="#{entry.view_uri}#comments">#{entry.comments_count} comments</a>.
+						[[posted by]] #{entry.author} at <a href="#{entry.to_href}">#{entry.create_time.strftime('%R %p')}</a> | 
+						<a href="#{entry.to_href}#comments">#{entry.comments.size} comments</a>.
 <?r	if session[:owner] ?>			
 						[<a href="del_entry?oid=#{entry.oid}">del</a>]
 <?r end ?>
@@ -47,4 +47,3 @@
 	</x:cell>
 	
 </x:page>
-

data/examples/blog/src/views/recent_posts.xhtml

@@ -5,7 +5,7 @@
 <?r if @entries ?>
 	<ul>
 <?r	for entry in @entries ?>
-		<li><a href="#{entry.view_uri}">#{entry.title}</a></li>
+		<li><a href="#{entry.to_href}">#{entry.title}</a></li>
 <?r	end ?>
 	</ul>
 <?r else ?>

data/examples/no_xsl_blog/lib/blog/controller.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: controller.rb 21 2005-04-15 15:41:20Z gmosx $
-
 require 'nitro/controller'
 require 'nitro/builders/rss'
 require 'nitro/ui/pager'
@@ -23,7 +19,7 @@ class BlogController < Nitro::Controller
 
 	def list_entry
 		@pager = UI::Pager.new('entries', request, 3)
-		@entries = BlogEntry.all("ORDER BY oid DESC #{@pager.sql_limit}")
+		@entries = BlogEntry.all(:order => 'oid DESC', :extra => @pager.sql_limit)
 		@pager.set(BlogEntry.count)
 	end
 	

data/examples/no_xsl_blog/lib/blog/model.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: model.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'lib/content'
 
 # The models used in the Blog part.
@@ -18,7 +14,7 @@ module Common
 	include BaseContent
 	include CreateTime
 
-	prop_accessor :author, String
+	property :author, String
 	validate_value :body
 end
 
@@ -26,7 +22,7 @@ end
 
 class BlogEntry 
 	include Common
-	has_many :comments, Comment, :linkback => 'entry_oid'
+	has_many :comments, Comment, :foreign_name => 'entry'
 	validate_value :title, :msg => 'Please provide a title'
 end
 

data/examples/no_xsl_blog/lib/blog.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: blog.rb 1 2005-04-11 11:04:30Z gmosx $
-
 # A simple blog to demonstrate the power of Nitro.
 
 class Blog

data/examples/no_xsl_blog/lib/content.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004 Navel, all rights reserved.
-# $Id: content.rb 1 2005-04-11 11:04:30Z gmosx $
-
 require 'nitro/markup'
 
 # The foundamental Content Unit.
@@ -9,15 +5,15 @@ require 'nitro/markup'
 module BaseContent
 	include Nitro::Markup
 
-	prop_accessor :title, String
-	prop_accessor :body, String, :markup => true, :ui => :textarea
+	property :title, String
+	property :body, String, :markup => true, :ui => :textarea
 end
 
 # CreateTime mixin.
 
 module CreateTime
-	prop_accessor :create_time, Time
-	prop_accessor :update_time, Time
+	property :create_time, Time
+	property :update_time, Time
 
 	def og_pre_insert(conn)
 		@create_time = @update_time = Time.now
@@ -35,9 +31,9 @@ end
 
 module Content
 	include BaseContent
-	prop_accessor :name, String
-	prop_accessor :ctime, Time
-	prop_accessor :mtime, Time
+	property :name, String
+	property :ctime, Time
+	property :mtime, Time
 
 	def initialize(*args)
 		@ctime = @mtime = Time.now

data/examples/no_xsl_blog/public/comments.xhtml

@@ -2,11 +2,8 @@
 
 <root xmlns:x="http://www.navel.gr/xml/shader.xsd">
 
-<h2>#{@entry.comments_count} Comments:</h2>			
-<?r	
-if comments = @entry.comments
-	for comment in comments
-?>
+<h2>#{@entry.comments.size} Comments:</h2>			
+<?r	if @entry.comments.each do |comment| ?>
 	<div class="comment">
 		#{comment.body}
 		<div class="footer">
@@ -16,12 +13,10 @@ if comments = @entry.comments
 <?r end ?>
 		</div>
 	</div>
-<?r		
-	end
-else
-?>
-no comments.
-<?r		end ?>
+<?r	end.empty? then ?>
+	no comments.
+<?r	end ?>
+
 <form id="new_comment" action="new_comment" method="post">
 	<input type="hidden" name="entry_oid" value="#{@entry.oid}" />
 	<p>

data/examples/no_xsl_blog/public/index.xhtml

@@ -12,8 +12,8 @@
 					<h3 class="title">#{entry.title}</h3>
 					#{entry.body}
 					<div class="footer">
-						[[posted by]] #{entry.author} at <a href="#{entry.view_uri}">#{entry.create_time.strftime('%R %p')}</a> | 
-						<a href="#{entry.view_uri}#comments">#{entry.comments_count} comments</a>.
+						[[posted by]] #{entry.author} at <a href="#{entry.to_href}">#{entry.create_time.strftime('%R %p')}</a> | 
+						<a href="#{entry.to_href}#comments">#{entry.comments.size} comments</a>.
 <?r	if session[:owner] ?>			
 						[<a href="del_entry?oid=#{entry.oid}">del</a>]
 <?r end ?>

data/examples/no_xsl_blog/public/recent_posts.xhtml

@@ -5,7 +5,7 @@
 <?r if @entries ?>
 	<ul>
 <?r	for entry in @entries ?>
-<li><a href="#{entry.view_uri}">#{entry.title}</a></li>
+		<li><a href="#{entry.to_href}">#{entry.title}</a></li>
 <?r	end ?>
 	</ul>
 <?r else ?>

data/examples/no_xsl_blog/run.rb

@@ -1,7 +1,3 @@
-# * George Moschovitis  <gm@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: run.rb 21 2005-04-15 15:41:20Z gmosx $
-
 require 'nitro'
 require 'og'
 
@@ -18,13 +14,10 @@ Nitro.run do |conf|
 
 	Og.connect(
 	#	:address => 'localhost',
-		:adapter => 'mysql',
-		# :backend => 'psql',
-		:database => 'blog',
+		:store => 'mysql',
+		:name => 'blog',
 		:user => 'root',
 		:password => 'navelrulez'
-		# :user => 'postgres',
-		# :password => 'navelrulez',
 	)
 
 	conf.dispatcher = Dispatcher.new(

data/lib/nitro/adapters/cgi.rb

@@ -1,7 +1,7 @@
 # * George Moschovitis  <gm@navel.gr>
 # * James Britt  <james_b@neurogami.com>
 # (c) 2005 Navel, all rights reserved.
-# $Id: cgi.rb 1 2005-04-11 11:04:30Z gmosx $
+# $Id: cgi.rb 41 2005-05-05 14:56:40Z gmosx $
 
 require 'cgi'
 require 'stringio'
@@ -34,11 +34,11 @@ class Cgi
 		CgiUtils.parse_cookies(context)
 
 		# gmosx, TODO: move this into a filter.
-		Og.db.get_connection if defined?(Og) and Og.db
+		#	Og.db.get_connection if defined?(Og) and Og.db
 
-		context.render(  context.path)
+		context.render(context.path)
 
-		Og.db.put_connection if defined?(Og) and Og.db
+		# Og.db.put_connection if defined?(Og) and Og.db
 
 		cgi.print(CgiUtils.response_headers(context))
 		cgi.print(context.out)
@@ -111,11 +111,10 @@ class CgiUtils
 	# to arrays.
 
 	def self.parse_query_string(query_string)
-
-		# gmosx, THINK: better return nil here?
-		return {} if (query_string.nil? or query_string.empty?)
-
 		params = {}
+		
+		# gmosx, THINK: better return nil here?
+		return params if (query_string.nil? or query_string.empty?)
 
 		query_string.split(/[&;]/).each do |p| 
 			key, val = p.split('=')