og 0.22.0 → 0.23.0

data/INSTALL

@@ -47,7 +47,8 @@ that you possibly have allready installed. Use with caution.
 
 You also have to manualy install the following libraries:
 
-* Facets
+* Nano
+* Mega
 * RedCloth
 
 = Manual installation.

data/README

@@ -1,4 +1,4 @@
-= Og 0.22.0 README
+= Og 0.23.0 README
 
 Og (ObjectGraph) is a powerful and elegant object-relational mapping 
 library. Og manages the lifecycle of Ruby objects and  provides 
@@ -160,8 +160,8 @@ http://rubyforge.org/mailman/listinfo/nitro-general
 
 == Licence
 
-Copyright (c) 2004-2005, George 'tml' Moschovitis.
 Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
+Copyright (c) 2004-2005, George 'gmosx' Moschovitis (http://www.gmosx.com).
 
 Og (http://www.nitrohq.com) is copyrighted free 
 software created and maintained by George Moschovitis (mailto:gm@navel.gr)

data/Rakefile

@@ -66,7 +66,7 @@ spec = Gem::Specification.new do |s|
 
   s.files = FileList[
     '[A-Z]*', 'install.rb', '{bin,benchmark,examples,doc,lib,test,vendor}/**/*' 
-  ].exclude('.svn/**/*').exclude('**/*.log').to_a
+  ].exclude("_darcs").exclude("_darcs/**/*").exclude('**/*.log').to_a
 
   s.require_path = 'lib'
   s.autorequire = 'og'

data/{CHANGELOG → doc/CHANGELOG.1}

@@ -1,3 +1,7 @@
+11-08-2005  Aleksi Niemela <Aleksi.Niemela@cs.helsinki.fi>
+
+  * lib/og/store/*: log creation of join tables.
+
 07-08-2005  George Moschovitis <gm@navel.gr>
 
   * lib/og/entity.rb: fixed schema_inheritance alias.

data/doc/RELEASES

@@ -1,3 +1,56 @@
+== Version 0.23.0
+
+The summer vacations are over and there is a brand new Nitro 
+release. There is a preview of the new Scaffolder (also handles
+Og relations), lots of small features and improvements and many bug
+fixes. Moreover the code has been restructured to utilize the 
+excellent Nano/Mega project as the support library.
+
+Most notable additions:
+
+* Scaffolding reloaded. The scaffolding infrastrucure is 
+reimplemented to generate more flexible code. The automatically
+generated forms allow for visualisation and editing of 
+Og relations suchs as HasMany and BelongsTo.
+
+Morover, an experimental admin component is provided. Just add the
+line 
+
+require 'part/admin'
+
+and surf
+
+http://www.mysite.com/admin
+
+To enter a simple administration screen. This feature is 
+considered a preview and will be improved in a future version.
+
+* Introduced Og Taggable mixin. It was never easier to add
+tagging to your appplication.
+
+  class Article
+    include Og::Taggable
+    ..
+  end
+
+  article.tag('navel', 'gmosx', 'nitro')
+  article.tags
+  article.tag_names
+  Article.find_with_tags('navel', 'gmosx')
+  Article.find_with_any_tag('name', 'gmosx')
+
+  t = Article::Tag.find_by_name('ruby')
+  t.articles
+  t.articles.count
+
+For an example usage of this Mixin, consult the Spark sources.
+
+* Added support for 'evolving' a single Og managed class. Useful
+when you are in development mode and change your schema.
+
+* Many many small bug fixes.
+
+
 == Version 0.22.0
 
 A snapshot of the latest developments. Many requested features

data/examples/run.rb

@@ -23,7 +23,7 @@ end
 # = A Parent class.
 
 class User
-  property :name, String, :unique => true
+  property :name, String, :uniq => true
   has_many :comments, UserComment
   
   def initialize(name = nil)

data/lib/og.rb

@@ -1,20 +1,20 @@
 # = Og
 #
-# Copyright (c) 2004-2005, George Moschovitis (http://www.gmosx.com)
 # Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
+# Copyright (c) 2004-2005, George Moschovitis (http://www.gmosx.com)
 #
-# Og is copyrighted free software created and maintained by 
-# George Moschovitis (mailto:gm@navel.gr) and released under the 
-# standard BSD Licence. For details consult the file doc/LICENCE.
+# Og (http://www.nitrohq.com) is copyrighted free software 
+# created and maintained by George Moschovitis (mailto:gm@navel.gr) 
+# and released under the standard BSD Licence. For details 
+# consult the file doc/LICENCE.
+
+require 'mega/synchash'
+require 'mega/syncarray'
 
 require 'glue'
 require 'glue/logger'
 require 'glue/attribute'
 require 'glue/property'
-require 'glue/array'
-require 'glue/hash'
-require 'glue/time'
-require 'glue/pool'
 require 'glue/validation'
 require 'glue/aspects'
 require 'glue/configuration'
@@ -23,37 +23,6 @@ require 'glue/configuration'
 # provides transparent and efficient object-relational mapping
 # and querying mechanisms.
 #
-# === Features
-#
-# The library provides the following features:
-#
-# * 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, ..).
-# * 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
 #
 # Og defines, reserves and uses the following property 
@@ -71,19 +40,12 @@ require 'glue/configuration'
 # mark them as Object (or Array or Hash) in the prop_accessor
 # and the engine will serialize a YAML dump of the object.
 # Arbitrary object graphs are supported too.
-#
-# === Lifecycle Callbacks
-#
-# * og_read
-# * og_insert
-# * og_update
-# * og_delete
 
 module Og
 
   # The version.
 
-  Version = '0.22.0'
+  Version = '0.23.0'
 
   # Library path.
 
@@ -170,11 +132,11 @@ module Og
    
 end
 
+#--
 # gmosx: leave this here.
+#++
 
 require 'og/manager'
 require 'og/errors'
 require 'og/types'
 require 'og/validation'
-
-# * George Moschovitis <gm@navel.gr>

data/lib/og/entity.rb

@@ -56,6 +56,11 @@ module EntityMixin
       def transaction(&block)
         self.class.ogmanager.store.transaction(&block)
       end
+
+      def saved?
+        not @oid.nil?
+      end
+      alias_method :serialized?, :saved?
       
       def og_quote(obj)
         self.class.ogmanager.store.quote(obj)

data/lib/og/errors.rb

@@ -1,5 +1,3 @@
-# $Id$
-
 module Og
   
 # This exception is thrown when a low level error happens 
@@ -14,3 +12,5 @@ class StoreException < Exception
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/og/manager.rb

@@ -1,3 +1,5 @@
+require 'mega/pool'
+
 require 'og/entity'
 require 'og/store'
 
@@ -38,7 +40,7 @@ class Manager
   def initialize(options)
     @options = options
     @entities = {}
-    @pool = Glue::Pool.new
+    @pool = Pool.new
         
     @store_class = Store.for_name(options[:store])
     @store_class.destroy(options) if options[:destroy]
@@ -108,11 +110,6 @@ class Manager
     
     info = EntityInfo.new(klass)
 
-    # ensure that the superclass is managed before the
-    # subclass.
-
-    manage(klass.superclass) if has_super?(klass)
-
     klass.module_eval %{
       def ==(other)
         other ? @#{klass.primary_key.first} == other.#{klass.primary_key.first} : false
@@ -123,6 +120,11 @@ class Manager
     klass.class.send(:attr_accessor, :ogmanager)
 
     Relation.enchant(klass)    
+
+    # ensure that the superclass is managed before the
+    # subclass.
+
+    manage(klass.superclass) if has_super?(klass)
     
     # FIXME: uggly!
     store.enchant(klass, self); put_store
@@ -167,8 +169,6 @@ class Manager
       end
     end
     
-    Logger.debug "Og manageable classes: #{classes.inspect}" if $DBG
-
     return classes
   end
 
@@ -176,6 +176,9 @@ class Manager
   
   def manage_classes(*classes)
     classes = manageable_classes.flatten if classes.empty?
+    
+    Logger.debug "Og manageable classes: #{classes.inspect}" if $DBG
+    
     classes.each { |c| resolve_inheritance(c) }
     classes.each { |c| Relation.resolve(c, :resolve_target) }
     classes.each { |c| Relation.resolve(c, :resolve_polymorphic) }
@@ -187,3 +190,6 @@ class Manager
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>
+# * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>

data/lib/og/mixin/hierarchical.rb

@@ -1,8 +1,5 @@
-require 'facet/string/plural'
-require 'facet/string/singular'
-require 'facet/string/demodulize'
-require 'facet/string/underscore'
-require 'facet/macro'
+require 'mega/macro'
+require 'mega/orm_support'
 
 module Og
 

data/lib/og/mixin/optimistic_locking.rb

@@ -1,4 +1,4 @@
-require 'facet/macro'
+require 'mega/macro'
 
 module Og
 

data/lib/og/mixin/orderable.rb

@@ -1,4 +1,4 @@
-require 'facet/macro'
+require 'mega/macro'
 
 module Og
 
@@ -25,7 +25,7 @@ module Orderable
         scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
       end
     
-      cond = 'condition => ' + scope
+      cond = ':condition => ' + scope
       cond_and = ':condition => ' + scope + ' + " AND " +'
     else
       cond = ':condition => nil'

data/lib/og/mixin/taggable.rb

@@ -0,0 +1,218 @@
+require 'mega/macro'
+require 'nano/object/assign_with'
+
+#--
+# gmosx: make polymorphic work with many_to_many.
+#++
+
+module Og
+
+# The default Tag implementation. A tag attaches semantics to
+# a given object.
+#--
+# FIXME: use index and char() instead of String.
+#++
+
+class Tag
+  property :name, String, :uniq => true
+  
+  def initialize(name = nil)
+    @name = name
+  end
+end
+
+# Add tagging methods to the target class.
+# For more information on the algorithms used surf:
+# http://www.pui.ch/phred/archives/2005/04/tags-database-schemas.html
+#
+# === Example
+#
+# class Article
+#    include Taggable
+#    ..
+#  end
+#
+# article.tag('navel', 'gmosx', 'nitro')
+# article.tags
+# article.tag_names
+# Article.find_with_tags('navel', 'gmosx')
+# Article.find_with_any_tag('name', 'gmosx')
+#
+# Article::Tag.find_by_name('ruby').articles
+
+module Taggable
+  
+  # Helper.
+  
+  def self.tags_to_names(the_tags, separator = ' ')
+    if the_tags.is_a? Array
+      names = the_tags 
+    elsif the_tags.is_a? String
+      names = the_tags.split(separator)
+    end
+    
+    names = names.flatten.uniq.compact
+    
+    return names
+  end  
+
+  def self.append_dynamic_features(base, options = nil)
+    o = { 
+      :base_tag_class => Og::Tag,
+      :separator => ' '
+    }
+    o.update(options) if options
+
+    code = ''
+                
+    unless o[:tag_class]
+      o[:tag_class] = 'Tag'
+      code << %{
+        class #{o[:tag_class]} < #{o[:base_tag_class]}
+          many_to_many #{base}, :foreign_name => :tags
+        end
+      }
+    end
+    
+    tag_class = o[:tag_class]
+    separator = o[:separator].inspect
+    
+    code << %{
+      many_to_many :tags, #{o[:tag_class]}
+     }
+
+    # Instance Methods:
+     
+    # Apply a collection of tags to the object.
+    # +tags+ can be either an array or a String.
+    #
+    # === Options
+    #
+    # +clear+: clear the tags collection before adding the
+    #           new tags.
+
+    code << %{      
+      def tag(the_tags, options = {})
+        options = {
+          :clear => true
+        }.merge(options)
+        
+        names = Taggable.tags_to_names(the_tags, #{separator})
+        
+        tags.load_members
+        
+        # clear the collection if needed.    
+        
+        self.tags.clear if options[:clear]
+
+        # append the tag names to the collection    
+        
+        names.each do |name| 
+          name = name.strip
+          unless tagged_with?(name)
+            unless tag_obj = #{tag_class}.find_by_name(name) 
+              tag_obj = #{tag_class}.create(name)
+            end
+             tags << tag_obj
+           end
+        end
+        
+        self.save
+      end
+    }
+
+    # Clears all tags.
+    
+    def delete_tags
+    end
+    alias_method :clear_tags, :delete_tags
+    
+    # Returns an array of strings containing the tags applied to 
+    # this object.
+    
+    code << %{  
+      def tag_names
+        tags.map { |t| t.name }
+      end
+    }  
+
+    # Checks to see if this object has been tagged 
+    # with +tag_name+.
+
+    code << %{      
+      def tagged_with?(tag_name)
+        tag_names.include?(tag_name)
+      end
+      alias_method :tagged_by?, :tagged_with?      
+    }
+
+    # Class Methods:
+    
+    code << %{
+      class << self
+    }
+    
+    # Find objects with all of the provided tags.
+    # INTERSECTION (AND)
+    #--
+    # TODO: move info out of compiled code.
+    #++
+
+    code << %{
+      def find_with_tags(*names)
+        info = ogmanager.store.join_table_info(#{base}, #{tag_class})
+        count = names.size
+        names = names.map { |n| "'\#{n}'" }.join(',')
+        sql = %{        
+          SELECT o.* 
+          FROM 
+            \#{info[:first_table]} AS o, 
+            \#{info[:second_table]} as t, 
+            \#{info[:table]} as j  
+          WHERE o.oid = j.\#{info[:first_key]} 
+            AND t.oid = j.\#{info[:second_key]} 
+            AND (t.name in (\#{names}))
+          GROUP BY o.oid
+          HAVING COUNT(o.oid) = \#{count};
+        }
+        return self.select(sql)
+      end
+      alias_method :find_with_tag, :find_with_tags
+    }
+
+    # Find objects with any of the provided tags.
+    # UNION (OR)
+
+    code << %{
+      def find_with_any_tag(*names)
+        info = ogmanager.store.join_table_info(#{base}, #{tag_class})
+        count = names.size
+        names = names.map { |n| "'\#{n}'" }.join(',')
+        sql = %{        
+          SELECT o.* 
+          FROM 
+            \#{info[:first_table]} AS o, 
+            \#{info[:second_table]} as t, 
+            \#{info[:table]} as j  
+          WHERE 
+            o.oid = j.\#{info[:first_key]} 
+            AND t.oid = j.\#{info[:second_key]} 
+            AND (t.name in (\#{names}))
+          GROUP BY o.oid
+        }
+        return self.select(sql)
+      end
+    }
+        
+    code << %{
+      end
+    }
+    
+    base.module_eval(code)
+  end
+  
+end
+
+end 
+
+# * George Moschovitis <gm@navel.gr>

data/lib/og/relation.rb

@@ -1,16 +1,20 @@
-require 'facet/object/constant'
-require 'facet/string/plural'
-require 'facet/string/demodulize'
-require 'facet/string/underscore'
+require 'nano/object/constant'
+require 'nano/string/capitalized%3F'
+
+require 'mega/orm_support'
 
 module Og
 
-# A relation between Entities.
+# A relation between Entities. 
 
 class Relation
 
+  # The parameters of this relation.
+  
   attr_accessor :options
   
+  # Is this a polymorphic relation?
+  
   attr_accessor :is_polymorphic
   
   # A generalized initialize method for all relations.
@@ -20,18 +24,34 @@ class Relation
     @options = options
     @options.update(args.pop) if args.last.is_a?(Hash)
 
-    if args.empty? or (not (args.last.is_a?(Class) or args.last.is_a?(Symbol)))
-      raise 'Class of target not defined' 
-    end
-
     target_name = if collection
       :target_plural_name
     else 
       :target_singular_name 
     end
 
-    @options[:target_class] = args.pop
-    @options[target_name] = args.first unless args.empty?
+    # Check that all needed options are provided.
+    
+    if args.empty? or (not (args.last.is_a?(Class) or args.last.is_a?(Symbol)))
+      raise 'Class of target not defined' 
+    end
+
+    # Try to set the target class. Checks for class and 
+    # class symbol.
+    
+    if args.last.to_s.capitalized?
+      @options[:target_class] = args.pop
+    end
+    
+    # Try to set the target name.
+    
+    if args.last.is_a? Symbol
+      @options[target_name] = args.pop
+    end      
+    
+    # Inflect target_class if not provided.
+    
+    @options[:target_class] ||= @options[target_name].to_s.singular.camelize.intern
     
     setup()
   end
@@ -193,7 +213,8 @@ module RelationMacros
 
     # === Examples
     #
-    # belongs_to Article
+    # belongs_to :article # inflects Article
+    # belongs_to Article  # inflects :article
     # belongs_to :article, Article
     # belongs_to :article, Article, :view => 'lala'
     
@@ -204,7 +225,8 @@ module RelationMacros
 
     # === Examples
     #
-    #  refers_to Topic
+    # refers_to :topic # inflects Topic
+    # refers_to Topic # inflects :topic
     
     def refers_to(*args)
       require 'og/relation/refers_to'
@@ -230,11 +252,15 @@ module RelationMacros
       meta :relations, Og::HasMany.new(args, :owner_class => self, :collection => true)
     end
 
+    # ..
+    
     def joins_many(*args)
       require 'og/relation/joins_many'
       meta :relations, Og::JoinsMany.new(args, :owner_class => self, :collection => true)
     end
     
+    # ..
+    
     def many_to_many(*args)
       require 'og/relation/many_to_many'
       meta :relations, Og::ManyToMany.new(args, :owner_class => self, :collection => true)

data/lib/og/relation/has_many.rb

@@ -1,6 +1,4 @@
-require 'facet/string/singular'
-require 'facet/string/demodulize'
-require 'facet/string/underscore'
+require 'mega/orm_support'
 
 require 'og/relation'
 require 'og/collection'

data/lib/og/relation/joins_many.rb

@@ -1,6 +1,4 @@
-require 'facet/string/singular'
-require 'facet/string/demodulize'
-require 'facet/string/underscore'
+require 'mega/orm_support'
 
 require 'og/relation'
 require 'og/collection'
@@ -26,8 +24,15 @@ class JoinsMany < Relation
     self[:target_singular_name] = target_plural_name.to_s.singular
 
     store = owner_class.ogmanager.store
-    join_table_info = store.join_table_info(owner_class, target_class)
+
+    # handle schema_inheritance
     
+    join_class = owner_class
+    if sclass = owner_class.metadata.superclass
+      join_class = sclass.first
+    end
+    join_table_info = store.join_table_info(join_class, target_class)
+
     if through = self[:through] 
       # A custom class is used for the join. Use the class 
       # table and don't create a new table.
@@ -118,3 +123,4 @@ end
 
 # * George Moschovitis <gm@navel.gr>
 # * Ysabel <deb@ysabel.org>
+# * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>

data/lib/og/relation/refers_to.rb

@@ -13,7 +13,7 @@ class RefersTo < Relation
 
     owner_class.module_eval %{
       attr_accessor :#{target_singular_name}
-      prop_accessor :#{foreign_key}, #{target_pkclass}#{field}
+      prop_accessor :#{foreign_key}, #{target_pkclass}#{field}, :relation => true
 
       def #{target_singular_name}(reload = false)
         return nil if @#{foreign_key}.nil? 
@@ -28,7 +28,7 @@ class RefersTo < Relation
       def #{target_singular_name}=(obj)
         @#{foreign_key} = obj.#{target_pk} if obj
       end
-    }
+    }    
   end
 
 end

data/lib/og/store/mysql.rb

@@ -12,6 +12,20 @@ rescue Object => ex
   end
 end
 
+# Helper for scripts.
+#
+# === Example
+#
+# mysql "-u root -p", <<-END
+#  drop database if exists weblog_development;
+#  create database weblog_development;
+#  grant all on weblog_development.* to #{`id -un`.strip}@localhost;
+# END
+
+def mysql(opts, stream)
+  IO.popen("mysql #{opts}", 'w') { |io| io.puts stream }
+end
+
 require 'og/store/sql'
 
 # Customize the standard mysql resultset to make
@@ -232,6 +246,7 @@ private
           create_join_table_sql(info).each do |sql|
             @conn.query sql
           end
+          Logger.debug "Created jointable '#{info[:table]}'."          
         rescue => ex
           if ex.respond_to?(:errno) and ex.errno == 1050 # table already exists.
             Logger.debug 'Join table already exists' if $DBG
@@ -320,3 +335,5 @@ private
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/og/store/psql.rb

@@ -203,7 +203,7 @@ private
     rescue Object => ex
       # gmosx: any idea how to better test this?
       if ex.to_s =~ /relation .* already exists/i
-        Logger.debug 'Table already exists' if $DBG
+        Logger.debug 'Table already exists'
         return
       else
         raise
@@ -219,6 +219,7 @@ private
           create_join_table_sql(info).each do |sql|
             @conn.exec(sql).clear
           end
+          Logger.debug "Created jointable '#{info[:table]}'."
         rescue Object => ex
           # gmosx: any idea how to better test this?
           if ex.to_s =~ /relation .* already exists/i

data/lib/og/store/sql.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 
-require 'facet/object/constant'
+require 'nano/object/constant'
 
 module Og
 
@@ -323,7 +323,7 @@ class SqlStore < Store
   # selected properties. Pass the required properties as symbols
   # or strings.
   #--
-  # gmosx, THINH: condition is not really useful here :(
+  # gmosx, THINK: condition is not really useful here :(
   #++
   
   def update(obj, options = nil)
@@ -445,7 +445,7 @@ class SqlStore < Store
     
   def unjoin(obj1, obj2, table)
     first, second = join_object_ordering(obj1, obj2)
-    first_key, second_key = ordered_join_table_keys(obj1, obj2, table)
+    first_key, second_key = ordered_join_table_keys(obj1.class, obj2.class)
     exec "DELETE FROM #{table} WHERE #{first_key}=#{first.pk} AND #{second_key}=#{second.pk}"    
   end
     
@@ -483,6 +483,9 @@ class SqlStore < Store
 
 private
 
+  # Create the sql table where objects of this class are 
+  # persisted.
+  
   def create_table(klass)
     raise 'Not implemented'
   end
@@ -494,6 +497,15 @@ private
     exec "DROP TABLE #{klass.table}"
   end
 
+  # Evolve (recreate) the sql table where objects of this class 
+  # are persisted.
+  
+  def evolve_table(klass)
+    drop_table(klass)
+    create_table(klass)
+  end
+  alias_method :update_table, :evolve_table
+
   # Return the field for the given property.
 
   def field_for_property(property)
@@ -772,7 +784,15 @@ private
         if rel = klass.relation(name)
           target_table = rel[:target_class]::OGTABLE
           tables << target_table
-          join_conditions << "#{klass::OGTABLE}.#{rel[:foreign_key]}=#{target_table}.#{rel[:target_pk]}"
+#         join_conditions << "#{klass::OGTABLE}.#{rel[:foreign_key]}=#{target_table}.#{rel[:target_pk]}"
+          if rel.is_a?(JoinsMany)
+            tables << rel[:join_table]
+            owner_key, target_key = klass.ogmanager.store.join_table_keys(klass, rel[:target_class])
+            join_conditions << "#{rel[:join_table]}.#{owner_key}=#{klass::OGTABLE}.#{rel[:owner_pk]} AND \
+                                #{rel[:join_table]}.#{target_key}=#{rel[:target_class]::OGTABLE}.#{rel[:target_pk]}"
+          else
+            join_conditions << "#{klass::OGTABLE}.#{rel[:foreign_key]}=#{target_table}.#{rel[:target_pk]}"
+          end
         else
           raise 'Unknown relation name'
         end
@@ -940,3 +960,4 @@ end
 # * Michael Neumann <mneumann@ntecs.de>
 # * Ghislain Mary
 # * Ysabel <deb@ysabel.org>
+# * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>

data/lib/og/store/sqlite.rb

@@ -159,6 +159,7 @@ private
           create_join_table_sql(info).each do |sql|
             @conn.query(sql).close
           end
+          Logger.debug "Created jointable '#{info[:table]}'."                    
         rescue Object => ex
           # gmosx: any idea how to better test this?
           if ex.to_s =~ /table .* already exists/i

data/lib/og/test/testcase.rb

@@ -1,9 +1,7 @@
 require 'test/unit'
 require 'test/unit/assertions'
 
-require 'facet/string/underscore'
-require 'facet/string/demodulize'
-require 'facet/string/pluralize'
+require 'mega/orm_support'
 
 require 'glue'
 require 'glue/fixture'

data/lib/og/types.rb

@@ -17,3 +17,6 @@ NotNull = { :sql => 'NOT NULL' }.freeze
 Null = { :sql => 'NULL' }.freeze
 
 end
+
+# * Michael Neumann <mneumann@ntecs.de>
+# * George Moschovitis <gm@navel.gr>

data/test/og/mixin/tc_taggable.rb

@@ -0,0 +1,69 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+require 'og/mixin/taggable'
+
+class Article
+  property :title, :body, String
+  include Og::Taggable
+  
+  def initialize(title = nil)
+    @title = title
+  end
+end
+
+$og = Og.setup(
+  :store => 'mysql',
+  :name => 'test',
+  :user => 'root',
+  :password => 'navelrulez',
+  :destroy => true
+)
+
+class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
+
+  def test_all
+    a1 = Article.create('Hello')
+    a1.tag('navel gmosx sexy')
+    a1.save
+    
+    a2 = Article.create('Other')
+    a2.tag('gmosx', 'rain')
+    a2.save
+    
+    a3 = Article.create('George')
+    a3.tag('phd', 'name')
+    a3.save
+    
+    assert_equal 3, a1.tags.size 
+    assert a1.tag_names.include?('navel')
+    
+    assert a1.tagged_with?('navel')
+    
+    assert_equal false, a1.tagged_with?('photo')
+    
+    res = Article.find_with_tags('navel', 'gmosx')
+    assert_equal 1, res.size
+    assert_equal 'Hello', res[0].title
+
+    res = Article.find_with_tag('gmosx')
+    assert_equal 2, res.size
+    res = res.map { |o| o.title }
+    assert res.include?('Hello')
+    assert res.include?('Other')    
+
+    res = Article.find_with_any_tag('navel', 'gmosx', 'phd')
+    assert_equal 3, res.size
+    
+=begin
+    TODO:
+    Article.fing_with_no_tag('gmosx')
+    Article.find_by_tags('+name +gmosx -sexy')
+    Article.find_by_tags(:with => '', :any => '', :no => '')
+=end
+  end
+
+end

data/test/og/tc_inheritance.rb

@@ -34,6 +34,21 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
     end    
   end
 
+  class Car
+    property :name
+  end
+
+  class User
+    property :login, String
+    many_to_many Car
+    schema_inheritance
+  end
+
+  class Admin < User
+    property :password, String
+    has_one Car
+  end
+
   def test_all
 =begin
     @og = Og.setup(
@@ -48,7 +63,7 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
       :name => 'test'
     )  
 =end
-#=begin
+=begin
     @og = Og.setup(
       :destroy => true,
       :store => :psql,
@@ -56,8 +71,8 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
       :user => 'postgres',
       :password => 'navelrulez'
     )  
-#=end    
-=begin
+=end    
+#=begin
     @og = Og.setup(
       :destroy => true,
       :store => :mysql,
@@ -65,7 +80,7 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
       :user => 'root',
       :password => 'navelrulez'
     )  
-=end    
+#=end    
     assert_equal [Document], Photo.metadata.superclass
     assert_equal [Photo, Article], Document.metadata.subclasses
     
@@ -108,5 +123,9 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
     
     articles = Article.all(:limit => 2)
     assert_equal 2, articles.size
+    
+    # Bug report.
+    Admin.create
+    Admin.create.cars.size
   end
 end

data/test/og/tc_override.rb

@@ -0,0 +1,31 @@
+$DBG = true
+
+require 'og'
+require 'test/unit'
+
+class Book
+  property :title
+  belongs_to :owner, Person # this creates a problem?
+end
+
+class Person
+  property :name, Og::VarChar(128)
+  has_many :books, Book, :foreign_name => :owner
+end
+
+class TestOg < Test::Unit::TestCase
+  include Og
+
+  def test_basic
+    book = Book.create
+    person = Person.create
+    person.books << book
+  end
+
+  def setup
+    Og.table_prefix = nil
+    og = Og.setup(:destroy => true, :store => :sqlite, :name => 'test')
+  end
+end
+
+# * Kristof Jozsa <dyn@ond.vein.hu>

data/test/og/tc_store.rb

@@ -31,7 +31,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
     
   class Article
     property :title, :body, String
-    has_many Comment
+    has_many :comments
     has_one :author, User
     refers_to :owner, User
     many_to_many Category
@@ -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.22.0
-date: 2005-08-07 00:00:00 +03:00
+  version: 0.23.0
+date: 2005-08-31 00:00:00 +03:00
 summary: Og (ObjectGraph)
 require_paths: 
   - lib
@@ -29,82 +29,86 @@ cert_chain:
 authors: 
   - George Moschovitis
 files: 
+  - Rakefile
   - README
-  - CHANGELOG
   - INSTALL
-  - Rakefile
   - install.rb
-  - benchmark/bench.rb
-  - benchmark/sqlite-no-prepare.1.txt
-  - benchmark/sqlite-no-prepare.2.txt
-  - benchmark/sqlite-prepare.1.txt
   - benchmark/sqlite-prepare.2.txt
+  - benchmark/sqlite-prepare.1.txt
+  - benchmark/sqlite-no-prepare.2.txt
+  - benchmark/sqlite-no-prepare.1.txt
+  - benchmark/bench.rb
   - examples/run.rb
   - examples/mysql_to_psql.rb
   - examples/README
   - doc/tutorial.txt
-  - doc/LICENSE
-  - doc/RELEASES
   - doc/config.txt
+  - doc/RELEASES
+  - doc/LICENSE
   - doc/AUTHORS
+  - doc/CHANGELOG.1
   - lib/og
-  - lib/og.rb
   - lib/vendor
-  - lib/og/collection.rb
-  - lib/og/entity.rb
-  - lib/og/relation.rb
-  - lib/og/relation
+  - lib/og.rb
   - lib/og/mixin
+  - lib/og/relation
   - lib/og/store
-  - lib/og/manager.rb
-  - lib/og/errors.rb
-  - lib/og/store.rb
+  - lib/og/test
   - lib/og/validation.rb
   - 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
+  - lib/og/store.rb
+  - lib/og/relation.rb
+  - lib/og/manager.rb
+  - lib/og/errors.rb
+  - lib/og/entity.rb
+  - lib/og/collection.rb
+  - lib/og/mixin/tree.rb
+  - lib/og/mixin/timestamped.rb
+  - lib/og/mixin/orderable.rb
+  - lib/og/mixin/optimistic_locking.rb
+  - lib/og/mixin/hierarchical.rb
+  - lib/og/mixin/taggable.rb
+  - lib/og/mixin/revisable.rb
   - lib/og/relation/refers_to.rb
   - lib/og/relation/many_to_many.rb
   - lib/og/relation/joins_many.rb
-  - lib/og/mixin/hierarchical.rb
-  - lib/og/mixin/orderable.rb
-  - lib/og/mixin/timestamped.rb
-  - lib/og/mixin/tree.rb
-  - lib/og/mixin/optimistic_locking.rb
-  - lib/og/store/filesys.rb
-  - lib/og/store/psql.rb
-  - lib/og/store/sql.rb
-  - lib/og/store/mysql.rb
+  - lib/og/relation/has_one.rb
+  - lib/og/relation/has_many.rb
+  - lib/og/relation/belongs_to.rb
   - lib/og/store/sqlserver.rb
   - lib/og/store/sqlite.rb
-  - lib/og/store/kirby.rb
+  - lib/og/store/sql.rb
+  - lib/og/store/psql.rb
+  - lib/og/store/mysql.rb
   - lib/og/store/memory.rb
-  - lib/og/test/assertions.rb
+  - lib/og/store/kirby.rb
+  - lib/og/store/filesys.rb
   - lib/og/test/testcase.rb
+  - lib/og/test/assertions.rb
   - lib/vendor/mysql411.rb
   - lib/vendor/mysql.rb
   - lib/vendor/kirbybase.rb
   - lib/vendor/README
   - test/og
-  - test/og/store
   - test/og/mixin
-  - test/og/tc_inheritance.rb
+  - test/og/store
   - test/og/tc_types.rb
-  - test/og/tc_relation.rb
   - test/og/tc_store.rb
-  - test/og/tc_polymorphic.rb
-  - test/og/tc_join.rb
   - test/og/tc_select.rb
   - test/og/tc_reverse.rb
+  - test/og/tc_relation.rb
+  - test/og/tc_polymorphic.rb
+  - test/og/tc_override.rb
   - test/og/tc_multiple.rb
-  - test/og/store/tc_filesys.rb
-  - test/og/mixin/tc_hierarchical.rb
-  - test/og/mixin/tc_orderable.rb
+  - test/og/tc_join.rb
+  - test/og/tc_inheritance.rb
   - test/og/mixin/tc_timestamped.rb
+  - test/og/mixin/tc_orderable.rb
   - test/og/mixin/tc_optimistic_locking.rb
+  - test/og/mixin/tc_hierarchical.rb
+  - test/og/mixin/tc_taggable.rb
+  - test/og/store/tc_filesys.rb
 test_files: []
 rdoc_options: 
   - "--main"
@@ -129,5 +133,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.22.0
+            version: 0.23.0
       version: