og 0.25.0 → 0.26.0

data/lib/og/store/sql.rb

@@ -76,6 +76,15 @@ module SqlUtils
     return Date.strptime(str)
   end
 
+  # Parse a boolean
+  # true, 1, t  => true
+  # other       => false
+
+  def parse_boolean(str)
+    return true if (str=='true' || str=='t' || str=='1')
+    return false
+  end
+
   #--
   # TODO: implement me!!
   #++
@@ -167,7 +176,10 @@ module SqlUtils
   def join_table_info(owner_class, target_class, postfix = nil)
 
     # some fixes for schema inheritance.
-
+    
+    raise "Undefined owner_class in #{target_class}" unless owner_class
+    raise "Undefined target_class in #{owner_class}" unless target_class
+    
     owner_class = owner_class.schema_inheritance_root_class if owner_class.schema_inheritance_child?
     target_class = target_class.schema_inheritance_root_class if target_class.schema_inheritance_child?
 
@@ -333,7 +345,8 @@ class SqlStore < Store
   # Loads an object from the store using the primary key.
 
   def load(pk, klass)
-    sql = "SELECT * FROM #{klass::OGTABLE} WHERE #{klass.pk_symbol}=#{pk}"
+    pk_field = klass.primary_key.field || klass.primary_key.symbol
+    sql = "SELECT * FROM #{klass::OGTABLE} WHERE #{pk_field}=#{pk}"
     sql << " AND ogtype='#{klass}'" if klass.schema_inheritance_child?
     res = query sql
     read_one(res, klass)
@@ -430,7 +443,7 @@ class SqlStore < Store
   # results.
 
   def select(sql, klass)
-    sql = "SELECT * FROM #{klass.table} " + sql unless sql =~ /SELECT/
+    sql = "SELECT * FROM #{klass.table} " + sql unless sql =~ /SELECT/i
     read_all(query(sql), klass)
   end
   alias_method :find_by_sql, :select
@@ -438,7 +451,7 @@ class SqlStore < Store
   # Specialized one result version of select.
 
   def select_one(sql, klass)
-    sql = "SELECT * FROM #{klass.table} " + sql unless sql =~ /SELECT/
+    sql = "SELECT * FROM #{klass.table} " + sql unless sql =~ /SELECT/i
     read_one(query(sql), klass)
   end
   alias_method :find_by_sql_one, :select_one
@@ -545,6 +558,7 @@ private
     exec "DROP TABLE #{klass.table}"
   end
   alias_method :destroy, :drop_table
+  alias_method :drop_schema, :drop_schema
 
   # Evolve (recreate) the sql table where objects of this class 
   # are persisted.
@@ -654,7 +668,7 @@ private
     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])"
+      return "#{self.class}.parse_boolean(res[#{col} + offset])"
     elsif p.klass.ancestors.include?(Og::Blob)
       return "#{self.class}.parse_blob(res[#{col} + offset])"
     else 
@@ -691,13 +705,15 @@ private
 
   def eval_og_update(klass)
     pk = klass.pk_symbol
+    pk_field = klass.primary_key.field || klass.primary_key.symbol
+
     props = klass.properties.values.reject { |p| pk == p.symbol }
-    
+
     updates = props.collect { |p|
       "#{field_for_property(p)}=#{write_prop(p)}"
     }
 
-    sql = "UPDATE #{klass::OGTABLE} SET #{updates.join(', ')} WHERE #{pk}=#\{@#{pk}\}"
+    sql = "UPDATE #{klass::OGTABLE} SET #{updates.join(', ')} WHERE #{pk_field}=#\{@#{pk}\}"
 
     klass.module_eval %{
       def og_update(store, options = nil)
@@ -770,9 +786,9 @@ private
       def og_create_schema(store)
         if Og.create_schema
           #{Glue::Aspects.gen_advice_code(:og_create_schema, klass.advices, :pre) if klass.respond_to?(:advices)}
-          unless self.class.superclass.ancestors.include? SchemaInheritanceBase
+#          unless self.class.superclass.ancestors.include? SchemaInheritanceBase
             store.send(:create_table, #{klass})
-          end
+#          end
           #{Glue::Aspects.gen_advice_code(:og_create_schema, klass.advices, :post) if klass.respond_to?(:advices)}
         end
       end
@@ -825,7 +841,7 @@ private
     end
   
     if sql = options[:sql]
-      sql = "SELECT * FROM #{klass.table} " + sql unless sql =~ /SELECT/
+      sql = "SELECT * FROM #{klass.table} " + sql unless sql =~ /SELECT/i
       return sql
     end
 
@@ -1021,4 +1037,4 @@ end
 # * Ghislain Mary
 # * Ysabel <deb@ysabel.org>
 # * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>
-# * Rob Pitt <rob@motionpath.com>
+# * Rob Pitt <rob@motionpath.com>

data/lib/og/store/sqlite.rb

@@ -80,7 +80,7 @@ class SqliteStore < SqlStore
   def query(sql)
     Logger.debug sql if $DBG
     return @conn.query(sql)
-  rescue => ex
+  rescue Exception => ex
     handle_sql_exception(ex, sql)
   end
 
@@ -162,8 +162,8 @@ private
       for info in join_tables
         begin
           create_join_table_sql(info).each do |sql|
-            @conn.query(sql).close
-          end
+          @conn.query(sql).close
+        end
           Logger.debug "Created jointable '#{info[:table]}'."                    
         rescue Object => ex
           # gmosx: any idea how to better test this?

data/lib/og/validation.rb

@@ -20,7 +20,7 @@ module Validation
     # Ensures that if a record is found with a matching value,
     # that it is the same record, allowing updates.
     #
-    # The Og libraries are required for this methdod to 
+    # The Og libraries are required for this method to 
     # work. You can override this method if you want to
     # use another OR mapping library.
     #
@@ -31,57 +31,75 @@ module Validation
     # TODO: :unique should implicitly generate 
     # validate_unique.
     #++
-    
-    def validate_unique(*params)
-      c = {
-        :on => :save
-      }
-      c.update(params.pop) if params.last.is_a?(Hash)
 
-      for name in params do
-        c[:msg] ||= "#{self.name} with this #{name} already exists"
+    def validate_unique(*params)
+      c = parse_config(params, :on => :save)
 
-        code = %{
-          others = obj.class.send(:find_by_#{name}, obj.send(:#{name}))
+      params.each do |field|
+        c[:msg] ||= "#{self.name} with this #{field} already exists"
   
-          unless others.empty?
-            if (others.size != 1) or (others[0].oid != obj.oid)
-              errors.add(:#{name}, '#{c[:msg]}')
-            end
+        define_validation(:unique, field, c[:on]) do |obj|
+          # What to do if value is nil?  Right now it is an empty string,
+          # which can need to be unique.
+          value = obj.send(field) || ''
+          others = [*obj.class.send("find_by_#{field}".to_sym, value)]
+  
+          unless others[0].nil?
+            obj.errors.add(field, c[:msg]) if others.size > 1 or others[0].oid != obj.oid
           end
-        }
-
-        validations! << [code, c[:on]]
+        end
       end
     end
 
-    # Validate the related object or objects. Works
-    # with all relations.
+    # Validate that a property relation is not nil.
+    # This works for all relations.
+    #
+    # You should not put a validation in both related
+    # classes, because it can cause infinite looping.
+    #
+    # The Og libraries are required for this method to
+    # work. You can override this method if you want to
+    # use another OR mapping library.
+    #
+    # === Example
+    #
+    # class Uncle
+    #   has_many :secrets, Secret
+    #   validate_related :secrets
+    # end
+    #
+    # class Secret
+    #   belongs_to :uncle, Uncle
+    # end
     
     def validate_related(*params)
-      c = { 
+      c = parse_config(params,
         :msg => Glue::Validation::Errors.invalid_relation, 
         :on => :save 
-      }
-      c.update(params.pop) if params.last.is_a?(Hash)
-      
-      for name in params
-        code = %{
-          unless (obj.#{name}.is_a?(Array) ? obj.#{name} : [obj.#{name}]).inject(true) { |memo, obj| (obj.nil? or obj.valid?) and memo }
-            errors.add(:#{name}, '#{c[:msg]}')
-          end;
-        }
+      )
 
-        validations! << [code, c[:on]]
+      params.each do |field|
+        define_validation(:related, field, c[:on]) do |obj|
+          value = obj.send(field)
+          if value.members.length == 0
+            obj.errors.add(field, c[:msg])
+          else
+            valid = value.members.inject do |memo, rel_obj| 
+              (rel_obj.nil? or rel_obj.valid?) and memo
+            end
+            obj.errors.add(field, c[:msg]) unless valid
+          end
+        end
       end
     end
+
     alias_method :validate_associated, :validate_related
 
-  end
-  
-end 
+  end 
+
+end
 
 end
 
 # * George Moschovitis <gm@navel.gr>
-# * Bryan Soto
+# * Bryan Soto

data/test/glue/tc_revisable.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
+
+require 'test/unit'
+
+require 'og'
+require 'glue/revisable'
+
+class Article
+  is Revisable
+  property :body, String, :revisable => true
+  property :title, String
+  
+  def initialize(t, b)
+    @title, @body = t, b
+  end
+end
+
+$og = Og.setup($og_config)
+
+class TestOgRevisable < Test::Unit::TestCase # :nodoc: all
+
+  def test_all
+    a = Article.create('hello', 'world')
+    a.revise do |a|
+      a.body = 'wow!'
+    end
+    a.revise do |a|
+      a.body = 'nice'
+    end
+    a.revise do |a|
+      a.body = 'it'
+    end
+    
+    assert_equal 3, a.revisions.count
+    
+    rev = a.get_revision(2)
+    assert_equal 'wow!', rev.body
+    
+    a.rollback(2)
+    assert_equal 'wow!', a.body
+    
+    a.rollback(1)
+    assert_equal 'world', a.body
+    
+    a.rollback(3)
+    assert_equal 'nice', a.body
+
+    assert_equal 6, a.revisions.count
+    
+    a.revise do |a|
+      a.title = 'kicks'
+      a.body = 'ass'
+    end
+
+    assert_equal 7, a.revisions.count
+    
+    # The automatically generated class.
+    
+    assert_equal 7, Article::Revision.count
+  end
+
+end

data/test/og/CONFIG.rb

@@ -7,7 +7,7 @@
 
 # CHANGE THIS TO SETUP MOST TESTS
 
-configA = :sqlite
+configA = :mysql
 
 # FOR MULTI-TESTS
 
@@ -38,7 +38,7 @@ $og_mysql = {
   :user => 'root',
   :name => 'test',
 # :password => 'navelrulez',
-  :socket => '/var/run/mysqld/mysqld.sock'
+# :socket => '/var/run/mysqld/mysqld.sock'
 }
 
 $og_psql = {

data/test/og/store/tc_kirby.rb

@@ -0,0 +1,31 @@
+require 'test/unit'
+require 'og'
+
+$DBG = true
+
+class Track
+  prop_accessor :name, String
+  belongs_to Disc
+end
+
+class Disc
+  prop_accessor :name, String
+  has_many Track
+end
+
+Og.setup( :destroy => true, :store => :kirby )
+
+
+class TC_Kirby < Test::Unit::TestCase # :nodoc: all
+
+  def test_all
+    d = Disc.create
+    t = Track.create
+    d.tracks << t
+    
+    assert_equal 1, d.tracks.size
+  end
+
+end
+
+# * Guillaume Pierronnet <guillaume.pierronnet@gmail.com>

data/test/og/tc_finder.rb

@@ -11,6 +11,7 @@ class TC_OgFinder < Test::Unit::TestCase # :nodoc: all
   class User
     property :name, String
     property :age, Fixnum
+    property :father, String
   end
 
   def setup
@@ -28,6 +29,25 @@ class TC_OgFinder < Test::Unit::TestCase # :nodoc: all
     User.find_or_create_by_name_and_age('tml', 3)
     
     assert_equal 2, User.all.size
+
+    # Basic check that tml is just right.
+    
+    u = User.find_by_name('tml')
+    assert_equal('tml', u.name)
+    assert_equal(3,     u.age)
+    assert_equal(nil,   u.father)
+
+    # Block form initialization works.
+    
+    u2 = User.find_or_create_by_name_and_age('tommy', 9) {|x| x.father = 'jack' }
+    assert_equal('tommy', u2.name)
+    assert_equal(9,       u2.age)
+    assert_equal('jack',  u2.father)
+
+    # Doesn't create another object same object.
+    
+    u3 = User.find_or_create_by_name_and_age('tommy', 9) {|x| x.father = 'jack' }
+    assert_equal(1, User.find_all_by_name('tommy').size)
   end
   
 end

data/test/og/tc_validation.rb

@@ -0,0 +1,53 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+$DBG = true
+
+require 'test/unit'
+
+require 'og'
+
+class TC_ValidateUnique < Test::Unit::TestCase # :nodoc: all
+  include Og
+
+  class Framework
+    property :app_name, String
+    property :creator, String
+    
+    validate_unique :app_name
+  end
+
+  Og.setup($og_config)
+
+  def setup
+    @framework = Framework.new
+    @app_name = 'Nitro'
+    @framework.app_name = @app_name
+    @framework.creator = 'gmosx'
+    @framework.save
+  end
+
+  def teardown
+    Framework.all.each { |entry| entry.delete }
+  end
+
+  def test_modify_already_created
+    # if setup completes, then unique entries are already allowed.
+    framework = Framework.find_all_by_app_name(@app_name)
+    assert_equal(1, framework.size)
+    assert_equal(@app_name, framework[0].app_name)
+    framework[0].creator = "George Moschovitis"
+    assert(framework[0].valid?)
+    assert_equal(0, framework[0].errors.size)
+  end
+
+  def test_duplicate
+    @dup = Framework.new
+    @dup.app_name = @framework.app_name
+    assert_equal(false, @dup.valid?)
+    assert(@dup.errors.size > 0)
+    assert_equal(1, @dup.errors.on(:app_name).size)
+    assert_match(/.*?app_name.*?exists.*?/i, @dup.errors.on(:app_name).first)
+    assert(@dup.errors.errors.has_key?(:app_name))
+  end
+end
+