og 0.31.0 → 0.40.0

data/lib/og/validation.rb

@@ -2,15 +2,15 @@ require 'glue/validation'
 
 module Glue 
 
-# Extend the Validation methods defined in glue/validation.rb with 
-# extra db related options.
+# Extend the Validation methods defined in glue/validation.rb 
+# with extra db related options.
 
 module Validation
 
   # Encapsulates a list of validation errors.
   
   class Errors
-    setting :invalid_relation, :default => 'Invalid relations'
+    setting :invalid_relation, :default => "Undefined"
     setting :not_unique, :default => 'The value is already used'
   end
 
@@ -32,7 +32,7 @@ module Validation
     # validate_unique.
     #++
 
-    def validate_unique(*params)
+    def validate_unique *params
       c = parse_config(params, :on => :save)
 
       params.each do |field|
@@ -72,7 +72,7 @@ module Validation
     #   belongs_to :uncle, Uncle
     # end
     
-    def validate_related(*params)
+    def validate_related *params
       c = parse_config(params,
         :msg => Glue::Validation::Errors.invalid_relation, 
         :on => :save 
@@ -93,13 +93,10 @@ module Validation
       end
     end
 
-    alias_method :validate_associated, :validate_related
+    alias validate_associated validate_related
 
   end 
 
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * Bryan Soto

data/test/{og/mixin → glue}/tc_hierarchical.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
 
 require 'rubygems'
 require 'facets'
@@ -8,21 +8,11 @@ require 'ostruct'
 require 'og'
 require 'glue/hierarchical'
 
-=begin
-$og = Og.setup(
-  :store => 'mysql',
-  :name => 'test',
-  :user => 'root',
-  :password => 'navelrulez',
-  :destroy => true
-)
-=end
-
 class TC_OgHierarchical < Test::Unit::TestCase # :nodoc: all
 
   class Comment 
-    property :body, String
-    property :create_time, Time
+    attr_accessor :body, String
+    attr_accessor :create_time, Time
     
     include Glue::NestedSets
 

data/test/glue/tc_og_paginate.rb

@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
+
+require 'test/unit'
+
+require 'nitro/helper/pager'
+
+class TC_OgPaginate < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+  include Nitro::PagerHelper
+  
+  class RequestMock < Hash
+    attr_accessor :query
+    
+    def initialize
+      @query = {}
+    end
+    
+    def get(k, default)
+      return self[k] || default
+    end
+  end
+  
+  def request
+    RequestMock.new
+  end
+  
+  class Person
+    attr_accessor :name, String
+    
+    def initialize(name)
+      @name = "Name #{name}"
+    end
+  end
+  
+  $og1.manage_classes(Person)
+  
+  def test_all
+    (1..5).each do |i|
+      Person.create(i)
+    end
+
+    items, pager = paginate(Person, :per_page => 2)
+    assert_equal 5, pager.total_count
+    assert_equal 2, items.size
+  end
+  
+end

data/test/{og/mixin → glue}/tc_optimistic_locking.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
 
 require 'rubygems'
 require 'facets'
@@ -7,21 +7,11 @@ require 'test/unit'
 require 'og'
 require 'glue/optimistic_locking'
 
-=begin
-$og = Og.setup(
-  :store => 'psql',
-  :name => 'test',
-  :user => 'postgres',
-  :password => 'navelrulez',
-  :destroy => true
-)
-=end
-
 class TC_OgLocking < Test::Unit::TestCase # :nodoc: all
   include Og
   
   class Article
-    property :body, String
+    attr_accessor :body, String
     include Glue::Locking
     
     def initialize(body)

data/test/{og/mixin → glue}/tc_orderable.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
 
 require 'rubygems'
 require 'facets'
@@ -8,21 +8,11 @@ require 'ostruct'
 require 'og'
 require 'glue/orderable'
 
-=begin
-$og = Og.setup(
-  :store => 'psql',
-#  :store => :memory,
-  :name => 'test',
-  :user => 'postgres',
-  :password => 'navelrulez',
-  :destroy => true
-)
-=end
-
 class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
-
+  include Glue
+  
   class Article
-    property :title, :body, String
+    attr_accessor :title, :body, String
     has_many :comments, Comment, :list => true, :order => 'position DESC'
 
     def initialize(title = nil)
@@ -31,10 +21,12 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
   end
 
   class Comment 
-    property :body, String
-    belongs_to :article, Article
+    attr_accessor :body, String
+    belongs_to :article
     
-    is Glue::Orderable, :scope => :article
+    # We have to set the parent before inserting the comment
+    # for the scope to work!
+    is Orderable #, :scope => :article
 
     def initialize(body = nil)
       @body = body
@@ -42,15 +34,15 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
   end
 
   class Playlist
-    prop :name, String
-    has_many Track
+    attr_accessor :name, String
+    has_many :tracks
   end
 
   class Track
-    prop :name, String
-    is Glue::Orderable, :scope => :playlist
+    attr_accessor :name, String
+    is Orderable, :scope => :playlist
 
-    belongs_to Playlist
+    belongs_to :playlist
 
     def initialize(name, playlist)
       @name = name
@@ -143,7 +135,7 @@ class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
     tr.move_to(3)
     assert_equal(3, tr.position)
 
-    assert_equal(%w{two three five four one six}, track_list() )
+    assert_equal( %w{two three five four one six}, track_list() )
   end
 
 end

data/test/glue/tc_orderable2.rb

@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
+
+$DBG = true
+
+require 'test/unit'
+
+require 'og'
+require 'glue/orderable'
+
+class TestOgOrderable < Test::Unit::TestCase # :nodoc: all
+
+  class Article
+    is Glue::Orderable
+    attr_accessor :body, String, :revisable => true
+    attr_accessor :title, String
+    
+    def initialize(t, b)
+      @title, @body = t, b
+    end
+  end
+
+  $og1.manage_classes(Article)
+
+  def test_all
+    a1 = Article.create('hello', 'world')
+    a2 = Article.create('another', 'one')
+    a3 = Article.create('great', 'stuff')
+
+    assert_equal 1, a1.position
+    assert_equal 2, a2.position
+    assert_equal 3, a3.position
+
+    a2.move_higher
+
+    a1 = Article.find_by_title('hello')
+    a2 = Article.find_by_title('another')
+
+    assert_equal 1, a2.position
+    assert_equal 2, a1.position
+
+    a1.orderable_position = 32
+    assert_equal 32, a1.position
+
+
+  end
+
+end

data/test/glue/tc_revisable.rb

@@ -9,15 +9,15 @@ class TestOgRevisable < Test::Unit::TestCase # :nodoc: all
 
   class Article
     is Glue::Revisable
-    property :body, String, :revisable => true
-    property :title, String
+    attr_accessor :body, String, :revisable => true
+    attr_accessor :title, String
     
     def initialize(t, b)
       @title, @body = t, b
     end
   end
 
-  $og1.manage_classes(Article)
+  $og1.manage_classes(Article, Article::Revision)
 
   def test_all
     a = Article.create('hello', 'world')

data/test/{og/mixin → glue}/tc_taggable.rb

@@ -1,6 +1,4 @@
-$DBG = true
-
-require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
 
 require 'rubygems'
 require 'facets'
@@ -13,7 +11,7 @@ require 'glue/taggable'
 class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
 
   class Article
-    property :title, :body, String
+    attr_accessor :title, :body, String
     is Taggable
     
     def initialize(title = nil)
@@ -21,11 +19,11 @@ class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
     end
   end
 
-  $og1.manage_classes(Article)
+  $og1.manage_classes(Article, Tag)
 
   def test_all
     a1 = Article.create('Hello')
-    a1.tag('navel gmosx sexy')
+    a1.tag('great gmosx sexy')
     a1.save
     
     a2 = Article.create('Other')
@@ -39,13 +37,13 @@ class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
 
     assert_equal 6, Tag.count
     assert_equal 3, a1.tags.size 
-    assert a1.tag_names.include?('navel')
+    assert a1.tag_names.include?('great')
     
-    assert a1.tagged_with?('navel')
+    assert a1.tagged_with?('great')
     
     assert_equal false, a1.tagged_with?('photo')
     
-    res = Article.find_with_tags('navel', 'gmosx')
+    res = Article.find_with_tags('great', 'gmosx')
     assert_equal 1, res.size
     assert_equal 'Hello', res[0].title
 
@@ -55,12 +53,24 @@ class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
     assert res.include?('Hello')
     assert res.include?('Other')    
 
-    res = Article.find_with_any_tag('navel', 'gmosx', 'phd')
+    res = Article.find_with_any_tag('great', 'gmosx', 'phd')
     assert_equal 3, res.size
 
     a1.delete_all_tags
     assert_equal 0, a1.tags.size
     
+    assert_equal 4, Tag.count
+    
+    Tag.all.each do |tag|
+      n = case tag.name
+      when 'rain', 'phd', 'name': 1
+      when 'gmosx': 1
+      else flunk tag.name + ' not expected'
+      end
+      
+      assert n, tag.count
+    end
+    
 =begin
     TODO:
     Article.fing_with_no_tag('gmosx')

data/test/{og/mixin → glue}/tc_timestamped.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
 
 require 'rubygems'
 require 'facets'
@@ -8,21 +8,11 @@ require 'ostruct'
 require 'og'
 require 'glue/timestamped'
 
-=begin
-$og = Og.setup(
-  :store => 'psql',
-  :name => 'test',
-  :user => 'postgres',
-  :password => 'navelrulez',
-  :destroy => true
-)
-=end
-
 class TestCaseOgTimestamped < Test::Unit::TestCase # :nodoc: all
 
   class Article 
     is Glue::Timestamped
-    property :body, String
+    attr_accessor :body, String
 
     def initialize(body = nil)
       @body = body

data/test/glue/tc_webfile.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), '..', 'og', 'CONFIG.rb')
+
+require 'test/unit'
+
+require 'nitro/cgi/request'
+require 'og'
+require 'glue/webfile'
+
+class TC_Webfile < Test::Unit::TestCase # :nodoc: all
+
+  class Image
+    def self.webfile_path request, name
+      File.join(Uploads.public_root, request.user.name, 'icon.png')
+    end
+    
+    attr_accessor :file, WebFile, :magick => { :small => '64x64', :medium => '96x96' }
+    
+    def initialize(file)
+      @file = file
+    end
+  end
+
+  class NonImage
+    attr_accessor :file, WebFile
+  end
+
+  $og1.manage_classes(Image, NonImage)
+
+  def test_all
+    im = Image.new('me')
+    noim = NonImage.new
+    
+    assert_equal 'me', im.file
+    assert noim
+  end
+end

