og 0.24.0 → 0.25.0

data/lib/og/relation/belongs_to.rb

@@ -6,12 +6,14 @@ class BelongsTo < RefersTo
 
   def enchant
     super
-    unless target_class.ann.this[:descendants]
-      target_class.ann(:this, :descendants => [])
+    unless target_class.ann.self[:descendants]
+      target_class.ann(:self, :descendants => [])
     end
-    target_class.ann.this.descendants! << [owner_class, foreign_key]
+    target_class.ann.self.descendants! << [owner_class, foreign_key]
   end
   
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/og/relation/has_many.rb

@@ -40,6 +40,7 @@ class HasMany < Relation
         unless @#{target_plural_name}
           @#{target_plural_name} = HasManyCollection.new(
             self, 
+            #{target_class},
             :add_#{target_singular_name},
             :remove_#{target_singular_name},
             :find_#{target_plural_name},

data/lib/og/relation/joins_many.rb

@@ -28,7 +28,7 @@ class JoinsMany < Relation
     # handle schema_inheritance
     
     join_class = owner_class
-    if sclass = owner_class.ann.this[:superclass]
+    if sclass = owner_class.ann.self[:superclass]
       join_class = sclass
     end
     join_table_info = store.join_table_info(join_class, target_class)
@@ -42,8 +42,8 @@ class JoinsMany < Relation
       # Calculate the name of the join table
       join_table = self[:join_table] = join_table_info[:table]
       # Create a join table.
-      owner_class.ann :this, :join_tables => []
-      owner_class.ann.this.join_tables! << join_table_info
+      owner_class.ann :self, :join_tables => [] if owner_class.ann.self.join_tables.nil?
+      owner_class.ann.self.join_tables! << join_table_info
     end
     
     owner_key = join_table_info[:owner_key]
@@ -58,6 +58,7 @@ class JoinsMany < Relation
         unless @#{target_plural_name}
           @#{target_plural_name} = JoinsManyCollection.new(
             self, 
+            #{target_class},
             :add_#{target_singular_name},
             :remove_#{target_singular_name},
             :find_#{target_plural_name},
@@ -72,7 +73,7 @@ class JoinsMany < Relation
       end
 
       def add_#{target_singular_name}(obj, options = nil)
-        obj.save
+        obj.save if obj.unsaved?
         obj.class.ogmanager.store.join(self, obj, "#{join_table}", options)
       end
 

data/lib/og/store.rb

@@ -3,13 +3,13 @@ module Og
 # A Store is responsible for the peristance of the ObjectGraph.
 
 class Store
-  
+
   # Options.
-  
+
   attr_accessor :options
-  
+
   # Transaction nesting.
-  
+
   attr_accessor :transaction_nesting
 
   # :section: Store methods.
@@ -18,12 +18,12 @@ class Store
 
   def self.for_name(name)
     # gmosx: to keep RDoc happy.
-    eval %{ 
+    eval %{
       require 'og/store/#{name}'
       return  #{name.to_s.capitalize}Store
     }
   end
-                      
+
   # Creates a store.
 
   def self.create(options)
@@ -44,11 +44,11 @@ class Store
   end
 
   # Close the session to the store.
-  
+
   def close
   end
 
-  # Enchants a class. 
+  # Enchants a class.
 
   def enchant(klass, manager)
     klass.class.send(:define_method, :index) do |arg|
@@ -67,36 +67,15 @@ class Store
       end
 
       # Evaluate an alias for the primary key.
-  
+
       alias_method :pk, :#{pk}
       alias_method :pk=, :#{pk}=
-      
+
       def self.pk_symbol
         :#{klass.primary_key.symbol}
       end
     }
     
