og 0.9.5 → 0.10.0

data/test/og/tc_sqlite.rb

@@ -0,0 +1,87 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+=begin
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+require 'og/adapters/sqlite'
+
+class TC_OgSqlite3 < Test::Unit::TestCase # :nodoc: all
+	include N
+
+	# Forward declaration.
+
+	class Comment; end
+	
+	class Article
+		prop_accessor :name, String
+		prop_accessor :age, Fixnum
+		has_many :comments, Comment
+
+		def initialize (name = nil, age = nil)
+			@name, @age = name, age
+		end
+	end
+
+	class Comment
+		prop_accessor :text, String
+		belongs_to :article, Article
+
+		def initialize(text = nil)
+			@text = text
+		end
+	end
+
+	def setup
+		config = {
+			:adapter => 'sqlite',
+			:database => 'test',
+			:connection_count => 2 
+		}
+		
+		$DBG = true
+
+		Og::Database.drop_db!(config)
+		@og = Og::Database.new(config)
+	end
+
+	def teardown
+		@og.shutdown
+	end
+
+	def test_all
+		a = Article.new('gmosx', 30)
+		a.save!
+
+		a1 = Article[1]
+
+		assert_equal 'gmosx', a1.name
+		assert_equal 30, a1.age
+		assert_equal 1, a1.oid
+
+		Article.create('drak', 12)
+		Article.create('ekarak', 34)
+		Article.create('mario', 53)
+		Article.create('elathan', 34)
+
+		articles = Article.all
+
+		assert_equal 5, articles.size
+
+		a3 = Article[3]
+
+		assert_equal 'ekarak', a3.name
+
+		c1 = Comment.new('a comment')
+		c1.save!
+		a3.add_comment(c1)
+		
+		a5 = Article[3]
+		assert_equal 1, a5.comments.size
+	end
+
+end
+
+=end

data/test/tc_og.rb

@@ -85,52 +85,59 @@ class OrderItem
 end
 
 class TC_N_OG < Test::Unit::TestCase
+	def test_psql
+		config = {
+			:adapter => 'psql',
+			# :address => 'localhost',
+			:database => 'test',
+			:user => 'postgres',
+			:password => 'navelrulez',
+			:connection_count => 2
+		}
+
+		run_all_tests(config)
+	end
 
-	def setup
-		psql = true
-
-		if psql
-			config = {
-				:backend => "psql",
-				:address => "localhost",
-				:database => "test",
-				:user => "postgres",
-				:password => "navelrulez",
-				:connection_count => 1
-			}
-		else
-			config = {
-				:backend => "mysql",
-				:address => "localhost",
-				:database => "test",
-				:user => "root",
-				:password => "navelrulez",
-				:connection_count => 1
-			}
-		end
-		
-		Og::Database.drop_db!(config)
-		$og = Og::Database.new(config)
+=begin	
+	def test_mysql
+		config = {
+			:adapter => 'mysql',
+			# :address => 'localhost',
+			:database => 'test',
+			:user => 'root',
+			:password => 'navelrulez',
+			:connection_count => 2
+		}
+
+		run_all_tests(config)
 	end
 
-	def teardown
-		$og.shutdown()
+	def test_sqlite
+		config = {
+			:adapter => 'sqlite',
+			:database => 'test',
+			:connection_count => 2 
+		}
+
+		run_all_tests(config)
 	end
+=end
 
 	# gmosx: hmm, implemented in one method to enforce order.
-	#	
-	def test_all
-		$DBG = true
+		
+	def run_all_tests(config)
+		Og::Database.drop_db!(config)
+		og = Og::Database.new(config)
 
-		$og.get_connection()
+		og.get_connection
 		
 		article = Article.new("Title", "Here comes the body")
-		$og << article
+		og << article
 		
 		article.title = "Changed"
 		article.save!
 		
-		$og.pupdate("body='Hello'", article)
+		og.pupdate("body='Hello'", article)
 
 		article.update_properties "body='Hello'"
 		
@@ -143,9 +150,9 @@ class TC_N_OG < Test::Unit::TestCase
 		another.options = nil
 		another.save!
 		
-		assert_equal(nil, $og.load(30000, Article))
+		assert_equal(nil, og.load(30000, Article))
 		
-		articles = $og.load_all(Article)
+		articles = og.load_all(Article)
 
 #		p articles
 #		p Article[23]
