activerecord 1.5.1 → 1.6.0

data/lib/active_record/support/breakpoint.rb

@@ -16,11 +16,14 @@
 # license please contact me.
 
 require 'irb'
-# require 'binding_of_caller' <- Needs this
+require File.dirname(__FILE__) + '/binding_of_caller'
 require 'drb'
 require 'drb/acl'
 
 module Breakpoint
+  id = %q$Id: breakpoint.rb 41 2005-01-22 20:22:10Z flgr $
+  Version = id.split(" ")[2].to_i
+
   extend self
 
   # This will pop up an interactive ruby session at a
@@ -114,10 +117,10 @@ module Breakpoint
     end
   end
 
-  module CommandBundle #:nodoc:
+  module CommandBundle
     # Proxy to a Breakpoint client. Lets you directly execute code
     # in the context of the client.
-    class Client#:nodoc:
+    class Client
       def initialize(eval_handler) # :nodoc:
         @eval_handler = eval_handler
       end
@@ -133,15 +136,23 @@ module Breakpoint
       end
 
       # Will execute the specified statement at the client.
-      def method_missing(method, *args)
-        if args.empty?
-          result = eval("#{method}")
+      def method_missing(method, *args, &block)
+        if args.empty? and not block
+          result = eval "#{method}"
         else
