og 0.31.0 → 0.40.0

data/test/og/tc_multi_validations.rb

@@ -1,20 +1,18 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
 require 'test/unit'
 
 require 'glue'
-require 'glue/property'
 require 'glue/validation'
 require 'og/validation'
 
 class TC_MultiValidation < Test::Unit::TestCase # :nodoc: all
 
-  MultiValidationsModel = File.expand_path(File.join(File.dirname(__FILE__), 'multi_validations_model.rb'))
-
- def test_all
-    load MultiValidationsModel
+  def test_all
+    file = File.join(File.dirname(__FILE__), 'multi_validations_model.rb')
+    load file
     assert_equal 2, TC_MultiValidation::User.validations.size
-    load MultiValidationsModel
+    load file
     assert_equal 2, TC_MultiValidation::User.validations.size
   end
  

data/test/og/tc_multiple.rb

@@ -28,13 +28,14 @@ class TestMultiple < Test::Unit::TestCase # :nodoc: all
       @title = title
     end
   end
-  
-  def test_all
-    $og1.manage_class Article
-    $og2.manage_class User
 
-    assert Article.ogmanager.store.is_a?($og1.store.class) 
-    assert User.ogmanager.store.is_a?($og2.store.class) 
+  # Order is important, User has to be managed first!
+  $og2.manage_class User
+  $og1.manage_class Article
+
+  def test_all
+    assert_equal Article.ogmanager.store.class, $og1.store.class
+    assert_equal User.ogmanager.store.class, $og2.store.class
     
     a1 = Article.create('hello')
     a2 = Article.create('world')

data/test/og/tc_override.rb

@@ -6,12 +6,12 @@ require 'test/unit'
 
 require 'og'
 
-class TestOg < Test::Unit::TestCase
+class TC_Override < Test::Unit::TestCase
   include Og
 
   class Book
-    property :title
-    belongs_to :owner, Person # this creates a problem?
+    property :title, String
+    belongs_to :owner, Person
   end
 
   class Person
@@ -22,7 +22,7 @@ class TestOg < Test::Unit::TestCase
   def setup
     @old_prefix = Og.table_prefix
     Og.table_prefix = nil
-    og = Og.start
+    $og1.manage_classes(Book, Person)
   end
 
   def teardown
@@ -34,10 +34,16 @@ class TestOg < Test::Unit::TestCase
     book = Book.create
     person = Person.create
     person.books << book
+    
+    assert_equal person.books.size, 1
   end
-
-  def test_not_an_exact_duplicate
-    # This is supposed to test Og.table_prefix, see setup below.
+  
+  # This tests, if the tables are without prefix, note that changing the
+  # Class of the testcase will change the table name.
+  
+  def test_og_prefix
+    assert_equal Book.table, 'tc_override_book'
+    assert_equal Person.table, 'tc_override_person'
   end
 
 end

data/test/og/tc_primary_key.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'test/unit'
+
+require 'og'
+  
+class TC_Key < Test::Unit::TestCase # :nodoc: all
+
+  class User
+    @@pk = $og1.store.primary_key_type
+    attr_accessor :newid, Fixnum, :primary_key => true, :sql => @@pk
+    attr_accessor :name, String
+    attr_accessor :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
+
+    User.all.each do |u|
+      assert_raise(NoMethodError) { u.oid }
+      assert_not_nil u.pk
+      assert_not_nil u.newid
+    end
+  end
+end

data/test/og/tc_relation.rb

@@ -7,12 +7,15 @@ require 'test/unit'
 require 'og'
 require 'og/relation'
 
-=begin
+class Dummer
+  property :dum, String
+end
+
 class TestCaseOgRelation < Test::Unit::TestCase # :nodoc: all
   include Og
-
+  
   class User
-    property :name
+    property :name, String
     has_many Dummer
     has_many Article
     def initialize(name)
@@ -27,6 +30,8 @@ class TestCaseOgRelation < Test::Unit::TestCase # :nodoc: all
       @body = body
     end
   end
+  
+  $og1.manage_classes(Dummer, Article, User)
 
   def test_all    
     # no-namespace case.
@@ -40,15 +45,9 @@ class TestCaseOgRelation < Test::Unit::TestCase # :nodoc: all
     assert_equal TestCaseOgRelation::Article, rel.target_class    
     
     # bug: test the no belongs_to case in Article
-    
-    og = Og.setup($og_config)
-    og.manage_classes    
   end
 
   def test_refers_to
-    og = Og.setup($og_config)
-    og.manage_classes
-
     # test refers_to accessor is correctly updated
     u = User.create("George")
     a = Article.create("Og is a good thing!")
