nitro 0.2.0 → 0.3.0

data/ChangeLog

@@ -1,5 +1,191 @@
+01-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* --- VERSION 0.3.0 ---
+	
+	* removed some dependencies from the Gem.
+	
+	* MAJOR: renamed og get/put to load/save.
+	
+	* lib/n/std.rb: removed most NilClass overrides [b.candler]
+	
+	* lib/n/og/connection.rb (#delete): fixed delete with no descendants,
+	og_pre_delete callback.
+	
+	* lib/n/og/backends/psql.rb (#read_prop): fixed YAML bug.
+
+	* lib/n/og/backends/mysql.rb (#read_prop): fixed YAML bug.
+	
+	* lib/n/og.rb (#enchant): all method,
+	(#manage_classes): introduced,
+	(#enchant): delete! method,
+	(#enchant): klass.save() method.
+	
+	* examples/og/run.rb: totally recoded the example to work with Og,
+	yeah the example fully works.
+	
+	* moved db files to .scrap
+	
+	* examples/simple: YEAH works with og.
+	
+	* lib/n/server/webrick.rb (#do_GET): og connection per request.
+
+31-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/n/og/backends/mysql.rb: converted to the new refactored code.
+
+	* lib/n/og/backend.rb (#eval_og_insert): moves the code here,
+	use a custom oid_generator,
+	factored out deserialize code,
+	pre/post_inser_update.
+	(#eval_og_update): generate callbacks.
+	
+	* lib/n/og/backends/psql.rb (#eval_og_insert): if the managed
+	object defines pre/post callbacks, insert them,
+	(OgUtils::oid_generation_code): introduced.
+	
+	* no __og, just og_xxx.
+
+30-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/n/og/backends/psql.rb (#write_prop): fixed,
+	(#initialize): autocreate database if not found,
+	made createdb/dropdb class methods.
+
+	* lib/n/og/backends/mysql.rb (#write_prop): fixed,
+	(#initialize): autocreate database if not found,
+	made createdb/dropdb class methods,
+	no transactions for mysql.	
+		
+	* lib/n/og/backend.rb (OgUtils#table): remove leading module,
+	(#transaction, #start, #commit, #rollback): working transaction 
+	support,
+	added missing methods from the backend implementations.
+	
+	* lib/n/og/meta.rb: introduced,
+	(#belongs_to): mega it works,
+	(#has_many): mega it works, INCREDIBLE,
+	(OgMetaLanguage): use a separate module,
+	(#has_many): correct calculation of linkback property,
+	update og_descendants
+	
+	* lib/n/og.rb (#enchant): more enchantments,
+	(#create_db!): introduced,
+	(#drop_db!): introduced,
+	(#pupdate!): enchant.
+		
+	* lib/n/og/connection.rb (#select): added,
+	(#select_all): added, can use sql without select,
+	(#delete): it fuckin works and deletes descendants too!
+	(#transaction, #start, #commit, #rollback): working transaction 
+	support,
+	removed all N::OgUtils.table crap.
+
+29-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/n/og/backends/mysql.rb: introduced,
+	create_table works,
+	fuckin mega, insert works,
+	excellent, deserialize works,
+	(#valid?): implemented
+	
+	* lib/n/og/backends/psql.rb: introduced,
+	yeah, i got a table created,
+	store Array,Hash,Object etc as text,
+	yeah, it inserts an object,
+	(#eval_og_deserialize): implemented,
+	(#map_fields): factored out.
+	(#valid?): implemented
+	
+	* lib/n/og/managed.rb: introduced.
+
+	* lib/n/og/backend.rb: introduced,
+	different exec/query/safe_exec/safe_query.
+	
+	* test/n/tc_og.rb: introduced.
+	
+	* lib/n/og/connection.rb: introduced,
+	(#update_properties): introduced and works,
+	(#getxxxx): get methods work,
+	(#get_all): works.
+	
+	* lib/n/og.rb: introduced the new O-R library a hybrid between
+	ndb and ActiveRecord,
+	(ManagedClassMeta): introduced,
+	(#enchant): nice :),
+	cool, use capitalize to get the Backend,
+	(#get_connection): use a thread-local variable,
+	(#put_connection): use a thread-local variable,
+	(#wrap_method): uses a connection from Thread.local,
+	(#convert): converts a normal object to a managed object,
+	(#manage): fixed bug with create_table,
+	(#enchant): YEAH, added the first enchantments :) 
+
+28-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/n/connection.rb (#create_schema, #drop_schema): removed.
+
+	* lib/n/managed.rb: fix in __db_read_row.
+
+	* lib/n/server/appserver.rb: show where app server is listening too.
+
+	* examples/simple/conf/*: greatly simplified configuration.
+
+	* lib/n/config.rb: moved many standard configurations
+	here.
+
+27-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/n/db.rb: dont require utils and connection by default.
+	
+	* lib/n/db/connection.rb (#count_children): use get_res_value,
+	greatly improved the organization and documentation.
+
+	* lib/n/db/mysql.rb: added latest psql fixes,
+	(#calc_fields): reimplemented,
+	(#get_res_value): introduced.
+
+	* test/n/tc_db_mysql.rb: many fixes.
+
+	* test/n/server/tc_filters.rb: added.
+
+	* lib/n/db/psql.rb (#retry_query): should raise after retries [b.candler],
+	(#retry_query, #next_oid): use //i in error checks [b.candler],
+	(#exec, #exec_clear): moved from connection,
+	removed PsqlBackend, overload DbConnection instead.
+	
+	* MAJOR: removed the App namespace module from many many files.
+	
+	* bin/new_project.rb: moved from etc/
+	
+	* lib/n/server: renamed from app, more standard naming.
+	
+	* lib/n/app/requestpart.rb: renamed.
+
+	* lib/n/app/webrick.rb: merged webrick-servlet.rb
+
+	* lib/n/server/PLAYBACK.txt: removed
+
+	* lib/n/server/RESEARCH.txt: removed
+
+26-10-2004  George Moschovitis  <gm@navel.gr>
+
+	* lib/n/app/dispatcher.rb: introduced for experiments in design.
+	
+	* lib/n/logger.rb: cleaned up formating with some Ruby magic.
+
+	* lib/n/shaders.rb (NilShader): name = nil for better dumps.
+
+	* lib/n/app/webrick-servlet.rb: alias :do_POST.
+
+	* Rakefile, added builder as required in the Gem.
+	
+	* lib/n/app/handlers/page-handler.rb (#transform_script):
+	support <?rb as marker [c.nasis]. 
+	
 25-10-2004  George Moschovitis  <gm@navel.gr>
 
+	* --- VERSION 0.2.0 ---
+
 	* test cases pass again.
 	
 	* lib/n/app/webrick-servlet.rb: fixed bug with default index,

data/README

@@ -1,4 +1,4 @@
-= Nitro
+= Nitro 0.3.0
 
 Nitro is an efficient, yet simple engine for developing professional Web 
 Applications using the Ruby language. Nitro aims to provide a robust 
@@ -6,6 +6,8 @@ infrastructure for scalable web applications that can be distributed
 over a server cluster. However, Nitro can also power simple web 
 applications for deployment on intranets or even personal computers.
 
+Nitro integrated the powerful Og Object-Relational mapping library.
+
 
 == Features
 
@@ -62,17 +64,27 @@ A short summary of the major features:
 	<!-- run time include (dynamic include) -->
 	<x:include xl:href="myfile.si" />
 
+* Minimum configuration
+
+	Configuration files are kept to the absolute minimum. The target
+	is to have no configuration files at all.
+
 * Object-Relational Mapping 
 
-	Nitro integrates the NDB object-relational mapping library. NDB 
-	provides transparent serialization of object graphs to a RDBMS 
-	backend. Unlike other similar libraries NDB maps standard Ruby
-	objects to SQL tables and not vice versa. NDB provides a flexible
-	and intuitive api for querieng the database, raw access to the 
-	SQL language if needed (for example to fine tune the automatically
-	generated SQL tables, or for custom queries), suports deserialization
-	to Ruby objects or tuples and provides a collection of usefull Mixins
-	to synthesize common Entities.
+	Nitro integrates the Og (ObjectGraph) object-relational mapping 
+	library. Og	provides transparent serialization of object graphs to a RDBMS 
+	backend. Unlike other similar libraries Og maps standard Ruby
+	objects to SQL tables and not vice versa. Og provides a meta language
+	to describe the relations between objects, a flexible	and intuitive api 
+	for querieng the database, raw access to the SQL language if needed 
+	(for example to fine tune the automatically generated SQL tables, or 
+	for custom queries), suports deserialization to Ruby objects or tuples 
+	and provides a collection of usefull Mixins to synthesize common 
+	Entities.
+	
+	Og is a combination of the best features of Active Record and the
+	former O-R mapping library included in Nitro (NDB). Adapters for
+	PostgreSQL and MySQL are included.
 	
 * Distributed State
 
@@ -172,11 +184,17 @@ Nitro requires the following applications or libraries:
 The following applications or libraries are optional:
 
 * PostgreSQL (http://www.postgres.org)
-	Used for Database driven web applications
+	Used for Database driven web applications.
 	
+* MySQL (http://www.mysql.org)
+	Used for Database driven web applications.
+
 * Ruby-psql (http://www.postgresql.jp/interfaces/ruby/archive/ruby-postgres-0.7.1.tar.gz)
 	Ruby interface to the PostgreSQL RDBMS.
 
+* Ruby-mysql (http://tmtm.org/ja/ruby/mysql/README_en.html)
+	Ruby interface to the MySQL RDBMS.
+	
 * Ruby-XSLT (http://gregoire.lejeune.free.fr/ruby-xslt_0.4.0.tar.gz)
 	Used for XSLT based templates.
 
@@ -233,6 +251,17 @@ $ vi conf/config.rb
 
 edit the postgresql user and password
 
+if you wan to run this application with MySQL
+edit the configuration file to include
+
+{
+	...
+	:backend => "mysql"
+	...
+}
+
+instead.
+
 run the following script to initialize the postgresql database used by
 the example
 

data/RELEASES

@@ -1,10 +1,19 @@
+== Version 0.3.0 was released on 01/11/2004.
+
+An important revision! Nitro now includes the first version
+of a brand new ObjectRelational mapping library called 
+Og (ObjectGraph) that combines the best features of Active
+Record and NDB. A fully working MySQL adapter is also provided.
+Moreover the code base is further cleaned up. Small improvements 
+to the application configuration system.
+
 
 == Version 0.2.0 was released on 25/10/2004.
 
 Greatly improved RDoc documentation. Cleaned up many source files,
 and improved the directory structure to be more compatible with
 other Ruby projects. Introduced a test suite. Important bug fixes
-in NDB. Tiny example no longer requires apache so sholud run out
+in NDB. Tiny example no longer requires apache so should run out
 of the box.
 
 

data/Rakefile

@@ -25,7 +25,7 @@ task :default => :package
 
 Rake::TestTask.new do |t|
 	t.libs << "test"
-	t.test_files = FileList["test/**/tc*.rb"].exclude("**/tc*db*.rb")
+	t.test_files = FileList["test/**/tc*.rb"].exclude("**/tc*og*.rb")
 	t.verbose = true
 end
 
@@ -33,7 +33,7 @@ end
 
 Rake::TestTask.new(:test_all) do |t|
 	t.libs << "test"
-	t.test_files = FileList["test/**/tc*.rb"].exclude("**/tc*mysql*.rb")
+	t.test_files = FileList["test/**/tc*.rb"]
 	t.verbose = true
 end
 
@@ -66,8 +66,9 @@ spec = Gem::Specification.new do |s|
 	s.version = PKG_VERSION
 	s.summary = "Web Engine"
 	s.description = "An efficient, yet simple engine for Web Applications"
-	s.add_dependency("postgres", ">= 0.7.1")
-	s.add_dependency("extensions", ">= 0.5")
+	#	s.add_dependency("postgres", ">= 0.7.1")
+	#	s.add_dependency("extensions", ">= 0.5")
+	# s.add_dependency("builder")
 	s.required_ruby_version = ">= 1.8.1"
 	s.files = PKG_FILES.to_a 
 	s.require_path = "lib"

data/bin/cluster.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: cluster.rb 104 2004-10-22 13:35:03Z gmosx $
+# $Id: cluster.rb 112 2004-10-27 10:59:55Z gmosx $
 
 $:.unshift "lib"
 
@@ -12,7 +12,7 @@ require "monitor"
 require "n/application"
 require "n/server"
 require "n/utils/cache"
-require "n/app/session"
+require "n/server/session"
 
 module N
 
@@ -202,7 +202,7 @@ class Cluster < N::Application
 	
 	def run
 		N::Cluster::Clm.new
-		DRb.start_service("druby://:8001", N::App::SessionManager.new)
+		DRb.start_service("druby://:8001", N::SessionManager.new)
 	
 		while true
 			sleep(5000)

data/{etc/new-project.rb → bin/new_app.rb}

@@ -7,7 +7,7 @@
 # George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: new-project.rb 86 2004-10-19 13:58:40Z gmosx $
+# $Id: new_app.rb 112 2004-10-27 10:59:55Z gmosx $
 #++
 
 base_dir = ARGV[0]

data/examples/og/README

@@ -0,0 +1,4 @@
+= Og Example
+
+A simple example that demonstrates some Og features. The example
+automatically creates a 'test' database.

data/examples/og/run.rb

@@ -0,0 +1,254 @@
+# = Og Example 
+#
+# A simple example to demonstrate the Og library.
+#
+# code: 
+# * George Moschovitis  <gm@navel.gr>
+#
+# (c) 2004 Navel, all rights reserved.
+# $Id: run.rb 124 2004-11-01 12:34:17Z gmosx $
+
+$:.unshift "../../lib"
+
+require "n/std"
+require "n/logger"
+require "n/og"
+
+# Full debug information.
+$DBG = true
+
+# = A child class
+#
+class Comment
+	prop_accessor String, :body
+	
+	def initialize(body = nil)
+		@body = body
+	end
+	
+	def to_s
+		return @body
+	end
+end
+
+# forward declaration
+class ArticleComment < Comment; end
+
+# forward declaration
+class UserComment < Comment; end
+
+# forward declaration
+class Part; end
+
+# = A Parent class
+#
+class User
+	prop_accessor String, :name
+	
+	has_many UserComment, :comments
+	
+	def initialize(name = nil)
+		@name = name
+	end
+	
+	def to_s
+		return @name
+	end
+end
+
+# = A parent class
+#
+class Article
+	prop_accessor String, :title
+	prop_accessor String, :body
+	# override the default O->R mapping
+	prop_accessor Fixnum, "smallint DEFAULT 1", :level
+	# store a Ruby Hash in the Database. Marshal
+	# is used for serializing the attribute.
+	prop_accessor Hash, :options
+	prop_accessor Time, :create_time
+	
+	# define comment relation:
+	has_many ArticleComment, :comments
+	
+	has_many Part, :parts
+	
+	# define author relation:
+	belongs_to User, :author
+	
+	# this attribute is NOT stored in the db.
+	attr_accessor :other_options
+	
+	# Managed object constructors with no args, take *args 
+	# as parameter to allow for Mixin chaining.
+	#
+	def initialize(title = nil, body = nil)
+		@title, @body = title, body
+		@create_time = Time.now
+		@options = {}
+		@other_options = {}
+	end
+	
+	def to_s
+		return "#@title: #@body"
+	end
+end
+
+# = Article comment
+#
+class ArticleComment < Comment
+	belongs_to Article, :article
+end
+
+# = User comment
+#
+class UserComment < Comment
+	belongs_to User, :author
+end
+
+# = Another child class
+#
+class Part
+	prop_accessor String, :name
+	belongs_to Article, :article
+	
+	def initialize(name = nil)
+		@name = name
+	end
+	
+	def to_s
+		return @name
+	end
+end
+
+# Initialize a logger.
+
+$log = Logger.new(STDERR); 
+
+# Og configuration.
+=begin
+config = {
+	:address => "localhost",
+	:database => "test",
+	:backend => "psql",
+	:user => "postgres",
+	:password => "navelrulez",
+	:connection_count => 1
+}
+=end
+config = {
+	:address => "localhost",
+	:database => "test",
+	:backend => "mysql",
+	:user => "root",
+	:password => "navelrulez",
+	:connection_count => 1
+}
+
+# Cleanup the database for earlier executions
+
+N::Og.drop_db!(config)
+
+# Initialize Og
+
+$og = N::Og.new(config)
+
+# Define the managed objects
+
+$og.manage_classes(Article, User, ArticleComment, UserComment, Part)
+
+# Get an Og connection for this thread.
+
+$og.get_connection
+
+# Create some articles
+
+a1 = Article.new("Title1", "Body1")
+a1.save!
+
+a2 = Article.new("Title2", "Body2")
+a2.save!
+
+puts "\n\n"
+puts "* Get and print all articles:"
+articles = Article.all()
+articles.each { |a| puts a }
+
+# Create some comments
+
+c1 = ArticleComment.new("Comment 1")
+c1.article = a1
+c1.save!
+
+c2 = ArticleComment.new("Comment 2")
+# alternative way to set the parent.
+c2.article_oid = a1.oid
+# an alternative way to save (add to the $og 'virtal collection' of
+# managed objects).
+$og << c2
+
+c3 = ArticleComment.new("Comment 3")
+c3.article = a1
+c3.save!
+
+puts "\n\n"
+puts "* Print all all comments for article 1:"
+a1.comments.each { |c| puts c }
+
+# Most Og commands allow you to fine-tune the low level
+# SQL code by passing extra_sql parameters, here is an
+# example
+puts "\n\n"
+puts "* comments with sql finetunings:"
+# use a standard SQL limit clause
+a1.comments("LIMIT 2").each { |c| puts c }
+
+
+# Change a managed object
+a1.title = "Changed Title"
+# Og knows that this is a managed object and executes
+# an SQL UPDATE instead of an SQL INSERT
+a1.save!
+
+puts "\n\n"
+Article.all.each { |a| puts a }
+
+# The previous command updates the whole object. It is used
+# when there are many updates or you dont care about speed. 
+# To update only specific fields use pupdate or properties_update
+a2.pupdate! "title='A specific title'"
+
+puts "\n\n"
+Article.all.each { |a| puts a }
+
+# delete an object
+ArticleComment.delete(c3)
+
+puts "\n\n"
+ArticleComment.all.each { |a| puts a }
+
+
+# Serialize a hash
+a1.options = { "k1" => "val1", "k2" => "val2" }
+a1.save!
+
+# lookup an object
+article = Article[a1.oid]
+
+puts "\n\n"
+puts article.options.inspect
+
+u = User.new("gmosx")
+u.save!
+
+article = Article[1]
+# you can also lookup by the name property.
+article.author = User["gmosx"]  
+article.save!
+
+part = Part.new("admin")
+part.article = article
+part.save!
+
+article.parts.each { |pa| puts pa }
+