@@ -157,9 +164,9 @@ class TC_N_OG < Test::Unit::TestCase
 		
 		assert_equal("gmosx", user.name)
 		
-		users1 = $og.select("name='gmosx' ORDER BY oid", User)
+		users1 = og.select("name='gmosx' ORDER BY oid", User)
 		
-		users = $og.select("SELECT * FROM #{User::DBTABLE} WHERE name='gmosx' ORDER BY oid", User)
+		users = og.select("SELECT * FROM #{User::DBTABLE} WHERE name='gmosx' ORDER BY oid", User)
 		
 		users2 = User.select "name='gmosx' ORDER BY oid"
 		
@@ -173,7 +180,6 @@ class TC_N_OG < Test::Unit::TestCase
 		comment.author = User["gmosx"]
 		comment.save!
 
-
 		# test automatically generated add_commnet
 		comment = Comment.new("This is another comment")
 		comment.author = User["gmosx"]
@@ -195,8 +201,10 @@ class TC_N_OG < Test::Unit::TestCase
 		article.add_comment(Comment.new("hello"))
 		article.add_comment(Comment.new("world"))
 
+		assert_equal 2, Comment.count
+
 		Article.delete(article)
-		
+
 		assert Comment.all.empty?
 
 		comment.delete!		
@@ -210,14 +218,14 @@ class TC_N_OG < Test::Unit::TestCase
 			end
 		end
 
-		assert($og.managed_classes.include?(Test::Article))
+		assert(og.managed_classes.include?(Test::Article))
 		
 		# bug: indirectly managed (includes managed Module)
-		assert($og.managed_classes.include?(Test::MyClass))
+		assert(og.managed_classes.include?(Test::MyClass))
 
 		# test create
 		article = Article.create("title", "body")
-		assert_equal(3, article.oid)
+		# assert_equal(3, article.oid)
 
 		# test refers_to
 
@@ -235,7 +243,18 @@ class TC_N_OG < Test::Unit::TestCase
 
 		user = User['gmosx']
 		assert_equal true, user.banned
+
+		og.put_connection
+		og.shutdown
+
+		# Test database allready exists
+
+		og = Og::Database.new(config)
+
+		user = User.new("gmosx")
+		user.save!
 		
+		og.shutdown
 	end
 
 end

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
-date: 2005-02-04
+  version: 0.10.0
+date: 2005-02-15
 summary: Og (ObjectGraph)
 require_paths: 
   - lib
 email: gm@navel.gr
-homepage: http://www.navel.gr/og
+homepage: http://www.rubyforge.com/projects/nitro
 rubyforge_project: nitro
 description: An efficient and transparent Object-Relational mapping library
 autorequire: og
@@ -21,7 +21,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - 
       - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.1
+        version: 1.8.0
   version: 
 platform: ruby
 authors: 
@@ -34,6 +34,7 @@ files:
   - Rakefile
   - ChangeLog.1
   - ChangeLog
+  - install.rb
   - examples/og/mysql_to_psql.rb
   - examples/og/run.rb
   - examples/og/mock_example.rb
@@ -48,7 +49,6 @@ files:
   - lib/glue/time.rb
   - lib/glue/property.rb
   - lib/glue/misc.rb
-  - lib/glue/macro.rb
   - lib/glue/flexob.rb
   - lib/glue/cache.rb
   - lib/glue/string.rb
@@ -56,18 +56,20 @@ files:
   - lib/glue/array.rb
   - lib/glue/validation.rb
   - lib/glue/attribute.rb
-  - lib/og/backends
-  - lib/og/version.rb
+  - lib/og/adapter.rb
+  - lib/og/adapters
   - lib/og/enchant.rb
   - lib/og/connection.rb
+  - lib/og/database.rb
   - lib/og/mock.rb
   - lib/og/meta.rb
   - lib/og/backend.rb
-  - lib/og/backends/mysql.rb
-  - lib/og/backends/sqlite.rb
-  - lib/og/backends/psql.rb
+  - lib/og/adapters/mysql.rb
+  - lib/og/adapters/sqlite.rb
+  - lib/og/adapters/psql.rb
   - lib/og.rb
   - test/tc_og.rb
+  - test/og/tc_sqlite.rb
   - test/og/tc_lifecycle.rb
   - vendor/extensions/enumerable.rb
   - vendor/extensions/all.rb