-          result = eval("#{method}(*Marshal.load(#{Marshal.dump(args).inspect}))")
-        end
-
-        unless [true, false, nil].include?(result)
-          result.extend(DRbUndumped) if result
+          # This is a bit ugly. The alternative would be using an
+          # eval context instead of an eval handler for executing
+          # the code at the client. The problem with that approach
+          # is that we would have to handle special expressions
+          # like "self", "nil" or constants ourself which is hard.
+          remote = eval %{
+            result = lambda { |block, *args| #{method}(*args, &block) }
+            def result.call_with_block(*args, &block)
+              call(block, *args)
+            end
+            result
+          }
+          remote.call_with_block(*args, &block)
         end
 
         return result
@@ -175,6 +186,7 @@ module Breakpoint
     #   client.File.open("temp.txt", "w") { |f| f.puts "Hello" } 
     def client()
       if Breakpoint.use_drb? then
+        sleep(0.5) until Breakpoint.drb_service.eval_handler
         Client.new(Breakpoint.drb_service.eval_handler)
       else
         Client.new(lambda { |code| eval(code, TOPLEVEL_BINDING) })
@@ -205,7 +217,7 @@ module Breakpoint
   # These exceptions will be raised on failed asserts
   # if Breakpoint.asserts_cause_exceptions is set to
   # true.
-  class FailedAssertError < RuntimeError#:nodoc:
+  class FailedAssertError < RuntimeError
   end
 
   # This asserts that the block evaluates to true.
@@ -279,7 +291,7 @@ module Breakpoint
       @collision_handler.call
     end
 
-    def ping; end
+    def ping() end
 
     def add_breakpoint(context, message)
       workspace = IRB::WorkSpace.new(context)
@@ -290,31 +302,7 @@ module Breakpoint
       @handler.call(workspace, message)
     end
 
-    def register_handler(&block)
-      @handler = block
-    end
-
-    def unregister_handler
-      @handler = nil
-    end
-
-    attr_reader :eval_handler
-
-    def register_eval_handler(&block)
-      @eval_handler = block
-    end
-
-    def unregister_eval_handler
-      @eval_handler = lambda { }
-    end
-
-    def register_collision_handler(&block)
-      @collision_handler = block
-    end
-
-    def unregister_collision_handler
-      @collision_handler = lambda { }
-    end
+    attr_accessor :handler, :eval_handler, :collision_handler
   end
 
   # Will run Breakpoint in DRb mode. This will spawn a server
@@ -359,7 +347,8 @@ module Breakpoint
   #
   # Detailed information about running DRb through firewalls is
   # available at http://www.rubygarden.org/ruby?DrbTutorial
-  def activate_drb(uri = nil, allowed_hosts = ['localhost', '127.0.0.1', '::1'], ignore_collisions = false) #:nodoc:
+  def activate_drb(uri = nil, allowed_hosts = ['localhost', '127.0.0.1', '::1'],
+    ignore_collisions = false)
 
     return false if @use_drb
 
@@ -402,7 +391,7 @@ module Breakpoint
   end
 
   # Deactivates a running Breakpoint service.
-  def deactivate_drb #:nodoc:
+  def deactivate_drb
     @service.stop_service unless @service.nil?
     @service = nil
     @use_drb = false
@@ -411,14 +400,12 @@ module Breakpoint
 
   # Returns true when Breakpoints are used over DRb.
   # Breakpoint.activate_drb causes this to be true.
-  def use_drb? #:nodoc:
+  def use_drb?
     @use_drb == true
   end
 end
 
 module IRB # :nodoc:
-  def IRB.parse_opts() end
-
   class << self; remove_method :start; end
   def self.start(ap_path = nil, main_context = nil, workspace = nil)
     $0 = File::basename(ap_path, ".rb") if ap_path
@@ -442,7 +429,11 @@ module IRB # :nodoc:
     @CONF[:MAIN_CONTEXT] = irb.context
 
     old_sigint = trap("SIGINT") do
-      irb.signal_handle
+      begin
+        irb.signal_handle
+      rescue RubyLex::TerminateLineInput
+        # ignored
+      end
     end
     
     catch(:IRB_EXIT) do
@@ -466,7 +457,7 @@ module IRB # :nodoc:
     end
   end
 
-  class Context#:nodoc:
+  class Context
     alias :old_evaluate :evaluate
     def evaluate(line, line_no)
       if line.chomp == "exit" then
@@ -477,7 +468,7 @@ module IRB # :nodoc:
     end
   end
 
-  class WorkSpace#:nodoc:
+  class WorkSpace
     alias :old_evaluate :evaluate
 
     def evaluate(*args)
@@ -495,7 +486,7 @@ module IRB # :nodoc:
     end
   end
 
-  module InputCompletor#:nodoc:
+  module InputCompletor
     def self.eval(code, context, *more)
       # Big hack, this assumes that InputCompletor
       # will only call eval() when it wants code
@@ -506,9 +497,9 @@ module IRB # :nodoc:
 end
 
 module DRb # :nodoc:
-  class DRbObject#:nodoc:
-    undef :inspect
-    undef :clone
+  class DRbObject
+    undef :inspect if method_defined?(:inspect)
+    undef :clone if method_defined?(:clone)
   end
 end
 
@@ -524,4 +515,4 @@ def assert(&block)
   Binding.of_caller do |context|
     Breakpoint.assert(context, &block)
   end
-end
+end

data/lib/active_record/support/core_ext/object_and_class.rb

@@ -0,0 +1,24 @@
+class Object #:nodoc:
+  def remove_subclasses_of(superclass)
+    subclasses_of(superclass).each { |subclass| Object.send(:remove_const, subclass) rescue nil }
+  end
+
+  def subclasses_of(superclass)
+    subclasses = []
+    ObjectSpace.each_object(Class) do |k|
+      next if !k.ancestors.include?(superclass) || superclass == k || k.to_s.include?("::") || subclasses.include?(k.to_s)
+      subclasses << k.to_s
+    end
+    subclasses
+  end
+end
+
+class Class #:nodoc:
+  def remove_subclasses
+    Object.remove_subclasses_of(self)
+  end
+
+  def subclasses
+    Object.subclasses_of(self)
+  end
+end

data/lib/active_record/support/dependencies.rb

@@ -9,14 +9,19 @@ module Dependencies
   @@mechanism = :load
   mattr_accessor :mechanism
   
+  def load?
+    mechanism == :load
+  end
+  
   def depend_on(file_name, swallow_load_errors = false)
     if !loaded.include?(file_name)
       loaded << file_name
-
       begin
         require_or_load(file_name)
       rescue LoadError
         raise unless swallow_load_errors
+      rescue Object => e
+        raise ScriptError, "#{e.message}"
       end
     end
   end
@@ -29,12 +34,16 @@ module Dependencies
     self.loaded = [ ]
   end
   
-  private
-    def require_or_load(file_name)
-      mechanism == :load ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
-    end
+  def require_or_load(file_name)
+    load? ? load("#{file_name}.rb") : require(file_name)
+  end
+  
+  def remove_subclasses_for(*classes)
+    classes.each { |klass| klass.remove_subclasses }
+  end
 end
 
+Object.send(:define_method, :require_or_load)     { |file_name| Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
 Object.send(:define_method, :require_dependency)  { |file_name| Dependencies.depend_on(file_name) } unless Object.respond_to?(:require_dependency)
 Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) } unless Object.respond_to?(:require_association)
 
