og 0.9.5 → 0.10.0

data/ChangeLog

@@ -1,6 +1,266 @@
+15-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* INSTALL: added some text for manual installation.
+
+	* examples/no_xsl_blog/*: misc fixes.
+
+	* lib/nitro/dispatcher.rb (#dispatch): pass context to fix reload bug.
+
+	* examples/og/run.rb: updated.
+
+	* lib/og/meta.rb (#many_to_many): fixed bug.
+
+	* lib/nitro/controller.rb: introduced simple controller to protect
+	the base controller.
+
+	* lib/nitro/runner.rb (#run): call setup_debug/stage/live,
+	more fixes in setup.
+
+	* Rakefile: added flexmock dependency,
+	removed database dependencies (RubyGems is too picky),
+	added install.rb in distribution.
+
+	* test/: fixed some type_checking bugs.
+
+	* lib/glue/property.rb: type_checking = false by default.
+
+	* test/nitro/adapters: renamed from adaptors.
+
+14-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og.rb: require validation.
+
+	* lib/nitro.rb: require runner.
+
+	* lib/nitro/runner.rb: moved from adapters,
+	(self.run): added helper.
+	split setup in many methods to allow for overrides.
+
+	* examples/no_xsl_blog: converted.
+
+	* lib/nitro/render.rb: use @request as alias to @context.
+
+	* lib/nitro/builders/xml.rb: handle single tags like
+	<br/>, <hr/> etc.
+
+	* examples/wee_style/run.rb: converted,
+	cleaned up programmatic code.
+
+	* examples/flash: converted.
+
+	* examples/tiny: converted.
+
+	* README: updated.
+
+	* examples/README.windows: added.
+
+	* examples/: updated docs.
+
+	* lib/nitro/adapters/runner.rb: more comments,
+	(#run): accept hash as conf, 
+	converted methods to non static,
+	(#setup): implemented,
+	fixed version printing,
+	use ENV to pass invoke methods,
+	ULTRA COOL: --console parameter works again.
+
+	* I love Stella (asteraki) :)
+
+13-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/adapters/runner.rb: improved,
+	added fcgi_proc action.
+
+	* examples/blog/run.rb: introduced, runnable from everywhere.
+
+	* lib/nitro/conf.rb: introduced, default configuration paramters.
+
+	* changed base dir in applications, to be runnuble from 
+	everywhere.
+
+12-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* INSTALL: updated.
+
+	* install.rb: implemented, refined.
+
+	* updated all example confg files.
+
+	* Introduced the 'tml' nick in the docs. :)
+
+	* README: updated.
+
+	* README.og: updated.
+
+	* lib/xsl/base.xsl: removed old tags.
+
+	* lib/glue/string.rb (#to_greeklish): removed,
+	(#screen_ip_address): removed.
+
+	* lib/glue/macro.rb: deprecated.
+
+	* Many fixes to many files to improve the generated RDoc
+	documentation.
+
+	* lib/nitro/controller.rb (#inherited): fixed caller index.
+
+	* YEAH, using a RUBYOPT trick I can develop my rubygems.
+
+	* lib/nitro/dispatcher.rb (#dispatch): beutify, added comments,
+	(#controller_class_for): implemented, allows for autoreloading
+	of controllers,
+	dispatcher[:index] -> dispatcher[:root], this is a better (less
+	confusing) name.
+
+	* small fix in ctl's.
+
+	* lib/nitro/adapters/runner.rb: added --filelog option,
+	some fixes,
+	execution modes, better handling of Rendering.reload.
+
+11-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/adapters/sqlite.rb: added missing res.close,
+	use more queries to avoid array creations.
+
+	* lib/nitro/adapters/*: renamed from adaptors.
+
+	* test/tc_og.rb: added test for override db.
+
+	* lib/og/adapters/*: dont use entity,
+	(#calc_field_index): ensure res.close in 
+	(#create_table): use conn.store to avoid catching the errors.
+
+	* lib/og/adapters/mysql.rb: reintroduced,
+	SOS: use res.free in MysqlAdapter,
+	set_query_with_result,
+	passes tests.
+
+10-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* bin/proto/conf/app.conf.rb: updated.
+
+	* Yeah, nitro/og is in the path now, no need for File.join tricks.
+
+	* Rakefile: recoded/simplified. 
+
+	* bin/nitro: introduced.
+
+	* nitro.gemspec: introduced, 
+	cleaned up, add full dependencies.
+
+09-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/adapters/psql.rb: reintroduced,
+	use serial to make more compatible with mysql/sqlite,
+	more careful resultset clearing,
+	yeah, it works again.
+
+	* benchmark/og/bench.rb: introduced,
+	made a test with prepared statements, not a big difference.
+
+	* test/tc_og.rb: more tests.
+
+	* lib/og.rb (#adapter): introduced.
+
+	* lib/og/adapter.rb: made a singleton.
+	(#for_name): implemented,
+	pass db to all eval methods.
+
+	* lib/og/database.rb (#drop_db/#create_db): use adapter,
+	keep adapter.
+
+	* lib/og/*: renamed deserialize to read,
+	after MANY changes, this passes the simple test case.
+
+	* lib/og/adapters/sqlite.rb: reimplemented many methods,
+	(#count): fixed.
+
+	* lib/og/connection.rb: removed code from methods, will be implemented by the adpters,
+	removed deserialize option, always deserialize,
+	renamed conn attribute to store to avoid ubiquity.
+
+08-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/adapter.rb: introduced, removed adapters/base.rb,
+	(#new_connection): implemented.
+
+	* lib/og/adapters/sqlite.rb: reintroduced.
+
+	* lib/og/database.rb: introduced, copied database related stuff from og.rb
+
+	* lib/og/adapters: renamed from adaptors.
+
+07-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/og/backends/psql.rb (#initialize): use config[:address]. [rbaduin]
+
+	* lib/og/backends/sqlite.rb: passes some tests thanx to some fixes to 
+	sqlite3 library by jamis buck,
+	(#start): fixed,
+	(#commit): fixed.
+	yeah it passes tc_og.rb !!
+
+	* test/nitro/adaptors/tc_cgi.rb (#test_parse_multipart): introduced.
+
+	* lib/nitro/adaptors/cgi.rb (#read_multipart): made compatible with nitro,
+	corect parsing of multivalues in multipart,
+	(#parse_multipart): custom method.
+	(Cgi): introduced.
+	(Cgi.buffer_size): introduced.
+
+	* examples/tiny/index.xhtml: upload form.
+
+06-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* lib/nitro/markup.rb: changes for type_checking.
+
+	* test/glue/tc_property_type_checking.rb: implemented.
+
+	* lib/glue/property.rb: added type_checking support.
+
+	* INSTALL: added.
+
+	* lib/og/adaptors/base.rb: introduced.
+
+	* lib/og/backends/sqlite.rb: switched to sqlite3,
+	fixed stupid create join tables bug,
+	(#create_table): correct rescue exceptions,
+	(#calc_field_index): fixed.
+
+	* lib/og/backends/psql.rb: fixed stupid create tables bug.
+
+05-02-2005  George Moschovitis  <gm@navel.gr>
+
+	* cleaned up docs in many files.
+
+	* test/tc_og.rb: dont use global ($og),
+	run tests for all backends.
+
+	* lib/og/*: small cleanups.
+
+	* lib/og/backends/sqlite.rb (#calc_fields_index): fixed,
+	(#query/safe_query): fixed.
+	after many fixes, it kinda works.
+
+	* lib/nitro/adaptors/runner.rb: fixed lhttpd option string. [james_b]
 
 04-02-2005  George Moschovitis  <gm@navel.gr>
 
+	* lib/og/backends/sqlite.rb: implemented many methods.
+
+	* lib/og/backends/filesys.rb: introduced.
+
+	* lib/og/version.rb: removed.
+
+	* lib/nitro/version.rb: removed.
+
+	* lib/nitro.rb: version, libpath here.
+
+	* lib/og.rb: version, libpath here.
+
+	* --- VERSION 0.9.5 ---
+
 	* lib/nitro/adaptors/fastcgi.rb: convert conf to Flexob.
 
 	* lib/nitro/adaptors/webrick.rb: added REQUEST_MUTEX to temp-fix windows bug.

data/LICENSE

@@ -1,5 +1,6 @@
 The BSD License
 
+Copyright (c) 2004-2005, George 'tml' Moschovitis.
 Copyright (c) 2004-2005, Navel Ltd. (http://www.navel.gr)
 All rights reserved.
 

data/README.og

@@ -1,4 +1,4 @@
-= Og 0.9.3
+= Og 0.10.0
 
 Nitro integrates the Og (ObjectGraph) object-relational mapping 
 library. Og	provides transparent serialization of object graphs to a RDBMS 
@@ -14,7 +14,7 @@ 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.
+PostgreSQL, MySQL and SQLite 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 
@@ -27,7 +27,7 @@ The library provides the following features:
 
 + Object-Relational mapping.
 + Absolutely no configuration files.
-+ Multiple backends (PostgreSQL, MySQL).
++ Multiple backend adapters (PostgreSQL, MySQL, SQLite).
 + ActiveRecord-style meta language and db aware methods.
 + Automatially generates join-tables for many_to_many relations.
 + Deserialize to Ruby Objects or ResultSets.
@@ -39,7 +39,7 @@ The library provides the following features:
 + Lifecycle callbacks.
 + Transparent support for cascading deletes for all backends.
 + Hierarchical structures (preorder traversal, materialized paths)
-+ Works safely as part of distributed application.
++ Works safely as part of a distributed application.
 + Automatic Validation/Constraints.
 + Simple and clean implementation.
 
@@ -102,7 +102,8 @@ mailto:gm@navel.gr.
 
 == Licence
 
-Copyright (c) 2004-2005 Navel Ltd (http://www.navel.gr)
+Copyright (c) 2004-2005, George 'tml' Moschovitis.
+Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
 
 Og (http://www.navel.gr/og) is copyrighted free software
 created and maintained by George Moschovitis (mailto:gm@navel.gr)

data/RELEASES.og

@@ -1,3 +1,26 @@
+== Version 0.10.0 was released on 15/02/2005.
+
+An important release.
+
+Most notable additions:
+
+* Improved Og implementation (cleaner code) and new Og 
+  adapter subsystem.
+
+* New SQLite3 Og adapter, improvements in MySQL and PostgreSQL 
+	adapters (needs version 1.1.0 of Sqlite3-Ruby).
+
+* Better GemSpec for easier installation by RubyGems.
+
+* Og supports optional typechecking by using property metadata.
+
+* and many more smaller fixes.
+
+WARNING: If you used an earlier version of Og you
+may need to drop your database and let Og recreated it
+automatically.
+
+
 == Version 0.9.3 was released on 01/02/2005.
 
 A maintenance release.

data/Rakefile

@@ -2,132 +2,142 @@
 # (c) 2004-2005 Navel, all rights reserved.
 # $Id$
 
-require "rake"
-require "rake/rdoctask"
-require "rake/gempackagetask"
-require "rake/testtask"
-require "rubygems"
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'rake/gempackagetask'
 
-#project = 'nitro'
-project = 'og'
+og = true 
 
-# ----------------------------------------------------------------------
-
-desc "Default Task"
 task :default => :package
 
-# ----------------------------------------------------------------------
-
-# Run the tests
+# Run the tests.
 
 Rake::TestTask.new do |t|
-	t.libs << "test"
-	t.test_files = FileList["test/**/tc*.rb"].exclude("**/tc*og*.rb")
+	t.libs << 'test'
+	t.test_files = FileList['test/**/tc*.rb'].exclude('**/tc*og*.rb')
 	t.verbose = true
 end
 
