activesupport 3.0.20 → 3.1.0

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

@@ -1,12 +1,10 @@
 require 'rational' unless RUBY_VERSION >= '1.9.2'
-require 'active_support/core_ext/object/acts_like'
-require 'active_support/core_ext/time/zones'
 
 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(2012).utc_offset.to_r / 86400
+      ::Time.local(2007).utc_offset.to_r / 86400
     end
 
     # Returns <tt>Time.zone.now.to_datetime</tt> when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise returns <tt>Time.now.to_datetime</tt>.
@@ -83,6 +81,29 @@ class DateTime
     change(:hour => 23, :min => 59, :sec => 59)
   end
 
+  # 1.9.3 defines + and - on DateTime, < 1.9.3 do not.
+  if DateTime.public_instance_methods(false).include?(:+)
+    def plus_with_duration(other) #:nodoc:
+      if ActiveSupport::Duration === other
+        other.since(self)
+      else
+        plus_without_duration(other)
+      end
+    end
+    alias_method :plus_without_duration, :+
+    alias_method :+, :plus_with_duration
+
+    def minus_with_duration(other) #:nodoc:
+      if ActiveSupport::Duration === other
+        plus_with_duration(-other)
+      else
+        minus_without_duration(other)
+      end
+    end
+    alias_method :minus_without_duration, :-
+    alias_method :-, :minus_with_duration
+  end
+
   # Adjusts DateTime to UTC by adding its offset value; offset is set to 0
   #
   # Example:
@@ -105,11 +126,7 @@ class DateTime
   end
 
   # Layers additional behavior on DateTime#<=> so that Time and ActiveSupport::TimeWithZone instances can be compared with a DateTime
-  def compare_with_coercion(other)
-    other = other.comparable_time if other.respond_to?(:comparable_time)
-    other = other.to_datetime unless other.acts_like?(:date)
-    compare_without_coercion(other)
+  def <=>(other)
+    super other.to_datetime
   end
-  alias_method :compare_without_coercion, :<=>
-  alias_method :<=>, :compare_with_coercion
 end

data/lib/active_support/core_ext/date_time/conversions.rb

@@ -51,25 +51,25 @@ class DateTime
     utc? && alternate_utc_string || ActiveSupport::TimeZone.seconds_to_utc_offset(utc_offset, colon)
   end
 
-  # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005 14:30:00 +0000"
+  # 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)
   end
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect
 
-  # Converts self to a Ruby Date object; time portion is discarded
+  # Converts self to a Ruby Date object; time portion is discarded.
   def to_date
     ::Date.new(year, month, day)
   end unless instance_methods(false).include?(:to_date)
 
-  # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class
-  # 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
+  # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class.
+  # 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
+    self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec, sec_fraction * (RUBY_VERSION < '1.9' ? 86400000000 : 1000000)) : self
   end
 
-  # To be able to keep Times, Dates and DateTimes interchangeable on conversions
+  # To be able to keep Times, Dates and DateTimes interchangeable on conversions.
   def to_datetime
     self
   end unless instance_methods(false).include?(:to_datetime)
@@ -79,17 +79,17 @@ class DateTime
     civil(year, month, day, hour, min, sec, offset)
   end
 
-  # Converts datetime to an appropriate format for use in XML
+  # Converts datetime to an appropriate format for use in XML.
   def xmlschema
     strftime("%Y-%m-%dT%H:%M:%S%Z")
   end unless instance_methods(false).include?(:xmlschema)
 
-  # Converts self to a floating-point number of seconds since the Unix epoch
+  # Converts self to a floating-point number of seconds since the Unix epoch.
   def to_f
     seconds_since_unix_epoch.to_f
   end
 
-  # Converts self to an integer number of seconds since the Unix epoch
+  # Converts self to an integer number of seconds since the Unix epoch.
   def to_i
     seconds_since_unix_epoch.to_i
   end

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

