og 0.30.0 → 0.31.0

data/ProjectInfo

@@ -2,7 +2,7 @@
 
 TITLE    : &title Og
 NAME     : &pkg og
-VERSION  : '0.30.0'
+VERSION  : '0.31.0'
 STATUS   : beta
 
 AUTHOR   : George Moschovitis
@@ -21,7 +21,7 @@ RUBYFORGE:
   USERNAME: 'gmosx'
 
 DEPENDENCIES:
- - [ glue, '= 0.30.0' ]
+ - [ glue, '= 0.31.0' ]
 
 PACKAGE: !!package
   distribute: [ gem, tgz, zip ]

data/doc/RELEASES

@@ -1,3 +1,13 @@
+== Version 0.31.0
+
+* Increased size of ogtype field in STI tables to 50 from 30.
+
+* Made Og (Mysql) respect the port option when creating and dropping databases.
+
+* Added thread_safe to Og.setup options.
+
+* Added #to_xml method to Og managed objects.
+
 == Version 0.30.0
 
 Another pragmatic release. The Nitro development team worked over

data/lib/glue/cacheable.rb

@@ -1,4 +1,4 @@
-require 'facet/classinherit'
+require 'facets/core/module/class_extension'
 
 module Glue
 
@@ -15,7 +15,7 @@ module Glue
 
 module Cacheable
 
-  ClassInherit do
+  class_extension do
   
     def after_enchant(base)
       base.module_eval do

data/lib/glue/taggable.rb

@@ -2,6 +2,11 @@ require 'facet/inflect'
 
 # The default Tag implementation. A tag attaches semantics to
 # a given object.
+#
+# === Design
+#
+# Use camelcase names for tags.
+#
 #--
 # FIXME: use index and char() instead of String.
 #++
@@ -55,10 +60,8 @@ class Tag
     @count -= 1
     
     if @count > 0
-      p "-- dec ref count"
       update_property :count
     else
-      p "-- count = 0 -> delete"
       self.delete()
     end
   end
@@ -170,24 +173,7 @@ module Taggable
     # INTERSECTION (AND)
   
     def find_with_tags(*names)
