From cd1f2d7b0ed7a25ff1c298732f921ce6d6d86f73 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 27 Sep 2007 08:49:18 +0000
Subject: Date/Time/DateTime Ruby 1.9 compat

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7647 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 .../lib/active_support/core_ext/date/conversions.rb         | 13 ++++++++-----
 .../lib/active_support/core_ext/date_time/conversions.rb    |  4 ++--
 .../lib/active_support/core_ext/time/conversions.rb         |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb
index 3491dec25a..511c69544e 100644
--- a/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -17,6 +17,9 @@ module ActiveSupport #:nodoc:
             alias_method :to_s, :to_formatted_s
             alias_method :default_inspect, :inspect
             alias_method :inspect, :readable_inspect
+
+            # Ruby 1.9 has Date#to_time which converts to localtime only.
+            remove_method :to_time if base.instance_methods.include?(:to_time)
           end
         end
 
@@ -25,13 +28,13 @@ module ActiveSupport #:nodoc:
             if formatter.respond_to?(:call)
               formatter.call(self).to_s
             else
-              strftime(formatter).strip
+              strftime(formatter)
             end
           else
             to_default_s
           end
         end
-        
+
         # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005"
         def readable_inspect
           strftime("%a, %d %b %Y")
@@ -40,18 +43,18 @@ module ActiveSupport #:nodoc:
         # To be able to keep Times, Dates and DateTimes interchangeable on conversions
         def to_date
           self
-        end
+        end if RUBY_VERSION < '1.9'
 
         # Converts self to a Ruby Time object; time is set to beginning of day
         # Timezone can either be :local or :utc  (default :local)
         def to_time(form = :local)
           ::Time.send("#{form}_time", year, month, day)
         end
-        
+
         # Converts self to a Ruby DateTime object; time is set to beginning of day
         def to_datetime
           ::DateTime.civil(year, month, day, 0, 0, 0, 0, 0)
-        end
+        end if RUBY_VERSION < '1.9'
 
         def xmlschema
           to_time.xmlschema
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 91ed0e94e9..4739e3fb6d 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -17,13 +17,13 @@ module ActiveSupport #:nodoc:
             if formatter.respond_to?(:call)
               formatter.call(self).to_s
             else
-              strftime(formatter).strip
+              strftime(formatter)
             end
           else
             to_datetime_default_s
           end
         end
-        
+
         # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005 14:30:00 +0000"
         def readable_inspect
           to_s(:rfc822)
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index 742f71e0a6..c0bc8b4313 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -24,7 +24,7 @@ module ActiveSupport #:nodoc:
             if formatter.respond_to?(:call)
               formatter.call(self).to_s
             else
-              strftime(formatter).strip
+              strftime(formatter)
             end
           else
             to_default_s
-- 
cgit v1.2.3