og 0.27.0 → 0.28.0

data/test/glue/tc_revisable.rb

@@ -5,19 +5,19 @@ require 'test/unit'
 require 'og'
 require 'glue/revisable'
 
-class Article
-  is Revisable
-  property :body, String, :revisable => true
-  property :title, String
-  
-  def initialize(t, b)
-    @title, @body = t, b
-  end
-end
+class TestOgRevisable < Test::Unit::TestCase # :nodoc: all
 
-$og = Og.setup($og_config)
+  class Article
+    is Revisable
+    property :body, String, :revisable => true
+    property :title, String
+    
+    def initialize(t, b)
+      @title, @body = t, b
+    end
+  end
 
-class TestOgRevisable < Test::Unit::TestCase # :nodoc: all
+  $og1.manage_classes(Article)
 
   def test_all
     a = Article.create('hello', 'world')

data/test/og/CONFIG.rb

@@ -15,7 +15,7 @@ configB = :mysql
 
 # SET THIS TO true TO ENABLE EXTRA DEBUG CODE
 
-debug = true
+debug = false
 
 # TO TEST AGAINST AN INSTALLATION OF OG INSTEAD THIS LOCAL 
 # DISTRIBUTION, SET THE FOLLOWING TO true.
@@ -32,7 +32,7 @@ end
 
 $DBG = debug
 
