og 0.24.0 → 0.25.0

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

@@ -214,8 +214,8 @@ private
       # gmosx: keep the '' for nil symbols.
       return %|#\{@#{p.symbol} ? "'#\{#{self.class}.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
     end
-  end    
-  
+  end
+
   def read_prop(p, col)
     if p.klass.ancestors.include?(Integer)
       return "res[#{col} + offset].to_i"
@@ -229,24 +229,24 @@ 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
 
   def eval_og_insert(klass)
     props = klass.properties
     values = props.collect { |p| write_prop(p) }.join(',') 
-    
+
     sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| p.symbol.to_s}.join(',')}) VALUES (#{values})"
 
     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)}
         store.conn.query_with_result = false
         store.conn.query "#{sql}"
         @#{klass.pk_symbol} = store.conn.insert_id
-        #{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

data/lib/og/store/kirby.rb

@@ -1,5 +1,5 @@
 begin
-  require 'vendor/kirbybase'
+  require 'og/vendor/kirbybase'
 rescue Object => ex
   Logger.error 'KirbyBase is not installed!'
   Logger.error ex
@@ -18,11 +18,11 @@ module Og
 class KirbyStore < SqlStore
 
   # Override if needed.
-  
+
   def self.base_dir(options)
     options[:base_dir] || './kirbydb'
   end
-  
+
   def self.destroy(options)
     begin
       FileUtils.rm_rf(base_dir(options))  
@@ -35,7 +35,7 @@ class KirbyStore < SqlStore
   def initialize(options)
     super
     mode = options[:mode] || :local
-    
+
     if mode == :client
       # Use a client/server configuration.
       @conn = KirbyBase.new(:client, options[:address], options[:port])
@@ -56,14 +56,14 @@ class KirbyStore < SqlStore
     # Nothing to do.
     super
   end
-  
+
   def enchant(klass, manager)
     klass.send :attr_accessor, :recno
     klass.send :alias_method, :oid, :recno
     klass.send :alias_method, :oid=, :recno=
 
     symbols = klass.properties.keys
-    
+
     klass.module_eval %{
       def self.kb_create(recno, #{symbols.join(', ')})
         obj = self.allocate
@@ -72,14 +72,14 @@ class KirbyStore < SqlStore
         return obj
       end
     }
- 
+
     super
   end
 
   def get_table(klass)
     @conn.get_table(klass.table.to_sym)
   end
-  
+
   # :section: Lifecycle methods.
 
   def load(pk, klass)
@@ -104,19 +104,19 @@ class KirbyStore < SqlStore
   #--
   # FIXME: optimize me!
   #++
-  
+
   def count(options)
     find(options).size
   end
 
   def query(options)
     Logger.debug "Querying with #{options.inspect}." if $DBG
-  
+
     klass = options[:class]
     table = get_table(klass)
-    
+
     objects = []
-    
+
     if condition = options[:condition] || options[:where]
       condition.gsub!(/=/, '==')
       condition.gsub!(/LIKE '(.*?)'/, '=~ /\1/')
@@ -126,29 +126,29 @@ class KirbyStore < SqlStore
     else
       objects = table.select
     end
-    
+
     if order = options[:order]
       desc = (order =~ /DESC/)
       order = order.gsub(/DESC/, '').gsub(/ASC/, '')
       eval "objects.sort { |x, y| x.#{order} <=> y.#{order} }"
       objects.reverse! if desc
     end
-        
-    return objects    
+
+    return objects
   end
 
-  def start  
+  def start
     # nop
   end
-  
+
   # Commit a transaction.
-  
+
   def commit
     # nop, not supported?
   end
-  
+
   # Rollback a transaction.
-  
+
   def rollback
     # nop, not supported?
   end
@@ -182,15 +182,15 @@ private
 
   def fields_for_class(klass)
     fields = []
-  
+
     klass.properties.values.each do |p|
       klass.index(p.symbol) if p.index
-      
+
       fields << p.symbol
-      
+
       type = p.klass.name.to_sym
       type = :Integer if type == :Fixnum
-      
+
       fields << type
     end
 
@@ -207,14 +207,14 @@ 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)}
         Logger.debug "Inserting \#{self}." if $DBG
         @#{pk} = store.get_table(#{klass}).insert(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
