og 0.27.0 → 0.28.0

data/test/og/tc_accumulator.rb

@@ -25,9 +25,7 @@ class TC_OgPolymorphic < Test::Unit::TestCase # :nodoc: all
     belongs_to Bar
   end
 
-  def setup
-    @og = Og.setup($og_config)
-  end
+  $og1.manage_classes(Foo, Bar, Foobar)
 
   def test_all
     2.times{|i|

data/test/og/tc_cacheable.rb

@@ -0,0 +1,58 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+$DBG = true
+
+require 'rubygems'
+require 'facets'
+require 'test/unit'
+
+require 'og'
+require 'glue/cacheable'
+require 'glue/cache/memory'
+#require 'glue/cache/drb'
+
+class TC_Cacheable < Test::Unit::TestCase # :nodoc: all
+  include Glue
+  
+  class User
+    is Cacheable
+    
+    property :name, String
+    property :age, Fixnum
+  end
+
+  def setup
+    @og = Og.start
+    @og.cache = MemoryCache.new
+#   @og.cache = DrbCache.new(:address => Og.cache_address, :port => Og.cache_port)
+  end
+
+  def test_all
+    User.create_with :name => 'George'
+    User.create_with :name => 'Stella'
+    
+    u = User[1]
+    
+    assert_equal 'George', u.name
+
+    # Comes from the cache.
+    
+    u = User[1]
+    u = User[1]
+    u = User[1]
+
+    assert_equal u, @og.cache.get(u.og_cache_key)
+        
+    u.name = 'Hello'
+    u.save
+    
+    u = User[1]
+    u = User[1]
+    
+    assert_equal u.name, @og.cache.get(u.og_cache_key).name
+    
+    u.delete
+    User.delete(2)
+  end
+  
+end

data/test/og/tc_delete_all.rb

@@ -6,28 +6,25 @@ require "og"
 require "pp"
 require "test/unit"
 
-$DBG = true
+# $DBG = true
 
-class Playlist
-  property :name, String
-  has_many :tracks
-end
-
-class Track
-  property :name, String
-  belongs_to Playlist
-
-  def initialize(playlist)
-    self.playlist = playlist
+class OgDeleteAll < Test::Unit::TestCase
+  class Playlist
+    property :name, String
+    has_many :tracks
   end
-end
 
+  class Track
+    property :name, String
+    belongs_to Playlist
 
-class OgDeleteAll < Test::Unit::TestCase
-  def setup
-    Og.setup($og_config)
+    def initialize(playlist)
+      self.playlist = playlist
+    end
   end
 
+  $og1.manage_classes Playlist, Track
+
   def pop
     @pl = Playlist.create
     5.times do |i|

data/test/og/tc_ez.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'test/unit'
+
+require 'og'
+  
+class TC_ResolveOptions < Test::Unit::TestCase # :nodoc: all
+
+  class User
+    property :name, String
+    property :age, Fixnum
+  end
+
+  $og1.manage_classes(User)
+
+  def test_all
+    User.create_with :name => 'George', :age => 14
+    User.create_with :name => 'Renos', :age => 20
+    User.create_with :name => 'Stella', :age => 23
+
+    users = User.find do |user|
+      user.age > 10
+      user.any { 
+        name == 'George'
+        name == 'Stella'
+      }
+    end
+    
+    assert_equal 2, users.size
+  end
+  
+end

data/test/og/tc_finder.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
-$DBG = true
+# $DBG = true
 
 require 'rubygems'
 require 'facets'
@@ -16,9 +16,7 @@ class TC_OgFinder < Test::Unit::TestCase # :nodoc: all
     property :father, String
   end
 
-  def setup
-    @og = Og.setup($og_config)
-  end
+  $og1.manage_classes User
 
   def test_all
     User.find_by_name('tml')

data/test/og/tc_inheritance.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
-$DBG = true
+# $DBG = true
 
 require 'rubygems'
 require 'facets'
@@ -52,9 +52,9 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
     has_one Car
   end
 
+  $og1.manage_classes(Document, Article, Document, Photo, Car, User, Admin)
+
   def test_all
-    @og = Og.setup($og_config)
-    
     assert_equal Document, Photo.superclass
     assert_equal [Photo, Article], Document.descendents
     

data/test/og/tc_inheritance2.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
-$DBG = true
+# $DBG = true
 
 require 'rubygems'
 require 'facets'
@@ -24,10 +24,9 @@ class TC_OgInheritance2 < Test::Unit::TestCase # :nodoc: all
    property :kaka, String
   end
   
+  $og1.manage_classes(Project, FProject, DProject)
   
   def test_all
-    @og = Og.setup($og_config)
-    
     Project.create    
     FProject.create    
     DProject.create    

data/test/og/tc_join.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
-$DBG = true
+# $DBG = true
 
 require 'rubygems'
 require 'facets'
@@ -36,8 +36,9 @@ class TC_Join < Test::Unit::TestCase # :nodoc: all
     has_one Category
   end
 
+  $og1.manage_classes(Category, Article, ArticleToCategory)
+
   def setup
-    @og = Og.setup($og_config)
   end
 
   def test_all

data/test/og/tc_multi_validations.rb

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

data/test/og/tc_multiple.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
-$DBG = true
+# $DBG = true
 
 require 'rubygems'
 require 'facets'
@@ -8,9 +8,6 @@ require 'test/unit'
 
 require 'og'
 
-$og1 = Og.setup($og_config1)
-$og2 = Og.setup($og_config2)
-
 class TestMultiple < Test::Unit::TestCase # :nodoc: all
   include Og
 
@@ -36,8 +33,8 @@ class TestMultiple < Test::Unit::TestCase # :nodoc: 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) 
+    assert Article.ogmanager.store.is_a?($og1.store.class) 
+    assert User.ogmanager.store.is_a?($og2.store.class) 
     
     a1 = Article.create('hello')
     a2 = Article.create('world')

data/test/og/tc_override.rb

@@ -3,31 +3,37 @@ require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 require 'rubygems'
 require 'facets'
 require 'test/unit'
-require 'og'
-
-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
+require 'og'
 
 class TestOg < Test::Unit::TestCase
   include Og
 
+  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
+
+  def setup
+    Og.table_prefix = nil
+    og = Og.start
+  end
+
   def test_basic
     book = Book.create
     person = Person.create
     person.books << book
   end
 
-  def setup
-    Og.table_prefix = nil
-    og = Og.setup($og_config)
+  def test_not_an_exact_duplicate
+    # This is supposed to test Og.table_prefix, see setup below.
   end
+
 end
 
 # * Kristof Jozsa <dyn@ond.vein.hu>

data/test/og/tc_polymorphic.rb

@@ -39,9 +39,7 @@ class TC_OgPolymorphic < Test::Unit::TestCase # :nodoc: all
     end    
   end
 
-  def setup
-    @og = Og.setup($og_config)
-  end
+  $og1.manage_classes(Comment, Article, User)
 
   def test_all
     u = User.create('gmosx')

data/test/og/tc_resolve.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'test/unit'
+
+require 'og'
+  
+class TC_ResolveOptions < Test::Unit::TestCase # :nodoc: all
+
+  class User
+    property :name, String
+    property :age, Fixnum
+  end
+
+  $og1.manage_classes(User)
+
+  def test_all
+    User.create_with :name => 'George', :age => 30
+    User.create_with :name => 'Gogo', :age => 10
+    User.create_with :name => 'Stella'
+    
+    users = User.find [ "name LIKE ? AND age > ?", 'G%', 4 ]
+    assert_equal 2, users.size
+
+    users = User.find [ "name LIKE ? AND age > ?", 'G%', 14 ]
+    assert_equal 1, users.size
+    
+    User.find "name LIKE 'G%' LIMIT 1"
+    assert_equal 1, users.size     
+  end
+  
+end

data/test/og/tc_reverse.rb

@@ -9,43 +9,42 @@ require 'og'
 # reverse engineering features allows us to map any schema
 # to our objects.
 
-$og = Og.setup($og_config)
 
 # 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));"
+$og2.store.exec "create table my_users (thename VARCHAR(32) PRIMARY KEY, password TEXT, age3 INTEGER);"
+$og2.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
+class TestReverse < Test::Unit::TestCase # :nodoc: all
+  include Og
   
-  def initialize(name, password, age)
-    @name, @password, @age = name, password, age
+  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
-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
+  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
-end
 
-$og.manage_classes
+  $og2.manage_classes(User, Comment)
 
-class TestReverse < Test::Unit::TestCase # :nodoc: all
-  include Og
-  
   def test_all
     assert_equal 'my_users', User.table
     assert_equal 'my_comments', Comment.table
@@ -56,7 +55,7 @@ class TestReverse < Test::Unit::TestCase # :nodoc: all
     gmosx = User.find_by_name('gmosx')
     assert_equal 'gmosx', gmosx.name
     
-    helen = User.find_by_age(25).first
+    helen = User.find_all_by_age(25).first
     assert_equal 'Helen', helen.name
     
     c = Comment.new('hello')

data/test/og/tc_scoped.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
-$DBG = true
+# $DBG = true
 
 require 'rubygems'
 require 'facets'
@@ -28,9 +28,7 @@ class TC_OgScoped < Test::Unit::TestCase # :nodoc: all
     end
   end
     
-  def setup
-    @og = Og.setup($og_config)
-  end
+  $og1.manage_classes(User, Article)
 
   def test_all
     u = User.create('tml')