og 0.29.0 → 0.30.0

data/lib/og/store/sqlite.rb

@@ -192,17 +192,17 @@ private
       Logger.debug "Table '#{klass::OGTABLE}' already exists" if $DBG
 
       actual_fields = Set.new(list_fields(klass::OGTABLE))
-      defined_fields = Set.new(klass.properties.values.map { |f| field_for_property(f) } )
+      defined_fields = Set.new(fields_for_class(klass).map { |f| f[0, f.index(' ')] } )
 
       unless defined_fields == actual_fields
-        Logger.debug "Field mismatch in '#{klass::OGTABLE}'. Attempting to correct..."
+        Logger.debug "Field mismatch in '#{klass::OGTABLE}'. Attempting to correct..." if $DBG
 
         fields_to_add = defined_fields - actual_fields
         fields_to_delete = actual_fields - defined_fields
 
         fields_to_add.each do |field|
           if @options[:evolve_schema] == true
-            Logger.debug "Adding field '#{field}' to '#{klass::OGTABLE}'"
+            Logger.debug "Adding field '#{field}' to '#{klass::OGTABLE}'" if $DBG
             sql = "ALTER TABLE #{klass::OGTABLE} ADD COLUMN #{property_to_field(klass, klass.properties[field.to_sym])}"
             @conn.query(sql)
             @conn.query("VACUUM #{klass::OGTABLE}")
@@ -252,7 +252,7 @@ private
           create_join_table_sql(info).each do |sql|
           @conn.query(sql).close
         end
-          Logger.debug "Created jointable '#{info[:table]}'."                    
+          Logger.debug "Created jointable '#{info[:table]}'." if $DBG
         rescue Object => ex
           # gmosx: any idea how to better test this?
           if ex.to_s =~ /table .* already exists/i
@@ -271,8 +271,14 @@ private
 
     fields = res.columns
 
+    # Check if the field should be ignored.
+    ignore = klass.ann[:self][:ignore_field] || klass.ann[:self][:ignore_fields] || klass.ann[:self][:ignore_columns]   
+
     res.fields.size.times do |i|
-      map[fields[i].intern] = i
+      field_name = fields[i].to_sym
+      unless (ignore and ignore.include?(field_name))
+        map[field_name] = i
+      end
     end
 
     return map