-# Run all tests
+# Run all tests. (including expensive/depended tests)
 
 Rake::TestTask.new(:test_all) do |t|
-	t.libs << "test"
-	t.test_files = FileList["test/**/tc*.rb"]
+	t.libs << 'test'
+	t.test_files = FileList['test/**/tc*.rb']
 	t.verbose = true
 end
 
-# ----------------------------------------------------------------------
+# Generate RDoc documentation.
 
 Rake::RDocTask.new do |rd|
-	rd.main = "README"
-	rd.rdoc_dir = "rdoc"
-	rd.rdoc_files.include("README", "lib/**/*.rb")
+	rd.main = 'README'
+	rd.rdoc_dir = 'rdoc'
+	rd.rdoc_files.include('README', 'INSTALL', 'lib/**/*.rb')
+	rd.options << '--all --inline-source'
 end
-	
-# ----------------------------------------------------------------------
 
-if 'nitro' == project
+# Build gem.
+
+if og 
+
+spec = Gem::Specification.new do |s|
+	s.name = 'og'
+	if File.read('lib/og.rb') =~ /Version\s+=\s+'(\d+\.\d+\.\d+)'/
+		s.version = $1 
+	else
+		raise 'No version found'
+	end
+	s.summary = 'Og (ObjectGraph)'
+	s.description = 'An efficient and transparent Object-Relational mapping library'
 	