@@ -16,6 +16,6 @@ class DateTime
   def in_time_zone(zone = ::Time.zone)
     return self unless zone
 
-    ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.__send__(:get_zone, zone))
+    ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.find_zone!(zone))
   end
 end

data/lib/active_support/core_ext/enumerable.rb

@@ -90,16 +90,13 @@ module Enumerable
   #     => { "Chade- Fowlersburg-e" => <Person ...>, "David Heinemeier Hansson" => <Person ...>, ...}
   #
   def index_by
-    inject({}) do |accum, elem|
-      accum[yield(elem)] = elem
-      accum
-    end
+    Hash[map { |elem| [yield(elem), elem] }]
   end
 
   # Returns true if the collection has more than 1 element. Functionally equivalent to collection.size > 1.
-  # Works with a block too ala any?, so people.many? { |p| p.age > 26 } # => returns true if more than 1 person is over 26.
+  # Can be called with a block too, much like any?, so people.many? { |p| p.age > 26 } returns true if more than 1 person is over 26.
   def many?(&block)
-    size = block_given? ? select(&block).size : self.size
+    size = block_given? ? count(&block) : self.size
     size > 1
   end
 

data/lib/active_support/core_ext/float/rounding.rb

@@ -16,4 +16,4 @@ class Float
       precisionless_round
     end
   end
-end
+end if RUBY_VERSION < '1.9'

data/lib/active_support/core_ext/hash/conversions.rb

@@ -26,10 +26,22 @@ class Hash
   #
   # * If +value+ is a callable object it must expect one or two arguments. Depending
   #   on the arity, the callable is invoked with the +options+ hash as first argument
-  #   with +key+ as <tt>:root</tt>, and +key+ singularized as second argument. Its
-  #   return value becomes a new node.
+  #   with +key+ as <tt>:root</tt>, and +key+ singularized as second argument. The 
+  #   callable can add nodes by using <tt>options[:builder]</tt>.
+  #
+  #     "foo".to_xml(lambda { |options, key| options[:builder].b(key) })
+  #     # => "<b>foo</b>"
   #
   # * If +value+ responds to +to_xml+ the method is invoked with +key+ as <tt>:root</tt>.
+  #     
+  #     class Foo
+  #       def to_xml(options)
+  #         options[:builder].bar "fooing!"
+  #       end
+  #     end
+  #          
+  #     {:foo => Foo.new}.to_xml(:skip_instruct => true)
+  #     # => "<hash><bar>fooing!</bar></hash>"
   #
   # * Otherwise, a node with +key+ as tag is created with a string representation of
   #   +value+ as text node. If +value+ is +nil+ an attribute "nil" set to "true" is added.
@@ -73,33 +85,15 @@ class Hash
     end
   end
 
-  class DisallowedType < StandardError #:nodoc:
-    def initialize(type)
-      super "Disallowed type attribute: #{type.inspect}"
-    end
-  end
-
-  DISALLOWED_XML_TYPES = %w(symbol yaml)
-
   class << self
-    def from_xml(xml, disallowed_types = nil)
-      typecast_xml_value(unrename_keys(ActiveSupport::XmlMini.parse(xml)), disallowed_types)
-    end
-
-    def from_trusted_xml(xml)
-      from_xml xml, []
+    def from_xml(xml)
+      typecast_xml_value(unrename_keys(ActiveSupport::XmlMini.parse(xml)))
     end
 
     private
-      def typecast_xml_value(value, disallowed_types = nil)
-        disallowed_types ||= DISALLOWED_XML_TYPES
-
+      def typecast_xml_value(value)
         case value.class.to_s
           when 'Hash'
-            if value.include?('type') && !value['type'].is_a?(Hash) && disallowed_types.include?(value['type'])
-              raise DisallowedType, value['type']
-            end
-
             if value['type'] == 'array'
               _, entries = Array.wrap(value.detect { |k,v| k != 'type' })
               if entries.nil? || (c = value['__content__'] && c.blank?)
@@ -107,9 +101,9 @@ class Hash
               else
                 case entries.class.to_s   # something weird with classes not matching here.  maybe singleton methods breaking is_a?
                 when "Array"
-                  entries.collect { |v| typecast_xml_value(v, disallowed_types) }
+                  entries.collect { |v| typecast_xml_value(v) }
                 when "Hash"
-                  [typecast_xml_value(entries, disallowed_types)]
+                  [typecast_xml_value(entries)]
                 else
                   raise "can't typecast #{entries.inspect}"
                 end
@@ -133,17 +127,14 @@ class Hash
             elsif value['type'] && value.size == 1 && !value['type'].is_a?(::Hash)
               nil
             else
-              xml_value = value.inject({}) do |h,(k,v)|
-                h[k] = typecast_xml_value(v, disallowed_types)
-                h
-              end
+              xml_value = Hash[value.map { |k,v| [k, typecast_xml_value(v)] }]
 
               # Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with
               # how multipart uploaded files from HTML appear
               xml_value["file"].is_a?(StringIO) ? xml_value["file"] : xml_value
             end
           when 'Array'
-            value.map! { |i| typecast_xml_value(i, disallowed_types) }
+            value.map! { |i| typecast_xml_value(i) }
             value.length > 1 ? value : value.first
           when 'String'
             value
@@ -155,10 +146,7 @@ class Hash
       def unrename_keys(params)
         case params.class.to_s
           when "Hash"
-            params.inject({}) do |h,(k,v)|
-              h[k.to_s.tr("-", "_")] = unrename_keys(v)
-              h
-            end
+            Hash[params.map { |k,v| [k.to_s.tr("-", "_"), unrename_keys(v)] } ]
           when "Array"
             params.map { |v| unrename_keys(v) }
           else

data/lib/active_support/core_ext/hash/deep_dup.rb

