og 0.28.0 → 0.29.0

data/lib/og/relation/joins_many.rb

@@ -97,7 +97,7 @@ class JoinsMany < Relation
       end      
 
       #--
-      # TODO: optimize this!!
+      # FIXME/TODO: optimize this!! use count.
       #++
             
       def count_#{target_plural_name}

data/lib/og/store/mysql.rb

@@ -67,24 +67,6 @@ module MysqlUtils
     return nil unless str
     return Mysql.quote(str)
   end
-
-  def quote(val)
-    case val
-      when Fixnum, Integer, Float
-        val ? val.to_s : 'NULL'
-      when String
-        val ? "'#{escape(val)}'" : 'NULL'
-      when Time
-        val ? "'#{timestamp(val)}'" : 'NULL'
-      when Date
-        val ? "'#{date(val)}'" : 'NULL'
-      when TrueClass
-        val ? "'1'" : 'NULL'
-      else
-        # gmosx: keep the '' for nil symbols.
-        val ? escape(val.to_yaml) : ''
-    end
-  end
 end
 
 # A Store that persists objects into a MySQL database.
@@ -110,6 +92,7 @@ class MysqlStore < SqlStore
     # gmosx: system is used to avoid shell expansion.
     system 'mysqladmin', '-f', "--user=#{options[:user]}", 
         "--password=#{options[:password]}", 
+        "--host=#{options[:address]}",
         'create', options[:name]    
     super
   end
@@ -117,6 +100,7 @@ class MysqlStore < SqlStore
   def self.destroy(options)
     system 'mysqladmin', '-f', "--user=#{options[:user]}", 
         "--password=#{options[:password]}", 'drop', 
+        "--host=#{options[:address]}",
         options[:name]
     super
   end

data/lib/og/store/psql.rb

@@ -516,6 +516,7 @@ class PsqlStore < SqlStore
       deleted += 1
     end
 
+    nullified_relations = 0
     sql_hash[:create].each do |sql|    
       con_retry = true
       begin
@@ -572,7 +573,7 @@ class PsqlStore < SqlStore
       text << "#{deleted} constraints were deleted, " if deleted != 0
       if broken_relations != 0
         text.gsub!(/,([^,]+)$/,' and \1')
-        text << "#{broken_relations} relations were broken, causing "
+        text << "#{broken_relations} relations were broken causing "
         if nullified_relations != 0
           text << "#{nullified_relations} relations to have non-existant foreign keys set to null"
           text << (deleted_relations == 0 ? ", " : " and ")

data/lib/og/store/sql.rb

@@ -97,23 +97,40 @@ module SqlUtils
 
   # Escape the various Ruby types.
 
-  def quote(val)
+  def quote(vals)
+    vals = [vals] unless vals.is_a?(Array)
+    quoted = vals.inject("") do |s,val|
+      s += case val
+        when Fixnum, Integer, Float
+          val ? val.to_s : 'NULL'
+        when String
+          val ? "'#{escape(val)}'" : 'NULL'
+        when Time
+          val ? "'#{timestamp(val)}'" : 'NULL'
+        when Date
+          val ? "'#{date(val)}'" : 'NULL'
+        when TrueClass
+          val ? "'t'" : 'NULL'
+        else
+          # gmosx: keep the '' for nil symbols.
+          val ? escape(val.to_yaml) : ''
+      end + ','
+    end
+    quoted.chop!
+    vals.size > 1 ? "(#{quoted})" : quoted
+  end
+
+  # Escape the Array Ruby type.
+
+  def quote_array(val)
     case val
-      when Fixnum, Integer, Float
-        val ? val.to_s : 'NULL'
-      when String
-        val ? "'#{escape(val)}'" : 'NULL'
-      when Time
-        val ? "'#{timestamp(val)}'" : 'NULL'
-      when Date
-        val ? "'#{date(val)}'" : 'NULL'
-      when TrueClass
-        val ? "'t'" : 'NULL'
+      when Array
+        val.collect{ |v| quotea(v) }.join(',')
       else
-        # gmosx: keep the '' for nil symbols.
-        val ? escape(val.to_yaml) : ''
+        quote(val)
     end
   end
+  alias_method :quotea, :quote_array
 
   # Apply table name conventions to a class name.
 
@@ -354,7 +371,7 @@ class SqlStore < Store
 
   def load(pk, klass)
     pk_field = klass.primary_key.field || klass.primary_key.symbol
-    sql = "SELECT * FROM #{klass::OGTABLE} WHERE #{pk_field}=#{pk}"
+    sql = "SELECT * FROM #{klass::OGTABLE} WHERE #{pk_field}=#{pk.to_i}"
     sql << " AND ogtype='#{klass}'" if klass.schema_inheritance_child?
     res = query sql
     read_one(res, klass)
@@ -365,7 +382,7 @@ class SqlStore < Store
 
   def reload(obj, pk)
     raise 'Cannot reload unmanaged object' unless obj.saved?
-    sql = "SELECT * FROM #{obj.class.table} WHERE #{obj.class.pk_symbol}=#{pk}"
+    sql = "SELECT * FROM #{obj.class.table} WHERE #{obj.class.pk_symbol}=#{pk.to_i}"
     sql << " AND ogtype='#{obj.class}'" if obj.class.schema_inheritance_child?
     res = query sql
     obj.og_read(res.next, 0)
@@ -441,8 +458,8 @@ class SqlStore < Store
 
   def find_one(options)
     klass = options[:class]
-# gmosx, THINK: should not set this by default.
-#    options[:limit] ||= 1        
+    # gmosx, THINK: should not set this by default.
+    # options[:limit] ||= 1        
     sql = resolve_options(klass, options)
     read_one(query(sql), klass, options)
   end
@@ -464,14 +481,21 @@ class SqlStore < Store
   end
   alias_method :find_by_sql_one, :select_one
 
-  # Perform an aggregation over query results.
+  # Perform an aggregation or calculation over query results.
+  # This low level method is used by the Entity 
+  # calculation / aggregation methods.
+  # 
+  # === Example
+  #
+  # calculate 'COUNT(*)'
+  # calculate 'MIN(age)'
+  # calculate 'SUM(age)', :group => :name
 
-  def aggregate(options)
+  def aggregate(term = 'COUNT(*)', options = {})
     if options.is_a?(String)
       sql = options
     else
-      aggregate = options[:aggregate] || 'COUNT(*)'
-      sql = "SELECT #{aggregate} FROM #{options[:class].table}"
+      sql = "SELECT #{term} FROM #{options[:class].table}"
       if condition = options[:condition]
         sql << " WHERE #{condition}"
         sql << " AND " if options[:class].schema_inheritance_child?
@@ -479,11 +503,38 @@ class SqlStore < Store
         sql << " WHERE " if options[:class].schema_inheritance_child?
       end
       sql << "ogtype='#{options[:class]}'" if options[:class].schema_inheritance_child?
+      if group = options[:group]
+        sql << " GROUP BY #{group}"
+      end
+      if extra = options[:extra_sql]
+        sql << " {extra}"
+      end        
+    end
+   
+    if group
+      # This is an aggregation, so return the calculated values
+      # as an array.
+      values = []
+      res = query(sql)
+      res.each_row do |row, idx|
+        values << row[0].to_f 
+      end
+      return values
+    else
+      #--
+      # gmosx, TODO: don't convert to float by default, perhaps
+      # should consult an option.
+      #++ 
+      return query(sql).first_value.to_f
     end
+  end
+  alias_method :calculate, :aggregate
 
-    query(sql).first_value.to_i
+  # Perform a count query.
+  
+  def count(options = {})
+    calculate('COUNT(*)', options).to_i
   end
-  alias_method :count, :aggregate
 
   # Relate two objects through an intermediate join table.
   # Typically used in joins_many and many_to_many relations.
@@ -605,7 +656,7 @@ private
       # holds the class name.
       fields << "ogtype VARCHAR(30)"
   
-      for desc in klass.descendents
+      for desc in klass.schema_inheritance_root_class.descendents
         properties.update(desc.properties)
       end
     end
@@ -925,7 +976,9 @@ private
       if condition.is_a?(Array)
         args = condition.dup
         str = args.shift
-        args.each { |arg| str.sub!(/\?/, quote(arg)) }
+        # ? handles a single type.
+        # ?* handles an array.
+        args.each { |arg| str.sub!(/\?\*/, quotea(arg)); str.sub!(/\?/, quote(arg)) }
         condition = str
       end
 
@@ -968,7 +1021,7 @@ private
 
   # Dynamicaly deserializes a result set row into an object.
   # Used for specialized queries or join queries. Please
-  # not that this deserialization method is slower than the
+  # note that this deserialization method is slower than the
   # precompiled og_read method.
 
   def read_row(obj, res, res_row, row)

data/lib/og/test/assertions.rb

@@ -141,7 +141,7 @@ module Test::Unit::Assertions
     assert_block(msg) { cookie.value == value }
   end
 
-  # :section: Template related assertions.
+  # :section: Glue::Template related assertions.
   
   # :section: Redirection assertions.
 

data/lib/og/test/testcase.rb

@@ -20,9 +20,9 @@ class TestCase
   def fixture(*classes)
   
     for klass in classes
-      f = Fixture.new(klass)
+      f = Glue::Fixture.new(klass)
       instance_variable_set "@#{klass.to_s.demodulize.underscore.pluralize}", f
-      Fixtures[klass] = f
+      Glue::Fixtures[klass] = f
       
       # create variables for the fixture objects.
       
@@ -40,7 +40,7 @@ class TestCase
     fixture(*classes)
 
     for klass in classes
-      f = Fixtures[klass]
+      f = Glue::Fixtures[klass]
 
       for obj in f.objects
         obj.save

data/test/glue/tc_revisable.rb

@@ -8,7 +8,7 @@ require 'glue/revisable'
 class TestOgRevisable < Test::Unit::TestCase # :nodoc: all
 
   class Article
-    is Revisable
+    is Glue::Revisable
     property :body, String, :revisable => true
     property :title, String
     

data/test/og/mixin/tc_hierarchical.rb

@@ -61,6 +61,7 @@ class TC_OgHierarchical < Test::Unit::TestCase # :nodoc: all
 
     c1.reload
     