-    # Generate finder methods.
-  
-    code = ''
-    
-    for p in klass.properties.values
-      # gmosx: :uniq does NOT set a unique constraint in the
-      # database.
-      finder = p.uniq || p.unique ? 'find_one' : 'find'
-      
-      code << %{
-        def self.find_by_#{p}(val, operator = '=', options = {})
-          options.update(
-            :class => #{klass},
-            :condition => "#{p.field || p}\#{operator}\#{ogmanager.store.quote(val)}"
-          )
-          ogmanager.store.#{finder}(options)
-        end; 
-      }
-    end
-  
-    klass.module_eval(code)
   end
 
   # :section: Lifecycle methods.
@@ -113,7 +92,7 @@ class Store
 
   # Save an object to store. Insert if this is a new object or
   # update if this is already inserted in the database.
-     
+
   def save(obj, options = nil)
     if obj.saved?
       obj.og_update(self, options)
@@ -137,14 +116,14 @@ class Store
 
   # Update selected properties of an object or class of
   # objects.
-  
+
   def update_properties(obj_or_class, props, options = nil)
   end
   alias_method :pupdate, :update_properties
   alias_method :update_property, :update_properties
-    
+
   # Permanently delete an object from the store.
-  
+
   def delete(obj_or_pk, klass = nil, cascade = true)
     unless obj_or_pk.is_a?(EntityMixin)
       # create a dummy instance to keep the og_delete
@@ -157,35 +136,35 @@ class Store
   end
 
   # Perform a query.
-  
+
   def find(klass, options)
   end
 
   # Count the results returned by the query.
-  
+
   def count(options)
   end
-  
+
   # :section: Transaction methods.
-  
+
   # Start a new transaction.
-  
+
   def start
     raise 'Not implemented'
     true if @transaction_nesting < 1
     @transaction_nesting += 1
   end
-  
+
   # Commit a transaction.
-  
+
   def commit
     raise 'Not implemented'
     @transaction_nesting -= 1
     true if @transaction_nesting < 1
   end
-  
+
   # Rollback a transaction.
-  
+
   def rollback
     @transaction_nesting -= 1
     true if @transaction_nesting < 1
@@ -193,7 +172,7 @@ class Store
 
   # Transaction helper. In the transaction block use
   # the db pointer to the backend.
-  
+
   def transaction(&block)
     begin
       start
@@ -220,7 +199,7 @@ private
 
   def eval_og_delete(klass)
   end
-  
+
   def eval_og_create_schema(klass)
   end
 end

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

@@ -42,7 +42,7 @@ class FilesysStore < Store
       self.class.create(options)
     end
   end
-                                                                                
+
   def enchant(klass, manager)    
     super 
 

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

@@ -44,7 +44,7 @@ class KirbyStore < SqlStore
   def close
     super
   end
-  
+
   def enchant(klass, manager)
     klass.property :oid, Fixnum, :sql => 'integer PRIMARY KEY'
     super
@@ -67,11 +67,11 @@ class KirbyStore < SqlStore
   def start
     # nop
   end
-  
+
   def commit
     # nop
   end
-  
+
   def rollback
     # nop
   end
@@ -85,7 +85,7 @@ private
 
     # 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
@@ -113,15 +113,15 @@ private
 
   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
 
@@ -135,7 +135,7 @@ private
     fields.size.times do |i|
       map[fields[i]] = i
     end
-  
+
     return map
   end
 
@@ -160,15 +160,15 @@ private
       return %|@#{p.symbol} ? "'#\{#{self.class}.date(@#{p.symbol})\}'" : nil|
     elsif p.klass.ancestors.include?(TrueClass)
       return "@#{p.symbol} ? \"'t'\" : nil"
-    else 
+    else
       # gmosx: keep the '' for nil symbols.
       return %|@#{p.symbol} ? "'#\{#{self.class}.escape(@#{p.symbol}.to_yaml)\}'" : "''"|
     end
-  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])"
@@ -182,27 +182,27 @@ private
       return "#{self.class}.parse_date(res[#{col} + offset])"
     elsif p.klass.ancestors.include?(TrueClass)
       return "('0' != res[#{col} + offset])"
-    else 
+    else
       return "YAML::load(res[#{col} + offset])"
