Changeset 6281

Timestamp:

03/02/07 11:08:52 (3 years ago)

Author:

bitsweat

Message:

Merge [6099] from trunk. Compatibility with Ruby 1.8.6: make private Time#to_date and #to_datetime public.

Files:

• branches/1-2-stable/activesupport/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/activesupport/lib/active_support/core_ext/time.rb (modified) (1 diff)
• branches/1-2-stable/activesupport/lib/active_support/core_ext/time/conversions.rb (modified) (1 diff)

branches/1-2-stable/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ruby 1.8.6 and 1.9 define private Time#to_date and #to_datetime; make them
+public for compatibility.  [Jeremy Kemper]
-
-* Deprecation: warn on stderr if RAILS_DEFAULT_LOGGER isn't set yet.  [Jeremy Kemper]

branches/1-2-stable/activesupport/lib/active_support/core_ext/time.rb

@@ +1 @@
+require 'date'
+require 'time'
+
+# Ruby 1.8-cvs and 1.9 define private Time#to_date
+class Time
+  %w(to_date to_datetime).each do |method|
+    public method if private_instance_methods.include?(method)
+  end
+end
+
-require File.dirname(__FILE__) + '/time/calculations'
-require File.dirname(__FILE__) + '/time/conversions'

branches/1-2-stable/activesupport/lib/active_support/core_ext/time/conversions.rb

@@ -1 @@
-require 'date'
-require 'time'
-
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc: