activesupport 2.3.18 → 3.0.0.beta

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

@@ -1,107 +1,95 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module DateTime #:nodoc:
-      # Converting datetimes to formatted strings, dates, and times.
-      module Conversions
-        def self.append_features(base) #:nodoc:
-          base.class_eval do
-            alias_method :default_inspect, :inspect
-            alias_method :to_default_s, :to_s unless (instance_methods(false) & [:to_s, 'to_s']).empty?
+require 'active_support/inflector'
 
-            # 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 instance_methods.include?(:to_time)
-          end
+class DateTime
+  # 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 instance_methods.include?(:to_time)
 
-          super
-
-          base.class_eval do
-            alias_method :to_s, :to_formatted_s
-            alias_method :inspect, :readable_inspect
-          end
-        end
-
-        # Convert to a formatted string. See Time::DATE_FORMATS for predefined formats.
-        # 
-        # This method is aliased to <tt>to_s</tt>.
-        # 
-        # === Examples
-        #   datetime = DateTime.civil(2007, 12, 4, 0, 0, 0, 0)   # => Tue, 04 Dec 2007 00:00:00 +0000
-        # 
-        #   datetime.to_formatted_s(:db)            # => "2007-12-04 00:00:00"
-        #   datetime.to_s(:db)                      # => "2007-12-04 00:00:00"
-        #   datetime.to_s(:number)                  # => "20071204000000"
-        #   datetime.to_formatted_s(:short)         # => "04 Dec 00:00"
-        #   datetime.to_formatted_s(:long)          # => "December 04, 2007 00:00"
-        #   datetime.to_formatted_s(:long_ordinal)  # => "December 4th, 2007 00:00"
-        #   datetime.to_formatted_s(:rfc822)        # => "Tue, 04 Dec 2007 00:00:00 +0000"
-        #
-        # == Adding your own datetime formats to to_formatted_s
-        # DateTime formats are shared with Time. You can add your own to the
-        # Time::DATE_FORMATS hash. Use the format name as the hash key and
-        # either a strftime string or Proc instance that takes a time or
-        # datetime argument as the value.
-        #
-        #   # config/initializers/time_formats.rb
-        #   Time::DATE_FORMATS[:month_and_year] = "%B %Y"
-        #   Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
-        def to_formatted_s(format = :default)
-          return to_default_s unless formatter = ::Time::DATE_FORMATS[format]
-          formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
-        end
-
-        # Returns the +utc_offset+ as an +HH:MM formatted string. Examples:
-        #
-        #   datetime = DateTime.civil(2000, 1, 1, 0, 0, 0, Rational(-6, 24))
-        #   datetime.formatted_offset         # => "-06:00"
-        #   datetime.formatted_offset(false)  # => "-0600"
-        def formatted_offset(colon = true, alternate_utc_string = nil)
-          utc? && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
-        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)
-        end
+  # Convert to a formatted string. See Time::DATE_FORMATS for predefined formats.
+  # 
+  # This method is aliased to <tt>to_s</tt>.
+  # 
+  # === Examples
+  #   datetime = DateTime.civil(2007, 12, 4, 0, 0, 0, 0)   # => Tue, 04 Dec 2007 00:00:00 +0000
+  # 
+  #   datetime.to_formatted_s(:db)            # => "2007-12-04 00:00:00"
+  #   datetime.to_s(:db)                      # => "2007-12-04 00:00:00"
+  #   datetime.to_s(:number)                  # => "20071204000000"
+  #   datetime.to_formatted_s(:short)         # => "04 Dec 00:00"
+  #   datetime.to_formatted_s(:long)          # => "December 04, 2007 00:00"
+  #   datetime.to_formatted_s(:long_ordinal)  # => "December 4th, 2007 00:00"
+  #   datetime.to_formatted_s(:rfc822)        # => "Tue, 04 Dec 2007 00:00:00 +0000"
+  #
+  # == Adding your own datetime formats to to_formatted_s
+  # DateTime formats are shared with Time. You can add your own to the
+  # Time::DATE_FORMATS hash. Use the format name as the hash key and
+  # either a strftime string or Proc instance that takes a time or
+  # datetime argument as the value.
+  #
+  #   # config/initializers/time_formats.rb
+  #   Time::DATE_FORMATS[:month_and_year] = "%B %Y"
+  #   Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
+  def to_formatted_s(format = :default)
+    if formatter = ::Time::DATE_FORMATS[format]
+      formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
+    else
+      to_default_s
+    end
+  end
+  alias_method :to_default_s, :to_s unless (instance_methods(false) & [:to_s, 'to_s']).empty?
+  alias_method :to_s, :to_formatted_s
 
-        # Converts self to a Ruby Date object; time portion is discarded
-        def to_date
-          ::Date.new(year, month, day)
-        end
+  # Returns the +utc_offset+ as an +HH:MM formatted string. Examples:
+  #
+  #   datetime = DateTime.civil(2000, 1, 1, 0, 0, 0, Rational(-6, 24))
+  #   datetime.formatted_offset         # => "-06:00"
+  #   datetime.formatted_offset(false)  # => "-0600"
+  def formatted_offset(colon = true, alternate_utc_string = nil)
+    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"
+  def readable_inspect
+    to_s(:rfc822)
+  end
+  alias_method :default_inspect, :inspect
+  alias_method :inspect, :readable_inspect
 
-        # 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
-        end
+  # Converts self to a Ruby Date object; time portion is discarded
+  def to_date
+    ::Date.new(year, month, day)
+  end unless method_defined?(:to_date)
 
-        # To be able to keep Times, Dates and DateTimes interchangeable on conversions
-        def to_datetime
-          self
-        end
+  # 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
+  end
 
-        # Converts datetime to an appropriate format for use in XML
-        def xmlschema
-          strftime("%Y-%m-%dT%H:%M:%S%Z")
-        end if RUBY_VERSION < '1.9'
+  # To be able to keep Times, Dates and DateTimes interchangeable on conversions
+  def to_datetime
+    self
+  end unless method_defined?(:to_datetime)
 
-        # Converts self to a floating-point number of seconds since the Unix epoch 
-        def to_f
-          seconds_since_unix_epoch.to_f
-        end
+  # Converts datetime to an appropriate format for use in XML
+  def xmlschema
+    strftime("%Y-%m-%dT%H:%M:%S%Z")
+  end unless method_defined?(:xmlschema)
+  
+  # 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
-        def to_i
-          seconds_since_unix_epoch.to_i
-        end
+  # Converts self to an integer number of seconds since the Unix epoch
+  def to_i
+    seconds_since_unix_epoch.to_i
+  end
 
-        private
+  private
 
-        def seconds_since_unix_epoch
-          seconds_per_day = 86_400
-          (self - ::DateTime.civil(1970)) * seconds_per_day
-        end
-      end
-    end
+  def seconds_since_unix_epoch
+    seconds_per_day = 86_400
+    (self - ::DateTime.civil(1970)) * seconds_per_day
   end
 end

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

@@ -0,0 +1,17 @@
+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

data/lib/active_support/core_ext/enumerable.rb

@@ -42,7 +42,7 @@ module Enumerable
   #
   # The latter is a shortcut for:
   #
-  #  payments.inject { |sum, p| sum + p.price }
+  #  payments.inject(0) { |sum, p| sum + p.price }
   #
   # It can also calculate the sum without the use of a block.
   #
@@ -75,11 +75,10 @@ module Enumerable
   #   (1..5).each_with_object(1) { |value, memo| memo *= value } # => 1
   #
   def each_with_object(memo, &block)
-    memo.tap do |m|
-      each do |element|
-        block.call(element, m)
-      end
+    each do |element|
+      block.call(element, memo)
     end
+    memo
   end unless [].respond_to?(:each_with_object)
 
   # Convert an enumerable to a hash. Examples:
@@ -102,19 +101,19 @@ module Enumerable
     size = block_given? ? select(&block).size : self.size
     size > 1
   end
-
-  # Returns true if none of the elements match the given block.
-  #
-  #   success = responses.none? {|r| r.status / 100 == 5 }
-  #
-  # This is a builtin method in Ruby 1.8.7 and later.
-  def none?(&block)
-    !any?(&block)
-  end unless [].respond_to?(:none?)
-
   
   # The negative of the Enumerable#include?. Returns true if the collection does not include the object.
   def exclude?(object)
     !include?(object)
   end
 end
+
+class Range #:nodoc:
+  # Optimize range sum to use arithmetic progression if a block is not given and
+  # we have a range of numeric values.
+  def sum(identity = 0)
+    return super if block_given? || !(first.instance_of?(Integer) && last.instance_of?(Integer))
+    actual_last = exclude_end? ? (last - 1) : last
+    (actual_last - first + 1) * (actual_last + first) / 2
+  end
+end

data/lib/active_support/core_ext/exception.rb

@@ -1,45 +1,3 @@
 module ActiveSupport
-  if RUBY_VERSION >= '1.9'
-    FrozenObjectError = RuntimeError
-  else
-    FrozenObjectError = TypeError
-  end
-end
-
-# TODO: Turn all this into using the BacktraceCleaner.
-class Exception # :nodoc:
-  def clean_message
-    Pathname.clean_within message
-  end
-
-  TraceSubstitutions = []
-  FrameworkStart = /action_controller\/dispatcher\.rb/.freeze
-  FrameworkRegexp = /generated|vendor|dispatch|ruby|script\/\w+/.freeze
-
-  def clean_backtrace
-    backtrace.collect do |line|
-      Pathname.clean_within(TraceSubstitutions.inject(line) do |result, (regexp, sub)|
-        result.gsub regexp, sub
-      end)
-    end
-  end
-
-  def application_backtrace
-    before_framework_frame = nil
-    before_application_frame = true
-
-    trace = clean_backtrace.reject do |line|
-      before_framework_frame ||= (line =~ FrameworkStart)
-      non_app_frame = (line =~ FrameworkRegexp)
-      before_application_frame = false unless non_app_frame
-      before_framework_frame || (non_app_frame && !before_application_frame)
-    end
-
-    # If we didn't find any application frames, return an empty app trace.
-    before_application_frame ? [] : trace
-  end
-
-  def framework_backtrace
-    clean_backtrace.grep FrameworkRegexp
-  end
+  FrozenObjectError = RUBY_VERSION < '1.9' ? TypeError : RuntimeError
 end

data/lib/active_support/core_ext/file.rb

@@ -1,5 +1 @@
 require 'active_support/core_ext/file/atomic'
-
-class File #:nodoc:
-  extend ActiveSupport::CoreExtensions::File::Atomic
-end

data/lib/active_support/core_ext/file/atomic.rb

@@ -1,47 +1,40 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module File #:nodoc:
-      module Atomic
-        # Write to a file atomically.  Useful for situations where you don't
-        # want other processes or threads to see half-written files.
-        #
-        #   File.atomic_write("important.file") do |file|
-        #     file.write("hello")
-        #   end
-        #
-        # If your temp directory is not on the same filesystem as the file you're 
-        # trying to write, you can provide a different temporary directory.
-        # 
-        #   File.atomic_write("/data/something.important", "/data/tmp") do |f|
-        #     file.write("hello")
-        #   end
-        def atomic_write(file_name, temp_dir = Dir.tmpdir)
-          require 'tempfile' unless defined?(Tempfile)
-          require 'fileutils' unless defined?(FileUtils)
+class File
+  # Write to a file atomically.  Useful for situations where you don't
+  # want other processes or threads to see half-written files.
+  #
+  #   File.atomic_write("important.file") do |file|
+  #     file.write("hello")
+  #   end
+  #
+  # If your temp directory is not on the same filesystem as the file you're
+  # trying to write, you can provide a different temporary directory.
+  #
+  #   File.atomic_write("/data/something.important", "/data/tmp") do |f|
+  #     file.write("hello")
+  #   end
+  def self.atomic_write(file_name, temp_dir = Dir.tmpdir)
+    require 'tempfile' unless defined?(Tempfile)
 
-          temp_file = Tempfile.new(basename(file_name), temp_dir)
-          yield temp_file
-          temp_file.close
+    temp_file = Tempfile.new(basename(file_name), temp_dir)
+    yield temp_file
+    temp_file.close
 
-          begin
-            # Get original file permissions
-            old_stat = stat(file_name)
-          rescue Errno::ENOENT
-            # No old permissions, write a temp file to determine the defaults
-            check_name = join(dirname(file_name), ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}")
-            open(check_name, "w") { }
-            old_stat = stat(check_name)
-            unlink(check_name)
-          end
+    begin
+      # Get original file permissions
+      old_stat = stat(file_name)
+    rescue Errno::ENOENT
+      # No old permissions, write a temp file to determine the defaults
+      check_name = join(dirname(file_name), ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}")
+      open(check_name, "w") { }
+      old_stat = stat(check_name)
+      unlink(check_name)
+    end
 
-          # Overwrite original file with temp file
-          FileUtils.mv(temp_file.path, file_name)
+    # Overwrite original file with temp file
+    rename(temp_file.path, file_name)
 
-          # Set correct permissions on new file
-          chown(old_stat.uid, old_stat.gid, file_name)
-          chmod(old_stat.mode, file_name)
-        end
-      end
-    end
+    # Set correct permissions on new file
+    chown(old_stat.uid, old_stat.gid, file_name)
+    chmod(old_stat.mode, file_name)
   end
 end

data/lib/active_support/core_ext/float.rb

@@ -1,7 +1 @@
 require 'active_support/core_ext/float/rounding'
-require 'active_support/core_ext/float/time'
-
-class Float #:nodoc:
-  include ActiveSupport::CoreExtensions::Float::Rounding
-  include ActiveSupport::CoreExtensions::Float::Time
-end

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

@@ -1,24 +1,19 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Float #:nodoc:
-      module Rounding
-        def self.included(base) #:nodoc:
-          base.class_eval do
-            alias_method :round_without_precision, :round
-            alias_method :round, :round_with_precision
-          end
-        end
+class Float
+  alias precisionless_round round
+  private :precisionless_round
 
-        # Rounds the float with the specified precision.
-        #
-        #   x = 1.337
-        #   x.round    # => 1
-        #   x.round(1) # => 1.3
-        #   x.round(2) # => 1.34
-        def round_with_precision(precision = nil)
-          precision.nil? ? round_without_precision : (self * (10 ** precision)).round / (10 ** precision).to_f
-        end
-      end
+  # Rounds the float with the specified precision.
+  #
+  #   x = 1.337
+  #   x.round    # => 1
+  #   x.round(1) # => 1.3
+  #   x.round(2) # => 1.34
+  def round(precision = nil)
+    if precision
+      magnitude = 10.0 ** precision
+      (self * magnitude).round / magnitude
+    else
+      precisionless_round
     end
   end
 end

data/lib/active_support/core_ext/hash.rb

@@ -1,14 +1,8 @@
-%w(keys indifferent_access deep_merge reverse_merge conversions diff slice except).each do |ext|
-  require "active_support/core_ext/hash/#{ext}"
-end
-
-class Hash #:nodoc:
-  include ActiveSupport::CoreExtensions::Hash::Keys
-  include ActiveSupport::CoreExtensions::Hash::IndifferentAccess
-  include ActiveSupport::CoreExtensions::Hash::DeepMerge
-  include ActiveSupport::CoreExtensions::Hash::ReverseMerge
-  include ActiveSupport::CoreExtensions::Hash::Conversions
-  include ActiveSupport::CoreExtensions::Hash::Diff
-  include ActiveSupport::CoreExtensions::Hash::Slice
-  include ActiveSupport::CoreExtensions::Hash::Except
-end
+require 'active_support/core_ext/hash/conversions'
+require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/diff'
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/hash/slice'