og 0.26.0 → 0.27.0

data/INSTALL

@@ -40,16 +40,21 @@ a standard installation script is provided.
 
 2. Run the installation script.
 
-  $ ruby install.rb
+  $ ruby setup.rb
 
 This installation script also installs some vendor libraries
 that you possibly have allready installed. Use with caution.
 
-You also have to manualy install the following libraries:
+Dependencies needed: See 'ProjectInfo' file located in the 
+current directory.
+
+Install the desired database client libraries Libraries are not 
+required for Og to run. If you wish to use an adapter which 
+uses one of the databases, then you'll need to install the 
+client library
+
+Postgres, MySQL, Kirbybase
 
-* Nano
-* Mega
-* RedCloth
 
 = Manual installation.
 

data/ProjectInfo

@@ -2,7 +2,7 @@
 
 TITLE    : &title Og
 NAME     : &pkg og
-VERSION  : '0.26.0'
+VERSION  : '0.27.0'
 STATUS   : beta
 
 AUTHOR   : George Moschovitis
@@ -17,7 +17,7 @@ DESCRIPTION: >
   KirbyBase, Filesystem and more.
 
 DEPENDENCIES:
- - [ glue, '= 0.26.0' ]
+ - [ glue, '= 0.27.0' ]
 
 DISTRIBUTE: [ gem, tgz, zip ]
 
@@ -25,6 +25,13 @@ RUBYFORGE:
   PROJECT: 'nitro'
   USERNAME: 'gmosx'
 
+RDOC:
+  - dir: rdoc
+    options: ['--all', '--inline-source']
+    include:
+      - 'lib/og/**/*'
+      - '[A-Z]*'
+
 # Anything to require upfront?
 #TEST:
 #  fixture: ''

data/README

@@ -1,4 +1,4 @@
-= Og 0.26.0 README
+= Og 0.27.0 README
 
 Og (ObjectGraph) is a powerful and elegant object-relational mapping 
 library. Og manages the lifecycle of Ruby objects and  provides 
@@ -163,8 +163,8 @@ http://rubyforge.org/mailman/listinfo/nitro-general
 
 == Licence
 
-Copyright (c) 2004-2005, Navel Ltd (http://www.navel.gr)
-Copyright (c) 2004-2005, George 'gmosx' Moschovitis (http://www.gmosx.com).
+Copyright (c) 2004-2006, George 'gmosx' Moschovitis (http://www.gmosx.com).
+Copyright (c) 2004-2006, Navel Ltd (http://www.navel.gr)
 
 Og (http://www.nitrohq.com) is copyrighted free 
 software created and maintained by George Moschovitis (mailto:gm@navel.gr)

data/Rakefile

@@ -30,7 +30,11 @@ task :default => :package
 # Run the tests.
 
 Rake::TestTask.new do |t|
+  cwd = File.expand_path(File.join(File.dirname(__FILE__) + '.'))
   t.libs << 'test'
+  %w[glue nitro og].each do |dir|
+    t.libs << File.join(cwd, dir, 'lib')
+  end
   t.test_files = FileList['test/**/tc*.rb']
   t.verbose = true
 end
@@ -65,7 +69,7 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = '= 1.8.3'
 
   s.files = FileList[
-    '[A-Z]*', 'install.rb', '{bin,benchmark,examples,doc,lib,test,vendor}/**/*' 
+    '[A-Z]*', 'setup.rb', '{bin,benchmark,examples,doc,lib,test,vendor}/**/*' 
   ].exclude("_darcs").exclude("_darcs/**/*").exclude('**/*.log').to_a
 
   s.require_path = 'lib'

data/doc/AUTHORS

@@ -33,5 +33,8 @@ IDEAS, ADDITIONAL CODING, SUPPORT:
 * Matt Bowen <matt.bowen@farweststeel.com>
   Oracle driver, documentation.
 
+* Aidan Rogers <aidan@yoyo.org>
+  Bug reports, patches.
+    
 * Thomas Quas <tquas@yahoo.com>
   Ideas, bug reports, unit tests.

data/doc/RELEASES

@@ -1,3 +1,60 @@
+== Version 0.27.0
+
+Once again we have a great mix of cool new features, along
+with bugfixes and a myriad of smaller improvements. Go and
+download the most advanced Ruby ORM Framework you can find.
+
+Most notable changes:
+
+* Og live collections support accumulation. Here is an example:
+
+  class Category
+    has_many :projects
+  end
+  
+  class Project
+    has_many :clients
+  end
+  
+  class Client
+  end
+  
+  clients = category.projects.clients 
+  
+  # => returns all clients for this category!
+
+* New WebFile system. Uploading files and handling photos was
+  never easier:
+  
+  class Photo
+    is Timestamped
+    is Taggable
+    property :title, String
+    property :file, WebFile, :magick => { :small => '64x64', :medium => '128x128' }
+  end
+
+  # the upload action
+  
+  def upload
+    photo = Photo.assign(request)
+    photo.save  
+  end
+  
+  This saves the photo, and creates 2 thumbnails. You can easily 
+  access the photo and thumbnails like this:
+  
+  <img src="#{photo.file_medium_thumbnail}" />
+  <img src="#{photo.file_small_thumbnail}" />
+  
+  ie obj.{propertyname}_#{thumbname}_thumbnail
+
+* Improved the generated RDOC comments.
+
+* Added evolution support to the KirbyBase adapter.
+
+* Added setup.rb for non-gem installation.
+
+
 == Version 0.26.0
 
 This is the release with the most community contributions. Check 

data/lib/glue/orderable.rb

@@ -128,7 +128,7 @@ module Orderable
       end
       self.class.update( adj, :condition => con.join(' AND ') )
       @position = dest_position
-      update_property(:"#{pos}")
+      update_property(pos.to_sym)
     end
 
     self
@@ -185,12 +185,12 @@ module Orderable
 
   def increment_position
     @position += 1
-    update_property(:"#{orderable_position}")
+    update_property(orderable_position.to_sym)
   end
 
   def decrement_position
     @position -= 1
-    update_property(:"#{orderable_position}")
+    update_property(orderable_position.to_sym)
   end
 
   def bottom_position
@@ -200,31 +200,31 @@ module Orderable
 
   def set_top_position
     @position = 1
-    update_property(:"#{orderable_position}")
+    update_property(orderable_position.to_sym)
   end
 
   def set_bottom_position
     @position = bottom_position + 1
-    update_property(:"#{orderable_position}")
+    update_property(orderable_position.to_sym)
   end
 
   def increment_position_of_higher_items
     pos = orderable_position
     con = orderable_condition + [ "#{pos} < #{@position}" ]
-    self.class.update( "#{pos}=(#{pos} + 1)",  :condition => con.join(' AND ') )
+    self.class.update "#{pos}=(#{pos} + 1)",  :condition => con.join(' AND ')
   end
 
   def increment_position_of_all_items
     pos = orderable_position
     con = orderable_condition
     con = con.empty? ? nil : con.join(' AND ')
-    self.class.update("#{pos}=(#{pos} + 1)", :condition => con )
+    self.class.update "#{pos}=(#{pos} + 1)", :condition => con 
   end
 
   def decrement_position_of_lower_items
     pos = orderable_position
     con = orderable_condition + [ "#{pos} > #{@position}" ]
-    self.class.update( "#{pos}=(#{pos} - 1)",  :condition => con.join(' AND ') )
+    self.class.update "#{pos}=(#{pos} - 1)",  :condition => con.join(' AND ')
   end
 
 end

data/lib/og.rb

@@ -43,7 +43,7 @@ module Og
 
   # The version.
 
-  Version = '0.26.0'
+  Version = '0.27.0'
 
   # Library path.
 
@@ -115,16 +115,16 @@ module Og
         # if it was being called by Og.setup to provide
         # additional, faster or enhanced functionality.
 
-        puts options[:called_by_og_setup]
         options[:called_by_og_setup] = true if options[:called_by_og_setup].nil?
         
         m = @@manager = Manager.new(options)        
         m.manage_classes
         
-        # Allows functionality that requires a store is finalized
-        # to be implemented. A vastly superior method of constructing
-        # foreign key constraints is an example of functionality
-        # this provides. Currently only used by the PostgreSQL store.
+        # Allows functionality that requires a store is 
+        # finalized to be implemented. A vastly superior 
+        # method of constructing foreign key constraints is an 
+        # example of functionality this provides. Currently 
+        # only used by the PostgreSQL store.
         
         m.post_setup if options[:called_by_og_setup]
       rescue Exception => ex 

data/lib/og/collection.rb

@@ -228,11 +228,20 @@ class Collection
     find(options).first
   end
 
-  # Redirect all other methods to the members array.
+  # Try to execute an accumulator or else
+  # redirect all other methods to the members array.
+  #
+  # An example of the accumulator:
+  #
+  # foo_foobars = foo1.bars.foobars
   
   def method_missing(symbol, *args, &block)
     load_members
-    @members.send(symbol, *args, &block)
+    if @member_class.instance_methods.include? symbol.to_s
+      @members.inject([]) { |a, x| a << x.send(symbol) }.flatten
+    else
+      @members.send(symbol, *args, &block)
+    end
   end
 
 private
@@ -245,4 +254,4 @@ end
 end
 
 # * George Moschovitis <gm@navel.gr>
-# *  Julien Perrot <jperrot@exosec.fr>
+# * Julien Perrot <jperrot@exosec.fr>

data/lib/og/entity.rb

@@ -106,8 +106,8 @@ module EntityMixin
       return obj
     end
 
-    def assign_properties(values, options)
-      Property.fill(self.new, values, options)
+    def assign_properties(values, options = {})
+      Property.populate_object(self.new, values, options)
     end
     alias_method :assign, :assign_properties
 

data/lib/og/manager.rb

@@ -102,9 +102,10 @@ class Manager
     info = EntityInfo.new(klass)
 
     # DON'T DO THIS!!!
+    
     klass.module_eval %{
       def ==(other)
-        other ? @#{klass.primary_key.symbol} == other.#{klass.primary_key.symbol} : false
+        other.instance_of?(#{klass}) ? @#{klass.primary_key.symbol} == other.#{klass.primary_key.symbol} : false
       end
     }
 

data/lib/og/store.rb

@@ -18,12 +18,9 @@ class Store
 
   def self.for_name(name)
     Logger.info "Og uses the #{name.to_s.capitalize} store."
-    
     # gmosx: to keep RDoc happy.
-    eval %{
-      require 'og/store/#{name}'
-      return  #{name.to_s.capitalize}Store
-    }
+    require('og/store/' + name.to_s)
+    return Og.const_get("#{name.to_s.capitalize}Store")
   end
 
   # Creates a store.
@@ -192,10 +189,8 @@ class Store
       yield(self) 
       commit
     rescue => ex
-      Logger.error 'Error in transaction'
-      Logger.error ex
-      Logger.error ex.backtrace
       rollback
+      raise ex
     end
   end
 
@@ -218,3 +213,5 @@ private
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/og/store/kirby.rb

@@ -34,6 +34,12 @@ class KirbyStore < SqlStore
 
   def initialize(options)
     super
+    
+    @typemap = {
+      :Fixnum => :Integer,
+      :TrueClass => :Boolean
+    }
+
     mode = options[:mode] || :local
 
     if mode == :client
@@ -62,10 +68,14 @@ class KirbyStore < SqlStore
     klass.send :alias_method, :recno, :oid
     klass.send :alias_method, :recno=, :oid= 
 
+    unless klass.properties.include? :recno
+      klass.property :recno, Fixnum
+    end
+
     symbols = klass.properties.keys
 
     klass.module_eval %{
-      def self.kb_create(recno, #{symbols.join(', ')})
+      def self.kb_create(#{symbols.join(', ')})
         obj = self.allocate
         obj.recno = recno
         #{ symbols.map { |s| "obj.#{s} = #{s}; "} }
@@ -158,29 +168,101 @@ class KirbyStore < SqlStore
     # nop, not supported.
   end
 
+  def join(obj1, obj2, table, options = nil)
+    first, second = join_object_ordering(obj1, obj2)
+    @conn.get_table(table.to_sym).insert(first.pk, second.pk)
+  end
+
+  def unjoin(obj1, obj2, table)
+    first, second = join_object_ordering(obj1, obj2)
+
+    @conn.get_table(table.to_sym).delete do |r|
+      require 'dev-utils/debug'
+      breakpoint
+      r.send(:first_key) == first.pk and
+        r.send(:second_key) == second.pk
+    end
+  end
+
 private
 
+  def typemap(key)
+    @typemap[key] || key
+  end
+
   def create_table(klass)
-    fields = fields_for_class(klass)
-    begin
+    if @conn.table_exists?(klass.table.to_sym)
+      get_table(klass).pack # Kirby specific method of database cleanup. 
+
+      field_names = field_names_for_class(klass)
+      actual_fields = get_table(klass).field_names
+
+      field_names.each do |needed_field|
+        next if actual_fields.include?(needed_field)
+
+        if @options[:evolve_schema] == true
+          Logger.debug "Adding field '#{needed_field}' to '#{klass.table}'"
+          field_type = typemap(klass.properties[needed_field].klass.name.to_sym)
+          if get_table(klass).respond_to?(:add_column)
+            get_table(klass).add_column(needed_field, field_type)
+          else
+            @conn.add_table_column(klass.table, needed_field, field_type)
+          end
+        else
+          Logger.warn "Table '#{klass.table}' is missing field '#{needed_field}' and :evolve_schema is not set to true!"
+        end
+      end
+      
+      actual_fields.each do |obsolete_field|
+        next if field_names.include?(obsolete_field)
+        
+        if @options[:evolve_schema] == true and @options[:evolve_schema_cautious] == false
+          Logger.debug "Removing obsolete field '#{obsolete_field}' from '#{klass.table}'"
+          if get_table(klass).respond_to?(:drop_column)
+            get_table(klass).drop_column(obsolete_field)
+          else
+            @conn.drop_table_column(klass.table, obsolete_field)
+          end
+        else
+          Logger.warn "You have an obsolete field '#{obsolete_field}' on table '#{klass.table}' and :evolve_schema is not set or is in cautious mode!"
+        end
+      end
+    else
+      Logger.debug "Creating table '#{klass.table}'"
+      fields = fields_for_class(klass)
       table = @conn.create_table(klass.table.to_sym, *fields) do |t| 
         t.record_class = klass
       end
-    rescue Object => ex
-      # gmosx: any idea how to better test this?
-      if ex.to_s =~ /already exists/i
-        Logger.debug "Table for '#{klass}' already exists!"
-        return
-      else
-        raise
+    end
+
+=begin
+    # Create join tables if needed. Join tables are used in
+    # 'many_to_many' relations.
+
+    if join_tables = klass.ann.self[:join_tables] 
+      for info in join_tables
+        unless @conn.table_exists?(info[:table].to_sym)
+          @conn.create_table(info[:table].to_sym, *create_join_table_sql(info))
+          Logger.debug "Created jointable '#{info[:table]}'."
+        end
       end
     end
+=end
+  end
+
+
+  def create_join_table_sql(join_info)
+    [join_info[:first_key].to_sym, :Integer, join_info[:second_key].to_sym, :Integer]
   end
 
   def drop_table(klass)
     @conn.drop_table(klass.table) if @conn.table_exists?(klass.table)
   end
 
+  def field_names_for_class(klass)
+    klass.properties.values.map {|p| p.symbol }
+  end
+
   def fields_for_class(klass)
     fields = []
 
@@ -189,8 +271,7 @@ private
 
       fields << p.symbol
 
-      type = p.klass.name.to_sym
-      type = :Integer if type == :Fixnum
+      type = typemap(p.klass.name.to_sym)
 
       fields << type
     end