-	# Nitro GemSpec
-	#
-	require "lib/nitro/version"
+	# s.add_dependency 'postgres-pr', '>= 0.3.0'
+	# s.add_dependency 'postgres', '>= 0.7.1'
+	s.add_dependency 'extensions', '>= 0.5'
+	# s.add_dependency 'sqlite3-ruby', '>= 1.0.0'
+	#s.add_dependency 'mysql', '>= 2.5.1'
+	s.add_dependency 'flexmock', '>= 0.0.3'
+
+	s.required_ruby_version = '>= 1.8.0'
+
+	s.files = FileList[
+		'README.og', 'RELEASES.og', 'LICENSE', 'AUTHORS', 'Rakefile', 'ChangeLog*',
+		'install.rb',
+		'examples/og/*', 'lib/glue.rb', 'lib/glue/**/*', 'lib/og/**/*', 'lib/og.rb',
+		'test/*og*.rb', 'test/og/*', 'vendor/extensions/**/*'
+	].exclude('.svn/**/*').exclude('**/*.log').to_a
+
+	s.require_path = 'lib'
+	s.autorequire = 'og'
 	
-	PKG_VERSION = Nitro::Version 
-	PKG_FILES = FileList[
-		"[A-Z]*", "{bin,benchmark,etc,ext,examples,doc,lib,test,vendor}/**/*" 
-	#	"examples/*.rb"
-	].exclude(".svn/**/*").exclude("*.og").exclude("**/*.log")
+	s.has_rdoc = true
+	s.extra_rdoc_files = FileList['README.og', 'RELEASES.og', 'LICENSE', 'AUTHORS'].to_a
+	s.rdoc_options << '--main' << 'README.og' << '--title' << 'Og Documentation'
+	s.rdoc_options << '--all' << '--inline-source'
+
+	s.author = 'George Moschovitis'
+	s.email = 'gm@navel.gr'
+	s.homepage = 'http://www.rubyforge.com/projects/nitro'
+	s.rubyforge_project = 'nitro'
+end
+
+else
 	