-  
+
   # Compile the og_update method for the class.
 
   def eval_og_update(klass)
@@ -223,41 +223,41 @@ private
 
     klass.module_eval %{
       def og_update(store, options = nil)
-        #{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.get_table(#{klass}).update { |r| r.recno == #{pk} }.set(#{updates.join(', ')})
-        #{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
-  
+
   def eval_og_read(klass)
     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)}
-        #{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)
         pk ||= self.pk
         pk = pk.to_i
-        #{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)}
         table = store.get_table(self.class)
         transaction do |tx|
           table.delete { |r| r.recno == pk }
-          if cascade and #{klass}.ann.this[:descendants]
-            #{klass}.ann.this.descendants.each do |dclass, foreign_key|
+          if cascade and #{klass}.ann.self[:descendants]
+            #{klass}.ann.self.descendants.each do |dclass, foreign_key|
               dtable = store.get_table(dclass)
               dtable.delete { |r| foreign_key == pk }
             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/mysql.rb

@@ -5,8 +5,8 @@ rescue Object => ex
   Logger.error 'Trying to use the pure-Ruby binding included in Og'
   begin
     # Attempt to use the included pure ruby version.
-    require 'vendor/mysql'
-    require 'vendor/mysql411'
+    require 'og/vendor/mysql'
+    require 'og/vendor/mysql411'
   rescue Object => ex
     Logger.error ex
   end
@@ -43,30 +43,30 @@ class Mysql::Result
       yield(row, 0)
     end
   end
-  
+
   def first_value
     val = fetch_row[0]
     free
     return val
   end
-  
+
   alias_method :close, :free
 
   def fields
     fetch_fields.map { |f| f.name }
-  end  
+  end
 end
 
 module Og
 
 module MysqlUtils
   include SqlUtils
-  
+
   def escape(str)
     return nil unless str
     return Mysql.quote(str)
   end
-  
+
   def quote(val)
     case val
       when Fixnum, Integer, Float
@@ -79,11 +79,11 @@ module MysqlUtils
         val ? "'#{date(val)}'" : 'NULL'
       when TrueClass
         val ? "'1'" : 'NULL'
-      else 
+      else
         # gmosx: keep the '' for nil symbols.
         val ? escape(val.to_yaml) : ''
-    end 
-  end  
+    end
+  end
 end
 
 # A Store that persists objects into a MySQL database.
@@ -129,7 +129,7 @@ class MysqlStore < SqlStore
   #    this is the location of mysql.sock. For Ubuntu/Debian 
   #    this is '/var/run/mysqld/mysqld.sock'. You can find
   #    the location for your system in my.cnf
-  
+
   def initialize(options)
     super
 
@@ -146,12 +146,12 @@ class MysqlStore < SqlStore
 
     # You should set recconect to true to avoid MySQL has
     # gone away errors.
-    
+
     if @conn.respond_to? :reconnect
       options[:reconnect] = true unless options.has_key?(:reconnect)
       @conn.reconnect = options[:reconnect]
     end
-    
+
   rescue => ex
     if ex.errno == 1049 # database does not exist.
       Logger.info "Database '#{options[:name]}' not found!"
@@ -166,15 +166,15 @@ class MysqlStore < SqlStore
     super
   end
 
-  def enchant(klass, manager)  
-    if klass.ann.this.primary_key.symbol == :oid
+  def enchant(klass, manager)
+    if klass.ann.self.primary_key.symbol == :oid
       unless klass.properties.include? :oid
         klass.property :oid, Fixnum, :sql => 'integer AUTO_INCREMENT PRIMARY KEY'
       end
     end
     super
   end
