Changeset 6099

Timestamp:

02/01/07 18:06:16 (2 years ago)

Author:

bitsweat

Message:

Ruby 1.8-cvs and 1.9 define a private Time#to_date that overrides Active Support. Make it public to preserve compatibility.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/time.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/time/conversions.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ruby 1.8-cvs and 1.9 define a private Time#to_date that overrides Active
+Support. Make it public to preserve compatibility.  [Jeremy Kemper]
-
-* Full test coverage for Inflector.  #7228 [Dan Kubb]

trunk/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/behavior'
-require File.dirname(__FILE__) + '/time/calculations'

trunk/activesupport/lib/active_support/core_ext/time/conversions.rb

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