-	spec = Gem::Specification.new do |s|
-		s.name = "nitro"
-		s.version = PKG_VERSION
-		s.summary = "Web Engine"
-		s.description = "An efficient, yet simple engine for Web Applications"
-		# s.add_dependency("postgres-pr", ">= 0.3.0")
-		#	s.add_dependency("postgres", ">= 0.7.1")
-		#	s.add_dependency("extensions", ">= 0.5")
-		s.required_ruby_version = ">= 1.8.1"
-		s.files = PKG_FILES.to_a 
-		s.require_path = "lib"
-		s.autorequire = "nitro"
-		s.has_rdoc = true
-		s.extra_rdoc_files = FileList["[A-Z]*"].exclude("*.og").to_a
-		s.rdoc_options << "--main" << "README" << "--title" << "Nitro Documentation"
-		s.test_files = []
-		s.bindir = "bin"
-		s.author = "George Moschovitis"
-		s.email = "gm@navel.gr"
-		s.homepage = "http://www.navel.gr/nitro"
-		s.rubyforge_project = "nitro"
+spec = Gem::Specification.new do |s|
+	s.name = 'nitro'
+	if File.read('lib/nitro.rb') =~ /Version\s+=\s+'(\d+\.\d+\.\d+)'/
+		s.version = $1 
+	else
+		raise 'No version found'
 	end