@@ -92,6 +94,8 @@ rdoc_options:
   - README.og
   - "--title"
   - Og Documentation
+  - "--all"
+  - "--inline-source"
 extra_rdoc_files: 
   - README.og
   - RELEASES.og
@@ -100,4 +104,24 @@ extra_rdoc_files:
 executables: []
 extensions: []
 requirements: []
-dependencies: []
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: extensions
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: "0.5"
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: flexmock
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.0.3
+      version: 

data/lib/glue/macro.rb

@@ -1,56 +0,0 @@
-# = Macros
-#
-# A powerfull macro implementation for Ruby. Allows definition
-# of new macro.
-#
-# EXPERIMENTAL, not fully working yet
-#
-# code: 
-# George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: macro.rb 165 2004-11-18 12:04:04Z gmosx $
-
-$__macros__ = {}
-$__required__ = {}
-
-module Kernel
-
-alias_method :old_require, :require
-def require(path)
-	return if $__required__[path]
-	
-	source = File.read(path)
-	
-	# parse macro
-	source.gsub!(/defmacro\s*\/(.*?)\/\s(.*?)endmacro/m) {
-		$__macros__[Regexp.new($1)] = $2 ; ""
-	}
-	
-	# expand macros	
-	$__macros__.each { |match, replace|
-		source.gsub!(match, replace)
-	}
-	
-	$__required__[path] = true
-
-	eval(source)
-end
-
-end
-
-require "nitro/test1.rb"
-require "nitro/test2.rb"
-
-__END__
-
-Examples:
-
-defmacro /my_macro\((.*)\)/
-	begin 
-		my_function(\1)
-	rescue => ex
-		puts ex
-	end 
-endmacro
-

data/lib/og/backends/mysql.rb