-      relation = relations.reject{|r| r.name != :tags}.first
-      info = ogmanager.store.join_table_info(relation)
-      count = names.size
-      names = names.map { |n| ogmanager.store.quote(n) }.join(',')
-      sql = %{
-        SELECT *
-        FROM #{info[:owner_table]} AS o
-        WHERE o.oid IN (
-          SELECT j.#{info[:owner_key]}
-          FROM #{info[:target_table]} AS t
-          JOIN #{info[:table]} AS j
-          ON t.oid = j.#{info[:target_key]}
-          WHERE (t.name IN (#{names}))
-          GROUP BY j.#{info[:owner_key]}
-          HAVING COUNT(j.#{info[:owner_key]}) = #{count}
-        )
-      }
-      return self.select(sql)
+      return find_request(:all, names)
     end
     alias_method :find_with_tag, :find_with_tags
   
@@ -195,9 +181,29 @@ module Taggable
     # UNION (OR)
   
     def find_with_any_tag(*names)
-      relation = relations.reject{|r| r.name != :tags}.first
+      return find_request(:any, names)
+    end
+
+    private
+
+    def find_request(request_type, names)
+      condition = ""
+      opt = names.last
+      if opt.is_a?(Hash)
+	names.pop
+	escaped_condition = ogmanager.store.prepare_statement(opt[:condition])
+	#escaped_condition = ogmanager.store.escape_condition(opt[:condition])
+        condition = "AND #{escaped_condition}"
+      end
+
+      relation = relations.detect {|r| r.name == :tags}
       info = ogmanager.store.join_table_info(relation)
-      count = names.size
+
+      if request_type == :all
+        count = names.size
+        additionnal_code = "HAVING COUNT(j.#{info[:owner_key]}) = #{count}"
+      end
+
       names = names.map { |n| ogmanager.store.quote(n) }.join(',')
       sql = %{        
         SELECT *
@@ -209,6 +215,7 @@ module Taggable
           ON t.oid = j.#{info[:target_key]}
           WHERE (t.name IN (#{names}))
           GROUP BY j.#{info[:owner_key]}
+	  #{additionnal_code}
           )
       }
       return self.select(sql)

data/lib/glue/tree.rb

@@ -2,8 +2,6 @@
 
 raise 'This is not working yet, do not require this file.'
 
-require 'glue/attribute'
-
 # A useful encapsulation of the nested intervals pattern for 
 # hierarchical SQL queries. Slightly adapted from the original
 # article (http://www.dbazine.com/tropashko4.shtml)

data/lib/og.rb

@@ -43,7 +43,7 @@ module Og
 
   # The version.
 
-  Version = '0.30.0'
+  Version = '0.31.0'
 
   # Library path.
 
@@ -107,35 +107,35 @@ module Og
   
   setting :unmanageable_classes, :default => [], :doc => 'Explicitly unmanageable classes'
   
-  # The active manager
+  # Pseudo type for binary data
 
-  mattr_accessor :manager
+  class Blob; end
 
-  # thread safe state
+  class << self
 
-  mattr_reader :thread_safe
+    # The active manager
 
-  # Pseudo type for binary data
+    attr_accessor :manager
 
-  class Blob; end
+    # thread safe state
 
-  class << self
+    attr_reader :thread_safe
 
     # Helper method, useful to initialize Og.
     # If no options are passed, sqlite is selected
     # as the default store.
 
-    def setup(options = {:store => :sqlite})
-      begin
+    def setup(options = {})
+        options={:store => :sqlite}.update(options)
         # This is a flag a store or manager can use to determine
         # if it was being called by Og.setup to provide
         # additional, faster or enhanced functionality.
 
         options[:called_by_og_setup] = true if options[:called_by_og_setup].nil?
 
-        @@thread_safe = true
+        @thread_safe = options.fetch(:thread_safe, true)
 
-        m = @@manager = Manager.new(options)        
+        m = @manager = Manager.new(options)        
         m.manage_classes
 
         # Allows functionality that requires a store is 
@@ -145,15 +145,6 @@ module Og
         # only used by the PostgreSQL store.
         
         m.post_setup if options[:called_by_og_setup]
-      rescue Exception => ex 
-        Logger.error "Og.setup had problems: #{ex.class} => #{ex.message}"
-        if $DBG
-          Logger.error ex.inspect 
-          Logger.error ex.backtrace.join("\n")          
-          exit 
-        end
-      end
-
       return m
     end
     alias_method :connect, :setup
@@ -164,21 +155,21 @@ module Og
     # Helper method.
 
     def escape(str)
-      @@manager.store.escape(str)
+      @manager.store.escape(str)
     end
 
     # Quote the string.
     
     def quote(str)
-      @@manager.store.quote(str)
+      @manager.store.quote(str)
     end
     
     # Change thread_safe mode.
     
     def thread_safe=(bool)
-      @@thread_safe = bool
-#      @@manager and @@manager.class.managers.each { |m| m.initialize_store }
-      @@thread_safe
+      @thread_safe = bool
+#      @manager and @manager.class.managers.each { |m| m.initialize_store }
+      @thread_safe
     end
   end
 

data/lib/og/entity.rb

@@ -1,4 +1,4 @@
-require 'facet/classinherit'
+require 'facets/core/module/class_extension'
 require 'facet/kernel/assign_with'
 
 require 'glue/property'
@@ -6,6 +6,8 @@ require 'og/relation'
 require 'og/ez/clause'
 require 'og/ez/condition'
 
+require 'rexml/document'  # for to_xml
+
 module Og
 
 # Include this module to classes to make them managable by Og.
@@ -114,10 +116,32 @@ module EntityMixin
   def og_clone(*args)
     Og::Entity.clone(self,*args)
   end  
+  
+  # convert Og object to REXML-Object
+  # example usage:
+  # User[1].to_rexml
+
+  def to_rexml
+    xml = REXML::Element.new(self.class.to_s.downcase)
+    xml.add_attribute("oid", self.oid.to_s)
+    self.class.properties.keys.each do |key|
+      xml << REXML::Element.new(key.to_s).add_text(self.send(key).to_s) unless key == :oid
+    end
+    return xml
+  end
+  alias_method :to_xml_dom, :to_rexml
+  
+  # convert Og object to an XML-String
+  # example usage:
+  # User[1].to_xml
+  
+  def to_xml
+    self.to_rexml.to_s
+  end
 
   include RelationDSL
 
-  class_inherit do
+  class_extension do
 
     def create(*args)
       obj = self.new(*args)
@@ -649,7 +673,7 @@ class Entity
     
     def entity_from_string(str)
       res = nil
-      Og.manager.managed_classes.each do |klass|
+      Og::Manager.managed_classes.each do |klass|
         if klass.name == str
           res = klass
           break
@@ -763,3 +787,4 @@ end
 # * George Moschovitis <gm@navel.gr>
 # * Tom Sawyer <transfire@gmail.com>
 # * Rob Pitt <rob@motionpath.com>
+# * Fabian Buch <fabian@fabian-buch.de>

data/lib/og/ez/clause.rb

@@ -44,7 +44,7 @@ module Caboose
           @negate = args[2]
         end
         # append ! to negate the statement
-        if @name[-1] == '!'
+        if @name[-1,1] == '!'
           @negate = true
           @name = @name.slice(0, @name.length - 1) 
         end

data/lib/og/relation.rb

@@ -123,7 +123,7 @@ class Relation
   def symbol_to_class(sym, owner_class)
     c = owner_class.name.dup
     c = "::" + c unless c =~ /::/
-    c.gsub!(/::.*$/, '::')
+    c.gsub!(/::[^:]*$/, '::')
     c << sym.to_s
     begin
       return constant(c)
@@ -184,6 +184,7 @@ class Relation
       if r.polymorphic?
 
         target_dm = r.target_class.to_s.demodulize
+
         r.owner_class.module_eval %{
           class #{r.owner_class}::#{target_dm} < #{r.target_class}
           end
@@ -260,7 +261,7 @@ module RelationDSL
 
   inheritor(:relations, [], :+) #unless @relations
 
-  class_inherit do
+  class_extension do
 
     # === Examples
     #

data/lib/og/store/mysql.rb

@@ -88,19 +88,25 @@ class MysqlStore < SqlStore
   extend MysqlUtils
   include MysqlUtils
 
+  DefaultPort = 3306
+
   def self.create(options)
+    options[:port] ||= DefaultPort
     # gmosx: system is used to avoid shell expansion.
-    system 'mysqladmin', '-f', "--user=#{options[:user]}", 
-        "--password=#{options[:password]}", 
+    system 'mysqladmin', '-f', "--user=#{options[:user]}",
+        "--password=#{options[:password]}",
         "--host=#{options[:address]}",
-        'create', options[:name]    
+        "--port=#{options[:port]}",
+        'create', options[:name]
     super
   end
 
   def self.destroy(options)
+    options[:port] ||= DefaultPort
     system 'mysqladmin', '-f', "--user=#{options[:user]}", 
-        "--password=#{options[:password]}", 'drop', 
+        "--password=#{options[:password]}", 'drop',
         "--host=#{options[:address]}",
+        "--port=#{options[:port]}",
         options[:name]
     super
   end
@@ -200,6 +206,38 @@ class MysqlStore < SqlStore
     @conn.affected_rows
   end
 
+  # Deserialize one object from the ResultSet.
+
+  def read_one(res, klass, options = nil)
+    return nil if res.blank?
+
+    if options and join_relations = options[:include]
+      join_relations = [join_relations].flatten.collect do |n|  
+        klass.relation(n) 
+      end     
+    end
+
+    res_row = res.next
+
+    # causes STI classes to come back as the correct child class 
+    # if accessed from the superclass.
+
+    klass = Og::Entity::entity_from_string(res_row[0]) if klass.schema_inheritance?
+    obj = klass.og_allocate(res_row, 0)
+
+    if options and options[:select]
+      read_row(obj, res, res_row, 0)
+    else    
+      obj.og_read(res_row)
+      read_join_relations(obj, res_row, 0, join_relations) if join_relations 
+    end
+
+    return obj
+
+  ensure
+    res.close
+  end
+
 private
 
   def create_table(klass)

data/lib/og/store/psql.rb

@@ -593,6 +593,38 @@ class PsqlStore < SqlStore
   def post_setup
     create_constraints
   end
+
+  # Deserialize one object from the ResultSet.
+
+  def read_one(res, klass, options = nil)
+    return nil if res.blank?
+
+    if options and join_relations = options[:include]
+      join_relations = [join_relations].flatten.collect do |n| 
+        klass.relation(n) 
+      end
+    end
+
+    res_row = res.next
+
+    # causes STI classes to come back as the correct child class 
+    # if accessed from the superclass.
+    
+    klass = Og::Entity::entity_from_string(res_row.result.flatten[res_row.fieldnum('ogtype')]) if klass.schema_inheritance?
+    obj = klass.og_allocate(res_row, 0)
+
+    if options and options[:select]
+      read_row(obj, res, res_row, 0)
+    else
+      obj.og_read(res_row)
+      read_join_relations(obj, res_row, 0, join_relations) if join_relations
+    end
+
+    return obj
+
+  ensure
+    res.close
+  end
   
 private
 

data/lib/og/store/sql.rb

@@ -5,6 +5,7 @@ require 'facet/kernel/constant'
 require 'facet/string/capitalized'
 require 'facet/ormsupport'
 
+
 module Og
 
 # A collection of useful SQL utilities.
@@ -536,7 +537,8 @@ class SqlStore < Store
       values = []
       res = query(sql)
       res.each_row do |row, idx|
-        values << type_cast(return_type, row[0])
+        value = [ row[idx] ].flatten[0]
+        values << type_cast(return_type, value)
       end
       return values
     else
@@ -628,6 +630,20 @@ class SqlStore < Store
     # return affected rows.
   end
 
+  #takes an array, the first parameter of which is a prepared statement
+  #style string; this handles parameter escaping.
+  def prepare_statement(condition)
+    if condition.is_a?(Array)
+      args = condition.dup
+      str = args.shift
+      # ? handles a single type.
+      # ?* handles an array.
+      args.each { |arg| str.sub!(/\?\*/, quotea(arg)); str.sub!(/\?/, quote(arg)) }
+      condition = str
+    end
+    condition
+  end
+  
 private
 
   # Create the sql table where objects of this class are 
@@ -702,7 +718,7 @@ private
       # chain. So inject a special class ogtype field that 
       # holds the class name.
 
-      fields << "ogtype VARCHAR(30)"
+      fields << "ogtype VARCHAR(50)"
     end
     
     for p in properties.values
@@ -1033,9 +1049,7 @@ private
       # If an array is passed as a condition, use prepared 
       # statement style escaping. 
              
-      if condition.is_a?(Array)
-        condition = prepare_statement(condition)
-      end
+      condition = prepare_statement(condition)
 
       sql << " WHERE #{condition}"
     end
@@ -1053,17 +1067,6 @@ private
     return sql
   end
   
-  #takes an array, the first parameter of which is a prepared statement
-  #style string; this handles parameter escaping.
-  def prepare_statement(condition)
-    args = condition.dup
-    str = args.shift
-    # ? handles a single type.
-    # ?* handles an array.
-    args.each { |arg| str.sub!(/\?\*/, quotea(arg)); str.sub!(/\?/, quote(arg)) }
-    condition = str
-  end
-  
   # Subclasses can override this if they need some other order.
   # This is needed because different backends require different
   # order of the keywords.
@@ -1109,38 +1112,6 @@ private
     end
   end
 
-  # Deserialize one object from the ResultSet.
-
-  def read_one(res, klass, options = nil)
-    return nil if res.blank?
-
-    if options and join_relations = options[:include]
-      join_relations = [join_relations].flatten.collect do |n| 
-        klass.relation(n) 
-      end
-    end
-
-    res_row = res.next
-    
-    # causes STI classes to come back as the correct child class 
-    # if accessed from the superclass.
-    
-    klass = Og::Entity::entity_from_string(res_row.result.flatten[res_row.fieldnum('ogtype')]) if klass.schema_inheritance?
-    obj = klass.og_allocate(res_row, 0)
-
-    if options and options[:select]
-      read_row(obj, res, res_row, 0)
-    else
-      obj.og_read(res_row)
-      read_join_relations(obj, res_row, 0, join_relations) if join_relations
-    end
-
-    return obj
-
-  ensure
-    res.close
-  end
-
   # Deserialize all objects from the ResultSet.
 
   def read_all(res, klass, options = nil)

data/lib/og/store/sqlite.rb

@@ -131,6 +131,38 @@ class SqliteStore < SqlStore
     rows.map { |r| r[idx] }
   end
 
+  # Deserialize one object from the ResultSet.
+
+  def read_one(res, klass, options = nil)
+    return nil if res.blank?
+
+    if options and join_relations = options[:include]
+      join_relations = [join_relations].flatten.collect do |n|  
+        klass.relation(n) 
+      end     
+    end
+
+    res_row = res.next
+
+    # causes STI classes to come back as the correct child class 
+    # if accessed from the superclass.
+
+    klass = Og::Entity::entity_from_string(res_row[0]) if klass.schema_inheritance?
+    obj = klass.og_allocate(res_row, 0)
+
+    if options and options[:select]
+      read_row(obj, res, res_row, 0)
+    else    
+      obj.og_read(res_row)
+      read_join_relations(obj, res_row, 0, join_relations) if join_relations 
+    end
+
+    return obj
+
+  ensure
+    res.close
+  end
+
 private
 
   def property_to_field(klass, p)

data/lib/og/validation.rb

@@ -10,8 +10,8 @@ module Validation
   # Encapsulates a list of validation errors.
   
   class Errors
-    cattr_accessor :not_unique, 'The value is already used'
-    cattr_accessor :invalid_relation, 'Invalid relations'
+    setting :invalid_relation, :default => 'Invalid relations'
+    setting :not_unique, :default => 'The value is already used'
   end
 
   module ClassMethods 

data/test/og/CONFIG.rb

@@ -80,7 +80,7 @@ require 'glue'
 require 'glue/logger'
 require 'og'
 
-Logger.set(Logger.new(StringIO.new)) unless $DBG
+Logger.get.level = Logger::WARN unless $DBG
 
 $og1 ||= Og.setup(@og_config1)
 $og2 ||= Og.setup(@og_config2)

data/test/og/tc_ez.rb

@@ -60,3 +60,40 @@ class TC_EZ_STI < Test::Unit::TestCase # :nodoc: all
     assert(results.empty?)
   end
 end
+
+class TC_EZ_TrueClass < Test::Unit::TestCase # :nodoc: all
+  class Animal
+    property :mammal, TrueClass
+  end
+
+  $og1.manage_classes(Animal)
+
+  def test_for_null
+    2.times do
+      animal = Animal.new
+      animal.mammal = true
+      animal.save
+
+      animal = Animal.new
+      animal.mammal = false
+      animal.save
+    end
+
+    rubyish = ezish = nil
+
+    assert_nothing_raised do
+      rubyish = {
+        :true => Animal.all.select{|a| a.mammal}.map{|a| a.oid},
+        :false => Animal.all.reject{|a| a.mammal}.map{|a| a.oid}
+      }
+
+      ezish = {
+        :true => Animal.find{|animal| animal.mammal! == :null }.map{|a| a.oid},
+        :false => Animal.find{|animal| animal.mammal == :null }.map{|a| a.oid}
+      }
+    end
+
+    assert_equal rubyish[:true], ezish[:true]
+    assert_equal rubyish[:false], ezish[:false]
+  end
+end

data/test/og/tc_multi_validations.rb

@@ -9,11 +9,12 @@ require 'og/validation'
 
 class TC_MultiValidation < Test::Unit::TestCase # :nodoc: all
 
-  def test_all
-    file = File.join(File.dirname(__FILE__), 'multi_validations_model.rb')
-    load file
+  MultiValidationsModel = File.expand_path(File.join(File.dirname(__FILE__), 'multi_validations_model.rb'))
+
+ def test_all
+    load MultiValidationsModel
     assert_equal 2, TC_MultiValidation::User.validations.size
-    load file
+    load MultiValidationsModel
     assert_equal 2, TC_MultiValidation::User.validations.size
   end
  

data/test/og/tc_setup.rb

@@ -0,0 +1,48 @@
+require File.join(File.dirname(__FILE__), '..','..','..','glycerin' )
+require 'test/unit'
+require 'og'
+
+class TCOg_setup < Test::Unit::TestCase # :nodoc: all
+  MockManager=Struct.new :options, :manage_classes, :post_setup
+
+  def test_default
+    manager= Og.setup
+    assert_instance_of Og::Manager, manager
+    assert_equal :sqlite, manager.options[:store]
+    assert_equal 'data', manager.options[:name]
+    assert_equal true, manager.options[:called_by_og_setup]
+  end
+
+  def test_mattrs_initialized
+    manager= Og.setup
+    assert_equal manager,Og.manager
+    assert Og.thread_safe
+  end  
+
+  def test_missing_store
+    assert_raises(LoadError){Og.setup(:store=>:missing)}
+  end  
+
+  def test_setup_default_store_plus_options
+    manager=Og.setup(:evolve_schema=>true)
+    assert_instance_of Og::Manager, manager
+    assert_equal :sqlite, manager.options[:store]
+    assert_equal true, manager.options[:evolve_schema]
+  end
+
+  def test_calls_manager_methods
+    mock_manager=Struct.new :options, :called do 
+      def manage_classes
+        self.called = [:mc]
+      end
+      def post_setup
+        self.called << :ps
+      end
+    end
+    old=Og::Manager
+    Og.const_set :Manager, mock_manager
+    manager=Og.setup
+    assert_equal [:mc, :ps],manager.called
+    Og.const_set :Manager, old
+  end
+end

data/test/og/tc_sti_find.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'test/unit'
+
+require 'rubygems'
+require 'og'
+
+class TC_SchemaInheritFindByName < Test::Unit::TestCase
+  class Foo
+    property :name
+    
+    schema_inheritance
+  end
+
+  class FooBar < Foo; end
+  class BarFoo < Foo; end
+
+  $og1.manage_classes(Foo, FooBar, BarFoo)
+
+  def test_find_by_name
+    name = 'tt'
+
+    f= Foo.create
+    f.name= name
+    f.save
+
+    f1= nil
+
+    assert_nothing_raised do
+      f1 = Foo.find_by_name(name)
+    end
+
+    assert_equal(f, f1)
+  end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.30.0
-date: 2006-05-05 00:00:00 +03:00
+  version: 0.31.0
+date: 2006-07-20 00:00:00 -07:00
 summary: State of the art object-relational mapping system.
 require_paths: 
 - lib
 email: gm@navel.gr
 homepage: http://www.nitroproject.org
-rubyforge_project: nitro
+rubyforge_project: 
 description: 
 autorequire: 
 default_executable: 
@@ -22,119 +22,123 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - !ruby/object:Gem::Version 
       version: 0.0.0
   version: 
-platform: 
+platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - George Moschovitis
 files: 
-- ProjectInfo
-- INSTALL
-- README
 - doc
-- examples
 - lib
 - test
-- setup.rb
-- doc/CHANGELOG.1
-- doc/AUTHORS
-- doc/tutorial.txt
-- doc/LICENSE
-- doc/RELEASES
-- doc/config.txt
-- examples/README
-- examples/run.rb
-- examples/mysql_to_psql.rb
+- .
+- examples
 - lib/og
 - lib/glue
-- lib/og.rb
 - lib/og/ez
-- lib/og/collection.rb
-- lib/og/entity.rb
-- lib/og/errors.rb
-- lib/og/evolution.rb
-- lib/og/manager.rb
+- lib/og/test
 - lib/og/relation
 - lib/og/store
-- lib/og/relation.rb
-- lib/og/test
-- lib/og/store.rb
 - lib/og/vendor
-- lib/og/test.rb
-- lib/og/types.rb
-- lib/og/markers.rb
-- lib/og/validation.rb
-- lib/og/ez/condition.rb
-- lib/og/ez/clause.rb
-- lib/og/relation/all.rb
-- lib/og/relation/many_to_many.rb
-- lib/og/relation/belongs_to.rb
-- lib/og/relation/has_many.rb
-- lib/og/relation/has_one.rb
-- lib/og/relation/joins_many.rb
-- lib/og/relation/refers_to.rb
 - lib/og/store/alpha
-- lib/og/store/kirby.rb
-- lib/og/store/mysql.rb
-- lib/og/store/psql.rb
-- lib/og/store/sql.rb
-- lib/og/store/sqlite.rb
-- lib/og/store/sqlite2.rb
-- lib/og/store/alpha/sqlserver.rb
-- lib/og/store/alpha/filesys.rb
-- lib/og/store/alpha/memory.rb
-- lib/og/test/assertions.rb
-- lib/og/test/testcase.rb
-- lib/og/vendor/mysql.rb
-- lib/og/vendor/README
-- lib/glue/hierarchical.rb
-- lib/glue/orderable.rb
-- lib/glue/optimistic_locking.rb
-- lib/glue/revisable.rb
-- lib/glue/taggable.rb
-- lib/glue/timestamped.rb
-- lib/glue/tree.rb
-- lib/glue/searchable.rb
-- lib/glue/cacheable.rb
 - test/og
 - test/glue
 - test/og/mixin
-- test/og/CONFIG.rb
 - test/og/store
-- test/og/tc_delete_all.rb
-- test/og/tc_inheritance.rb
-- test/og/tc_join.rb
 - test/og/tc_multiple.rb
-- test/og/tc_override.rb
-- test/og/tc_polymorphic.rb
-- test/og/tc_relation.rb
-- test/og/tc_reverse.rb
-- test/og/tc_select.rb
+- test/og/mixin/tc_timestamped.rb
+- test/og/tc_validation2.rb
 - test/og/tc_store.rb
 - test/og/tc_types.rb
-- test/og/tc_finder.rb
+- doc/CHANGELOG.1
+- lib/og/test/testcase.rb
+- lib/og/markers.rb
+- lib/og/relation/refers_to.rb
+- test/og/store/tc_filesys.rb
+- test/og/tc_inheritance.rb
+- doc/RELEASES
+- test/og/tc_cacheable.rb
+- lib/og/store/alpha/sqlserver.rb
+- INSTALL
+- test/og/tc_relation.rb
+- examples/README
+- lib/og/relation/has_many.rb
+- lib/glue/optimistic_locking.rb
 - test/og/tc_scoped.rb
-- test/og/tc_validation.rb
-- test/og/tc_accumulator.rb
-- test/og/tc_inheritance2.rb
-- test/og/tc_validation2.rb
+- examples/run.rb
+- test/og/multi_validations_model.rb
+- lib/og/ez/condition.rb
+- lib/og/store/psql.rb
+- lib/og/relation.rb
+- lib/og/validation.rb
 - test/og/tc_multi_validations.rb
-- test/og/tc_cacheable.rb
-- test/og/tc_validation_loop.rb
+- lib/og/vendor/README
 - test/og/tc_resolve.rb
-- test/og/multi_validations_model.rb
-- test/og/tc_ez.rb
+- doc/LICENSE
+- test/og/tc_validation_loop.rb
+- lib/og/collection.rb
+- lib/og/store/sqlite2.rb
+- test/og/tc_join.rb
+- lib/glue/hierarchical.rb
+- lib/og/store/mysql.rb
+- lib/og/relation/joins_many.rb
+- lib/og/store/kirby.rb
+- test/og/tc_select.rb
+- doc/config.txt
+- lib/og/test.rb
+- lib/og/evolution.rb
+- lib/og/relation/all.rb
+- lib/og/relation/has_one.rb
+- lib/og/store/alpha/filesys.rb
+- lib/og/relation/belongs_to.rb
+- test/og/mixin/tc_hierarchical.rb
+- test/og/tc_reverse.rb
+- test/og/tc_finder.rb
+- test/og/tc_delete_all.rb
+- doc/tutorial.txt
+- test/glue/tc_revisable.rb
+- test/og/tc_setup.rb
+- test/og/tc_override.rb
+- doc/AUTHORS
+- README
+- lib/glue/taggable.rb
+- test/og/store/tc_sti.rb
+- lib/og/errors.rb
+- test/og/tc_polymorphic.rb
+- lib/glue/timestamped.rb
+- lib/og/entity.rb
+- setup.rb
+- test/og/tc_inheritance2.rb
+- ProjectInfo
+- lib/glue/tree.rb
+- lib/og/relation/many_to_many.rb
+- lib/og/store/sql.rb
+- lib/glue/cacheable.rb
+- examples/mysql_to_psql.rb
+- test/og/store/tc_kirby.rb
 - test/og/tc_aggregations_calculations.rb
+- lib/og/vendor/mysql.rb
 - test/og/tc_camel_case_join.rb
-- test/og/mixin/tc_hierarchical.rb
-- test/og/mixin/tc_orderable.rb
-- test/og/mixin/tc_optimistic_locking.rb
+- lib/og/store.rb
+- lib/og/types.rb
 - test/og/mixin/tc_taggable.rb
-- test/og/mixin/tc_timestamped.rb
-- test/og/store/tc_filesys.rb
-- test/og/store/tc_kirby.rb
-- test/og/store/tc_sti.rb
-- test/glue/tc_revisable.rb
+- test/og/mixin/tc_optimistic_locking.rb
+- test/og/tc_sti_find.rb
+- lib/og/manager.rb
+- lib/og/test/assertions.rb
+- lib/glue/orderable.rb
+- test/og/CONFIG.rb
+- lib/glue/revisable.rb
+- test/og/mixin/tc_orderable.rb
+- test/og/tc_accumulator.rb
+- lib/og.rb
+- lib/glue/searchable.rb
+- test/og/tc_validation.rb
+- test/og/tc_ez.rb
+- lib/og/store/alpha/memory.rb
+- lib/og/ez/clause.rb
+- lib/og/store/sqlite.rb
 test_files: []
 
 rdoc_options: []
@@ -155,5 +159,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.30.0
+        version: 0.31.0
     version: