og 0.28.0 → 0.29.0

data/test/og/tc_cacheable.rb

@@ -1,58 +1,193 @@
 require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
-$DBG = true
-
 require 'rubygems'
 require 'facets'
+require 'fileutils'
 require 'test/unit'
 
 require 'og'
 require 'glue/cacheable'
 require 'glue/cache/memory'
+require 'glue/cache/file'
+require 'glue/cache/memcached'
 #require 'glue/cache/drb'
 
-class TC_Cacheable < Test::Unit::TestCase # :nodoc: all
-  include Glue
-  
+class TC_MemoryCacheable < Test::Unit::TestCase # :nodoc: all
   class User
-    is Cacheable
+    is Glue::Cacheable
     
     property :name, String
     property :age, Fixnum
   end
 
+  $og1.manage_classes(User)
+
+  Caches = [Glue::MemoryCache]
+
   def setup
-    @og = Og.start
-    @og.cache = MemoryCache.new
-#   @og.cache = DrbCache.new(:address => Og.cache_address, :port => Og.cache_port)
+    @og = User.ogmanager
+#   @og.cache = Glue::DrbCache.new(:address => Og.cache_address, :port => Og.cache_port)
+  end
+
+  def teardown
+    @og.cache = nil
   end
 
   def test_all
-    User.create_with :name => 'George'
-    User.create_with :name => 'Stella'
+    Caches.each do |cache_class|
+  #   @og.cache = DrbCache.new(:address => Og.cache_address, :port => Og.cache_port)
+      @og.cache = cache_class.new
+      
+      msg = "Failed for cache type: #{cache_class}"
+
+      User.create_with :name => 'George'
+      User.create_with :name => 'Stella'
+     
+      u = User[1]
+      
+      assert_equal 'George', u.name, msg
+
+      # Comes from the cache.
+      
+      u = User[1]
+      u = User[1]
+      u = User[1]
+
+      assert_equal u, @og.cache.get(u.og_cache_key), msg
     
-    u = User[1]
+      u.name = 'Hello'
+      u.save
+      
+      u = User[1]
+      u = User[1]
+      
+      assert_equal u.name, @og.cache.get(u.og_cache_key).name, msg
+      
+      u.delete
+      User.delete(2)
+    end
+  end
+end
+
+class TC_FileCacheable < Test::Unit::TestCase # :nodoc: all
+  class User
+    is Glue::Cacheable
     
-    assert_equal 'George', u.name
+    property :name, String
+    property :age, Fixnum
+  end
+
+  $og1.manage_classes(User)
+
+  Caches = [Glue::FileCache]
+
+  def setup
+    Glue::FileCache.basedir = File.join(File.dirname(__FILE__), '..', 'cache')
+    FileUtils.rm_r Glue::FileCache.basedir if File.exists? Glue::FileCache.basedir
+
+    @og = User.ogmanager
+#   @og.cache = Glue::DrbCache.new(:address => Og.cache_address, :port => Og.cache_port)
+  end
+
+  def teardown
+    @og.cache = nil
+  end
+
+  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
+      
+      msg = "Failed for cache type: #{cache_class}"
+
+      User.create_with :name => 'George'
+      User.create_with :name => 'Stella'
+     
+      u = User[1]
+      
+      assert_equal 'George', u.name, msg
+
+      # Comes from the cache.
+      
+      u = User[1]
+      u = User[1]
+      u = User[1]
 
-    # Comes from the cache.
+      assert_equal u, @og.cache.get(u.og_cache_key), msg
     
-    u = User[1]
-    u = User[1]
-    u = User[1]
+      u.name = 'Hello'
+      u.save
+      
+      u = User[1]
+      u = User[1]
+      
+      assert_equal u.name, @og.cache.get(u.og_cache_key).name, msg
+      
+      u.delete
+      User.delete(2)
+    end
+  end
+end
+
+begin
+  Glue::MemCached.new
+  class TC_MemCachedCacheable < Test::Unit::TestCase # :nodoc: all
+    class User
+      is Glue::Cacheable
+      
+      property :name, String
+      property :age, Fixnum
+    end
 
-    assert_equal u, @og.cache.get(u.og_cache_key)
+    $og1.manage_classes(User)
+
+    Caches = [Glue::MemCached]
+
+    def setup
+      @og = User.ogmanager
+      #   @og.cache = Glue::DrbCache.new(:address => Og.cache_address, :port => Og.cache_port)
+    end
+
+    def teardown
+      @og.cache = nil
+    end
+
+    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
         
-    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)
+        msg = "Failed for cache type: #{cache_class}"
+
+        User.create_with :name => 'George'
+        User.create_with :name => 'Stella'
+        
+        u = User[1]
+        
+        assert_equal 'George', u.name, msg
+
+        # Comes from the cache.
+        
+        u = User[1]
+        u = User[1]
+        u = User[1]
+
+        assert_equal u, @og.cache.get(u.og_cache_key), msg
+        
+        u.name = 'Hello'
+        u.save
+        
+        u = User[1]
+        u = User[1]
+        
+        assert_equal u.name, @og.cache.get(u.og_cache_key).name, msg
+        
+        u.delete
+        User.delete(2)
+      end
+    end
   end
-  
+rescue Object 
+  puts 'MemCached sever not running, skipping test'
 end
+

data/test/og/tc_inheritance.rb

@@ -56,7 +56,10 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
 
   def test_all
     assert_equal Document, Photo.superclass
-    assert_equal [Photo, Article], Document.descendents
+    descendents = Document.descendents
+    assert_equal(2, descendents.size)
+    assert descendents.include?(Photo)
+    assert descendents.include?(Article)
     
     assert Document.ann.self.schema_inheritance
 

data/test/og/tc_multi_validations.rb

@@ -5,6 +5,7 @@ require 'test/unit'
 require 'glue'
 require 'glue/property'
 require 'glue/validation'
+require 'og/validation'
 
 class TC_MultiValidation < Test::Unit::TestCase # :nodoc: all
 

data/test/og/tc_override.rb

@@ -20,10 +20,16 @@ class TestOg < Test::Unit::TestCase
   end
 
   def setup
+    @old_prefix = Og.table_prefix
     Og.table_prefix = nil
     og = Og.start
   end
 
+  def teardown
+    Og.table_prefix = @old_prefix
+    @old_prefix = nil
+  end
+
   def test_basic
     book = Book.create
     person = Person.create

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.28.0
-date: 2006-02-06 00:00:00 +02:00
+  version: 0.29.0
+date: 2006-03-07 00:00:00 +02:00
 summary: State of the art object-relational mapping system.
 require_paths: 
 - lib
@@ -15,7 +15,7 @@ description:
 autorequire: 
 default_executable: 
 bindir: bin
-has_rdoc: false
+has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -49,6 +49,7 @@ files:
 - lib/og
 - lib/glue
 - lib/og.rb
+- lib/og/ez
 - lib/og/relation
 - lib/og/store
 - lib/og/test
@@ -63,8 +64,9 @@ files:
 - lib/og/errors.rb
 - lib/og/entity.rb
 - lib/og/collection.rb
-- lib/og/ez
 - lib/og/markers.rb
+- lib/og/ez/condition.rb
+- lib/og/ez/clause.rb
 - lib/og/relation/many_to_many.rb
 - lib/og/relation/refers_to.rb
 - lib/og/relation/joins_many.rb
@@ -73,22 +75,19 @@ files:
 - lib/og/relation/belongs_to.rb
 - lib/og/relation/all.rb
 - lib/og/store/alpha
-- lib/og/store/sqlite2.rb
 - 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/sqlite2.rb
 - lib/og/store/alpha/sqlserver.rb
 - lib/og/store/alpha/memory.rb
-- lib/og/store/alpha/kirby.rb
 - lib/og/store/alpha/filesys.rb
 - lib/og/test/testcase.rb
 - lib/og/test/assertions.rb
 - lib/og/vendor/mysql.rb
 - lib/og/vendor/README
-- lib/og/ez/clause.rb
-- lib/og/ez/condition.rb
 - lib/glue/taggable.rb
 - lib/glue/tree.rb
 - lib/glue/hierarchical.rb
@@ -112,7 +111,6 @@ files:
 - test/og/tc_polymorphic.rb
 - test/og/tc_multiple.rb
 - test/og/tc_join.rb
-- test/og/tc_resolve.rb
 - test/og/tc_inheritance.rb
 - test/og/CONFIG.rb
 - test/og/tc_scoped.rb
@@ -124,8 +122,10 @@ files:
 - test/og/tc_validation_loop.rb
 - test/og/tc_cacheable.rb
 - test/og/tc_multi_validations.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
@@ -133,6 +133,7 @@ files:
 - test/og/mixin/tc_optimistic_locking.rb
 - test/og/store/tc_filesys.rb
 - test/og/store/tc_kirby.rb
+- test/og/store/tc_sti.rb
 - test/glue/tc_revisable.rb
 test_files: []
 
@@ -154,5 +155,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.28.0
+        version: 0.29.0
     version: 

data/lib/og/store/alpha/kirby.rb

@@ -1,284 +0,0 @@
-begin
-  require 'lib/vendor/kirbybase'
-rescue Object => ex
-  Logger.error 'KirbyBase is not installed!'
-  Logger.error ex
-end
-
-require 'og/store/sql'
-
-module Og
-
-# A Store that persists objects into an KirbyBase database.
-# KirbyBase is a pure-ruby database implementation.
-# To read documentation about the methods, consult the 
-# documentation for SqlStore and Store.
-
-class KirbyStore < SqlStore
-
-  def self.db_dir(options)
-    "#{options[:name]}_db"
-  end
-  
-  def self.destroy(options)
-    begin
-      FileUtils.rm_rf(db_dir(options))  
-      super
-    rescue Object
-      Logger.info "Cannot drop '#{options[:name]}'!"
-    end
-  end
-
-  def initialize(options)
-    super
-    
-    if options[:embedded]
-      name = self.class.db_dir(options)
-      FileUtils.mkdir_p(name)
-      @conn = KirbyBase.new(:local, nil, nil, name)
-    else
-      # TODO
-    end
-  end
-
-  def close
-    super
-  end
-
-  def enchant(klass, manager)
-    klass.property :oid, Fixnum, :sql => 'integer PRIMARY KEY'
-    super
-  end
-
-  def query(sql)
-    Logger.debug sql if $DBG
-    return @conn.query(sql)
-  rescue => ex
-    handle_sql_exception(ex, sql)
-  end
-
-  def exec(sql)
-    Logger.debug sql if $DBG
-    @conn.query(sql).close
-  rescue => ex
-    handle_sql_exception(ex, sql)
-  end
-
-  def start
-    # nop
-  end
-
-  def commit
-    # nop
-  end
-
-  def rollback
-    # nop
-  end
-
-private
-
-  def create_table(klass)
-    fields = fields_for_class(klass)
-
-    table = @conn.create_table(klass::OGTABLE, *fields) { |obj| obj.encrypt = false }
-
-    # Create join tables if needed. Join tables are used in
-    # 'many_to_many' relations.
-
-     if klass.__meta and join_tables = klass.__meta[:join_tables] 
-      for join_table in join_tables
-        begin
-          @conn.create_table(join_table[:table],
-            join_table[:first_key], :Integer,
-            join_table[:second_key], :Integer)
-            # KirbyBase doesn't support indices.
-        rescue RuntimeError => error
-          # Unfortunately, KirbyBase just throws RuntimeErrors
-          # with no extra information, so we just have to look
-          # for the error message it uses.
-          if error.message =~ /table #{join_table[:table]} already exists/i          
-            Logger.debug 'Join table already exists' if $DBG
-          else
-            raise
-          end
-        end
-      end
-    end
-  end
-
-  def drop_table(klass)
-    @conn.drop_table(klass.table) if @conn.table_exists?(klass.table)
-  end
-
-  def fields_for_class(klass)
-    fields = []
-
-    klass.properties.each do |p|
-      klass.index(p.symbol) if p.meta[:index]
-
-      fields << p.symbol
-
-      type = p.klass.name.intern
-      type = :Integer if type == :Fixnum
-
-      fields << type
-    end
-
-    return fields
-  end
-
-  def create_field_map(klass)
-    map = {}
-    fields = @conn.get_table(klass.table).field_names
-
-    fields.size.times do |i|
-      map[fields[i]] = i
-    end
-
-    return map
-  end
-
-  # Return an sql string evaluator for the property.
-  # No need to optimize this, used only to precalculate code.
-  # YAML is used to store general Ruby objects to be more 
-  # portable.
-  #--
-  # FIXME: add extra handling for float.
-  #++
-  
-  def write_prop(p)
-    if p.klass.ancestors.include?(Integer)
-      return "@#{p.symbol} || nil"
-    elsif p.klass.ancestors.include?(Float)
-      return "@#{p.symbol} || nil"    
-    elsif p.klass.ancestors.include?(String)
-      return %|@#{p.symbol} ? "'#\{#{self.class}.escape(@#{p.symbol})\}'" : nil|
-    elsif p.klass.ancestors.include?(Time)
-      return %|@#{p.symbol} ? "'#\{#{self.class}.timestamp(@#{p.symbol})\}'" : nil|
-    elsif p.klass.ancestors.include?(Date)
-      return %|@#{p.symbol} ? "'#\{#{self.class}.date(@#{p.symbol})\}'" : nil|
-    elsif p.klass.ancestors.include?(TrueClass)
-      return "@#{p.symbol} ? \"'t'\" : nil"
-    else
-      # gmosx: keep the '' for nil symbols.
-      return %|@#{p.symbol} ? "'#\{#{self.class}.escape(@#{p.symbol}.to_yaml)\}'" : "''"|
-    end
-  end
-
-  # Return an evaluator for reading the property.
-  # No need to optimize this, used only to precalculate code.
-
-  def read_prop(p, col)
-    if p.klass.ancestors.include?(Integer)
-      return "#{self.class}.parse_int(res[#{col} + offset])"
-    elsif p.klass.ancestors.include?(Float)
-      return "#{self.class}.parse_float(res[#{col} + offset])"
-    elsif p.klass.ancestors.include?(String)
-      return "res[#{col} + offset]"
-    elsif p.klass.ancestors.include?(Time)
-      return "#{self.class}.parse_timestamp(res[#{col} + offset])"
-    elsif p.klass.ancestors.include?(Date)
-      return "#{self.class}.parse_date(res[#{col} + offset])"
-    elsif p.klass.ancestors.include?(TrueClass)
-      return "('0' != res[#{col} + offset])"
-    else
-      return "YAML::load(res[#{col} + offset])"
-    end
-  end
-
-  # :section: Lifecycle method compilers.
-
-  # Compile the og_update method for the class.
-
-  def eval_og_insert(klass)
-    pk = klass.pk_symbol
-    props = klass.properties
-
-    data = props.collect {|p| ":#{p.symbol} => #{write_prop(p)}"}.join(', ')
-#    data.gsub!(/#|\{|\}/, '')
-
-    klass.module_eval %{ 
-      def og_insert(store)
-        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
-        store.conn.get_table('#{klass.table}').insert(#{data})
-        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
-      end
-    }
-  end
-
-  # Compile the og_update method for the class.
-
-  def eval_og_update(klass)
-    pk = klass.pk_symbol
-    props = klass.properties.reject { |p| pk == p.symbol }
-
-    updates = props.collect { |p|
-      "#{p.symbol}=#{write_prop(p)}"
-    }
-
-    sql = "UPDATE #{klass::OGTABLE} SET #{updates.join(', ')} WHERE #{pk}=#\{@#{pk}\}"
-
-    klass.module_eval %{
-      def og_update(store)
-        #{Glue::Aspects.gen_advice_code(:og_update, klass.advices, :pre) if klass.respond_to?(:advices)}
-        store.exec "#{sql}"
-        #{Glue::Aspects.gen_advice_code(:og_update, klass.advices, :post) if klass.respond_to?(:advices)}
-      end
-    }
-  end
-
-  # Compile the og_read method for the class. This method is 
-  # used to read (deserialize) the  given class from the store. 
-  # In order to allow for changing field/attribute orders a 
-  # field mapping hash is used.
-
-  def eval_og_read(klass)
-    code = []
-    props = klass.properties 
-    field_map = create_field_map(klass)
-
-    props.each do |p|
-      if col = field_map[p.symbol]
-        code << "@#{p.symbol} = #{read_prop(p, col)}"
-      end
-    end
-
-    code = code.join('; ')
-
-    klass.module_eval %{
-       def og_read(res, row = 0, offset = 0)
-        #{Glue::Aspects.gen_advice_code(:og_read, klass.advices, :pre) if klass.respond_to?(:advices)}
-        #{code}
-        #{Glue::Aspects.gen_advice_code(:og_read, klass.advices, :post) if klass.respond_to?(:advices)}
-      end
-    }
-  end
-
-  #--
-  # FIXME: is pk needed as parameter?
-  #++
-
-  def eval_og_delete(klass)
-    klass.module_eval %{
-       def og_delete(store, pk, cascade = true)
-        #{Glue::Aspects.gen_advice_code(:og_delete, klass.advices, :pre) if klass.respond_to?(:advices)}
-        pk ||= @#{klass.pk_symbol}
-        transaction do |tx|
-          tx.exec "DELETE FROM #{klass.table} WHERE #{klass.pk_symbol}=\#{pk}"
-          if cascade and #{klass}.__meta[:descendants]
-            #{klass}.__meta[:descendants].each do |dclass, foreign_key|
-              tx.exec "DELETE FROM \#{dclass::OGTABLE} WHERE \#{foreign_key}=\#{pk}"
-            end
-          end
-        end
-        #{Glue::Aspects.gen_advice_code(:og_delete, klass.advices, :post) if klass.respond_to?(:advices)}
-      end
-    }
-  end
-
-end
-
-end
-
-# * George Moschovitis <gm@navel.gr>