@@ -0,0 +1,11 @@
+class Hash
+  # Returns a deep copy of hash.
+  def deep_dup
+    duplicate = self.dup
+    duplicate.each_pair do |k,v|
+      tv = duplicate[k]
+      duplicate[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_dup : v
+    end
+    duplicate
+  end
+end

data/lib/active_support/core_ext/hash/indifferent_access.rb

@@ -9,4 +9,16 @@ class Hash
   def with_indifferent_access
     ActiveSupport::HashWithIndifferentAccess.new_from_hash_copying_default(self)
   end
+
+  # Called when object is nested under an object that receives
+  # #with_indifferent_access. This method will be called on the current object
+  # by the enclosing object and is aliased to #with_indifferent_access by
+  # default. Subclasses of Hash may overwrite this method to return +self+ if
+  # converting to an +ActiveSupport::HashWithIndifferentAccess+ would not be
+  # desirable.
+  #
+  #   b = {:b => 1}
+  #   {:a => b}.with_indifferent_access["a"] # calls b.nested_under_indifferent_access
+  #
+  alias nested_under_indifferent_access with_indifferent_access
 end

data/lib/active_support/core_ext/hash/keys.rb

@@ -35,11 +35,13 @@ class Hash
   # as keys, this will fail.
   #
   # ==== Examples
-  #   { :name => "Rob", :years => "28" }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key(s): years"
-  #   { :name => "Rob", :age => "28" }.assert_valid_keys("name", "age") # => raises "ArgumentError: Unknown key(s): name, age"
+  #   { :name => "Rob", :years => "28" }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key: years"
+  #   { :name => "Rob", :age => "28" }.assert_valid_keys("name", "age") # => raises "ArgumentError: Unknown key: name"
   #   { :name => "Rob", :age => "28" }.assert_valid_keys(:name, :age) # => passes, raises nothing
   def assert_valid_keys(*valid_keys)
-    unknown_keys = keys - [valid_keys].flatten
-    raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
+    valid_keys.flatten!
+    each_key do |k|
+      raise(ArgumentError, "Unknown key: #{k}") unless valid_keys.include?(k)
+    end
   end
 end

data/lib/active_support/core_ext/hash/reverse_merge.rb

@@ -1,27 +1,22 @@
 class Hash
-  # Allows for reverse merging two hashes where the keys in the calling hash take precedence over those
-  # in the <tt>other_hash</tt>. This is particularly useful for initializing an option hash with default values:
+  # Merges the caller into +other_hash+. For example,
   #
-  #   def setup(options = {})
-  #     options.reverse_merge! :size => 25, :velocity => 10
-  #   end
+  #   options = options.reverse_merge(:size => 25, :velocity => 10)
   #
-  # Using <tt>merge</tt>, the above example would look as follows:
+  # is equivalent to
   #
-  #   def setup(options = {})
-  #     { :size => 25, :velocity => 10 }.merge(options)
-  #   end
+  #   options = {:size => 25, :velocity => 10}.merge(options)
   #
-  # The default <tt>:size</tt> and <tt>:velocity</tt> are only set if the +options+ hash passed in doesn't already
-  # have the respective key.
+  # This is particularly useful for initializing an options hash
+  # with default values.
   def reverse_merge(other_hash)
     other_hash.merge(self)
   end
 
-  # Performs the opposite of <tt>merge</tt>, with the keys and values from the first hash taking precedence over the second.
-  # Modifies the receiver in place.
+  # Destructive +reverse_merge+.
   def reverse_merge!(other_hash)
-    merge!( other_hash ){|k,o,n| o }
+    # right wins if there is no left
+    merge!( other_hash ){|key,left,right| left }
   end
 
   alias_method :reverse_update, :reverse_merge!

data/lib/active_support/core_ext/hash/slice.rb

@@ -21,7 +21,7 @@ class Hash
 
   # Replaces the hash with only the given keys.
   # Returns a hash contained the removed key/value pairs
-  #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d =>4}
+  #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d => 4}
   def slice!(*keys)
     keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
     omit = slice(*self.keys - keys)
@@ -30,6 +30,8 @@ class Hash
     omit
   end
 
+  # Removes and returns the key/value pairs matching the given keys.
+  #   {:a => 1, :b => 2, :c => 3, :d => 4}.extract!(:a, :b) # => {:a => 1, :b => 2}
   def extract!(*keys)
     result = {}
     keys.each {|key| result[key] = delete(key) }

data/lib/active_support/core_ext/hash.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/hash/conversions'
 require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/deep_dup'
 require 'active_support/core_ext/hash/diff'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/indifferent_access'

data/lib/active_support/core_ext/integer/inflections.rb

@@ -4,10 +4,13 @@ class Integer
   # Ordinalize turns a number into an ordinal string used to denote the
   # position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
   #
-  #   1.ordinalize    # => "1st"
-  #   2.ordinalize    # => "2nd"
-  #   1002.ordinalize # => "1002nd"
-  #   1003.ordinalize # => "1003rd"
+  #  1.ordinalize     # => "1st"
+  #  2.ordinalize     # => "2nd"
+  #  1002.ordinalize  # => "1002nd"
+  #  1003.ordinalize  # => "1003rd"
+  #  -11.ordinalize   # => "-11th"
+  #  -1001.ordinalize # => "-1001st"
+  #
   def ordinalize
     ActiveSupport::Inflector.ordinalize(self)
   end

data/lib/active_support/core_ext/kernel/reporting.rb

@@ -59,4 +59,35 @@ module Kernel
       raise unless exception_classes.any? { |cls| e.kind_of?(cls) }
     end
   end
+
+  # Captures the given stream and returns it:
+  #
+  #   stream = capture(:stdout) { puts "Cool" }
+  #   stream # => "Cool\n"
+  #
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+  alias :silence :capture
+
+  # Silences both STDOUT and STDERR, even for subprocesses.
+  #
+  #   quietly { system 'bundle install' }
+  #
+  def quietly
+    silence_stream(STDOUT) do
+      silence_stream(STDERR) do
+        yield
+      end
+    end
+  end
 end

data/lib/active_support/core_ext/kernel/requires.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/module/deprecation'
 
 module Kernel
   # Require a library with fallback to RubyGems.  Warnings during library
@@ -23,4 +24,5 @@ module Kernel
       end
     end
   end
+  deprecate :require_library_or_gem
 end

data/lib/active_support/core_ext/logger.rb

@@ -4,18 +4,17 @@ require 'active_support/core_ext/class/attribute_accessors'
 class Logger #:nodoc:
   def self.define_around_helper(level)
     module_eval <<-end_eval, __FILE__, __LINE__ + 1
-      def around_#{level}(before_message, after_message, &block)  # def around_debug(before_message, after_message, &block)
-        self.#{level}(before_message)                             #   self.debug(before_message)
-        return_value = block.call(self)                           #   return_value = block.call(self)
-        self.#{level}(after_message)                              #   self.debug(after_message)
-        return return_value                                       #   return return_value
-      end                                                         # end
+      def around_#{level}(before_message, after_message)  # def around_debug(before_message, after_message, &block)
+        self.#{level}(before_message)                     #   self.debug(before_message)
+        return_value = yield(self)                        #   return_value = yield(self)
+        self.#{level}(after_message)                      #   self.debug(after_message)
+        return_value                                      #   return_value
+      end                                                 # end
     end_eval
   end
   [:debug, :info, :error, :fatal].each {|level| define_around_helper(level) }
 end
 
-
 require 'logger'
 
 # Extensions to the built-in Ruby logger.
@@ -65,11 +64,11 @@ class Logger
     formatter.datetime_format if formatter.respond_to?(:datetime_format)
   end
 
-  alias :old_formatter :formatter if method_defined?(:formatter)
-  # Get the current formatter. The default formatter is a SimpleFormatter which only
-  # displays the log message
-  def formatter
-    @formatter ||= SimpleFormatter.new
+  alias :old_initialize :initialize
+  # Overwrite initialize to set a default formatter.
+  def initialize(*args)
+    old_initialize(*args)
+    self.formatter = SimpleFormatter.new
   end
 
   # Simple formatter which only displays the message.
@@ -79,30 +78,4 @@ class Logger
       "#{String === msg ? msg : msg.inspect}\n"
     end
   end
-
-  private
-    alias old_format_message format_message
-
-    # Ruby 1.8.3 transposed the msg and progname arguments to format_message.
-    # We can't test RUBY_VERSION because some distributions don't keep Ruby
-    # and its standard library in sync, leading to installations of Ruby 1.8.2
-    # with Logger from 1.8.3 and vice versa.
-    if method_defined?(:formatter=)
-      def format_message(severity, timestamp, progname, msg)
-        formatter.call(severity, timestamp, progname, msg)
-      end
-    else
-      def format_message(severity, timestamp, msg, progname)
-        formatter.call(severity, timestamp, progname, msg)
-      end
-
-      attr_writer :formatter
-      public :formatter=
-
-      alias old_format_datetime format_datetime
-      def format_datetime(datetime) datetime end
-
-      alias old_msg2str msg2str
-      def msg2str(msg) msg end
-    end
 end

data/lib/active_support/core_ext/module/attr_accessor_with_default.rb

@@ -7,25 +7,25 @@ class Module
   #     attr_accessor_with_default :age, 25
   #   end
   #
-  #   some_person.age
-  #   => 25
-  #   some_person.age = 26
-  #   some_person.age
-  #   => 26
+  #   person = Person.new
+  #   person.age # => 25
+  #
+  #   person.age = 26
+  #   person.age # => 26
   #
   # To give attribute <tt>:element_name</tt> a dynamic default value, evaluated
   # in scope of self:
   #
   #   attr_accessor_with_default(:element_name) { name.underscore }
   #
-  def attr_accessor_with_default(sym, default = nil, &block)
-    raise 'Default value or block required' unless !default.nil? || block
-    define_method(sym, block_given? ? block : Proc.new { default })
+  def attr_accessor_with_default(sym, default = Proc.new)
+    ActiveSupport::Deprecation.warn "attr_accessor_with_default is deprecated. Use Ruby instead!"
+    define_method(sym, block_given? ? default : Proc.new { default })
     module_eval(<<-EVAL, __FILE__, __LINE__ + 1)
-      def #{sym}=(value)                        # def age=(value)
-        class << self; attr_reader :#{sym} end  #   class << self; attr_reader :age end
-        @#{sym} = value                         #   @age = value
-      end                                       # end
+      def #{sym}=(value)                          # def age=(value)
+        class << self; attr_accessor :#{sym} end  #   class << self; attr_accessor :age end
+        @#{sym} = value                           #   @age = value
+      end                                         # end
     EVAL
   end
 end

data/lib/active_support/core_ext/module/attr_internal.rb

@@ -1,16 +1,12 @@
 class Module
   # Declares an attribute reader backed by an internally-named instance variable.
   def attr_internal_reader(*attrs)
-    attrs.each do |attr|
-      module_eval "def #{attr}() #{attr_internal_ivar_name(attr)} end", __FILE__, __LINE__
-    end
+    attrs.each {|attr_name| attr_internal_define(attr_name, :reader)}
   end
 
   # Declares an attribute writer backed by an internally-named instance variable.
   def attr_internal_writer(*attrs)
-    attrs.each do |attr|
-      module_eval "def #{attr}=(v) #{attr_internal_ivar_name(attr)} = v end", __FILE__, __LINE__
-    end
+    attrs.each {|attr_name| attr_internal_define(attr_name, :writer)}
   end
 
   # Declares an attribute reader and writer backed by an internally-named instance
@@ -29,4 +25,15 @@ class Module
     def attr_internal_ivar_name(attr)
       Module.attr_internal_naming_format % attr
     end
+
+    def attr_internal_define(attr_name, type)
+      internal_name = attr_internal_ivar_name(attr_name).sub(/\A@/, '')
+      class_eval do # class_eval is necessary on 1.9 or else the methods a made private
+        # use native attr_* methods as they are faster on some Ruby implementations
+        send("attr_#{type}", internal_name)
+      end
+      attr_name, internal_name = "#{attr_name}=", "#{internal_name}=" if type == :writer
+      alias_method attr_name, internal_name
+      remove_method internal_name
+    end
 end

data/lib/active_support/core_ext/module/delegation.rb

@@ -126,11 +126,7 @@ class Module
           %(raise "#{self}##{prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}")
         end
 
-      module_eval(<<-EOS, file, line - 5)
-        if instance_methods(false).map(&:to_s).include?("#{prefix}#{method}")
-          remove_possible_method("#{prefix}#{method}")
-        end
-
+      module_eval(<<-EOS, file, line - 1)
         def #{prefix}#{method}(*args, &block)               # def customer_name(*args, &block)
           #{to}.__send__(#{method.inspect}, *args, &block)  #   client.__send__(:name, *args, &block)
         rescue NoMethodError                                # rescue NoMethodError

data/lib/active_support/core_ext/module/remove_method.rb

@@ -1,11 +1,16 @@
 class Module
   def remove_possible_method(method)
-    remove_method(method)
+    if method_defined?(method) || private_method_defined?(method)
+      remove_method(method)
+    end
   rescue NameError
+    # If the requested method is defined on a superclass or included module,
+    # method_defined? returns true but remove_method throws a NameError.
+    # Ignore this.
   end
 
   def redefine_method(method, &block)
     remove_possible_method(method)
     define_method(method, &block)
   end
-end
+end

data/lib/active_support/core_ext/numeric/time.rb

@@ -1,4 +1,6 @@
 require 'active_support/duration'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/acts_like'
 
 class Numeric
   # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.