-    end        
+    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)
-        #{Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
         store.conn.get_table('#{klass.table}').insert(#{data})
-        #{Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
       end
     }
   end
@@ -212,7 +212,7 @@ private
   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)}"
     }
@@ -221,9 +221,9 @@ private
 
     klass.module_eval %{
       def og_update(store)
-        #{Aspects.gen_advice_code(:og_update, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_update, klass.advices, :pre) if klass.respond_to?(:advices)}
         store.exec "#{sql}"
-        #{Aspects.gen_advice_code(:og_update, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_update, klass.advices, :post) if klass.respond_to?(:advices)}
       end
     }
   end
@@ -232,7 +232,7 @@ private
   # 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 
@@ -243,26 +243,26 @@ private
         code << "@#{p.symbol} = #{read_prop(p, col)}"
       end
     end
-    
+
     code = code.join('; ')
 
     klass.module_eval %{
        def og_read(res, row = 0, offset = 0)
-        #{Aspects.gen_advice_code(:og_read, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_read, klass.advices, :pre) if klass.respond_to?(:advices)}
         #{code}
-        #{Aspects.gen_advice_code(:og_read, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_read, klass.advices, :post) if klass.respond_to?(:advices)}
       end
     }
-  end        
+  end
 
   #--
   # FIXME: is pk needed as parameter?
   #++
-  
+
   def eval_og_delete(klass)
     klass.module_eval %{
        def og_delete(store, pk, cascade = true)
-        #{Aspects.gen_advice_code(:og_delete, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{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}"
@@ -272,9 +272,9 @@ private
             end
           end
         end
-        #{Aspects.gen_advice_code(:og_delete, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_delete, klass.advices, :post) if klass.respond_to?(:advices)}
       end
-    }    
+    }
   end
 
 end

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

@@ -11,7 +11,7 @@ module Og
 module MemoryUtils
 
   # FIXME: find a neutral name.
-  
+
   def table(klass)
     klass.to_s
   end
@@ -36,19 +36,19 @@ end
 
 class MemoryStore < Store
   extend MemoryUtils; include MemoryUtils
-  
+
   class ObjectHash < Hash
     def [](key)
       super(key.to_s)
     end
-    
+
     def []=(key, value)
       super(key.to_s, value)
     end
   end
-  
+
   # This hash implements an in-memory database.
-  
+
   @objects = ObjectHash.new
 
   def self.objects
@@ -58,9 +58,9 @@ class MemoryStore < Store
   def self.objects=(val)
     @objects = val
   end
-    
+
   # A pseudo-connection to the actual object store.
-  
+
   attr_accessor :conn
 
   def self.destroy(options)
@@ -68,7 +68,7 @@ class MemoryStore < Store
   rescue 
     Logger.info "Cannot destroy '#{name}'"
   end
-  
+
   def initialize(options)
     super
     begin
@@ -88,9 +88,9 @@ class MemoryStore < Store
     klass.property :oid, Fixnum
 
     super
-    
+
     @conn[klass] ||= {}
-    
+
     eval_og_insert(klass)
     eval_og_update(klass)
     eval_og_read(klass)
@@ -107,7 +107,7 @@ class MemoryStore < Store
 
   # Update selected properties of an object or class of
   # objects.
-  
+
   def update_properties(target, set, options = nil)
     set = set.gsub(/,/, ';')
     if target.is_a?(Class)
@@ -125,7 +125,7 @@ class MemoryStore < Store
       end
     else
       target.instance_eval(set)
-    end      
+    end
   end
   alias_method :pupdate, :update_properties
   alias_method :update_property, :update_properties
@@ -137,13 +137,13 @@ class MemoryStore < Store
   # User.find(:condition  => 'age > 15', :order => 'score ASC', :offet => 10, :limit =>10)
   # Comment.find(:include => :entry)
   # store.find(:class => User, :where => 'age > 15')