@@ -1,370 +0,0 @@
-# * George Moschovitis  <gm@navel.gr>
-# * Elias Athanasopoulos  <elathan@navel.gr>
-# (c) 2004-2005 Navel, all rights reserved.
-# $Id: mysql.rb 248 2005-01-31 13:38:34Z gmosx $
-
-require 'mysql'
-
-require 'og/backend'
-
-class Og
-
-# Implements a MySQL powered backend.
-
-class MysqlBackend < Og::Backend
-
-	# A mapping between Ruby and SQL types.
-	
-	TYPEMAP = {
-		Integer => 'integer',
-		Fixnum => 'integer',
-		Float => 'float',
-		String => 'text',
-		Time => 'timestamp',
-		Date => 'date',
-		TrueClass => 'tinyint',
-		Object => 'text',
-		Array => 'text',
-		Hash => 'text'		
-	}
-	
-	# Intitialize the connection to the RDBMS.
-	 		
-	def initialize(config)
-		begin
-			@conn = Mysql.connect(config[:address], config[:user], 
-					config[:password], config[:database])
-		rescue => ex
-			if ex.errno == 1049 # database does not exist.
-				Logger.info "Database '#{config[:database]}' not found!"
-				MysqlBackend.create_db(config[:database], config[:user], config[:password])
-				retry
-			end
-			raise
-		end
-	end
-
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	# Utilities
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	# Escape an SQL string
-	
-	def self.escape(str)
-		return nil unless str
-		return Mysql.quote(str)
-	end
-
-	# Convert a ruby time to an sql timestamp.
-	# TODO: Optimize this
-	 
-	def self.timestamp(time = Time.now)
-		return nil unless time
-		return time.strftime("%Y%m%d%H%M%S")
-	end
-	
-	# Output YYY-mm-dd
-	# TODO: Optimize this
-	
-	def self.date(date)
-		return nil unless date
-		return "#{date.year}-#{date.month}-#{date.mday}" 
-	end
-	
-	# Parse sql datetime
-	# TODO: Optimize this
-	
-	def self.parse_timestamp(str)
-		return Time.parse(str)		
-	end
-	
-	# Input YYYY-mm-dd
-	# TODO: Optimize this
-	
-	def self.parse_date(str)
-		return nil unless str
-		return Date.strptime(str)
-	end
-
-	# Return an sql string evaluator for the property.
-	# No need to optimize this, used only to precalculate code.
-	# YAML is used to store general Ruby objects to be more 
-	# portable.
-	#
-	# FIXME: add extra handling for float.
-	
-	def self.write_prop(p)
-		if p.klass.ancestors.include?(Integer)
-			return "#\{@#{p.symbol} || 'NULL'\}"
-		elsif p.klass.ancestors.include?(Float)
-			return "#\{@#{p.symbol} || 'NULL'\}"		
-		elsif p.klass.ancestors.include?(String)
-			return "'#\{Og::MysqlBackend.escape(@#{p.symbol})\}'"
-		elsif p.klass.ancestors.include?(Time)
-			return %|#\{@#{p.symbol} ? "'#\{Og::MysqlBackend.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
-		elsif p.klass.ancestors.include?(Date)
-			return %|#\{@#{p.symbol} ? "'#\{Og::MysqlBackend.date(@#{p.symbol})\}'" : 'NULL'\}|
-		elsif p.klass.ancestors.include?(TrueClass)
-			return "#\{@#{p.symbol} ? 1 : 0 \}"
-		else 
-			return %|#\{@#{p.symbol} ? "'#\{Og::MysqlBackend.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
-		end
-	end		
-
-	# Return an evaluator for reading the property.
-	# No need to optimize this, used only to precalculate code.
-	
-	def self.read_prop(p, idx)
-		if p.klass.ancestors.include?(Integer)
-			return "res[#{idx}].to_i()"
-		elsif p.klass.ancestors.include?(Float)
-			return "res[#{idx}].to_f()"
-		elsif p.klass.ancestors.include?(String)
-			return "res[#{idx}]"
-		elsif p.klass.ancestors.include?(Time)
-			return "Og::MysqlBackend.parse_timestamp(res[#{idx}])"
-		elsif p.klass.ancestors.include?(Date)
-			return "Og::MysqlBackend.parse_date(res[#{idx}])"
-		elsif p.klass.ancestors.include?(TrueClass)
-			return "('0' != res[#{idx}])"
-		else 
-			return "YAML::load(res[#{idx}])"
-		end				
-	end
-
-	# Returns the props that will be included in the insert query.
-	# The oid property is rejected because it is mapped to an 
-	# AUTO_INCREMENT column.
-	
-	def self.props_for_insert(klass)
-		klass.__props.reject { |p| :oid == p.symbol }
-	end
-
-	# Returns the code that actually inserts the object into the
-	# database. Returns the code as String.
-	
-	def self.insert_code(klass, sql, pre_cb, post_cb)
-		%{
-			#{pre_cb}
-			conn.exec "#{sql}"
-			@oid = conn.db.conn.insert_id()
-			#{post_cb}
-		}
-	end
-
-	# generate the mapping of the database fields to the
-	# object properties.
-	
-	def self.calc_field_index(klass, og)
-		res = og.query "SELECT * FROM #{klass::DBTABLE} LIMIT 1"
-		meta = og.managed_classes[klass]
-	
-		for idx in (0...res.num_fields)
-			meta.field_index[res.fetch_field.name] = idx
-		end
-	end
-	
-	# Generate the property for oid.
-	
-	def self.eval_og_oid(klass)
-		klass.class_eval %{
-			prop_accessor :oid, Fixnum, :sql => "integer AUTO_INCREMENT PRIMARY KEY"
-		}
-	end
-
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	# Connection methods. 
-	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	# Create the database.
-	
-	def self.create_db(database, user = nil, password = nil)
-		Logger.info "Creating database '#{database}'."
-		`mysqladmin -f --user=#{user} --password=#{password} create #{database}`
-	end
-	
-	# Drop the database.
-	
-	def self.drop_db(database, user = nil, password = nil)
-		Logger.info "Dropping database '#{database}'."
-		`mysqladmin -f --user=#{user} --password=#{password} drop #{database}`
-	end
-
-	# Execute an SQL query and return the result 
-	
-	def query(sql)
-		Logger.debug sql if $DBG
-		return @conn.query(sql)
-	end
-	
-	# Execute an SQL query, no result returned.
-	
-	def exec(sql)
-		Logger.debug sql if $DBG
-		@conn.query(sql)
-	end
-
-	# Execute an SQL query and return the result. Wrapped in a rescue
-	# block.
-	
-	def safe_query(sql)
-		Logger.debug sql if $DBG
-		begin
-			return @conn.query(sql)
-		rescue => ex
-			Logger.error "DB error #{ex}, [#{sql}]"
-			Logger.error ex.backtrace
-			return nil
-		end
-	end
-	
-	# Execute an SQL query, no result returned. Wrapped in a rescue 
-	# block.
-	
-	def safe_exec(sql)
-		Logger.debug sql if $DBG
-		begin
-			@conn.query(sql)
-		rescue => ex
-			Logger.error "DB error #{ex}, [#{sql}]"
-			Logger.error ex.backtrace
-		end
-	end
-	
-	# Check if it is a valid resultset.
-	
-	def valid?(res)
-		return !(res.nil? or 0 == res.num_rows)
-	end
-	
-	# Start a new transaction.
-	
-	def start
-		# no transaction support
-	end
-	
-	# Commit a transaction.
-	
-	def commit
-		# no transaction support
-	end
-	
-	# Rollback transaction.
-	
-	def rollback
-		# no transaction support
-	end	
-
-	# 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)
-		fields = create_fields(klass, TYPEMAP)
-
-		sql = "CREATE TABLE #{klass::DBTABLE} (#{fields.join(', ')}"
-		
-		# Create table constrains
-		
-		if klass.__meta and constrains = klass.__meta[:sql_constrain]
-			sql << ", #{constrains.join(', ')}"
-		end
-		
-		sql << ');'
-		
-		begin
-			exec(sql)
-			Logger.info "Created table '#{klass::DBTABLE}'."
-		rescue => ex
-			if ex.errno == 1050 # table already exists.
-				Logger.debug "Table already exists" if $DBG
-			else
-				raise
-			end
-		end
-		
-		# Create indices
-		
-		if klass.__meta and indices = klass.__meta[:sql_index] 
-			for data in indices
-				idx, options = *data
-				idx = idx.to_s
-				pre_sql, post_sql = options[:pre], options[:post]
-				idxname = idx.gsub(/ /, "").gsub(/,/, "_").gsub(/\(.*\)/, "")
-				exec "CREATE #{pre_sql} INDEX #{klass::DBTABLE}_#{idxname}_idx #{post_sql} ON #{klass::DBTABLE} (#{idx})"  
-			end
-		end
-
-		# Create join tables if needed. Join tables are used in
-		# 'many_to_many' relations.
-		
-		if klass.__meta and joins = klass.__meta[:sql_join] 
-			for data in joins
-				# the class to join to and some options.
-				join_class, options = *data
-				
-				# gmosx: dont use DBTABLE here, perhaps the join class
-				# is not managed yet.
-				join_table = "#{self.class.join_table(klass, join_class)}"
-				join_src = "#{self.class.encode(klass)}_oid"
-				join_dst = "#{self.class.encode(join_class)}_oid"
-				begin
-					exec "CREATE TABLE #{join_table} ( key1 integer NOT NULL, key2 integer NOT NULL )"
-					exec "CREATE INDEX #{join_table}_key1_idx ON #{join_table} (key1)"
-					exec "CREATE INDEX #{join_table}_key2_idx ON #{join_table} (key2)"
-				rescue => ex
-					if ex.errno == 1050 # table already exists.
-						Logger.debug "Join table already exists" if $DBG
-					else
-						raise
-					end
-				end
-			end
-		end		
-	end
-
-	# Deserialize one row of the resultset.
-	
-	def deserialize_one(res, klass)	
-		return nil unless valid?(res)
-		
-		# gmosx: Managed objects should have no params constructor.
-		row = res.fetch_row()
-		entity = klass.new()
-		entity.og_deserialize(row)
-		
-#		get_join_fields(res, 0, entity, join_fields) if join_fields
-
-		return entity
-	end
-	
-	# Deserialize all rows of the resultset.
-	
-	def deserialize_all(res, klass)	
-		return [] unless valid?(res)
-
-		entities = []
-
-		for tuple in (0...res.num_rows)
-			row = res.fetch_row()
-
-			entity = klass.new()
-			entity.og_deserialize(row)
-			
-#			get_join_fields(res, tuple, entity, join_fields) if join_fields
-			
-			entities << entity
-		end
-		
-		return entities
-	end
-
-	# Return a single integer value from the resultset.
-	
-	def get_int(res, idx = 0)	
-		return res.fetch_row[idx].to_i
-	end
-	
-end
-
-end