@@ -79,8 +78,3 @@ class TestCaseOgRelation < Test::Unit::TestCase # :nodoc: all
     assert_equal(u2.oid, a.active_user_oid)
   end
 end
-
-class Dummer
-  property :dum, String
-end
-=end

data/test/og/tc_reldelete.rb

@@ -0,0 +1,163 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'facets'
+
+require 'test/unit'
+require 'og'
+require 'glue/timestamped'
+
+class TC_DeletesRelationship < Test::Unit::TestCase # :nodoc: all
+  include Og
+
+  class Item
+    property :name, String
+
+    has_one Category
+    has_one Tag
+    
+    has_many Picture
+    has_many :figures
+    
+    joins_many User
+  end
+  
+  ###### 
+  # Single
+  ######
+
+  class Category
+    property :name, String
+    
+    belongs_to Item
+  end
+  
+  class Tag
+    property :name, String
+    
+    refers_to Item
+  end
+  
+  ###### 
+  # Many
+  ######
+  
+  class Picture
+    property :name, String
+    
+    belongs_to Item
+  end
+  
+  class Figure
+    property :name, String
+    
+    refers_to Item
+  end
+  
+  ###### 
+  # Many Many
+  ######
+  
+  class User
+    property :name, String
+    
+    many_to_many Item
+  end
+  
+  $og1.manage_classes(Item, Tag, Category, Picture, Figure, User)
+  
+  def setup
+    @conn = $og1.conn
+    
+    @i = Item.create_with(:name => 'Copter')
+    @c = Category.create_with(:name => 'blabla')
+    @t = Tag.create_with(:name => 'blabla')
+    
+    @p1 = Picture.create_with(:name => 'blabla1')
+    @p2 = Picture.create_with(:name => 'blabla2')
+    @f1 = Figure.create_with(:name => 'blabla1')
+    @f2 = Figure.create_with(:name => 'blabla2')
+    
+    @u = User.create_with(:name => 'George')
+    
+    @i.category = @c
+    @i.tag = @t
+    
+    @i.pictures << @p1
+    @p2.item = @i
+    
+    @i.figures << @f1
+    @f1.item = @i
+    
+    @i.add_user @u
+  end
+  
+  def teardown
+    [Tag, Item, Category, Picture, Figure, User].map {|x| x.delete_all }
+    @conn.exec("DELETE FROM #{Og::JoinsMany::OgTempJ_ogj_tc_deletesrelationship_item_tc_deletesrelationship_user::OGTABLE}")
+  end
+  
+  def test_setup
+    assert_equal 1, Item.count, 'There should be 1 Item'
+    assert_equal 1, Category.count
+    assert_equal 1, Tag.count
+    assert_equal 2, Picture.count
+    assert_equal 2, Figure.count
+    
+    assert_equal @t, @i.tag
+    assert_equal @c, @i.category
+  end
+  
+  def test_relationship_intact
+    assert_equal @i.oid, @t.instance_variable_get('@item_oid')
+    assert_equal @i.oid, @c.instance_variable_get('@item_oid')
+  end
+  
+  def test_descendants
+    assert_equal [
+    [Og::JoinsMany::OgTempJ_ogj_tc_deletesrelationship_item_tc_deletesrelationship_user, "item_oid"], 
+        [Category, "item_oid"], [Picture, "item_oid"]],
+      Item.ann.self.descendants
+  end
+  
+  ###### 
+  # Single
+  ######
+  
+  def test_deletes_category
+    @i.delete
+    assert_equal 0, Category.count, "Category should be deleted"
+  end
+  
+  def test_no_deletes_tag
+    @i.delete
+    assert_equal 1, Tag.count, 'Tag shouldn\'t be deleted'
+  end
+  
+  ###### 
+  # Many
+  ######
+  
+  def test_deletes_picture
+    @i.delete
+    assert_equal 0, Picture.count, "Pictures should be deleted"
+  end
+  
+  def test_no_deletes_figure
+    @i.delete
+    assert_equal 2, Figure.count, 'Figures shouldn\'t be deleted'
+  end
+  
+  ##### 
+  # Many Many
+  #####
+  
+  def test_deletes_rel_in_join_table
+    @i.delete
+    tbl = Og::JoinsMany::OgTempJ_ogj_tc_deletesrelationship_item_tc_deletesrelationship_user::OGTABLE
+    n = @conn.query("SELECT COUNT(*) FROM #{tbl}").first_value.to_i
+    
+    assert_equal 0, n;
+  end
+  
+end

data/test/og/tc_reverse.rb

@@ -10,11 +10,6 @@ require 'og'
 # to our objects.
 
 
-# create a 'legacy' schema.
-    
-$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 TestReverse < Test::Unit::TestCase # :nodoc: all
   include Og
   
