Convert DateTime extension modules to class reopens

activesupport/lib/active_support/core_ext/date_time.rb

-require 'active_support/core_ext/util'
 require 'date'
-require 'active_support/core_ext/time/behavior'
-require 'active_support/core_ext/time/zones'
 
+require 'active_support/core_ext/date_time/calculations'
+require 'active_support/core_ext/date_time/zones'
+
+require 'active_support/core_ext/time/behavior'
 class DateTime
   include ActiveSupport::CoreExtensions::Time::Behavior
-  include ActiveSupport::CoreExtensions::Time::Zones
 end
 
-ActiveSupport.core_ext DateTime, %w(calculations conversions)
+require 'active_support/core_ext/util'
+ActiveSupport.core_ext DateTime, %w(conversions)

activesupport/lib/active_support/core_ext/date_time/calculations.rb

 require 'rational'
 
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module DateTime #:nodoc:
-      # Enables the use of time calculations within DateTime itself
-      module Calculations
-        def self.included(base) #:nodoc:
-          base.extend ClassMethods
-
-          base.class_eval do
-            alias_method :compare_without_coercion, :<=>
-            alias_method :<=>, :compare_with_coercion
-          end
-        end
-
-        module ClassMethods
+class DateTime
+  class << self
     # DateTimes aren't aware of DST rules, so use a consistent non-DST offset when creating a DateTime with an offset in the local zone
     def local_offset
       ::Time.local(2007).utc_offset.to_r / 86400
@@ -37,7 +24,7 @@ def future?
 
   # Seconds since midnight: DateTime.now.seconds_since_midnight
   def seconds_since_midnight
-          self.sec + (self.min * 60) + (self.hour * 3600)
+    sec + (min * 60) + (hour * 3600)
   end
 
   # Returns a new DateTime where one or more of the elements have been changed according to the +options+ parameter. The time options
@@ -45,14 +32,14 @@ def seconds_since_midnight
   # minute is passed, then sec is set to 0.
   def change(options)
     ::DateTime.civil(
-            options[:year]  || self.year,
-            options[:month] || self.month,
-            options[:day]   || self.day,
-            options[:hour]  || self.hour,
-            options[:min]   || (options[:hour] ? 0 : self.min),
-            options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
-            options[:offset]  || self.offset,
-            options[:start]  || self.start
+      options[:year]  || year,
+      options[:month] || month,
+      options[:day]   || day,
+      options[:hour]  || hour,
+      options[:min]   || (options[:hour] ? 0 : min),
+      options[:sec]   || ((options[:hour] || options[:min]) ? 0 : sec),
+      options[:offset]  || offset,
+      options[:start]  || start
     )
   end
 
@@ -70,7 +57,7 @@ def advance(options)
   # Returns a new DateTime representing the time a number of seconds ago
   # Do not use this method in combination with x.months, use months_ago instead!
   def ago(seconds)
-          self.since(-seconds)
+    since(-seconds)
   end
 
   # Returns a new DateTime representing the time a number of seconds since the instance time
@@ -120,7 +107,6 @@ def compare_with_coercion(other)
     other = other.to_datetime unless other.acts_like?(:date)
     compare_without_coercion(other)
   end
-      end
-    end
-  end
+  alias_method :compare_without_coercion, :<=>
+  alias_method :<=>, :compare_with_coercion
 end

activesupport/lib/active_support/core_ext/date_time/zones.rb

+class DateTime
+  # Returns the simultaneous time in <tt>Time.zone</tt>.
+  #
+  #   Time.zone = 'Hawaii'             # => 'Hawaii'
+  #   DateTime.new(2000).in_time_zone  # => Fri, 31 Dec 1999 14:00:00 HST -10:00
+  #
+  # This method is similar to Time#localtime, except that it uses <tt>Time.zone</tt> as the local zone
+  # instead of the operating system's time zone.
+  #
+  # You can also pass in a TimeZone instance or string that identifies a TimeZone as an argument, 
+  # and the conversion will be based on that zone instead of <tt>Time.zone</tt>.
+  #
+  #   DateTime.new(2000).in_time_zone('Alaska')  # => Fri, 31 Dec 1999 15:00:00 AKST -09:00
+  def in_time_zone(zone = ::Time.zone)
+    ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.__send__(:get_zone, zone))
+  end
+end