+=begin
     Comment.all(:order => "lft, rgt").each { |c|
       puts sprintf("%3d %3d %s", c.lft, c.rgt, c.body)
       # p c  
@@ -71,6 +72,7 @@ class TC_OgHierarchical < Test::Unit::TestCase # :nodoc: all
     c1.full_comments(:order => "lft, rgt").each { |c| puts c.body }
     puts '--3'
     c1.direct_comments(:order => "lft, rgt").each { |c| puts c.body }
+=end
 
     assert_equal 6, c1.full_comments.size
     assert_equal 5, c1.comments.size

data/test/og/mixin/tc_orderable.rb

@@ -34,7 +34,7 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
     property :body, String
     belongs_to :article, Article
     
-    is Orderable, :scope => :article
+    is Glue::Orderable, :scope => :article
 
     def initialize(body = nil)
       @body = body
@@ -48,7 +48,7 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
 
   class Track
     prop :name, String
-    is Orderable, :scope => :playlist
+    is Glue::Orderable, :scope => :playlist
 
     belongs_to Playlist
 
@@ -62,7 +62,6 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
 
   def test_all
     a = Article.create('article')
-    a.save
 
     c1 = Comment.create('1')
     a.comments << c1

data/test/og/mixin/tc_taggable.rb

@@ -1,3 +1,5 @@
+$DBG = true
+
 require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
 require 'rubygems'
@@ -8,16 +10,6 @@ require 'ostruct'
 require 'og'
 require 'glue/taggable'
 
-=begin
-$og = Og.setup(
-  :store => 'mysql',
-  :name => 'test',
-  :user => 'root',
-  :password => 'navelrulez',
-  :destroy => true
-)
-=end
-
 class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
 
   class Article
@@ -43,7 +35,9 @@ class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
     a3 = Article.create('George')
     a3.tag('phd name')
     a3.save
-    
+
+
+    assert_equal 6, Tag.count
     assert_equal 3, a1.tags.size 
     assert a1.tag_names.include?('navel')
     
@@ -63,6 +57,9 @@ class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
 
     res = Article.find_with_any_tag('navel', 'gmosx', 'phd')
     assert_equal 3, res.size
+
+    a1.delete_all_tags
+    assert_equal 0, a1.tags.size
     
 =begin
     TODO:

data/test/og/mixin/tc_timestamped.rb

@@ -21,7 +21,7 @@ $og = Og.setup(
 class TestCaseOgTimestamped < Test::Unit::TestCase # :nodoc: all
 
   class Article 
-    is Timestamped
+    is Glue::Timestamped
     property :body, String
 
     def initialize(body = nil)

data/test/og/store/tc_sti.rb

@@ -0,0 +1,53 @@
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+
+require 'test/unit'
+
+require 'og'
+require 'og/store/sql'
+
+class TC_Sti < Test::Unit::TestCase
+  class StiParent
+    property :one
+    property :two
+
+    schema_inheritance
+  end
+
+  class StiChild < StiParent
+    property :three
+  end
+
+  def setup
+    @store = Og::SqlStore.new(nil)
+  end
+
+  def teardown
+    @store = nil
+  end
+
+  def test_fields_for_class_child
+    fields = @store.__send__(:fields_for_class, StiChild)
+    field_names = fields.map {|f| name, * = f.split(/\s/); name}
+
+    msg = "Sti Child not inheiriting parent fields"
+
+    assert_equal(5, field_names.size, msg)
+    assert(field_names.member?(:one.to_s), msg)
+    assert(field_names.member?(:two.to_s), msg)
+    assert(field_names.member?(:three.to_s), msg)
+    assert(field_names.member?(:ogtype.to_s), msg)
+  end
+
+  def test_fields_for_class_parent
+    fields = @store.__send__(:fields_for_class, StiParent)
+    field_names = fields.map {|f| name, * = f.split(/\s/); name}
+
+    msg = "Sti Parent not collecting child fields"
+
+    assert_equal(5, field_names.size, msg)
+    assert(field_names.member?(:one.to_s), msg)
+    assert(field_names.member?(:two.to_s), msg)
+    assert(field_names.member?(:three.to_s), msg)
+    assert(field_names.member?(:ogtype.to_s), msg)
+  end
+end

data/test/og/tc_aggregations_calculations.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+require 'rubygems'
+require 'facets'
+
+require 'test/unit'
+require 'og'
+
+class TC_OgAggrCalc < Test::Unit::TestCase # :nodoc: all
+  include Og
+
+  class User
+    property :section, String
+    property :age, Fixnum
+
+    def initialize(section, age)
+      @section = section
+      @age = age
+    end    
+  end
+
+  $og1.manage_classes(User)
+
+  def test_all
+    User.create('a', 12)
+    User.create('a', 16)
+    User.create('d', 34)
+    User.create('d', 33)
+    User.create('c', 27)
+    User.create('c', 31)
+    
+    assert_equal 6, User.count
+    assert_equal 12, User.minimum(:age)
+    assert_equal 34, User.maximum(:age)
+    assert_equal 34, User.max(:age)
+    assert_equal 25.5, User.avg(:age)
+    assert_equal 153, User.sum(:age)
+    
+    sums = User.sum(:age, :group => :section)
+    assert_equal 3, sums.size
+    assert_equal 28, sums[0]
+  end
+  
+end