data/test/og/CONFIG.rb

@@ -34,16 +34,16 @@ $DBG = debug
 
 og_mysql = {
   :destroy => true,
-  :store => :mysql,
+  :adapter => :mysql,
   :user => 'root',
   :name => 'test',
-# :password => 'navelrulez',
+# :password => 'gmrulez',
 # :socket => '/var/run/mysqld/mysqld.sock'
 }
 
 og_psql = {
   :destroy => true,
-  :store => :psql,
+  :adapter => :psql,
   :user => 'postgres',
   :password => 'postgres',
   :name => 'test'
@@ -51,19 +51,19 @@ og_psql = {
 
 og_sqlite = {
   :destroy => true,
-  :store => :sqlite,
+  :adapter => :sqlite,
   :name => 'test'
 }
 
 og_kirby = {
   :destroy => true,
-  :store => :kirby,
+  :adapter => :kirby,
   :name => 'test',
   :embedded => true
 }
 
 og_memory = {
-  :store => :memory,
+  :adapter => :memory,
   :name => :test,
   :destroy => true
 }  
@@ -82,10 +82,7 @@ require 'og'
 
 Logger.get.level = Logger::WARN unless $DBG
 
-$og1 ||= Og.setup(@og_config1)
-$og2 ||= Og.setup(@og_config2)
+$og1 ||= Og.start(@og_config1)
+$og2 ||= Og.start(@og_config2)
 
 Og.thread_safe = false if Og.thread_safe
-
-# * Tom Sawyer <transfire@gmail.com>
-# * George Moschovitis <gm@navel.gr>