-  
-  def find(options)  
+
+  def find(options)
     query(options)
   end
 
   # Find one object.
-  
+
   def find_one(options)
     query(options).first
   end
@@ -155,48 +155,48 @@ class MemoryStore < Store
   end
 
   # Count results.
-  
+
   def count(options)
     objects = 0
-    
+
     if condition = options[:condition] || options[:where]
       condition = "obj." + condition.gsub(/=/, '==')
     else
       condition = true
     end
-    
+
     eval %{
       for obj in @conn[options[:class]].values
         objects += 1 if #{condition}
       end
-    }    
-    
+    }
+
     return objects
   end
 
   # Relate two objects through an intermediate join table.
   # Typically used in joins_many and many_to_many relations.
-  
+
   def join(obj1, obj2, table)
     # nop
-  end 
-  
+  end
+
   # Query.
-  
+
   def query(options)
     objects = []
-    
+
     if condition = options[:condition] || options[:where]
       condition = "obj." + condition.gsub(/=/, '==')
     else
       condition = true
     end
-    
+
     eval %{
       for obj in @conn[options[:class]].values
         objects << obj if #{condition}
       end
-    }    
+    }
 
     if order = options[:order]
       desc = (order =~ /DESC/)
@@ -204,31 +204,31 @@ class MemoryStore < Store
       eval "objects.sort { |x, y| x.#{order} <=> y.#{order} }"
       objects.reverse! if desc
     end
-        
-    return objects    
+
+    return objects
   end
-  
+
   # :section: Transaction methods.
-  
+
   # Start a new transaction.
-  
+
   def start
   end
-  
+
   # Commit a transaction.
-  
+
   def commit
   end
-  
+
   # Rollback a transaction.
-  
+
   def rollback
   end
 
 private
 
   # :section: Lifecycle method compilers.
-  
+
   # Compile the og_update method for the class.
 
   def eval_og_insert(klass)
@@ -236,10 +236,10 @@ private
 
     klass.class_eval %{ 
       def og_insert(store)
-        #{Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
         @#{pk} = store.conn[#{klass}].size + 1
         store.conn[#{klass}][@#{pk}] = self
-        #{Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
       end
     }
   end
@@ -251,29 +251,29 @@ private
 
     klass.class_eval %{
       def og_update(store, options)
-        #{Aspects.gen_advice_code(:og_update, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_update, klass.advices, :pre) if klass.respond_to?(:advices)}
         store.conn[#{klass}][@#{pk}] = self
-        #{Aspects.gen_advice_code(:og_update, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_update, klass.advices, :post) if klass.respond_to?(:advices)}
       end
     }
   end
 
   # Not really useful in this store, kept for compatibility,
   # just to call the aspects.
-    
+
   def eval_og_read(klass)
     klass.class_eval %{
        def og_read
-        #{Aspects.gen_advice_code(:og_read, klass.advices, :pre) if klass.respond_to?(:advices)}
-        #{Aspects.gen_advice_code(:og_read, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_read, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_read, klass.advices, :post) if klass.respond_to?(:advices)}
       end
     }
-  end        
+  end
 
   def eval_og_delete(klass)
     klass.module_eval %{
        def og_delete(store, pk, cascade = true)
-        #{Aspects.gen_advice_code(:og_delete, klass.advices, :pre) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_delete, klass.advices, :pre) if klass.respond_to?(:advices)}
         pk ||= @#{klass.primary_key.first}
         transaction do |tx|
           tx.conn[#{klass}].delete(pk)
@@ -283,13 +283,13 @@ private
             end
           end
         end
-        #{Aspects.gen_advice_code(:og_delete, klass.advices, :post) if klass.respond_to?(:advices)}
+        #{Glue::Aspects.gen_advice_code(:og_delete, klass.advices, :post) if klass.respond_to?(:advices)}
       end
-    }    
+    }
   end
 
 end
 
 end
 
-# * George Moschovitis <gm@navel.gr>
+# * George Moschovitis <gm@navel.gr>