@@ -22,8 +17,8 @@ class TestReverse < Test::Unit::TestCase # :nodoc: all
     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
+    has_many Comment, :foreign_field => :usr
+    set_table :my_usrs
     set_primary_key :name, String
     
     def initialize(name, password, age)
@@ -32,9 +27,11 @@ class TestReverse < Test::Unit::TestCase # :nodoc: all
   end
 
   class Comment
-    property :cid, Fixnum
+    @@pk = $og1.store.primary_key_type
+    
+    property :cid, Fixnum, :sql => @@pk
     property :body, String
-    belongs_to User, :field => :user
+    belongs_to User, :field => :usr
     set_table :my_comments
     set_primary_key :cid
     
@@ -43,13 +40,21 @@ class TestReverse < Test::Unit::TestCase # :nodoc: all
     end
   end
 
-  $og2.manage_classes(User, Comment)
+  def setup
+    # create a 'legacy' schema.
+    store = $og1.store
+    pk = store.primary_key_type
+    store.exec "create table my_usrs (thename VARCHAR(32) PRIMARY KEY, password TEXT, age3 INTEGER)"
+    store.exec "create table my_comments (cid #{pk}, body TEXT, usr VARCHAR(32))"
+    
+    $og1.manage_classes(User, Comment)
+  end
 
   def test_all
-    assert_equal 'my_users', User.table
+    assert_equal 'my_usrs', User.table
     assert_equal 'my_comments', Comment.table
     
-    User.new('gmosx', 'navel', 30).insert
+    User.new('gmosx', 'nitro', 30).insert
     User.new('Helen', 'kontesa', 25).insert
     
     gmosx = User.find_by_name('gmosx')
@@ -66,5 +71,3 @@ class TestReverse < Test::Unit::TestCase # :nodoc: all
     assert_equal 'hello', helen.comments[0].body
   end
 end
-
-# * George Moschovitis <gm@navel.gr>

data/test/og/tc_scoped.rb

@@ -13,27 +13,19 @@ class TC_OgScoped < Test::Unit::TestCase # :nodoc: all
   class User
     property :name, String
     has_many :articles
-    
-    def initialize(name = nil)
-      @name = name
-    end
   end
 
   class Article
     property :hits, Fixnum
     belongs_to :user
-    
-    def initialize(hits = nil)
-      @hits = hits
-    end
   end
     
   $og1.manage_classes(User, Article)
 
   def test_all
-    u = User.create('tml')
-    a1 = Article.create(10)
-    a2 = Article.create(20)
+    u = User.create_with(:name => 'tml')
+    a1 = Article.create_with :hits => 10
+    a2 = Article.create_with :hits => 20
     u.articles << a1
     u.articles << a2
     

data/test/og/tc_setup.rb

@@ -6,43 +6,45 @@ class TCOg_setup < Test::Unit::TestCase # :nodoc: all
   MockManager=Struct.new :options, :manage_classes, :post_setup
 
   def test_default
-    manager= Og.setup
+    manager = Og.start
     assert_instance_of Og::Manager, manager
-    assert_equal :sqlite, manager.options[:store]
+    assert_equal :sqlite, manager.options[:adapter]
     assert_equal 'data', manager.options[:name]
     assert_equal true, manager.options[:called_by_og_setup]
   end
 
   def test_mattrs_initialized
-    manager= Og.setup
+    manager = Og.start
     assert_equal manager,Og.manager
     assert Og.thread_safe
   end  
 
   def test_missing_store
-    assert_raises(LoadError){Og.setup(:store=>:missing)}
+# gmosx: this test is not needed, Og catches and reports this
+# error.
+#   assert_raises(LoadError) { Og.start(:adapter => :missing) }
   end  
 
   def test_setup_default_store_plus_options
-    manager=Og.setup(:evolve_schema=>true)
+    manager = Og.start(:evolve_schema => true)
     assert_instance_of Og::Manager, manager
-    assert_equal :sqlite, manager.options[:store]
+    assert_equal :sqlite, manager.options[:adapter]
     assert_equal true, manager.options[:evolve_schema]
   end
 
   def test_calls_manager_methods
-    mock_manager=Struct.new :options, :called do 
-      def manage_classes
+    mock_manager = Struct.new(:options, :called) do 
+      def manage_classes(*args)
         self.called = [:mc]
       end
       def post_setup
         self.called << :ps
       end
     end
-    old=Og::Manager
+    old = Og::Manager
     Og.const_set :Manager, mock_manager
-    manager=Og.setup
-    assert_equal [:mc, :ps],manager.called
+    manager = Og.start
+    assert_equal [:mc, :ps], manager.called
     Og.const_set :Manager, old
   end
 end