og 0.24.0 → 0.25.0

data/test/og/mixin/tc_hierarchical.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 require 'ostruct'
 
 require 'og'
-require 'og/mixin/hierarchical'
+require 'glue/hierarchical'
 
 $og = Og.setup(
   :store => 'mysql',

data/test/og/mixin/tc_optimistic_locking.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 require 'test/unit'
 
 require 'og'
-require 'og/mixin/optimistic_locking'
+require 'glue/optimistic_locking'
 
 $og = Og.setup(
   :store => 'psql',

data/test/og/mixin/tc_orderable.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 require 'ostruct'
 
 require 'og'
-require 'og/mixin/orderable'
+require 'glue/orderable'
 
 class Playlist
   prop :name, String

data/test/og/mixin/tc_taggable.rb

@@ -4,11 +4,11 @@ require 'test/unit'
 require 'ostruct'
 
 require 'og'
-require 'og/mixin/taggable'
+require 'glue/taggable'
 
 class Article
   property :title, :body, String
-  include Og::Taggable
+  is Taggable
   
   def initialize(title = nil)
     @title = title

data/test/og/mixin/tc_timestamped.rb

@@ -4,7 +4,7 @@ require 'test/unit'
 require 'ostruct'
 
 require 'og'
-require 'og/mixin/timestamped'
+require 'glue/timestamped'
 
 $og = Og.setup(
   :store => 'psql',
@@ -17,7 +17,7 @@ $og = Og.setup(
 class TestCaseOgTimestamped < Test::Unit::TestCase # :nodoc: all
 
   class Article 
-    include Og::Timestamped
+    is Timestamped
     property :body, String
 
     def initialize(body = nil)

data/test/og/tc_finder.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+$DBG = true
+
+require 'test/unit'
+
+require 'og'
+
+class TC_OgFinder < Test::Unit::TestCase # :nodoc: all
+
+  class User
+    property :name, String
+    property :age, Fixnum
+  end
+
+  def setup
+    @og = Og.setup($og_config)
+  end
+
+  def test_all
+    User.find_by_name('tml')
+    User.find_by_name_and_age('tml', 3)
+    User.find_all_by_name_and_age('tml', 3)
+    User.find_all_by_name_and_age('tml', 3, :name_op => 'LIKE', :age_op => '>', :limit => 4)
+    
+    User.find_or_create_by_name_and_age('tml', 3)
+    User.find_or_create_by_name_and_age('stella', 5)
+    User.find_or_create_by_name_and_age('tml', 3)
+    
+    assert_equal 2, User.all.size
+  end
+  
+end

data/test/og/tc_inheritance.rb

@@ -56,11 +56,11 @@ class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
     assert_equal Document, Photo.superclass
     assert_equal [Photo, Article], Document.descendents
     
-    assert Document.ann.this.schema_inheritance
+    assert Document.ann.self.schema_inheritance
 
     # propagate schema_inheritance flag.
     
-    assert Photo.ann.this.schema_inheritance
+    assert Photo.ann.self.schema_inheritance
   
     # subclasses reuse the same table.
     

data/test/og/tc_scoped.rb

@@ -0,0 +1,45 @@
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
+
+$DBG = true
+
+require 'test/unit'
+
+require 'og'
+
+class TC_OgScoped < Test::Unit::TestCase # :nodoc: all
+
+  class User
+    property :name, String
+    has_many :articles
+    
+    def initialize(name = nil)
+      @name = name
+    end
+  end
+
+  class Article
+    property :hits, Fixnum
+    belongs_to :user
+    
+    def initialize(hits = nil)
+      @hits = hits
+    end
+  end
+    
+  def setup
+    @og = Og.setup($og_config)
+  end
+
+  def test_all
+    u = User.create('tml')
+    a1 = Article.create(10)
+    a2 = Article.create(20)
+    u.articles << a1
+    u.articles << a2
+    
+    assert_equal 2, u.articles.size
+    assert_equal 1, u.articles.find(:condition => 'hits > 15').size
+    assert_equal 20, u.articles.find(:condition => 'hits > 15').first.hits
+  end
+  
+end

data/test/og/tc_store.rb

@@ -236,11 +236,6 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
     
     assert_equal 'gmosx', a4.owner.name
 
-    # generated finders
-        
-    assert User.respond_to?(:find_by_name)
-    assert Comment.respond_to?(:find_by_body)
-    
     u = User.find_by_name('gmosx')
     assert_equal 'gmosx', u.name
     
@@ -263,14 +258,13 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 
     assert_equal 2, a.categories.size
 
-    a = Article.find_by_body('Hello').first
+    a = Article.find_by_body('Hello')
     assert_equal 2, a.categories.size
     assert_equal 'News', a.categories[0].title
 
     c = Category.find_by_title('News')
     assert_equal 1, c.articles.size
      
-     
     # bug: extended class and many_to_many.
 
     na = NewArticle.create('Bug')

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.24.0
-date: 2005-10-28
+  version: 0.25.0
+date: 2005-11-17
 summary: State of the art object-relational mapping system.
 require_paths: 
   - lib
@@ -51,15 +51,23 @@ files:
   - examples/mysql_to_psql.rb
   - examples/README
   - examples/run.rb
+  - lib/glue
   - lib/og
   - lib/og.rb
-  - lib/vendor
+  - lib/glue/hierarchical.rb
+  - lib/glue/optimistic_locking.rb
+  - lib/glue/orderable.rb
+  - lib/glue/revisable.rb
+  - lib/glue/taggable.rb
+  - lib/glue/taggable_old.rb
+  - lib/glue/timestamped.rb
+  - lib/glue/tree.rb
   - lib/og/collection.rb
   - lib/og/entity.rb
   - lib/og/errors.rb
   - lib/og/evolution.rb
   - lib/og/manager.rb
-  - lib/og/mixin
+  - lib/og/markers.rb
   - lib/og/relation
   - lib/og/relation.rb
   - lib/og/store
@@ -68,14 +76,7 @@ files:
   - lib/og/test.rb
   - lib/og/types.rb
   - lib/og/validation.rb
-  - lib/og/mixin/hierarchical.rb
-  - lib/og/mixin/optimistic_locking.rb
-  - lib/og/mixin/orderable.rb
-  - lib/og/mixin/revisable.rb
-  - lib/og/mixin/schema_inheritance_base.rb
-  - lib/og/mixin/taggable.rb
-  - lib/og/mixin/timestamped.rb
-  - lib/og/mixin/tree.rb
+  - lib/og/vendor
   - lib/og/relation/all.rb
   - lib/og/relation/belongs_to.rb
   - lib/og/relation/has_many.rb
@@ -95,16 +96,17 @@ files:
   - lib/og/store/alpha/sqlserver.rb
   - lib/og/test/assertions.rb
   - lib/og/test/testcase.rb
-  - lib/vendor/kbserver.rb
-  - lib/vendor/kirbybase.rb
-  - lib/vendor/mysql.rb
-  - lib/vendor/mysql411.rb
-  - lib/vendor/README
+  - lib/og/vendor/kbserver.rb
+  - lib/og/vendor/kirbybase.rb
+  - lib/og/vendor/mysql.rb
+  - lib/og/vendor/mysql411.rb
+  - lib/og/vendor/README
   - test/og
   - test/og/CONFIG.rb
   - test/og/mixin
   - test/og/store
   - test/og/tc_delete_all.rb
+  - test/og/tc_finder.rb
   - test/og/tc_inheritance.rb
   - test/og/tc_join.rb
   - test/og/tc_multiple.rb
@@ -112,6 +114,7 @@ files:
   - test/og/tc_polymorphic.rb
   - test/og/tc_relation.rb
   - test/og/tc_reverse.rb
+  - test/og/tc_scoped.rb
   - test/og/tc_select.rb
   - test/og/tc_store.rb
   - test/og/tc_types.rb
@@ -136,5 +139,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.24.0
+            version: 0.25.0
       version: 

data/lib/og/mixin/orderable.rb

@@ -1,174 +0,0 @@
-require 'mega/dynamod'
-
-module Og
-
-# Attach list/ordering methods to the enchanted class.
-
-module Orderable
-
-  def self.append_dynamic_features(base, options)
-    o = { 
-      :position => 'position', 
-      :type => Fixnum, 
-    }
-    o.update(options) if options
-
-    if o[:scope].is_a?(Symbol) && o[:scope].to_s !~ /_oid$/    
-      o[:scope] = "#{o[:scope]}_oid".intern 
-    end
-
-    position = o[:position]
-    scope = o[:scope]
-
-    if scope
-      if scope.is_a?(Symbol)
-        scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
-      end
-    
-      cond = ':condition => ' + scope
-      cond_and = ':condition => ' + scope + ' + " AND " +'
-    else
-      cond = ':condition => nil'
-      cond_and = ':condition => '
-    end    
-
-    code = %{    
-      property :#{position}, #{o[:type]}
-
-      pre "add_to_bottom", :on => :og_insert  
-      pre "decrement_position_of_lower_items", :on => :og_delete
-      
-      def move_higher
-        if higher = higher_item
-          #{base}.transaction do
-            higher.increment_position
-            decrement_position
-          end
-        end
-      end
-
-      def move_lower
-        if lower = lower_item
-          #{base}.transaction do
-            lower.decrement_position
-            increment_position
-          end
-        end
-      end
-
-      def move_to_top
-        #{base}.transaction do
-          increment_position_of_higher_items
-          set_top_position
-        end
-      end
-
-      def move_to_bottom
-        #{base}.transaction do
-          decrement_position_of_lower_items
-          set_bottom_position
-        end                      
-      end
-
-      def move_to(dest_position)
-        return if @#{position} == dest_position
-        
-        #{base}.transaction do
-          if @#{position} < dest_position
-            #{base}.update("#{position}=(#{position} - 1)", #{cond_and}"#{position} > \#\{@#{position}\} AND #{position} <= \#\{dest_position\}")
-          else
-            #{base}.update("#{position}=(#{position} + 1)", #{cond_and}"#{position} >= \#\{dest_position\} AND #{position} < \#\{@#{position}\} ")
-          end
-          @#{position} = dest_position
-          update_property(:#{position})
-        end
-        
-        self
-      end
-
-      def add_to_top
-        increment_position_of_all_items
-      end
-
-      def add_to_bottom
-        @#{position} = bottom_position + 1
-      end
-
-      def add_to
-      end
-
-      def higher_item
-        #{base}.one(#{cond_and}"#{position}=\#\{@#{position} - 1\}")
-      end
-      alias_method :previous_item, :higher_item
-
-      def lower_item
-        #{base}.one(#{cond_and}"#{position}=\#\{@#{position} + 1\}")
-      end
-      alias_method :next_item, :lower_item
-
-      def top_item
-      end
-      alias_method :first_item, :top_item
-
-      def bottom_item
-        #{base}.one(#{cond}, :order => "#{position} DESC", :limit => 1)
-      end
-      alias_method :last_item, :last_item
-
-      def top?
-        @#{position} == 1
-      end
-      alias_method :first?, :top?
-
-      def bottom?
-        @#{position} == bottom_position
-      end
-      alias_method :last?, :bottom?
-
-      def increment_position
-        @#{position} += 1
-        update_property(:#{position})
-      end
-    
-      def decrement_position
-        @#{position} -= 1
-        update_property(:#{position})
-      end
-
-      def bottom_position
-        item = bottom_item
-        item ? item.#{position} : 0
-      end
-
-      def set_top_position
-        @#{position} = 1
-        update_property(:#{position})
-      end
-
-      def set_bottom_position
-        @#{position} = bottom_position + 1
-        update_property(:#{position})
-      end
-
-      def increment_position_of_higher_items
-        #{base}.update("#{position}=(#{position} + 1)", #{cond_and}"#{position} < \#\{@#{position}\}")
-      end
-
-      def increment_position_of_all_items
-        #{base}.update("#{position}=(#{position} + 1)", #{cond})
-      end
-      
-      def decrement_position_of_lower_items
-        #{base}.update("#{position}=(#{position} - 1)", #{cond_and}"#{position} > \#\{@#{position}\}")
-      end
-    }    
-    
-    base.module_eval(code)
-  end
-  
-end
-
-end 
-
-# * George Moschovitis <gm@navel.gr>