Merge remote branch 'rails/master'

6 files changed, 9 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index 24168c7825..c3f0acce25 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -60,7 +60,7 @@ class DateTime
   # Converts self to a Ruby Date object; time portion is discarded
   def to_date
     ::Date.new(year, month, day)
-  end unless method_defined?(:to_date)
+  end unless instance_methods(false).include?(:to_date)
 
   # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class
   # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time
@@ -71,7 +71,7 @@ class DateTime
   # To be able to keep Times, Dates and DateTimes interchangeable on conversions
   def to_datetime
     self
-  end unless method_defined?(:to_datetime)
+  end unless instance_methods(false).include?(:to_datetime)
 
   def self.civil_from_format(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0)
     offset = utc_or_local.to_sym == :local ? local_offset : 0
@@ -81,7 +81,7 @@ class DateTime
   # Converts datetime to an appropriate format for use in XML
   def xmlschema
     strftime("%Y-%m-%dT%H:%M:%S%Z")
-  end unless method_defined?(:xmlschema)
+  end unless instance_methods(false).include?(:xmlschema)
   
   # Converts self to a floating-point number of seconds since the Unix epoch 
   def to_f
diff --git a/activesupport/lib/active_support/core_ext/file.rb b/activesupport/lib/active_support/core_ext/file.rb
index dc24afbe7f..a763447566 100644
--- a/activesupport/lib/active_support/core_ext/file.rb
+++ b/activesupport/lib/active_support/core_ext/file.rb
@@ -1 +1,2 @@
 require 'active_support/core_ext/file/atomic'
+require 'active_support/core_ext/file/path'
diff --git a/activesupport/lib/active_support/core_ext/load_error.rb b/activesupport/lib/active_support/core_ext/load_error.rb
index 615ebe9588..8bdfa0c5bc 100644
--- a/activesupport/lib/active_support/core_ext/load_error.rb
+++ b/activesupport/lib/active_support/core_ext/load_error.rb
@@ -3,6 +3,7 @@ class LoadError
     /^no such file to load -- (.+)$/i,
     /^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
     /^Missing API definition file in (.+)$/i,
+    /^cannot load such file -- (.+)$/i,
   ]
 
   def path
diff --git a/activesupport/lib/active_support/core_ext/string.rb b/activesupport/lib/active_support/core_ext/string.rb
index 411ea0f016..d8d1f9436e 100644
--- a/activesupport/lib/active_support/core_ext/string.rb
+++ b/activesupport/lib/active_support/core_ext/string.rb
@@ -9,3 +9,4 @@ require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/string/interpolation'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/string/exclude'
+require 'active_support/core_ext/string/encoding'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb
index 429b65bf15..1eb6e8748b 100644
--- a/activesupport/lib/active_support/multibyte/chars.rb
+++ b/activesupport/lib/active_support/multibyte/chars.rb
@@ -45,6 +45,8 @@ module ActiveSupport #:nodoc:
           @wrapped_string = string
           @wrapped_string.force_encoding(Encoding::UTF_8) unless @wrapped_string.frozen?
         end
+
+        undef <=>
       else
         def initialize(string) #:nodoc:
           @wrapped_string = string
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index 538a8b87c6..52612c27cb 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta3"
+    BUILD = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end