-  
+
   def query(sql)
     Logger.debug sql if $DBG
     @conn.query_with_result = true 
@@ -191,20 +191,20 @@ class MysqlStore < SqlStore
     handle_sql_exception(ex, sql)
   end
 
-  def start  
+  def start
     # nop
     # FIXME: InnoDB supports transactions.
   end
-  
+
   # Commit a transaction.
-  
+
   def commit
     # nop, not supported?
     # FIXME: InnoDB supports transactions.
   end
-  
+
   # Rollback a transaction.
-  
+
   def rollback
     # nop, not supported?
     # FIXME: InnoDB supports transactions.
@@ -223,29 +223,29 @@ private
     # THINK, should a method more like this be 
     # used instead of catching database exceptions 
     # for 'table exists'?
-    
+
     return if @conn.list_tables.include?(klass::OGTABLE)
-    
-  
+
+
     fields = fields_for_class(klass)
 
     sql = "CREATE TABLE #{klass::OGTABLE} (#{fields.join(', ')}"
-    
+
     # Create table constraints.
-    
-    if constraints = klass.ann.this[:sql_constraint]
+
+    if constraints = klass.ann.self[:sql_constraint]
       sql << ", #{constraints.join(', ')}"
     end
-  
+
     if table_type = @options[:table_type]
       sql << ") TYPE = #{table_type};"  
     else
       sql << ");"
     end
-    
+
     # Create indices.
-    
-    if indices = klass.ann.this[:index]
+
+    if indices = klass.ann.self[:index]
       for data in indices
         idx, options = *data
         idx = idx.to_s
@@ -254,7 +254,7 @@ private
         sql << " CREATE #{pre_sql} INDEX #{klass::OGTABLE}_#{idxname}_idx #{post_sql} ON #{klass::OGTABLE} (#{idx});"  
       end
     end
-    
+
     @conn.query_with_result = false
 
     begin
@@ -268,11 +268,11 @@ private
         raise
       end
     end
-    
+
     # Create join tables if needed. Join tables are used in
     # 'many_to_many' relations.
-    
-     if join_tables = klass.ann.this[:join_tables] 
+
+     if join_tables = klass.ann.self[:join_tables] 
       for info in join_tables
         begin
           create_join_table_sql(info).each do |sql|
@@ -317,12 +317,12 @@ private
       return %|#\{@#{p} ? "'#\{#{self.class}.date(@#{p})\}'" : 'NULL'\}|
     elsif p.klass.ancestors.include?(TrueClass)
       return "#\{@#{p} ? \"'1'\" : 'NULL' \}"
-    else 
+    else
       # gmosx: keep the '' for nil symbols.
       return %|#\{@#{p} ? "'#\{#{self.class}.escape(@#{p}.to_yaml)\}'" : "''"\}|
     end
-  end    
-  
+  end
+
   def read_prop(p, col)
     if p.klass.ancestors.include?(Integer)
       return "#{self.class}.parse_int(res[#{col} + offset])"
@@ -336,9 +336,9 @@ private
       return "#{self.class}.parse_date(res[#{col} + offset])"
     elsif p.klass.ancestors.include?(TrueClass)
       return "('1' == res[#{col} + offset])"
-    else 
+    else
       return "YAML.load(res[#{col} + offset])"
-    end        
+    end
   end
 
   def eval_og_insert(klass)
@@ -349,16 +349,16 @@ private
       props << Property.new(:symbol => :ogtype, :klass => String)
       values << ", '#{klass}'"
     end
-    
+
     sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| field_for_property(p)}.join(',')}) VALUES (#{values})"
 
     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)}
         store.conn.query_with_result = false
         store.conn.query "#{sql}"
         @#{klass.pk_symbol} = store.conn.insert_id
-        #{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