@@ -42,16 +51,12 @@ class Object #:nodoc:
   class << self
     # Use const_missing to autoload associations so we don't have to
     # require_association when using single-table inheritance.
-    unless respond_to?(:pre_dependency_const_missing)
-      alias_method :pre_dependency_const_missing, :const_missing
-
-      def const_missing(class_id)
-        begin
-          require_dependency(Inflector.underscore(Inflector.demodulize(class_id.to_s)))
-          return Object.const_get(class_id) if Object.const_defined?(class_id)
-        rescue LoadError
-          pre_dependency_const_missing(class_id)
-        end
+    def const_missing(class_id)
+      begin
+        require_or_load(class_id.to_s.demodulize.underscore)
+        if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end
+      rescue LoadError
+        raise NameError, "uninitialized constant #{class_id}"
       end
     end
   end

data/lib/active_record/timestamp.rb

@@ -4,6 +4,7 @@ module ActiveRecord
   # automatically included, so you don't need to do that manually.
   #
   # This behavior can be turned off by setting <tt>ActiveRecord::Base.record_timestamps = false</tt>.
+  # This behavior can use GMT by setting <tt>ActiveRecord::Base.timestamps_gmt = true</tt>
   module Timestamp 
     def self.append_features(base) # :nodoc:
       super
@@ -18,18 +19,20 @@ module ActiveRecord
     end    
       
     def create_with_timestamps
-      write_attribute("created_at", Time.now) if record_timestamps && respond_to?(:created_at) && created_at.nil?
-      write_attribute("created_on", Time.now) if record_timestamps && respond_to?(:created_on) && created_on.nil?
+      t = timestamps_gmt ? Time.now.gmtime : Time.now
+      write_attribute("created_at", t) if record_timestamps && respond_to?(:created_at) && created_at.nil?
+      write_attribute("created_on", t) if record_timestamps && respond_to?(:created_on) && created_on.nil?
 
-      write_attribute("updated_at", Time.now) if record_timestamps && respond_to?(:updated_at)
-      write_attribute("updated_on", Time.now) if record_timestamps && respond_to?(:updated_on)
+      write_attribute("updated_at", t) if record_timestamps && respond_to?(:updated_at)
+      write_attribute("updated_on", t) if record_timestamps && respond_to?(:updated_on)
       
       create_without_timestamps
     end
 
     def update_with_timestamps
-      write_attribute("updated_at", Time.now) if record_timestamps && respond_to?(:updated_at)
-      write_attribute("updated_on", Time.now) if record_timestamps && respond_to?(:updated_on)
+      t = timestamps_gmt ? Time.now.gmtime : Time.now
+      write_attribute("updated_at", t) if record_timestamps && respond_to?(:updated_at)
+      write_attribute("updated_on", t) if record_timestamps && respond_to?(:updated_on)
 
       update_without_timestamps
     end
@@ -41,5 +44,7 @@ module ActiveRecord
     # if the table has columns of either of these names. This feature is turned on by default.
     @@record_timestamps = true
     cattr_accessor :record_timestamps
+    @@timestamps_gmt = false
+    cattr_accessor :timestamps_gmt
   end
-end
+end

data/lib/active_record/validations.rb

@@ -254,7 +254,7 @@ module ActiveRecord
       # Configuration options:
       # * <tt>in</tt> - An enumerable object of available items
       # * <tt>message</tt> - Specifieds a customer error message (default is: "is not included in the list")
-      # * <tt>allows_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
+      # * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
       def validates_inclusion_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:inclusion], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
@@ -372,9 +372,9 @@ module ActiveRecord
         validations = self.class.read_inheritable_attribute(validation_method.to_s)
         if validations.nil? then return end
         validations.each do |validation|