-$og_mysql = {
+og_mysql = {
   :destroy => true,
   :store => :mysql,
   :user => 'root',
@@ -41,7 +41,7 @@ $og_mysql = {
 # :socket => '/var/run/mysqld/mysqld.sock'
 }
 
-$og_psql = {
+og_psql = {
   :destroy => true,
   :store => :psql,
   :user => 'postgres',
@@ -49,20 +49,20 @@ $og_psql = {
   :name => 'test'
 }
 
-$og_sqlite = {
+og_sqlite = {
   :destroy => true,
   :store => :sqlite,
   :name => 'test'
 }
 
-$og_kirby = {
+og_kirby = {
   :destroy => true,
   :store => :kirby,
   :name => 'test',
   :embedded => true
 }
 
-$og_memory = {
+og_memory = {
   :store => :memory,
   :name => :test,
   :destroy => true
@@ -71,9 +71,21 @@ $og_memory = {
 # This sets the common global vars to be used by the tests.
 
 eval %{
-  $og_config1 = $og_config = $og_#{configA}
-  $og_config2 = $og_#{configB}
+  @og_config1 = og_config = og_#{configA}
+  @og_config2 = og_#{configB}
 }
 
+require 'stringio'
+require 'glue'
+require 'glue/logger'
+require 'og'
+
+Logger.set(Logger.new(StringIO.new)) unless $DBG
+
+Og.thread_safe = false
+
+$og1 ||= Og.setup(@og_config1)
+$og2 ||= Og.setup(@og_config2)
+
 # * Tom Sawyer <transfire@gmail.com>
 # * George Moschovitis <gm@navel.gr>

data/test/og/mixin/tc_hierarchical.rb

@@ -8,6 +8,7 @@ require 'ostruct'
 require 'og'
 require 'glue/hierarchical'
 
+=begin
 $og = Og.setup(
   :store => 'mysql',
   :name => 'test',
@@ -15,6 +16,7 @@ $og = Og.setup(
   :password => 'navelrulez',
   :destroy => true
 )
+=end
 
 class TC_OgHierarchical < Test::Unit::TestCase # :nodoc: all
 
@@ -22,7 +24,7 @@ class TC_OgHierarchical < Test::Unit::TestCase # :nodoc: all
     property :body, String
     property :create_time, Time
     
-    include Og::NestedSets
+    include Glue::NestedSets
 
     def initialize(body = nil)
       @body = body
@@ -34,9 +36,9 @@ class TC_OgHierarchical < Test::Unit::TestCase # :nodoc: all
     end
   end
 
-  def test_all
-    $og.manage_classes    
+  $og1.manage_classes Comment
 
+  def test_all
     root = Comment.create('root')
     c1 = Comment.new('1')
     root.add_comment c1

data/test/og/mixin/tc_optimistic_locking.rb

@@ -7,6 +7,7 @@ require 'test/unit'
 require 'og'
 require 'glue/optimistic_locking'
 
+=begin
 $og = Og.setup(
   :store => 'psql',
   :name => 'test',
@@ -14,22 +15,23 @@ $og = Og.setup(
   :password => 'navelrulez',
   :destroy => true
 )
+=end
 
 class TC_OgLocking < Test::Unit::TestCase # :nodoc: all
   include Og
   
   class Article
     property :body, String
-    include Og::Locking
+    include Glue::Locking
     
     def initialize(body)
       @body = body
     end
   end
     
-  def test_all
-    $og.manage_classes    
+  $og1.manage_classes Article
     
+  def test_all
     Article.create('test')
 
     a = Article[1]
@@ -42,7 +44,7 @@ class TC_OgLocking < Test::Unit::TestCase # :nodoc: all
     end
     
     b.body = 'Ooops'
-    assert_raise(Og::StaleObjectError) do
+    assert_raise(Glue::StaleObjectError) do
       b.update
     end
     

data/test/og/mixin/tc_orderable.rb

@@ -8,23 +8,7 @@ require 'ostruct'
 require 'og'
 require 'glue/orderable'
 
-class Playlist
-  prop :name, String
-  has_many Track
-end
-
-class Track
-  include Og::Orderable, :scope => :playlist
-
-  belongs_to Playlist
-  prop :name, String
-
-  def initialize(name, playlist)
-    @name = name
-    self.playlist = playlist
-  end
-end
-
+=begin
 $og = Og.setup(
   :store => 'psql',
 #  :store => :memory,
@@ -33,11 +17,10 @@ $og = Og.setup(
   :password => 'navelrulez',
   :destroy => true
 )
+=end
 
 class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
 
-  class Comment; end
-
   class Article
     property :title, :body, String
     has_many :comments, Comment, :list => true, :order => 'position DESC'
@@ -51,16 +34,33 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
     property :body, String
     belongs_to :article, Article
     
-    include Og::Orderable #, :scope => :article
+    is Orderable, :scope => :article
 
     def initialize(body = nil)
       @body = body
     end
   end
 
-  def test_all
-    $og.manage_classes    
+  class Playlist
+    prop :name, String
+    has_many Track
+  end
+
+  class Track
+    prop :name, String
+    is Orderable, :scope => :playlist
+
+    belongs_to Playlist
+
+    def initialize(name, playlist)
+      @name = name
+      self.playlist = playlist
+    end
+  end
 
+  $og1.manage_classes(Article, Comment, Playlist, Track)
+
+  def test_all
     a = Article.create('article')
     a.save
 

data/test/og/mixin/tc_taggable.rb

@@ -8,15 +8,7 @@ require 'ostruct'
 require 'og'
 require 'glue/taggable'
 
-class Article
-  property :title, :body, String
-  is Taggable
-  
-  def initialize(title = nil)
-    @title = title
-  end
-end
-
+=begin
 $og = Og.setup(
   :store => 'mysql',
   :name => 'test',
@@ -24,20 +16,32 @@ $og = Og.setup(
   :password => 'navelrulez',
   :destroy => true
 )
+=end
 
 class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
 
+  class Article
+    property :title, :body, String
+    is Taggable
+    
+    def initialize(title = nil)
+      @title = title
+    end
+  end
+
+  $og1.manage_classes(Article)
+
   def test_all
     a1 = Article.create('Hello')
     a1.tag('navel gmosx sexy')
     a1.save
     
     a2 = Article.create('Other')
-    a2.tag('gmosx', 'rain')
+    a2.tag('gmosx rain')
     a2.save
     
     a3 = Article.create('George')
-    a3.tag('phd', 'name')
+    a3.tag('phd name')
     a3.save
     
     assert_equal 3, a1.tags.size 

data/test/og/mixin/tc_timestamped.rb

@@ -8,6 +8,7 @@ require 'ostruct'
 require 'og'
 require 'glue/timestamped'
 
+=begin
 $og = Og.setup(
   :store => 'psql',
   :name => 'test',
@@ -15,6 +16,7 @@ $og = Og.setup(
   :password => 'navelrulez',
   :destroy => true
 )
+=end
 
 class TestCaseOgTimestamped < Test::Unit::TestCase # :nodoc: all
 
@@ -27,9 +29,9 @@ class TestCaseOgTimestamped < Test::Unit::TestCase # :nodoc: all
     end
   end
 
-  def test_all
-    $og.manage_classes    
+  $og1.manage_classes Article
 
+  def test_all
     a = Article.create('article')
     a.save
 

data/test/og/multi_validations_model.rb

@@ -0,0 +1,8 @@
+class TC_MultiValidation < Test::Unit::TestCase # :nodoc: all
+  class User
+    property :name
+
+    validate_value :name
+    validate_unique :name
+  end
+end

data/test/og/store/tc_filesys.rb

@@ -1,14 +1,14 @@
-
 require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 require 'rubygems'
 require 'facets'
 require 'test/unit'
 require 'og'
 
+=begin FileSys is currently inaccessible through Og.setup?
 class TestCaseOgFilesys < Test::Unit::TestCase # :nodoc: all
   include Og
 
-  class Comment; end
+  @og = Og.setup(:store => :filesys, :name => 'test')
 
   class Article
     property :body, String
@@ -32,12 +32,14 @@ class TestCaseOgFilesys < Test::Unit::TestCase # :nodoc: all
     property :name, :name_key => true
   end
   
-  def setup
-    @og = Og.setup(:store => 'filesys', :name => 'test')
+  @og.manage_classes(Article, Comment, User)
+  
+  def self.og
+    @og
   end
 
-  def teardown
-    @og = nil
+  def og
+    self.class.og
   end
 
   def test_all
@@ -45,19 +47,19 @@ class TestCaseOgFilesys < Test::Unit::TestCase # :nodoc: all
     # p Article.metadata
 
     a1 = Article.new('Article 1')
-    @og.store.save(a1)  
+    og.store.save(a1)  
 
-    a2 = @og.store.load(1, Article)
+    a2 = og.store.load(1, Article)
 
     assert_equal a1.body, a2.body
 
     a3 = Article.new('Article 3')
     a3.save  
   
-    @og.store.delete(a3)
+    og.store.delete(a3)
 
-    assert @og.store.load(1, Article)
-    assert !@og.store.load(2, Article)
+    assert og.store.load(1, Article)
+    assert !og.store.load(2, Article)
 
     a2.delete
 
@@ -65,8 +67,9 @@ class TestCaseOgFilesys < Test::Unit::TestCase # :nodoc: all
     # a.save
     # a = Article[1]
 
-    @og.store.close
+    og.store.close
 #   @og.store.class.destroy(@og.options)
   end
 
 end
+=end

data/test/og/store/tc_kirby.rb

@@ -3,22 +3,24 @@ require 'facets'
 require 'test/unit'
 require 'og'
 
-$DBG = true
+# $DBG = true
 
-class Track
-  prop_accessor :name, String
-  belongs_to Disc
-end
+=begin
+class TC_Kirby < Test::Unit::TestCase # :nodoc: all
 
-class Disc
-  prop_accessor :name, String
-  has_many Track
-end
+  og = Og.setup( :destroy => true, :store => :kirby, :manual_management => true)
 
-Og.setup( :destroy => true, :store => :kirby )
+  class Track
+    prop_accessor :name, String
+    belongs_to Disc
+  end
 
+  class Disc
+    prop_accessor :name, String
+    has_many Track
+  end
 
-class TC_Kirby < Test::Unit::TestCase # :nodoc: all
+  og.manage_classes(Track, Disc)
 
   def test_all
     d = Disc.create
@@ -29,5 +31,6 @@ class TC_Kirby < Test::Unit::TestCase # :nodoc: all
   end
 
 end
+=end
 
 # * Guillaume Pierronnet <guillaume.pierronnet@gmail.com>