@@ -294,10 +300,10 @@ private
 
     klass.class_eval %{ 
       def og_insert(store)
-        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{::Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
         store.query("#{sql}").close
         @#{pk} = store.last_insert_rowid        
-        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{::Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
       end
     }
   end

data/lib/og/store/sqlite2.rb

@@ -1,3 +1,7 @@
+#--
+# TODO: extend from sqlite.rb to avoid code duplication.
+#++
+
 begin
   require 'sqlite'
 rescue Object => ex
@@ -166,7 +170,7 @@ private
           create_join_table_sql(info).each do |sql|
           @conn.query(sql).close
         end
-          Logger.debug "Created jointable '#{info[:table]}'."
+          Logger.debug "Created jointable '#{info[:table]}'." if $DBG
         rescue Object => ex
           # gmosx: any idea how to better test this?
           if ex.to_s =~ /table .* already exists/i
@@ -185,8 +189,14 @@ private
 
     fields = res.columns
 
+    # Check if the field should be ignored.
+    ignore = klass.ann[:self][:ignore_field] || klass.ann[:self][:ignore_fields] || klass.ann[:self][:ignore_columns]   
+
     res.fields.size.times do |i|
-      map[fields[i].intern] = i
+      field_name = fields[i].to_sym
+      unless (ignore and ignore.include?(field_name))
+        map[field_name] = i
+      end
     end
 
     return map
@@ -208,10 +218,10 @@ private
 
     klass.class_eval %{
       def og_insert(store)
-        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{::Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
         store.query("#{sql}").close
         @#{pk} = store.last_insert_rowid
-        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{::Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
       end
     }
   end

data/test/og/CONFIG.rb

@@ -82,10 +82,10 @@ require 'og'
 
 Logger.set(Logger.new(StringIO.new)) unless $DBG
 
-Og.thread_safe = false
-
 $og1 ||= Og.setup(@og_config1)
 $og2 ||= Og.setup(@og_config2)
 
+Og.thread_safe = false if Og.thread_safe
+
 # * Tom Sawyer <transfire@gmail.com>
 # * George Moschovitis <gm@navel.gr>

data/test/og/store/tc_sti.rb

@@ -17,6 +17,8 @@ class TC_Sti < Test::Unit::TestCase
     property :three
   end
 
+  $og1.manage_classes(StiParent, StiChild)
+
   def setup
     @store = Og::SqlStore.new(nil)
   end
@@ -51,3 +53,42 @@ class TC_Sti < Test::Unit::TestCase
     assert(field_names.member?(:ogtype.to_s), msg)
   end
 end
+
+class TC_Sti_OgType < Test::Unit::TestCase
+  class Human
+    property :name
+
+    schema_inheritance
+
+    def initialize(name)
+      @name = name
+    end
+  end
+
+  class Parent < Human
+    property :job
+  end
+
+  class Child < Human
+    property :toys
+  end
+
+  $og1.manage_classes(Human, Parent, Child)
+
+  def setup
+    Parent.create('mom')
+    Parent.create('dad')
+    Child.create('son')
+  end
+
+  def test_sti_all
+    all = Human.all
+    assert_equal(3, all.size)
+    parents = all.select {|h| h.class == Parent }
+    children = all.select {|h| h.class == Child }
+    assert_equal(2, parents.size)
+    assert_equal(1, children.size)
+    assert_equal(%w[dad mom], parents.sort {|x,y| x.name <=> y.name}.map {|p| p.name } )
+    assert_equal(%w[son], children.map {|c| c.name } )
+  end
+end

data/test/og/tc_aggregations_calculations.rb

@@ -5,6 +5,7 @@ require 'facets'
 
 require 'test/unit'
 require 'og'
+require 'glue/timestamped'
 
 class TC_OgAggrCalc < Test::Unit::TestCase # :nodoc: all
   include Og
@@ -12,6 +13,7 @@ class TC_OgAggrCalc < Test::Unit::TestCase # :nodoc: all
   class User
     property :section, String
     property :age, Fixnum
+    is Glue::Timestamped
 
     def initialize(section, age)
       @section = section
@@ -27,7 +29,7 @@ class TC_OgAggrCalc < Test::Unit::TestCase # :nodoc: all
     User.create('d', 34)
     User.create('d', 33)
     User.create('c', 27)
-    User.create('c', 31)
+    last = User.create('c', 31)
     
     assert_equal 6, User.count
     assert_equal 12, User.minimum(:age)
@@ -38,7 +40,11 @@ class TC_OgAggrCalc < Test::Unit::TestCase # :nodoc: all
     
     sums = User.sum(:age, :group => :section)
     assert_equal 3, sums.size
-    assert_equal 28, sums[0]
+    assert(sums.include?(28))
+    assert(sums.include?(58))
+    assert(sums.include?(67))
+    assert_equal(last.create_time.to_s, User.max(:create_time).to_s)
+    assert_instance_of(Time, User.max(:create_time))
   end
   
 end

data/test/og/tc_cacheable.rb

@@ -75,6 +75,7 @@ class TC_FileCacheable < Test::Unit::TestCase # :nodoc: all
     
     property :name, String
     property :age, Fixnum
+    property :permissions, Array
   end
 
   $og1.manage_classes(User)
@@ -104,7 +105,9 @@ class TC_FileCacheable < Test::Unit::TestCase # :nodoc: all
       User.create_with :name => 'Stella'
      
       u = User[1]
-      
+      u.permissions = %w[1 2 3]
+      u.save
+
       assert_equal 'George', u.name, msg
 
       # Comes from the cache.
@@ -122,6 +125,7 @@ class TC_FileCacheable < Test::Unit::TestCase # :nodoc: all
       u = User[1]
       
       assert_equal u.name, @og.cache.get(u.og_cache_key).name, msg
+      assert_equal %w[1 2 3], @og.cache.get(u.og_cache_key).permissions, msg
       
       u.delete
       User.delete(2)
@@ -155,7 +159,7 @@ begin
     def test_all
       Caches.each do |cache_class|
         #   @og.cache = DrbCache.new(:address => Og.cache_address, :port => Og.cache_port)
-        @og.cache = cache_class.new
+        @og.cache = cache_class.new(self.class, 60)
         
         msg = "Failed for cache type: #{cache_class}"
 

data/test/og/tc_camel_case_join.rb

@@ -0,0 +1,51 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'facets'
+require 'test/unit'
+require 'og'
+
+class TC_CamelCase < Test::Unit::TestCase # :nodoc: all
+  include Og
+  
+  class CategoryCamelCase
+    property :title, String
+    def initialize(title)
+      @title = title
+    end
+  end
+  
+  class ArticleCamelCase
+    property :title, String
+    joins_many CategoryCamelCase, :through => ArticleToCategory
+    
+    def initialize(title)
+      @title = title
+    end
+  end
+  
+  class ArticleToCategory
+    property :rate, Float
+    property :hits, Fixnum
+    has_one ArticleCamelCase
+    has_one CategoryCamelCase
+  end
+  
+  def setup
+    $og1.manage_classes(CategoryCamelCase, ArticleCamelCase, ArticleToCategory)
+  end
+  
+  def test_all
+    c1 = CategoryCamelCase.create('tech')
+    c2 = CategoryCamelCase.create('funny')
+    a = ArticleCamelCase.create('a1')
+    a.category_camel_cases.push(c1, :hits =>3, :rate => 2.3)
+    a.category_camel_cases.push(c2, :rate => 1.2)
+    join = a.category_camel_case_join_data(c1)
+    assert_equal 2.3, join.rate
+    assert_equal 3, join.hits
+    join = a.category_camel_case_join_data(c2)
+    assert_equal 1.2, join.rate
+    assert_equal nil, join.hits
+  end
+end

data/test/og/tc_ez.rb

@@ -28,6 +28,35 @@ class TC_ResolveOptions < Test::Unit::TestCase # :nodoc: all
     end
     
     assert_equal 2, users.size
+
+    users = User.find { |user| user.age === [14, 23] }
+
+    assert_equal 2, users.size
+  end
+end
+
+class TC_EZ_STI < Test::Unit::TestCase # :nodoc: all
+  class Person
+    property :name, String
+    property :kids, Integer
+    schema_inheritance
+  end
+
+  class Musician < Person
+    property :instruments, Array
+  end
+
+  class Plumber < Person
+    property :tools, Array
+  end
+
+  $og1.manage_classes(Person, Musician, Plumber)
+
+  def test_op_triple_equals # ===
+    results = nil
+    assert_nothing_raised do
+      results = Musician.find {|m| m.kids === [3,4,5]}
+    end
+    assert(results.empty?)
   end
-  
 end

data/test/og/tc_join.rb

@@ -13,6 +13,9 @@ class TC_Join < Test::Unit::TestCase # :nodoc: all
 
   class Category
     property :title, String
+    joins_many Article
+    joins_many :third_join, Article, :table => :ogj_article_category_third
+    joins_many :fourth_join, Article, :table => :ogj_article_category_fourth
     
     def initialize(title)
       @title = title
@@ -22,7 +25,11 @@ class TC_Join < Test::Unit::TestCase # :nodoc: all
   class Article
     property :title, String
 
-    joins_many Category, :through => ArticleToCategory
+    joins_many :first_join, Category, :through => ArticleToCategory
+    joins_many :second_join, Category, :through => ArticleToCategory
+    joins_many :third_join, Category, :table => :ogj_article_category_third
+    joins_many :fourth_join, Category, :table => :ogj_article_category_fourth
+    joins_many Category
         
     def initialize(title)
       @title = title
@@ -44,18 +51,78 @@ class TC_Join < Test::Unit::TestCase # :nodoc: all
   def test_all
     c1 = Category.create('tech')
     c2 = Category.create('funny')
+    c3 = Category.create('finance')
 
     a = Article.create('a1')
-    a.categories.push(c1, :hits =>3, :rate => 2.3) 
-    a.categories.push(c2, :rate => 1.2) 
-        
-    join = a.category_join_data(c1)
+    a2 = Article.create('a2')
+    a3 = Article.create('a2')
+
+    # Put the categories into seperate relations
+
+    a.first_join.push(c1, :hits =>3, :rate => 2.3) 
+    a.second_join.push(c2, :rate => 1.2) 
+    a.third_join << c1
+    a.fourth_join << c2
+    a2.third_join << c1
+    a3.fourth_join << c1
+
+    a.categories << c3
+
+    # ++ Join Through Tests
+
+    # Test that each relationship appears where it should
+
+    join = a.first_join_join_data(c1)
     assert_equal 2.3, join.rate
     assert_equal 3, join.hits
 
-    join = a.category_join_data(c2)
+    join = a.second_join_join_data(c2)
     assert_equal 1.2, join.rate
     assert_equal nil, join.hits
+
+    # This feature should be available but I cannot think
+    # of the best way to implement it right now.
+
+    # Test that each relationship does not appears where
+    # it should not.
+
+    # join = a.second_join_join_data(c1)
+    # assert_nil(join)
+
+    # join = a.first_join_join_data(c2)
+    # assert_nil(join)
+
+    # join = a.first_join_join_data(c3)
+    # assert_nil(join)
+
+    # -- Join Through Tests
+
+    # ++ Tripple join table tests
+
+    # Test each relationship appears where it should
+
+    assert(a.third_join.include?(c1), "c1 does not appear in third join relationship")
+    assert(a.fourth_join.include?(c2), "c2 does not appear in fourth join relationship")
+    assert(a.categories.include?(c3), "c3 does not appear in categories (un-named) join relationship")
+    
+    # Tests the same thing backwards
+    
+    assert(c3.articles.include?(a), "article does not appear in c3 (reverse join broken)")
+    assert(c1.third_join.include?(a2), "a2 does not appear in c1.third_join (reverse join broken)")
+    assert(c1.fourth_join.include?(a3), "a3 does not appear in c1.fourth_join (reverse join broken)")
+    assert(!c1.third_join.include?(a3), "a3 appears in c1.third_join (reverse join broken)")    
+    
+    # Test that each relationship does not appears where
+    # it should not.
+
+    assert(!a.third_join.include?(c2), "c2 appears in third join relationship")
+    assert(!a.third_join.include?(c3), "c3 appears in third join relationship")
+    assert(!a.fourth_join.include?(c1), "c1 appears in fourth join relationship")
+    assert(!a.fourth_join.include?(c3), "c3 appears in fourth join relationship")
+    assert(!a.categories.include?(c1), "c1 appears in categories (un-named) join relationship")
+    assert(!a.categories.include?(c2), "c2 appears in categories (un-named) join relationship")
+
+    # -- Tripple join table tests
   end
   
 end

data/test/og/tc_multi_validations.rb

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

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.29.0
-date: 2006-03-07 00:00:00 +02:00
+  version: 0.30.0
+date: 2006-05-05 00:00:00 +03:00
 summary: State of the art object-relational mapping system.
 require_paths: 
 - lib
 email: gm@navel.gr
-homepage: http://www.nitrohq.com
+homepage: http://www.nitroproject.org
 rubyforge_project: nitro
 description: 
 autorequire: 
@@ -22,115 +22,115 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - !ruby/object:Gem::Version 
       version: 0.0.0
   version: 
-platform: ruby
+platform: 
 signing_key: 
 cert_chain: 
 authors: 
 - George Moschovitis
 files: 
+- ProjectInfo
+- INSTALL
+- README
 - doc
 - examples
 - lib
 - test
-- ProjectInfo
-- Rakefile
-- README
 - setup.rb
-- INSTALL
-- doc/tutorial.txt
-- doc/config.txt
-- doc/RELEASES
-- doc/LICENSE
 - doc/CHANGELOG.1
 - doc/AUTHORS
-- examples/run.rb
+- doc/tutorial.txt
+- doc/LICENSE
+- doc/RELEASES
+- doc/config.txt
 - examples/README
+- examples/run.rb
 - examples/mysql_to_psql.rb
 - 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/relation
 - lib/og/store
+- lib/og/relation.rb
 - lib/og/test
+- lib/og/store.rb
 - lib/og/vendor
-- lib/og/validation.rb
-- lib/og/types.rb
 - lib/og/test.rb
-- lib/og/store.rb
-- lib/og/relation.rb
-- lib/og/manager.rb
-- lib/og/evolution.rb
-- lib/og/errors.rb
-- lib/og/entity.rb
-- lib/og/collection.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/refers_to.rb
-- lib/og/relation/joins_many.rb
-- lib/og/relation/has_one.rb
-- lib/og/relation/has_many.rb
 - lib/og/relation/belongs_to.rb
-- lib/og/relation/all.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/sqlite.rb
-- lib/og/store/sql.rb
-- lib/og/store/psql.rb
-- lib/og/store/mysql.rb
 - 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/memory.rb
 - lib/og/store/alpha/filesys.rb
-- lib/og/test/testcase.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/taggable.rb
-- lib/glue/tree.rb
 - lib/glue/hierarchical.rb
-- lib/glue/timestamped.rb
-- lib/glue/revisable.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_types.rb
-- test/og/tc_store.rb
-- test/og/tc_select.rb
-- test/og/tc_reverse.rb
-- test/og/tc_relation.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_multiple.rb
-- test/og/tc_join.rb
-- test/og/tc_inheritance.rb
-- test/og/CONFIG.rb
-- test/og/tc_scoped.rb
+- test/og/tc_relation.rb
+- test/og/tc_reverse.rb
+- test/og/tc_select.rb
+- test/og/tc_store.rb
+- test/og/tc_types.rb
 - test/og/tc_finder.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
-- test/og/tc_validation_loop.rb
-- test/og/tc_cacheable.rb
 - test/og/tc_multi_validations.rb
+- test/og/tc_cacheable.rb
+- test/og/tc_validation_loop.rb
 - test/og/tc_resolve.rb
 - test/og/multi_validations_model.rb
 - test/og/tc_ez.rb
 - test/og/tc_aggregations_calculations.rb
-- test/og/mixin/tc_timestamped.rb
-- test/og/mixin/tc_taggable.rb
-- test/og/mixin/tc_orderable.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
+- 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
@@ -155,5 +155,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.29.0
+        version: 0.30.0
     version: