og 0.31.0 → 0.40.0

data/test/og/multi_validations_model.rb

@@ -1,8 +1,22 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'test/unit'
+
+require 'glue'
+require 'glue/validation'
+require 'og/validation'
+
 class TC_MultiValidation < Test::Unit::TestCase # :nodoc: all
   class User
+    include Glue::Validation
+    
     property :name
 
     validate_value :name
     validate_unique :name
   end
+  
+  def test_empty
+    assert TC_MultiValidation.const_defined?('User')
+  end
 end

data/test/og/store/tc_filesys.rb

@@ -1,10 +1,11 @@
+=begin FileSys is currently not available.
+
 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
 
@@ -72,4 +73,5 @@ class TestCaseOgFilesys < Test::Unit::TestCase # :nodoc: all
   end
 
 end
+
 =end

data/test/og/store/tc_kirby.rb

@@ -1,22 +1,22 @@
-require 'rubygems'
-require 'facets'
-require 'test/unit'
-require 'og'
+=begin KirbyBase is currently not available.
 
-# $DBG = true
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
-=begin
-class TC_Kirby < Test::Unit::TestCase # :nodoc: all
+require 'test/unit'
 
-  og = Og.setup( :destroy => true, :store => :kirby, :manual_management => true)
+begin
 
+og = Og.setup( :destroy => true, :store => :kirby, :manual_management => true)
+
+class TC_Kirby < Test::Unit::TestCase # :nodoc: all
+  
   class Track
-    prop_accessor :name, String
+    attr_accessor :name, String
     belongs_to Disc
   end
 
   class Disc
-    prop_accessor :name, String
+    attr_accessor :name, String
     has_many Track
   end
 
@@ -26,11 +26,14 @@ class TC_Kirby < Test::Unit::TestCase # :nodoc: all
     d = Disc.create
     t = Track.create
     d.tracks << t
-    
+
     assert_equal 1, d.tracks.size
   end
 
 end
-=end
 
-# * Guillaume Pierronnet <guillaume.pierronnet@gmail.com>
+rescue LoadError => e
+  puts 'Skipping Kirby test, adapter not found.'
+end
+
+=end

data/test/og/store/tc_sti.rb

@@ -7,20 +7,20 @@ require 'og/store/sql'
 
 class TC_Sti < Test::Unit::TestCase
   class StiParent
-    property :one
-    property :two
-
-    schema_inheritance
+    is Og::SchemaInheritanceBase
+    
+    property :one, String
+    property :two, String
   end
 
   class StiChild < StiParent
-    property :three
+    property :three, String
   end
 
   $og1.manage_classes(StiParent, StiChild)
 
   def setup
-    @store = Og::SqlStore.new(nil)
+    @store = $og1.store
   end
 
   def teardown
@@ -56,9 +56,9 @@ end
 
 class TC_Sti_OgType < Test::Unit::TestCase
   class Human
-    property :name
-
-    schema_inheritance
+    is Og::SchemaInheritanceBase
+    
+    property :name, String
 
     def initialize(name)
       @name = name
@@ -66,11 +66,11 @@ class TC_Sti_OgType < Test::Unit::TestCase
   end
 
   class Parent < Human
-    property :job
+    property :job, String
   end
 
   class Child < Human
-    property :toys
+    property :toys, String
   end
 
   $og1.manage_classes(Human, Parent, Child)

data/test/og/store/tc_sti2.rb

@@ -0,0 +1,79 @@
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+
+require 'rubygems'
+require 'test/unit'
+require 'ostruct'
+
+require 'og'
+
+class TC_STI2 < Test::Unit::TestCase
+  
+  class User
+    is Og::SchemaInheritanceBase
+    
+    property :name, String
+
+    has_one Login
+    
+    # This triggered a bug when called from a subclass
+    has_many :pets, Pet#, :foreign_name => 'user'
+  end
+
+  class Admin < User
+    property :admin_praise, String
+  end
+
+  class Login
+    property :pass, String
+
+    belongs_to User
+  end
+  
+  class Pet
+    property :name, String
+    
+    belongs_to User
+  end
+  
+  def request
+    o = OpenStruct.new
+    o.params = {:name => 'George', :pass => 'Secret'}
+    return o
+  end
+  
+  $og1.manage_classes User, Login, Admin, Pet
+  
+  def setup
+    @user = Admin.create_with(request.params)
+    @login = Login.create_with(request.params)
+  end
+  
+  def teardown
+    [User, Login, Pet].map {|x| x.delete_all}
+  end
+  
+  def test_setup
+    assert_equal 1, User.count
+    assert_equal 1, Login.count
+  end
+  
+  def test_assign
+    @user.login = @login
+  end
+  
+  def test_has_many
+    pets = nil
+    assert_nothing_raised do
+      pets = @user.pets.size
+    end
+    
+    assert_equal 0, pets
+    
+    p1 = Pet.create_with(:name => 'Ziza')
+    
+    @user.pets << p1
+    
+    assert_equal 1, @user.pets(:reload => true).size
+  end
+  
+end

data/test/og/tc_build.rb

@@ -0,0 +1,41 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'facets'
+
+require 'test/unit'
+require 'og'
+require 'glue/timestamped'
+
+class TC_OgAggrCalc < Test::Unit::TestCase # :nodoc: all
+  include Og
+
+  class Category
+    attr_accessor :name, String
+  end
+  
+  class User
+    attr_accessor :name, String
+    joins_many Category
+
+    def initialize name
+      @name = name
+    end
+  end
+
+  $og1.manage_classes(User, Category)
+
+  def test_all
+    c1 = Category.create_with :name => 'one'
+    c2 = Category.create_with :name => 'two'
+    
+    u = User.new 'gmosx'
+    u.categories << c1
+    u.categories << c2
+    u.save
+    
+    g = User[1]
+    assert_equal 2, g.categories.size
+  end
+  
+end

data/test/og/tc_cacheable.rb

@@ -191,7 +191,8 @@ begin
       end
     end
   end
-rescue Object 
-  puts 'MemCached sever not running, skipping test'
+rescue Errno::ECONNREFUSED => ex # FIXME: Lookup Win32/Linux/BSD error
+  Logger.warn "skipping memcached test: server not running"
+  #Logger.warn ex.class # FIXME: remove when all error types listed above
 end
 

data/test/og/tc_has_many.rb

@@ -0,0 +1,96 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'facets'
+
+require 'test/unit'
+require 'og'
+require 'glue/timestamped'
+
+class TC_JoinsMany < Test::Unit::TestCase # :nodoc: all
+  include Og
+
+  class Item
+    property :name, String
+
+    has_many Tag
+  end
+
+  class Tag
+    property :name, String
+    
+    belongs_to Item
+  end
+  
+  $og1.manage_classes(Item, Tag)
+  
+  def setup
+    @conn = $og1.conn
+    
+    @name = 'George'
+  end
+  
+  def teardown
+    Item.delete_all
+    Tag.delete_all
+  end
+  
+  def test_assign_with_name
+    i = Item.create_with(:name => @name)
+    
+    assert_equal @name, i.name
+  end
+  
+  def test_concat
+    tag = Tag.create_with(:name => 'Nitro')
+    i = Item.create_with(:name => @name)
+    
+    i.tags << tag
+    
+    assert_equal 1, i.tags.size
+    assert_equal tag, i.tags.first
+  end
+  
+  def test_add
+    tag = Tag.create_with(:name => 'Facets')
+    i = Item.create_with(:name => @name)
+    
+    i.add_tag tag
+    
+    assert_equal 1, i.tags.size
+    assert_equal tag, i.tags.first
+  end
+  
+  def test_assign_with_tag
+    tag = Tag.create_with(:name => 'Nitro')
+    
+    assert_not_nil tag.saved?
+    
+    i = Item.create_with(:name => @name, :tags => tag)
+    
+    assert_not_nil i.saved?
+    assert_equal tag, i.tags.first
+  end
+  
+  def test_assign_with_tags
+    tags = [Tag.create_with(:name => 'Glue'), Tag.create_with(:name => 'Og')]
+    i = Item.create_with(:name => @name, :tags => tags)
+    
+    assert_equal tags, i.tags.to_ary
+  end
+  
+  def test_assign_with_collection
+    coll = HasManyCollection.new(
+      Item, 
+      Tag,
+      :add_tag,
+      :remove_tag,
+      :find_tags,
+      :count_tags
+    )
+    i = Item.create_with(:name => @name, :tags => coll)
+    
+    assert_equal coll, i.instance_variable_get("@tags")
+  end
+  
+end

data/test/og/tc_inheritance.rb

@@ -37,7 +37,7 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
   end
 
   class Car
-    property :name
+    property :name, String
     belongs_to :admin
   end
 
@@ -49,7 +49,7 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
 
   class Admin < User
     property :password, String
-    has_one Car
+    #has_one Car
   end
 
   $og1.manage_classes(Document, Article, Document, Photo, Car, User, Admin)
@@ -102,7 +102,9 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
     assert_equal 2, articles.size
 
     # Bug report.
-    Admin.create
-    Admin.create.car
+    # This happens when creating a has_one Car in Admin, which is wrong 
+    # because it overrides the joins_many from User.
+    #Admin.create
+    #Admin.create.car
   end
 end

data/test/og/tc_joins_many.rb

@@ -0,0 +1,93 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'facets'
+
+require 'test/unit'
+require 'og'
+require 'glue/timestamped'
+
+class TC_JoinsMany < Test::Unit::TestCase # :nodoc: all
+  include Og
+
+  class Item
+    property :name, String
+
+    joins_many Tag
+
+    def to_s
+      @name
+    end
+  end
+
+  class Tag
+    property :name, String
+
+    def to_s
+      @name
+    end
+  end
+  
+  def setup
+    $og1.manage_classes(Item, Tag)
+    @conn = $og1.conn
+  end
+  
+  def test_all
+    (1..3).each do |n|
+      t = Tag.new
+      t.name = "Tag_#{n}"
+      t.save
+    end
+    
+    assert_equal 3, Tag.all.size
+    
+    # see if i can get a tag back from th db
+    t = Tag.find_by_name("Tag_1")
+    
+    assert_not_nil t
+
+    i1 = Item.new
+    i1.name = "Item_1"
+    i1.save
+    i1.add_tag(Tag.find_by_name("Tag_1"))
+    i1.add_tag(Tag.find_by_name("Tag_2"))
+    i1.save
+
+    i2 = Item.new
+    i2.name = "Item_2"
+    i2.save
+    i2.add_tag(Tag.find_by_name("Tag_2"))
+    i2.add_tag(Tag.find_by_name("Tag_3"))
+    i2.save
+    
+    # count SQL, note that the join table will change when test class changes
+    
+    sql = 'SELECT count(*) FROM ogj_tc_joinsmany_item_tc_joinsmany_tag'
+    
+    # after inserting 2 tags into the each of the 2 items, 4 relations
+    
+    assert_equal 4, @conn.query(sql).first_value.to_i
+    
+    i1.delete(true)
+    i2.delete(true)
+    
+    # after deleting the 2 items, the relations are invalid
+    
+    assert_equal 0, @conn.query(sql).first_value.to_i
+
+    # the following code is new and should not trigger an exception due to
+    # existing items in the mapping table
+    
+    assert_nothing_raised do
+      i3 = Item.new
+      i3.name = "Item_3"
+      i3.save
+      i3.add_tag(Tag.find_by_name("Tag_1"))
+      i3.add_tag(Tag.find_by_name("Tag_2"))
+      i3.save
+    end
+    
+  end
+  
+end