og 0.21.2 → 0.22.0

data/CHANGELOG

@@ -1,7 +1,66 @@
+07-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/og/entity.rb: fixed schema_inheritance alias.
+  
+  * lib/og.rb: updated comments.
+  
+  * doc/RELEASES: updated.
+
+06-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/og/entity.rb: helper method.
+  
+  * lib/og/manager.rb (#manage_class): alias,
+  (#get_store): fixed bug in thread_safe mode, allows multiple
+  og's to run in thread safe mode.
+  
+  * test/og/tc_multiple.rb: implemented.
+
+05-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/og/relation/has_many.rb: support for legacy schemas,
+  :foreign_field option,
+  quote foreign_key values,
+  fixed foreign_field bug.
+
+  * lib/og/relation/refers_to.rb: support for legacy schemas.
+  
+  * lib/og/entity.rb (#set_primary_key): also get primary key class,
+  (#og_quote): added.
+
+04-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/og/store/*: use #field_for_property where needed,
+  don't create the oid property if not needed!
+  fixed enchant some more,
+  fixed finder calculation to honour field override.
+  
+  * lib/og/store/sql.rb (#table): honour sql_table metadata,
+  (#field_for_property): implemented,
+  (#eval_og_read): updated to handle custom fields.
+  
+  * lib/og/entity.rb (#sql_table): added helper [daval],
+  added set_xxx prefix to some helper.
+  
+  * test/og/tc_reverse.rb: introduced,
+  Yeah, I got data written to a legacy table.
+  
+  * lib/og/test/testcase.rb: introduced,
+  (fixture): implemented,
+  (og_fixture): implemented.
+
+  * lib/og/test/assertions.rb: introduced.
+
+30-07-2005  George Moschovitis <gm@navel.gr>
+
+  * test/: renamed from testing.
+
 28-07-2005  George Moschovitis <gm@navel.gr>
 
+  * --- VERSION 0.21.1 ---
+  
   * lib/og/store/psql.rb: custom eval_og_allocate,
-  fixed inheritance porblem.
+  fixed inheritance problem.
 
   * lib/og/store/sql.rb: factored out eval_og_allocate.
     

data/README

@@ -1,4 +1,4 @@
-= Og 0.21.2 README
+= Og 0.22.0 README
 
 Og (ObjectGraph) is a powerful and elegant object-relational mapping 
 library. Og manages the lifecycle of Ruby objects and  provides 
@@ -28,21 +28,25 @@ distribution (http://www.nitrohq.com).
 
 The library provides the following features:
 
-* Object-Relational mapping.
+* Object-Relational mapping, automatically maps standard 
+  Ruby objects to sql schemas
 * Absolutely no configuration files.
 * Multiple stores (PostgreSQL, MySQL, SQLite, Oraclei, SqlServer, ..).
-* Supports non SQL stores.
+* Supports non SQL stores (in-memory, filesystem, ..).
+* Can 'reverse engineer' legacy database schemase.
+* Fine-grained or High-level customization of the generated
+  schema.
 * ActiveRecord-style domain specific language and db synchronized
   collections.
 * Transforms resultsets from arbitrary sql queries to Ruby objects.
-* Automatically generate join tables for many to many relations.
-* Can use any Ruby object to join other Ruby objects.
+* Independent store for each object class, can support multiple
+  stores in the same application.
 * Deserialize to Ruby Objects.
 * Deserialize sql join queries to Ruby Objects.
 * Eager associations.
 * Serialize arbitrary ruby object graphs through YAML.
 * Connection pooling.
-* Thread safety (temporarily dissabled).
+* Thread safety.
 * SQL transactions.
 * Aspect oriented constructs allow interception of lifecycle callbacks.
 * Transparent support for cascading deletes for all backends.

data/doc/RELEASES

@@ -1,3 +1,69 @@
+== Version 0.22.0
+
+A snapshot of the latest developments. Many requested features
+where implemented, and many reported bugs fixed.
+
+* The much requested Og 'reverse mode' is implemented. Og's 
+domain specific language and API is extended to allow fine-grained 
+customization of the schema-to-objects mapping. Og can now handle 
+most of the legacy schemas you can throw at it. Here is an 
+example:
+
+class User
+  property :name, String, :field => :thename, :uniq => true
+  property :password, String
+  property :age, Fixnum, :field => :age3    
+  has_many Comment, :foreign_field => :user
+  set_table :my_users
+  set_primary_key :name, String
+end
+
+class Comment
+  property :cid, Fixnum
+  property :body, String
+  belongs_to User, :field => :user
+  set_table :my_comments
+  set_primary_key :cid
+end
+
+As you can see, even relation fields can be customized. For 
+higher level customization you can overload methods like #table,
+#field_for_property etc.
+
+* Og now handles multiple connections to multiple stores even 
+in thread safe mode. This means you can now have objects serialized
+in different RDBM systems in the same application. Or you can have
+some objects managed by an RDBMS store and others by a FAST 
+in-memory store. You can still have relations between objects in
+different stores. An example:
+
+mysql = Og.setup(:store => :mysql, ..)
+psql = Og.setup(:store => :psql, ..)
+
+class User
+  has_many Comment
+end
+
+class Comment
+  belongs_to User
+end
+
+mysql.manage_class User
+psql.manage_class Comment
+
+user.comments << comment
+
+* Greatly improved support for testing and test-driven-development.
+Support for Og fixtures and automatic test database
+setup is provided. Fixtures can be defined with yml or csv files.
+
+For an example of the testing infrastructure check out the 
+Spark 0.4.0 sources. Spark is a Wiki powered by Nitro.
+
+* Many smaller changes and feature implementations that make
+development with Og so much more pleasurable.
+
+
 == Version 0.21.2
 
 This is a bug fix release. 

data/lib/og.rb

@@ -27,24 +27,32 @@ require 'glue/configuration'
 #
 # The library provides the following features:
 #
-# + Object-Relational mapping, automatically maps standard 
+# * Object-Relational mapping, automatically maps standard 
 #   Ruby objects to sql schemas
-# + Absolutely no configuration files.
-# + Multiple stores (PostgreSQL, MySQL, SQLite, Oraclei, SqlServer, ..).
-# + Supports non SQL stores (in-memory, filesystem, ..).
-# + ActiveRecord-style meta language and db aware methods.
-# + Deserialize to Ruby Objects.
-# + Deserialize sql join queries to Ruby Objects.
-# + Eager associations.
-# + Serialize arbitrary ruby object graphs through YAML.
-# + Connection pooling.
-# + Thread safety.
-# + SQL transactions.
-#  + Aspect oriented constructs allow interception of lifecycle callbacks.
-# + Transparent support for cascading deletes for all backends.
-# + Hierarchical structures (nested sets)
-# + Works safely as part of distributed application.
-# + Simple implementation.
+# * Absolutely no configuration files.
+# * Multiple stores (PostgreSQL, MySQL, SQLite, Oraclei, SqlServer, ..).
+# * Supports non SQL stores (in-memory, filesystem, ..).
+# * Can 'reverse engineer' legacy database schemase.
+# * Fine-grained or High-level customization of the generated
+#   schema.
+# * ActiveRecord-style domain specific language and db synchronized
+#   collections.
+# * Transforms resultsets from arbitrary sql queries to Ruby objects.
+# * Independent store for each object class, can support multiple
+#   stores in the same application.
+# * Deserialize to Ruby Objects.
+# * Deserialize sql join queries to Ruby Objects.
+# * Eager associations.
+# * Serialize arbitrary ruby object graphs through YAML.
+# * Connection pooling.
+# * Thread safety.
+# * SQL transactions.
+# * Aspect oriented constructs allow interception of lifecycle callbacks.
+# * Transparent support for cascading deletes for all backends.
+# * Hierarchical structures (nested sets)
+# * Works safely as part of distributed application.
+# * Optimistic locking.
+# * Simple implementation.
 #
 # === Property Metadata
 #
@@ -75,7 +83,7 @@ module Og
 
   # The version.
 
-  Version = '0.21.2'
+  Version = '0.22.0'
 
   # Library path.
 

data/lib/og/entity.rb

@@ -14,7 +14,7 @@ module EntityMixin
     base.module_eval <<-end_eval, __FILE__, __LINE__ 
       def save(options = nil)
         self.class.ogmanager.store.save(self, options)
-#        return self
+        # return self
       end
       alias_method :save!, :save
 
@@ -56,6 +56,10 @@ module EntityMixin
       def transaction(&block)
         self.class.ogmanager.store.transaction(&block)
       end
+      
+      def og_quote(obj)
+        self.class.ogmanager.store.quote(obj)
+      end      
     end_eval
 
     base.send(:include, RelationMacros)
@@ -132,7 +136,13 @@ module EntityMixin
     def transaction(&block)
       ogmanager.store.transaction(&block)
     end
+
+    # Return the store (connection) for this class.
     
+    def ogstore
+      ogmanager.store
+    end
+        
     def primary_key
       unless @__meta and @__meta[:primary_key]
         self.meta :primary_key, Entity.resolve_primary_key(self)
@@ -142,21 +152,37 @@ module EntityMixin
     
     # Set the default find options for this entity.
     
-    def find_options(options)
+    def set_find_options(options)
       meta :find_options, options
     end
+    alias_method :find_options, :set_find_options
+
+    # Enable schema inheritance for this Entity class.
+    # The Single Table Inheritance pattern is used.
+        
+    def set_schema_inheritance
+      meta :schema_inheritance
+    end
+    alias_method :schema_inheritance, :set_schema_inheritance
     
     # Set the default order option for this entity.
     
-    def order(order_str)
+    def set_order(order_str)
       meta :find_options, :order => order_str
     end
+    alias_method :order, :set_order 
 
-    # Enable schema inheritance for this Entity class.
-    # The Single Table Inheritance pattern is used.
-        
-    def schema_inheritance
-      meta :schema_inheritance
+    # Set a custom table name.
+    
+    def set_sql_table(table)
+      meta :sql_table, table.to_s
+    end
+    alias_method :set_table, :set_sql_table
+
+    # Set the primary key.
+    
+    def set_primary_key(pk, pkclass = Fixnum)
+      meta :primary_key, pk, pkclass
     end
 
     # Is this entity a polymorphic parent?
@@ -178,6 +204,9 @@ end
 class Entity 
   class << self
     def resolve_primary_key(klass)
+      if pk = klass.__meta[:primary_key]
+        return pk
+      end
       for p in klass.properties
         if p.meta[:primary_key]
           return p.symbol, p.klass

data/lib/og/manager.rb

@@ -40,35 +40,36 @@ class Manager
     @entities = {}
     @pool = Glue::Pool.new
         
-    store_class = Store.for_name(options[:store])
-    store_class.destroy(options) if options[:destroy]
+    @store_class = Store.for_name(options[:store])
+    @store_class.destroy(options) if options[:destroy]
 
     if Og.thread_safe
       (options[:connection_count] || 5).times do
-        @pool << store_class.new(options)
+        @pool << @store_class.new(options)
       end    
     else
-      @store = store_class.new(options)
+      @store = @store_class.new(options)
     end
   end
 
-  # Get a store from the pool.
+  # Get a store from the pool. 
   
   def get_store
     if Og.thread_safe
       thread = Thread.current
       
-      unless conn = thread[:og_store]
-        conn = @pool.pop()
-        thread[:og_store] = conn
+      unless st = thread[:og_store] and st.is_a?(@store_class)
+        st = @pool.pop()
+        thread[:og_store] = st
       end
       
-      return conn
+      return st
     else
       return @store
     end
   end
   alias_method :store, :get_store
+  alias_method :conn, :get_store
 
   # Return a store to the pool.
   
@@ -111,7 +112,7 @@ class Manager
     # subclass.
 
     manage(klass.superclass) if has_super?(klass)
-    
+
     klass.module_eval %{
       def ==(other)
         other ? @#{klass.primary_key.first} == other.#{klass.primary_key.first} : false
@@ -181,6 +182,7 @@ class Manager
     classes.each { |c| Relation.resolve(c, :resolve_options) }
     classes.each { |c| manage(c) }
   end
+  alias_method :manage_class, :manage_classes
 
 end
 

data/lib/og/mixin/timestamped.rb

@@ -1,3 +1,5 @@
+require 'glue/aspects'
+
 module Og
 
 # Adds timestamping functionality.
@@ -7,8 +9,8 @@ module Timestamped
   property :update_time, Time
   property :access_time, Time
 
-  pre "@create_time = @update_time = Time.now", :on => :og_insert
-  pre "@update_time = Time.now", :on => :og_update
+  before "@create_time = @update_time = Time.now", :on => :og_insert
+  before "@update_time = Time.now", :on => :og_update
 
   def touch!
     @access_time = Time.now

data/lib/og/relation.rb

@@ -42,7 +42,6 @@ class Relation
       # as a polymorphic parent class.
       # This class acts as template
       # to generate customized versions of this class.
-
       owner_class.meta(:polymorphic, owner_class)
     elsif target_class.respond_to?(:metadata) and target_class.metadata.polymorphic
       # If the target class is polymorphic, create a specialized

data/lib/og/relation/has_many.rb

@@ -32,6 +32,8 @@ class HasMany < Relation
     self[:owner_singular_name] = owner_class.to_s.demodulize.underscore.downcase 
     self[:target_singular_name] = target_plural_name.to_s.singular
     self[:foreign_key] = "#{foreign_name || owner_singular_name}_#{owner_pk}"
+    # gmosx: DON'T set self[:foreign_field]
+    foreign_field = self[:foreign_field] || self[:foreign_key]
     
     owner_class.module_eval %{ 
       attr_accessor :#{target_plural_name}
@@ -65,7 +67,7 @@ class HasMany < Relation
       
       def find_#{target_plural_name}(options = {})
         find_options = {
-          :condition => "#{foreign_key} = \#\{@#{owner_pk}\}"
+          :condition => "#{foreign_field} = \#{og_quote(@#{owner_pk})}"
         }
         if options
           if condition = options.delete(:condition)
@@ -77,7 +79,7 @@ class HasMany < Relation
       end
       
       def count_#{target_plural_name}
-        #{target_class}.count(:condition => "#{foreign_key} = \#\{@#{owner_pk}\}")        
+        #{target_class}.count(:condition => "#{foreign_field} = \#{og_quote(@#{owner_pk})}")        
       end
     }
   end

data/lib/og/relation/refers_to.rb

@@ -7,9 +7,13 @@ class RefersTo < Relation
   def enchant
     self[:foreign_key] = "#{foreign_name || target_singular_name}_#{target_pk}"
 
+    if self[:field]
+      field = ", :field => :#{self[:field]}"
+    end 
+
     owner_class.module_eval %{
       attr_accessor :#{target_singular_name}
-      prop_accessor :#{foreign_key}, #{target_pkclass}
+      prop_accessor :#{foreign_key}, #{target_pkclass}#{field}
 
       def #{target_singular_name}(reload = false)
         return nil if @#{foreign_key}.nil? 

data/lib/og/store.rb

@@ -89,7 +89,7 @@ class Store
         def self.find_by_#{p.symbol}(val, operator = '=', options = {})
           options.update(
             :class => #{klass},
-            :condition => "#{p.symbol}\#{operator}\#{ogmanager.store.quote(val)}"
+            :condition => "#{p.meta[:field] || p.symbol}\#{operator}\#{ogmanager.store.quote(val)}"
           )
           ogmanager.store.#{finder}(options)
         end; 

data/lib/og/store/filesys.rb

@@ -6,7 +6,7 @@ require 'og/store'
 module Og
 
 # A Store that saves the object on the Filesystem.
-# You can create multiple instances that point to the same store.
+# An extension of the Memory store.
 
 class FilesysStore < Store
 
@@ -30,8 +30,6 @@ class FilesysStore < Store
     Logger.error "Cannot destroy '#{name}'"
   end
 
-  # :section: Misc methods.
-  
   # Initialize a connection to this store.
 
   def initialize(options)
@@ -54,7 +52,6 @@ class FilesysStore < Store
     FileUtils.mkdir_p(path(klass))
     File.open(spath(klass), 'w') { |f| f << '1' }
   rescue => ex
-    p ex
     Logger.error "Cannot create directory to store '#{klass}' classes!"                      
   end
 

data/lib/og/store/kirby.rb

@@ -1,5 +1,5 @@
 begin
-  require 'lib/og/store/kirby/kirbybase'
+  require 'lib/vendor/kirbybase'
 rescue Object => ex
   Logger.error 'KirbyBase is not installed!'
   Logger.error ex
@@ -282,4 +282,3 @@ end
 end
 
 # * George Moschovitis <gm@navel.gr>
-# * Ysabel <deb@isabel.org>

data/lib/og/store/mysql.rb

@@ -130,7 +130,11 @@ class MysqlStore < SqlStore
   end
 
   def enchant(klass, manager)
-    klass.property :oid, Fixnum, :sql => 'integer AUTO_INCREMENT PRIMARY KEY'
+    if klass.metadata.primary_key.flatten.first == :oid
+      unless klass.properties.find { |p| p.symbol == :oid }
+        klass.property :oid, Fixnum, :sql => 'integer AUTO_INCREMENT PRIMARY KEY'
+      end
+    end
     super
   end
   
@@ -183,7 +187,7 @@ private
     
     # Create table constrains.
     
-    if klass.__meta and constrains = klass.__meta[:sql_constrain]
+    if klass.metadata and constrains = klass.metadata.sql_constrain
       sql << ", #{constrains.join(', ')}"
     end
   
@@ -293,17 +297,18 @@ private
   def eval_og_insert(klass)
     props = klass.properties.dup
     values = props.collect { |p| write_prop(p) }.join(',') 
-    
+
     if klass.metadata.superclass or klass.metadata.subclasses
       props << Property.new(:ogtype, String)
       values << ", '#{klass}'"
     end
     
-    sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| p.symbol.to_s}.join(',')}) VALUES (#{values})"
+    sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| field_for_property(p)}.join(',')}) VALUES (#{values})"
 
     klass.class_eval %{
       def og_insert(store)
         #{Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
+        puts "#{sql}"
         store.conn.query_with_result = false
         store.conn.query "#{sql}"
         @#{klass.pk_symbol} = store.conn.insert_id

data/lib/og/store/psql.rb

@@ -132,7 +132,11 @@ class PsqlStore < SqlStore
       klass.const_set 'OGSEQ', "#{table(klass)}_oid_seq"
     end
 
-    klass.property :oid, Fixnum, :sql => 'serial PRIMARY KEY'
+    if klass.metadata.primary_key.flatten.first == :oid
+      unless klass.properties.find { |p| p.symbol == :oid }
+        klass.property :oid, Fixnum, :sql => 'serial PRIMARY KEY'
+      end
+    end
     super
   end
 
@@ -278,7 +282,7 @@ private
       values << ", '#{klass}'"
     end
     
-    sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| p.symbol.to_s}.join(',')}) VALUES (#{values})"
+    sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| field_for_property(p)}.join(',')}) VALUES (#{values})"
 
     klass.class_eval %{ 
       def og_insert(store)

data/lib/og/store/sql.rb

@@ -110,7 +110,11 @@ module SqlUtils
   end
 
   def table(klass)
-    "#{Og.table_prefix}#{tableize(klass)}"
+    if t = klass.metadata.sql_table
+      return t.first
+    else
+      "#{Og.table_prefix}#{tableize(klass)}"
+    end 
   end
 
   def join_object_ordering(obj1, obj2)
@@ -227,8 +231,8 @@ class SqlStore < Store
   def initialize(options)
     super
 
-    # The default Ruby <-> SQL type mappings, should be valid for most
-    # RDBM systems.
+    # The default Ruby <-> SQL type mappings, should be valid 
+    # for most RDBM systems.
     
     @typemap = {
       Integer => 'integer',
@@ -483,10 +487,23 @@ private
     raise 'Not implemented'
   end
 
+  # Drop the sql table where objects of this class are 
+  # persisted.
+  
   def drop_table(klass)
     exec "DROP TABLE #{klass.table}"
   end
 
+  # Return the field for the given property.
+
+  def field_for_property(property)
+    if f = property.meta[:field]
+      return f.to_s
+    else
+      return property.symbol.to_s
+    end
+  end
+  
   # Create the fields that correpsond to the klass properties.
   # The generated fields array is used in create_table.
   # If the property has an :sql metadata this overrides the 
@@ -513,7 +530,7 @@ private
     properties.each do |p|
       klass.index(p.symbol) if p.meta[:index]
         
-      field = p.symbol.to_s
+      field = field_for_property(p)
       
       if p.meta and p.meta[:sql]
         field << " #{p.meta[:sql]}"
@@ -538,7 +555,7 @@ private
 
     return fields
   end
-
+  
   def type_for_class(klass)
     @typemap[klass]    
   end
@@ -609,7 +626,7 @@ private
       values << ", '#{klass}'"
     end
     
-    sql = "INSERT INTO #{klass.table} (#{props.collect {|p| p.symbol.to_s}.join(',')}) VALUES (#{values})"
+    sql = "INSERT INTO #{klass.table} (#{props.collect {|p| field_for_property(p)}.join(',')}) VALUES (#{values})"
 
     klass.module_eval %{ 
       def og_insert(store)
@@ -627,7 +644,7 @@ private
     props = klass.properties.reject { |p| pk == p.symbol }
     
     updates = props.collect { |p|
-      "#{p.symbol}=#{write_prop(p)}"
+      "#{field_for_property(p)}=#{write_prop(p)}"
     }
 
     sql = "UPDATE #{klass::OGTABLE} SET #{updates.join(', ')} WHERE #{pk}=#\{@#{pk}\}"
@@ -655,7 +672,9 @@ private
     field_map = create_field_map(klass)
 
     props.each do |p|
-      if col = field_map[p.symbol]
+      f = field_for_property(p).intern
+      
+      if col = field_map[f]
         code << "@#{p.symbol} = #{read_prop(p, col)}"
       end
     end

data/lib/og/store/sqlite.rb

@@ -64,7 +64,11 @@ class SqliteStore < SqlStore
   end
   
   def enchant(klass, manager)
-    klass.property :oid, Fixnum, :sql => 'integer PRIMARY KEY'
+    if klass.metadata.primary_key.flatten.first == :oid
+      unless klass.properties.find { |p| p.symbol == :oid }
+        klass.property :oid, Fixnum, :sql => 'integer PRIMARY KEY'
+      end
+    end
     super
   end
 
@@ -192,7 +196,7 @@ private
       values << ", '#{klass}'"
     end
     
-    sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| p.symbol.to_s}.join(',')}) VALUES (#{values})"
+    sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| field_for_property(p)}.join(',')}) VALUES (#{values})"
 
     klass.class_eval %{ 
       def og_insert(store)

data/lib/og/test.rb

@@ -0,0 +1,2 @@
+require 'og/test/assertions'
+require 'og/test/testcase'

data/lib/og/test/assertions.rb

@@ -0,0 +1,175 @@
+require 'test/unit'
+require 'test/unit/assertions'
+require 'rexml/document'
+
+#--
+# Og related assertions.
+#++
+
+module Test::Unit::Assertions
+
+  STATUS_MAP = {
+    :success => 200,
+    :ok => 200,
+    :redirect => 307
+  }
+  
+  # :section: General assertions.
+
+  # Check the status of the response.
+  
+  def assert_response(options = {})
+    unless options.is_a? Hash
+      options = { :status => options }
+    end
+    msg = options[:msg]
+    if status = options.fetch(:status, :success)
+      status = STATUS_MAP[status] if STATUS_MAP.has_key?(status)
+      assert_status(status, msg)
+    end
+  end
+
+  def assert_status(status, msg)
+    msg = format_msg("Status not '#{status}'", msg)
+    assert_block(msg) { @context.status == status }
+  end
+    
+  #--
+  # Compile some helpers.
+  #++
+  
+  for m in [:get, :post, :put, :delete, :head]
+    eval %{
+      def assert_#{m}(uri, headers = {}, params = {}, session = nil)
+        #{m}(uri, headers, params, session)
+        assert_response :success
+      end 
+    }
+  end
+  
+  def assert_output(options = {})
+    msg = options[:msg]
+    if re = options[:match] || options[:contains]
+      assert_output_match(re, msg)
+    end
+    if re = options[:no_match] || options[:contains_no]
+      assert_output_not_match(re, msg)
+    end
+    if content_type = options[:content_type]
+      assert_content_type(content_type, msg)
+    end
+  end
+  
+  def assert_output_match(re, msg)
+    msg = format_msg("Rendered output does not match '#{re.source}'", msg)
+    assert_block(msg) { @context.body =~ Regexp.new(re) }
+  end
+  alias_method :assert_output_contains, :assert_output_match
+
+  def assert_output_not_match(re, msg)
+    msg = format_msg("Rendered output matches '#{re.source}'", msg)
+    assert_block(msg) { @context.out =~ Regexp.new(re) }
+  end
+  alias_method :assert_output_contains_not, :assert_output_match
+
+  def assert_content_type(ctype, msg)
+    msg = format_msg("Content type is not '#{ctype}' as expected", msg)
+    assert_block(msg) { @context.content_type == ctype }
+  end    
+  
+  # :section: Session related assertions.
+
+  def assert_session(options = {})
+    msg = options[:msg]
+    if key = options[:has]
+      assert_session_has(key, msg)
+    end
+    if key = options[:has_no] || options[:no]
+      assert_session_has_no(key, msg)
+    end
+    if key = options[:key] and value = options[:value]
+      assert_session_equal(key, value, msg)
+    end    
+  end
+
+  def assert_session_has(key, msg = nil)
+    msg = format_msg("Object '#{key}' not found in session", msg)
+    assert_block(msg) {  @context.session[key] }
+  end
+
+  def assert_session_has_no(key, msg = nil)
+    msg = format_msg("Unexpected object '#{key}' found in session", msg)
+    assert_block(msg) { !@context.session[key] }
+  end
+  
+  def assert_session_equal(key, value, msg = nil)
+    msg = format_msg("The value of session object '#{key}' is '#{@context.session[key]}' but was expected '#{value}'", msg)
+    assert_block(msg) { @context.session[key] == value }
+  end
+
+  # :section: Cookies related assertions.
+
+  def assert_cookie(options = {})
+    msg = options[:msg]
+    if key = options[:has]
+      assert_cookie_has(key, msg)
+    end
+    if key = options[:has_no] || options[:no]
+      assert_cookie_has_no(key, msg)
+    end
+    if key = options[:key] and value = options[:value]
+      assert_cookie_equal(key, value, msg)
+    end    
+  end
+
+  def assert_cookie_has(name, msg = nil)
+    msg = format_msg("Cookie '#{name}' not found", msg)
+    assert_block(msg) { @context.response_cookie(name) }
+  end
+
+  def assert_cookie_has_no(name, msg = nil)
+    msg = format_msg("Unexpected cookie '#{name}' found", msg)
+    assert_block(msg) { !@context.response_cookie(name) }
+  end
+  
+  def assert_cookie_equal(name, value, msg = nil)
+    unless cookie = @context.response_cookie(name)
+      msg = format_msg("Cookie '#{name}' not found", msg)
+      assert_block(msg) { false }
+    end
+    msg = format_msg("The value of cookie '#{name}' is '#{cookie.value}' but was expected '#{value}'", msg)
+    assert_block(msg) { cookie.value == value }
+  end
+
+  # :section: Template related assertions.
+  
+  # :section: Redirection assertions.
+
+  def assert_redirected(options = {})
+    msg = options[:msg]
+    
+    msg = format_msg("No redirection (status = #{@context.status})", msg)
+    assert_block(msg) { @context.redirect? }
+    
+    if to = options[:to]
+      msg = format_msg("Not redirected to '#{to}'", msg)
+      assert_block(msg) { @context.response_headers['location'] == "http://#{to}" }
+    end
+  end
+
+  def assert_not_redirected(options = {})
+    msg = options[:msg]
+    msg = format_msg("Unexpected redirection (location = '#{@context.response_headers['location']}')", msg)
+    assert_block(msg) { !@context.redirect? }
+  end
+  
+  # :section: Utility methods 
+
+  def format_msg(message, extra) # :nodoc:
+    extra += ', ' if extra
+    return "#{extra}#{message}"
+  end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/og/test/testcase.rb

@@ -0,0 +1,57 @@
+require 'test/unit'
+require 'test/unit/assertions'
+
+require 'facet/string/underscore'
+require 'facet/string/demodulize'
+require 'facet/string/pluralize'
+
+require 'glue'
+require 'glue/fixture'
+require 'og'
+require 'og/test/assertions'
+
+module Test::Unit
+  
+class TestCase
+
+  # Include fixtures in this test case.
+  #--
+  # gmosx: this method should probably be moved to glue.
+  #++
+  
+  def fixture(*classes)
+  
+    for klass in classes
+      f = Fixture.new(klass)
+      instance_variable_set "@#{klass.to_s.demodulize.underscore.pluralize}", f
+      Fixtures[klass] = f
+      
+      # create variables for the fixture objects.
+      
+      for name, obj in f
+        instance_variable_set "@#{name}", obj
+      end      
+    end
+
+  end  
+  
+  # Include fixtures in this test case, and serialize them in 
+  # the active Og store.
+  
+  def og_fixture(*classes)
+    fixture(*classes)
+
+    for klass in classes
+      f = Fixtures[klass]
+
+      for obj in f.objects
+        obj.save
+      end
+    end    
+  end
+
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/test/og/store/tc_filesys.rb

@@ -40,8 +40,8 @@ class TestCaseOgFilesys < Test::Unit::TestCase # :nodoc: all
   end
 
   def test_all
-    # p Comment.__meta
-    # p Article.__meta
+    # p Comment.metadata
+    # p Article.metadata
 
     a1 = Article.new('Article 1')
     @og.store.save(a1)  
@@ -65,7 +65,7 @@ class TestCaseOgFilesys < Test::Unit::TestCase # :nodoc: all
     # a = Article[1]
 
     @og.store.close
-    @og.store.class.destroy(@og.options)
+#   @og.store.class.destroy(@og.options)
   end
 
 end

data/test/og/tc_multiple.rb

@@ -0,0 +1,68 @@
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+
+$DBG = true
+
+require 'test/unit'
+
+require 'og'
+
+$og1 = Og.setup(
+  :destroy => true,
+  :store => :mysql,
+  :user => 'root',
+  :password => 'navelrulez',
+  :name => 'test'
+)    
+
+$og2 = Og.setup(
+  :destroy => true,
+  :store => :psql,
+  :user => 'postgres',
+  :password => 'navelrulez',
+  :name => 'test'
+)    
+
+class TestMultiple < Test::Unit::TestCase # :nodoc: all
+  include Og
+
+  class User
+    property :name, String, :uniq => true
+    has_many Article
+    
+    def initialize(name)
+      @name = name
+    end
+  end
+
+  class Article
+    property :title, String
+    belongs_to User
+    
+    def initialize(title)
+      @title = title
+    end
+  end
+  
+  def test_all
+    $og1.manage_class Article
+    $og2.manage_class User
+
+    assert Article.ogmanager.store.is_a?(Og::MysqlStore) 
+    assert User.ogmanager.store.is_a?(Og::PsqlStore) 
+    
+    a1 = Article.create('hello')
+    a2 = Article.create('world')
+    
+    u = User.create('gmosx')
+    
+    assert_equal 2, Article.count
+    
+    u.articles << a1
+    u.articles << a2
+    
+    gmosx = User.find_by_name('gmosx')
+    assert_equal 2, gmosx.articles.size
+    assert_equal 'hello', gmosx.articles[0].title
+  end
+  
+end

data/test/og/tc_polymorphic.rb

@@ -39,9 +39,15 @@ class TC_OgPolymorphic < Test::Unit::TestCase # :nodoc: all
 
   def setup
     @og = Og.setup(
+=begin
       :destroy => true,
       :store => :sqlite,
       :name => 'test'
+=end
+      :store => :mysql,
+      :name => 'testreverse',
+      :user => 'root',
+      :password => 'navelrulez'      
     )    
   end
 

data/test/og/tc_reverse.rb

@@ -0,0 +1,78 @@
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+
+$DBG = true
+
+require 'test/unit'
+
+require 'og'
+
+# 'testreverse' is a legacy database schema. Og's advanced
+# reverse engineering features allows us to map any schema
+# to our objects.
+
+$og = Og.setup(
+  :destroy => true,
+  :store => :mysql,
+  :name => 'testreverse',
+  :user => 'root',
+  :password => 'navelrulez'
+)
+
+# create a 'legacy' schema.
+    
+$og.store.exec "create table my_users (thename VARCHAR(32) PRIMARY KEY, password TEXT, age3 INTEGER);"
+$og.store.exec "create table my_comments (cid MEDIUMINT NOT NULL AUTO_INCREMENT, body TEXT, user VARCHAR(32), PRIMARY KEY(cid));"
+
+class User
+  property :name, String, :field => :thename, :uniq => true
+  property :password, String
+  property :age, Fixnum, :field => :age3    
+  has_many Comment, :foreign_field => :user
+  set_table :my_users
+  set_primary_key :name, String
+  
+  def initialize(name, password, age)
+    @name, @password, @age = name, password, age
+  end
+end
+
+class Comment
+  property :cid, Fixnum
+  property :body, String
+  belongs_to User, :field => :user
+  set_table :my_comments
+  set_primary_key :cid
+  
+  def initialize(body)
+    @body = body
+  end
+end
+
+$og.manage_classes
+
+class TestReverse < Test::Unit::TestCase # :nodoc: all
+  include Og
+  
+  def test_all
+    assert_equal 'my_users', User.table
+    assert_equal 'my_comments', Comment.table
+    
+    User.new('gmosx', 'navel', 30).insert
+    User.new('Helen', 'kontesa', 25).insert
+    
+    gmosx = User.find_by_name('gmosx')
+    assert_equal 'gmosx', gmosx.name
+    
+    helen = User.find_by_age(25).first
+    assert_equal 'Helen', helen.name
+    
+    c = Comment.new('hello')
+    c.insert
+    helen.comments << c
+  
+    assert_equal 1, helen.comments(:reload => true).size
+    assert_equal 'hello', helen.comments[0].body
+  end
+end
+
+# * George Moschovitis <gm@navel.gr>

data/test/og/tc_store.rb

@@ -44,7 +44,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
   class NewArticle < Article
     property :more_text, String
   end
-  
+
   class Comment
     property :body, String
     property :hits, Fixnum
@@ -103,7 +103,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
     conversions_test
   end
 =end
-=begin
+#=begin
   def test_mysql
     @og = Og.setup(
       :destroy => true,
@@ -116,8 +116,8 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
     features_test
 #    conversions_test
   end
-=end
-#=begin
+#=end
+=begin
   def test_sqlite
     @og = Og.setup(
       :destroy => true,
@@ -127,7 +127,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
     features_test
     conversions_test
   end
-#=end
+=end
 =begin
   def test_memory
     @og = Og.setup(

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.21.2
-date: 2005-07-28 00:00:00 +03:00
+  version: 0.22.0
+date: 2005-08-07 00:00:00 +03:00
 summary: Og (ObjectGraph)
 require_paths: 
   - lib
@@ -60,8 +60,9 @@ files:
   - lib/og/errors.rb
   - lib/og/store.rb
   - lib/og/validation.rb
-  - lib/og/testing
   - lib/og/types.rb
+  - lib/og/test
+  - lib/og/test.rb
   - lib/og/relation/belongs_to.rb
   - lib/og/relation/has_many.rb
   - lib/og/relation/has_one.rb
@@ -81,6 +82,8 @@ files:
   - lib/og/store/sqlite.rb
   - lib/og/store/kirby.rb
   - lib/og/store/memory.rb
+  - lib/og/test/assertions.rb
+  - lib/og/test/testcase.rb
   - lib/vendor/mysql411.rb
   - lib/vendor/mysql.rb
   - lib/vendor/kirbybase.rb
@@ -95,6 +98,8 @@ files:
   - test/og/tc_polymorphic.rb
   - test/og/tc_join.rb
   - test/og/tc_select.rb
+  - test/og/tc_reverse.rb
+  - test/og/tc_multiple.rb
   - test/og/store/tc_filesys.rb
   - test/og/mixin/tc_hierarchical.rb
   - test/og/mixin/tc_orderable.rb
@@ -124,5 +129,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.21.2
+            version: 0.22.0
       version: