Ticket #10466: date_time_xmlschema_fixes_1.9.diff

test/core_ext/date_time_ext_test.rb

@@ -32 +32 @@
-    assert_equal DateTime.new(2005, 2, 21), DateTime.new(2005, 2, 21).to_datetime
-  end
-
-  # FIXME: ruby 1.9 compat
-  def test_to_time
-    assert_equal Time.utc(2005, 2, 21, 10, 11, 12), DateTime.new(2005, 2, 21, 10, 11, 12, 0, 0).to_time
-    assert_equal Time.utc_time(2039, 2, 21, 10, 11, 12), DateTime.new(2039, 2, 21, 10, 11, 12, 0, 0).to_time
@@ -200 +199 @@
-  end
-
-  def test_xmlschema
-equal '1880-02-28T15:15:10Z', DateTime.civil(1880, 2, 28, 15, 15, 10).xmlschema
-equal '1980-02-28T15:15:10Z', DateTime.civil(1980, 2, 28, 15, 15, 10).xmlschema
-equal '2080-02-28T15:15:10Z', DateTime.civil(2080, 2, 28, 15, 15, 10).xmlschema
+match(/^1880-02-28T15:15:10\+00:?00$/, DateTime.civil(1880, 2, 28, 15, 15, 10).xmlschema)
+match(/^1980-02-28T15:15:10\+00:?00$/, DateTime.civil(1980, 2, 28, 15, 15, 10).xmlschema)
+match(/^2080-02-28T15:15:10\+00:?00$/, DateTime.civil(2080, 2, 28, 15, 15, 10).xmlschema)
-    assert_match(/^1880-02-28T15:15:10-06:?00$/, DateTime.civil(1880, 2, 28, 15, 15, 10, -0.25).xmlschema)
-    assert_match(/^1980-02-28T15:15:10-06:?00$/, DateTime.civil(1980, 2, 28, 15, 15, 10, -0.25).xmlschema)
-    assert_match(/^2080-02-28T15:15:10-06:?00$/, DateTime.civil(2080, 2, 28, 15, 15, 10, -0.25).xmlschema)

lib/active_support/core_ext/date_time/conversions.rb

@@ -9 +9 @@
-            alias_method :to_s, :to_formatted_s
-            alias_method :default_inspect, :inspect
-            alias_method :inspect, :readable_inspect
+
+            # Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows
+            # DateTimes outside the range of what can be created with Time.
+            remove_method :to_time if base.instance_methods.include?(:to_time)
-          end
-        end
-
@@ -38 +42 @@
-        # 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
-        def to_time
-          self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec) : self
-        
+
-
-        # To be able to keep Times, Dates and DateTimes interchangeable on conversions
-        def to_datetime
-          self
-        end
-
+
-        def xmlschema
-#{offset == 0 ? 'Z' : '%Z'}
-
+%Z
+ if RUBY_VERSION < '1.9'
-      end
-    end
-  end

lib/active_support/core_ext/date/conversions.rb

@@ -20 +20 @@
-
-            # Ruby 1.9 has Date#to_time which converts to localtime only.
-            remove_method :to_time if base.instance_methods.include?(:to_time)
+
+            # Ruby 1.9 has Date#xmlschema which converts to a string without the time component.
+            remove_method :xmlschema if base.instance_methods.include?(:xmlschema)
-          end
-        end
-