-          if Symbol === validation
+          if validation.is_a?(Symbol)
             self.send(validation)
-          elsif String === validation
+          elsif validation.is_a?(String)
             eval(validation, binding)
           elsif validation_block?(validation)
             validation.call(self)

data/lib/active_record/vendor/mysql411.rb

@@ -255,7 +255,7 @@ class Mysql
       def_value = f[7]
       max_length = 0
       
-      ret << Field::new(table_name, table_name, column_name, length, type, flags, decimals, def_value, max_length)
+      ret << Field::new(table_name, table_name, column_name_alias, length, type, flags, decimals, def_value, max_length)
     end
     ret
   end

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activerecord'
-PKG_VERSION   = '1.5.1' + PKG_BUILD
+PKG_VERSION   = '1.6.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 PKG_FILES = FileList[

data/test/association_inheritance_reload.rb

@@ -0,0 +1,14 @@
+require 'abstract_unit'
+require 'fixtures/company'
+
+class AssociationInheritanceReloadTest < Test::Unit::TestCase
+  fixtures :companies
+
+  def test_set_attributes
+    assert_equal ["errors.add_on_empty('name', \"can't be empty\")"], Firm.read_inheritable_attribute("validate"), "Second run"
+    # ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
+    remove_subclass_of(ActiveRecord::Base)
+    load 'fixtures/company.rb'
+    assert_equal ["errors.add_on_empty('name', \"can't be empty\")"], Firm.read_inheritable_attribute("validate"), "Second run"
+  end
+end

data/test/associations_test.rb

@@ -74,6 +74,10 @@ class HasOneAssociationsTest < Test::Unit::TestCase
     assert_equal Account.find(1).credit_limit, @signals37.account.credit_limit
   end
 
+  def test_triple_equality
+    assert Account === @signals37.account
+  end
+
   def test_type_mismatch
     assert_raises(ActiveRecord::AssociationTypeMismatch) { @signals37.account = 1 }
     assert_raises(ActiveRecord::AssociationTypeMismatch) { @signals37.account = Project.find(1) }
@@ -382,6 +386,14 @@ class HasManyAssociationsTest < Test::Unit::TestCase
     assert_equal 2, @signals37.clients_of_firm(true).size
   end
 
+  def test_build_many
+    new_clients = @signals37.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}])
+    assert_equal 2, new_clients.size
+
+    assert @signals37.save
+    assert_equal 3, @signals37.clients_of_firm(true).size
+  end
+
   def test_invalid_build
     new_client = @signals37.clients_of_firm.build
     assert new_client.new_record?
@@ -399,6 +411,11 @@ class HasManyAssociationsTest < Test::Unit::TestCase
     assert_equal new_client, @signals37.clients_of_firm.last
     assert_equal new_client, @signals37.clients_of_firm(true).last
   end
+  
+  def test_create_many
+    @signals37.clients_of_firm.create([{"name" => "Another Client"}, {"name" => "Another Client II"}])
+    assert_equal 3, @signals37.clients_of_firm(true).size
+  end
 
   def test_deleting
     force_signal37_to_load_all_clients_of_firm
@@ -720,6 +737,27 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
     assert_equal 2, aridridel.projects(true).size
   end
 
+  def test_habtm_adding_before_save_with_join_attributes
+    no_of_devels = Developer.count
+    no_of_projects = Project.count
+    now = Date.today
+    ken = Developer.new("name" => "Ken")
+    ken.projects.push_with_attributes( Project.find(1), :joined_on => now )
+    p = Project.new("name" => "Foomatic")
+    ken.projects.push_with_attributes( p, :joined_on => now )
+    assert ken.new_record?
+    assert p.new_record?
+    assert ken.save
+    assert !ken.new_record?
+    assert_equal no_of_devels+1, Developer.count
+    assert_equal no_of_projects+1, Project.count
+    assert_equal 2, ken.projects.size
+    assert_equal 2, ken.projects(true).size
+
+    kenReloaded = Developer.find_by_name 'Ken'
+    kenReloaded.projects.each { |prj| assert_equal(now.to_s, prj.joined_on.to_s) }
+  end
+
   def test_build
     devel = Developer.find(1)
     proj = devel.projects.build("name" => "Projekt")