Squashed commit of the following:

commit 2683de5da85135e8d9fe48593ff6167db9d64b18
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:29:20 2013 -0700

    cannot support infinite ranges right now

commit cebb6acef2c3957f975f6db4afd849e535126253
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:26:12 2013 -0700

    reverting infinity comparison

commit 385f7e6b4efd1bf9b89e8d607fcb13e5b03737ea
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:23:28 2013 -0700

    Revert "Added ability to compare date/time with infinity"

    This reverts commit 38f28dca3aa16efd6cc3af6453f2e6b9e9655ec1.

    Conflicts:
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb
    	activesupport/test/core_ext/date_ext_test.rb
    	activesupport/test/core_ext/date_time_ext_test.rb
    	activesupport/test/core_ext/numeric_ext_test.rb
    	activesupport/test/core_ext/time_ext_test.rb
    	activesupport/test/core_ext/time_with_zone_test.rb

commit 0d799a188dc12b18267fc8421675729917610047
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:18:53 2013 -0700

    Revert "Refactor infinite comparable definition a bit"

    This reverts commit dd3360e05e4909f2f0c74a624cccc2def688f828.

commit 42dec90e49745bbfae546f0560b8783f6b48b074
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:18:47 2013 -0700

    Revert "Require 'active_support/core_ext/module/aliasing' in the infinite_comparable module"

    This reverts commit 7003e71c13c53ec3d34250560fbf80b8381df693.

16 files changed, 7 insertions, 172 deletions

diff --git a/activesupport/lib/active_support/core_ext/date.rb b/activesupport/lib/active_support/core_ext/date.rb
index 5f13f5f70f..465fedda80 100644
--- a/activesupport/lib/active_support/core_ext/date.rb
+++ b/activesupport/lib/active_support/core_ext/date.rb
@@ -2,5 +2,4 @@ require 'active_support/core_ext/date/acts_like'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/date/conversions'
 require 'active_support/core_ext/date/zones'
-require 'active_support/core_ext/date/infinite_comparable'
 
diff --git a/activesupport/lib/active_support/core_ext/date/infinite_comparable.rb b/activesupport/lib/active_support/core_ext/date/infinite_comparable.rb
deleted file mode 100644
index ca5d793942..0000000000
--- a/activesupport/lib/active_support/core_ext/date/infinite_comparable.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'active_support/core_ext/infinite_comparable'
-
-class Date
-  include InfiniteComparable
-end
diff --git a/activesupport/lib/active_support/core_ext/date_time.rb b/activesupport/lib/active_support/core_ext/date_time.rb
index 024af91738..e8a27b9f38 100644
--- a/activesupport/lib/active_support/core_ext/date_time.rb
+++ b/activesupport/lib/active_support/core_ext/date_time.rb
@@ -2,4 +2,3 @@ require 'active_support/core_ext/date_time/acts_like'
 require 'active_support/core_ext/date_time/calculations'
 require 'active_support/core_ext/date_time/conversions'
 require 'active_support/core_ext/date_time/zones'
-require 'active_support/core_ext/date_time/infinite_comparable'
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
index f347f09293..937567440b 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -155,4 +155,11 @@ class DateTime
   def utc_offset
     (offset * 86400).to_i
   end
+
+  # Layers additional behavior on DateTime#<=> so that Time and
+  # ActiveSupport::TimeWithZone instances can be compared with a DateTime.
+  def <=>(other)
+    super other.to_datetime
+  end
+
 end
diff --git a/activesupport/lib/active_support/core_ext/date_time/infinite_comparable.rb b/activesupport/lib/active_support/core_ext/date_time/infinite_comparable.rb
deleted file mode 100644
index 8a282b19f2..0000000000
--- a/activesupport/lib/active_support/core_ext/date_time/infinite_comparable.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'active_support/core_ext/infinite_comparable'
-
-class DateTime
-  include InfiniteComparable
-end
diff --git a/activesupport/lib/active_support/core_ext/infinite_comparable.rb b/activesupport/lib/active_support/core_ext/infinite_comparable.rb
deleted file mode 100644
index b78b2deaad..0000000000
--- a/activesupport/lib/active_support/core_ext/infinite_comparable.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'active_support/concern'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/object/try'
-
-module InfiniteComparable
-  extend ActiveSupport::Concern
-
-  included do
-    alias_method_chain :<=>, :infinity
-  end
-
-  define_method :'<=>_with_infinity' do |other|
-    if other.class == self.class
-      public_send :'<=>_without_infinity', other
-    else
-      infinite = try(:infinite?)
-      other_infinite = other.try(:infinite?)
-
-      # inf <=> inf
-      if infinite && other_infinite
-        infinite <=> other_infinite
-      # not_inf <=> inf
-      elsif other_infinite
-        -other_infinite
-      # inf <=> not_inf
-      elsif infinite
-        infinite
-      else
-        conversion = "to_#{self.class.name.downcase}"
-        other = other.public_send(conversion) if other.respond_to?(conversion)
-        public_send :'<=>_without_infinity', other
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/numeric.rb b/activesupport/lib/active_support/core_ext/numeric.rb
index d5cfc2ece4..a6bc0624be 100644
--- a/activesupport/lib/active_support/core_ext/numeric.rb
+++ b/activesupport/lib/active_support/core_ext/numeric.rb
@@ -1,4 +1,3 @@
 require 'active_support/core_ext/numeric/bytes'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/numeric/conversions'
-require 'active_support/core_ext/numeric/infinite_comparable'
diff --git a/activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb b/activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb
deleted file mode 100644
index b5f1b0487b..0000000000
--- a/activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'active_support/core_ext/infinite_comparable'
-
-class Float
-  include InfiniteComparable
-end
-
-class BigDecimal
-  include InfiniteComparable
-end
diff --git a/activesupport/lib/active_support/core_ext/time.rb b/activesupport/lib/active_support/core_ext/time.rb
index af6b589b71..32cffe237d 100644
--- a/activesupport/lib/active_support/core_ext/time.rb
+++ b/activesupport/lib/active_support/core_ext/time.rb
@@ -3,4 +3,3 @@ require 'active_support/core_ext/time/calculations'
 require 'active_support/core_ext/time/conversions'
 require 'active_support/core_ext/time/marshal'
 require 'active_support/core_ext/time/zones'
-require 'active_support/core_ext/time/infinite_comparable'
diff --git a/activesupport/lib/active_support/core_ext/time/infinite_comparable.rb b/activesupport/lib/active_support/core_ext/time/infinite_comparable.rb
deleted file mode 100644
index 63795885f5..0000000000
--- a/activesupport/lib/active_support/core_ext/time/infinite_comparable.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'active_support/core_ext/infinite_comparable'
-
-class Time
-  include InfiniteComparable
-end
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index f3fa96ec6f..b1adf6d396 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -357,11 +357,6 @@ class DateExtBehaviorTest < ActiveSupport::TestCase
       Date.today.freeze.freeze
     end
   end
-
-  def test_compare_with_infinity
-    assert_equal(-1, Date.today <=> Float::INFINITY)
-    assert_equal(1, Date.today <=> -Float::INFINITY)
-  end
 end
 
 class DateExtConversionsTest < ActiveSupport::TestCase
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index 7be578599b..3e76b8a9b1 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -335,10 +335,3 @@ class DateTimeExtCalculationsTest < ActiveSupport::TestCase
       old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
     end
 end
-
-class DateTimeExtBehaviorTest < ActiveSupport::TestCase
-  def test_compare_with_infinity
-    assert_equal(-1, DateTime.now <=> Float::INFINITY)
-    assert_equal(1, DateTime.now <=> -Float::INFINITY)
-  end
-end
diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb
index 3744d50864..f22ae3ccac 100644
--- a/activesupport/test/core_ext/numeric_ext_test.rb
+++ b/activesupport/test/core_ext/numeric_ext_test.rb
@@ -441,57 +441,3 @@ class NumericExtFormattingTest < ActiveSupport::TestCase
     assert_equal '1 Million', BigDecimal("1000010").to_s(:human)
   end
 end
-
-class NumericExtBehaviorTest < ActiveSupport::TestCase
-  def setup
-    @inf = BigDecimal.new('Infinity')
-  end
-
-  def test_compare_infinity_with_date
-    assert_equal(-1, -Float::INFINITY <=> Date.today)
-    assert_equal(1, Float::INFINITY <=> Date.today)
-    assert_equal(-1, -@inf <=> Date.today)
-    assert_equal(1, @inf <=> Date.today)
-  end
-
-  def test_compare_infinty_with_infinty
-    assert_equal(-1, -Float::INFINITY <=> Float::INFINITY)
-    assert_equal(1, Float::INFINITY <=> -Float::INFINITY)
-    assert_equal(0, Float::INFINITY <=> Float::INFINITY)
-    assert_equal(0, -Float::INFINITY <=> -Float::INFINITY)
-
-    assert_equal(-1, -Float::INFINITY <=> BigDecimal::INFINITY)
-    assert_equal(1, Float::INFINITY <=> -BigDecimal::INFINITY)
-    assert_equal(0, Float::INFINITY <=> BigDecimal::INFINITY)
-    assert_equal(0, -Float::INFINITY <=> -BigDecimal::INFINITY)
-
-    assert_equal(-1, -BigDecimal::INFINITY <=> Float::INFINITY)
-    assert_equal(1, BigDecimal::INFINITY <=> -Float::INFINITY)
-    assert_equal(0, BigDecimal::INFINITY <=> Float::INFINITY)
-    assert_equal(0, -BigDecimal::INFINITY <=> -Float::INFINITY)
-  end
-
-  def test_compare_infinity_with_time
-    assert_equal(-1, -Float::INFINITY <=> Time.now)
-    assert_equal(1, Float::INFINITY <=> Time.now)
-    assert_equal(-1, -@inf <=> Time.now)
-    assert_equal(1, @inf <=> Time.now)
-  end
-
-  def test_compare_infinity_with_datetime
-    assert_equal(-1, -Float::INFINITY <=> DateTime.now)
-    assert_equal(1, Float::INFINITY <=> DateTime.now)
-    assert_equal(-1, -@inf <=> DateTime.now)
-    assert_equal(1, @inf <=> DateTime.now)
-  end
-
-  def test_compare_infinity_with_twz
-    time_zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
-    twz = ActiveSupport::TimeWithZone.new(Time.now, time_zone)
-
-    assert_equal(-1, -Float::INFINITY <=> twz)
-    assert_equal(1, Float::INFINITY <=> twz)
-    assert_equal(-1, -@inf <=> twz)
-    assert_equal(1, @inf <=> twz)
-  end
-end
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index 6e94d5e10d..3e2355ae23 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -1,7 +1,6 @@
 require 'abstract_unit'
 require 'active_support/time'
 require 'active_support/core_ext/range'
-require 'active_support/core_ext/numeric'
 
 class RangeTest < ActiveSupport::TestCase
   def test_to_s_from_dates
@@ -17,7 +16,6 @@ class RangeTest < ActiveSupport::TestCase
   def test_date_range
     assert_instance_of Range, DateTime.new..DateTime.new
     assert_instance_of Range, DateTime::Infinity.new..DateTime::Infinity.new
-    assert_instance_of Range, DateTime.new..DateTime::Infinity.new
   end
 
   def test_overlaps_last_inclusive
@@ -92,28 +90,4 @@ class RangeTest < ActiveSupport::TestCase
     time_range_2 = Time.utc(2005, 12, 10, 17, 31)..Time.utc(2005, 12, 10, 18, 00)
     assert !time_range_1.overlaps?(time_range_2)
   end
-
-  def test_infinite_bounds
-    time_zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
-
-    time = Time.now
-    date = Date.today
-    datetime = DateTime.now
-    twz = ActiveSupport::TimeWithZone.new(time, time_zone)
-
-    infinity1 = Float::INFINITY
-    infinity2 = BigDecimal.new('Infinity')
-
-    [infinity1, infinity2].each do |infinity|
-      [time, date, datetime, twz].each do |bound|
-        [time, date, datetime, twz].each do |value|
-          assert Range.new(bound, infinity).include?(value + 10.years)
-          assert Range.new(-infinity, bound).include?(value - 10.years)
-
-          assert !Range.new(bound, infinity).include?(value - 10.years)
-          assert !Range.new(-infinity, bound).include?(value + 10.years)
-        end
-      end
-    end
-  end
 end
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 2864d7a57f..4e53aff00b 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -855,10 +855,3 @@ class TimeExtMarshalingTest < ActiveSupport::TestCase
     assert_equal Time.local(2004, 2, 29), Time.local(2004, 5, 31).last_quarter
   end
 end
-
-class TimeExtBehaviorTest < ActiveSupport::TestCase
-  def test_compare_with_infinity
-    assert_equal(-1, Time.now <=> Float::INFINITY)
-    assert_equal(1, Time.now <=> -Float::INFINITY)
-  end
-end
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 98a87ab9e6..3ce3297874 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -1118,13 +1118,3 @@ class TimeWithZoneMethodsForString < ActiveSupport::TestCase
       Time.zone = old_tz
     end
 end
-
-class TimeWithZoneExtBehaviorTest < ActiveSupport::TestCase
-  def test_compare_with_infinity
-    time_zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
-    twz = ActiveSupport::TimeWithZone.new(Time.now, time_zone)
-
-    assert_equal(-1, twz <=> Float::INFINITY)
-    assert_equal(1, twz <=> -Float::INFINITY)
-  end
-end