+	s.summary = 'Nitro Web Engine'
+	s.description = 
+		'An efficient, multiparadigm and flexible platform for rapid ' +
+		'web application development. Implements a full development stack ' +
+		'(Model, View, Controller).'
+	
+	# s.add_dependency 'postgres-pr', '>= 0.3.0'
+	# s.add_dependency 'postgres', '>= 0.7.1'
+	s.add_dependency 'extensions', '>= 0.5'
+	# s.add_dependency 'sqlite3-ruby', '>= 1.0.0'
+	# s.add_dependency 'mysql', '>= 2.5.1'
+	s.add_dependency 'flexmock', '>= 0.0.3'
 
-else
+	s.required_ruby_version = '>= 1.8.0'
+
+	s.files = FileList[
+		'[A-Z]*', 'install.rb', '{bin,benchmark,examples,doc,lib,test,vendor}/**/*' 
+	].exclude('.svn/**/*').exclude('*.og').exclude('**/*.log').to_a
 
-	# Og stand-alone GemSpec
-	#
-	require "lib/og/version"
+	s.require_path = 'lib'
+	s.autorequire = 'nitro'
 	
-	PKG_VERSION = Og::Version
-	PKG_FILES = FileList[
-		"README.og", "RELEASES.og", "LICENSE", "AUTHORS", "Rakefile", "ChangeLog*", 
-		"examples/og/*", "lib/glue.rb", "lib/glue/**/*", "lib/og/**/*", "lib/og.rb",
-		"test/*og*.rb", "test/og/*", "vendor/extensions/**/*"
-	].exclude(".svn/**/*").exclude("**/*.log")
+	s.has_rdoc = true
+	s.extra_rdoc_files = FileList['[A-Z]*'].exclude('*.og').to_a
+	s.rdoc_options << '--main' << 'README' << '--title' << 'Nitro Documentation'
+	s.rdoc_options << '--all' << '--inline-source'
+
+	s.test_files = []
 	
-	spec = Gem::Specification.new do |s|
-		s.name = 'og'
-		s.version = PKG_VERSION
-		s.summary = 'Og (ObjectGraph)'
-		s.description = 'An efficient and transparent Object-Relational mapping library'
-		#	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"
-		s.autorequire = "og"
-		s.has_rdoc = true
-		s.extra_rdoc_files = FileList["README.og", "RELEASES.og", "LICENSE", "AUTHORS"].to_a
-		s.rdoc_options << "--main" << "README.og" << "--title" << "Og Documentation"
-		s.test_files = []
-		s.bindir = "bin"
-		s.author = "George Moschovitis"
-		s.email = "gm@navel.gr"
-		s.homepage = "http://www.navel.gr/og"
-		s.rubyforge_project = "nitro"
-	end
+	s.bindir = 'bin'
+	s.executables = ['nitro']
+	s.default_executable = 'nitro'
+
+	s.author = 'George Moschovitis'
+	s.email = 'gm@navel.gr'
+	s.homepage = 'http://www.rubyforge.com/projects/nitro'
+	s.rubyforge_project = 'nitro'
+end
 
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.package_dir = "dist"
+  pkg.package_dir = 'dist'
   pkg.need_zip = true
   pkg.need_tar = true
 end
 
-# ----------------------------------------------------------------------
+# Manual install (not recommended).
 
-desc "Install the gem"
-task :install => :repackage do
-  sh "gem install --local --no-rdoc dist/nitro-#{PKG_VERSION}.gem"
+task :install do
+  ruby 'install.rb'
 end
 
-# vim: ft=ruby