activesupport 2.3.5 → 3.0.0.beta3

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

@@ -1,90 +1,85 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Time #:nodoc:
-      # Converting times to formatted strings, dates, and datetimes.
-      module Conversions
-        DATE_FORMATS = {
-          :db           => "%Y-%m-%d %H:%M:%S",
-          :number       => "%Y%m%d%H%M%S",
-          :time         => "%H:%M",
-          :short        => "%d %b %H:%M",
-          :long         => "%B %d, %Y %H:%M",
-          :long_ordinal => lambda { |time| time.strftime("%B #{time.day.ordinalize}, %Y %H:%M") },
-          :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
-        }
+require 'active_support/inflector'
+require 'active_support/core_ext/time/publicize_conversion_methods'
+require 'active_support/values/time_zone'
 
-        def self.included(base) #:nodoc:
-          base.class_eval do
-            alias_method :to_default_s, :to_s
-            alias_method :to_s, :to_formatted_s
-          end
-        end
+class Time
+  DATE_FORMATS = {
+    :db           => "%Y-%m-%d %H:%M:%S",
+    :number       => "%Y%m%d%H%M%S",
+    :time         => "%H:%M",
+    :short        => "%d %b %H:%M",
+    :long         => "%B %d, %Y %H:%M",
+    :long_ordinal => lambda { |time| time.strftime("%B #{ActiveSupport::Inflector.ordinalize(time.day)}, %Y %H:%M") },
+    :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
+  }
 
-        # Converts to a formatted string. See DATE_FORMATS for builtin formats.
-        #
-        # This method is aliased to <tt>to_s</tt>.
-        #
-        #   time = Time.now                     # => Thu Jan 18 06:10:17 CST 2007
-        #
-        #   time.to_formatted_s(:time)          # => "06:10:17"
-        #   time.to_s(:time)                    # => "06:10:17"
-        #
-        #   time.to_formatted_s(:db)            # => "2007-01-18 06:10:17"
-        #   time.to_formatted_s(:number)        # => "20070118061017"
-        #   time.to_formatted_s(:short)         # => "18 Jan 06:10"
-        #   time.to_formatted_s(:long)          # => "January 18, 2007 06:10"
-        #   time.to_formatted_s(:long_ordinal)  # => "January 18th, 2007 06:10"
-        #   time.to_formatted_s(:rfc822)        # => "Thu, 18 Jan 2007 06:10:17 -0600"
-        #
-        # == Adding your own time formats to +to_formatted_s+
-        # You can add your own formats 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 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 = 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.
-        #
-        #   Time.local(2000).formatted_offset         # => "-06:00"
-        #   Time.local(2000).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
+  # Converts to a formatted string. See DATE_FORMATS for builtin formats.
+  #
+  # This method is aliased to <tt>to_s</tt>.
+  #
+  #   time = Time.now                     # => Thu Jan 18 06:10:17 CST 2007
+  #
+  #   time.to_formatted_s(:time)          # => "06:10:17"
+  #   time.to_s(:time)                    # => "06:10:17"
+  #
+  #   time.to_formatted_s(:db)            # => "2007-01-18 06:10:17"
+  #   time.to_formatted_s(:number)        # => "20070118061017"
+  #   time.to_formatted_s(:short)         # => "18 Jan 06:10"
+  #   time.to_formatted_s(:long)          # => "January 18, 2007 06:10"
+  #   time.to_formatted_s(:long_ordinal)  # => "January 18th, 2007 06:10"
+  #   time.to_formatted_s(:rfc822)        # => "Thu, 18 Jan 2007 06:10:17 -0600"
+  #
+  # == Adding your own time formats to +to_formatted_s+
+  # You can add your own formats 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 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 = 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
+  alias_method :to_s, :to_formatted_s
+ 
+  # Returns the UTC offset as an +HH:MM formatted string.
+  #
+  #   Time.local(2000).formatted_offset         # => "-06:00"
+  #   Time.local(2000).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
 
-        # Converts a Time object to a Date, dropping hour, minute, and second precision.
-        #
-        #   my_time = Time.now  # => Mon Nov 12 22:59:51 -0500 2007
-        #   my_time.to_date     # => Mon, 12 Nov 2007
-        #
-        #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
-        #   your_time.to_date                                 # => Tue, 13 Jan 2009
-        def to_date
-          ::Date.new(year, month, day)
-        end
+  # Converts a Time object to a Date, dropping hour, minute, and second precision.
+  #
+  #   my_time = Time.now  # => Mon Nov 12 22:59:51 -0500 2007
+  #   my_time.to_date     # => Mon, 12 Nov 2007
+  #
+  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+  #   your_time.to_date                                 # => Tue, 13 Jan 2009
+  def to_date
+    ::Date.new(year, month, day)
+  end unless method_defined?(:to_date)
 
-        # A method to keep Time, Date and DateTime instances interchangeable on conversions.
-        # In this case, it simply returns +self+.
-        def to_time
-          self
-        end
+  # A method to keep Time, Date and DateTime instances interchangeable on conversions.
+  # In this case, it simply returns +self+.
+  def to_time
+    self
+  end unless method_defined?(:to_time)
 
-        # Converts a Time instance to a Ruby DateTime instance, preserving UTC offset.
-        #
-        #   my_time = Time.now    # => Mon Nov 12 23:04:21 -0500 2007
-        #   my_time.to_datetime   # => Mon, 12 Nov 2007 23:04:21 -0500
-        #
-        #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
-        #   your_time.to_datetime                             # => Tue, 13 Jan 2009 13:13:03 -0500
-        def to_datetime
-          ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400))
-        end
-      end
-    end
-  end
+  # Converts a Time instance to a Ruby DateTime instance, preserving UTC offset.
+  #
+  #   my_time = Time.now    # => Mon Nov 12 23:04:21 -0500 2007
+  #   my_time.to_datetime   # => Mon, 12 Nov 2007 23:04:21 -0500
+  #
+  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+  #   your_time.to_datetime                             # => Tue, 13 Jan 2009 13:13:03 -0500
+  def to_datetime
+    ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400))
+  end unless method_defined?(:to_datetime)
 end

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

@@ -0,0 +1,56 @@
+# Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
+# unmarshalled in the local zone, instead of utc. We're layering behavior on the _dump and _load
+# methods so that utc instances can be flagged on dump, and coerced back to utc on load.
+if !Marshal.load(Marshal.dump(Time.now.utc)).utc?
+  class Time
+    class << self
+      alias_method :_load_without_utc_flag, :_load
+      def _load(marshaled_time)
+        time = _load_without_utc_flag(marshaled_time)
+        time.instance_eval do
+          if defined?(@marshal_with_utc_coercion)
+            val = remove_instance_variable("@marshal_with_utc_coercion")
+          end
+          val ? utc : self
+        end
+      end
+    end
+
+    alias_method :_dump_without_utc_flag, :_dump
+    def _dump(*args)
+      obj = dup
+      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
+      obj._dump_without_utc_flag(*args)
+    end
+  end
+end
+
+# Ruby 1.9.2 adds utc_offset and zone to Time, but marshaling only
+# preserves utc_offset. Preserve zone also, even though it may not
+# work in some edge cases.
+if Time.local(2010).zone != Marshal.load(Marshal.dump(Time.local(2010))).zone
+  class Time
+    class << self
+      alias_method :_load_without_zone, :_load
+      def _load(marshaled_time)
+        time = _load_without_zone(marshaled_time)
+        time.instance_eval do
+          if zone = defined?(@_zone) && remove_instance_variable('@_zone')
+            ary = to_a
+            ary[-1] = zone
+            utc? ? Time.utc(*ary) : Time.local(*ary)
+          else
+            self
+          end
+        end
+      end
+    end
+
+    alias_method :_dump_without_zone, :_dump
+    def _dump(*args)
+      obj = dup
+      obj.instance_variable_set('@_zone', zone)
+      obj._dump_without_zone(*args)
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+require 'date'
+
+class Time
+  # Ruby 1.8-cvs and early 1.9 series define private Time#to_date
+  %w(to_date to_datetime).each do |method|
+    if private_instance_methods.include?(method) || private_instance_methods.include?(method.to_sym)
+      public method
+    end
+  end
+end

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

@@ -1,86 +1,78 @@
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Time #:nodoc:
-      module Zones
-        def self.included(base) #:nodoc:
-          base.extend(ClassMethods) if base == ::Time # i.e., don't include class methods in DateTime
-        end
-        
-        module ClassMethods
-          attr_accessor :zone_default
-          
-          # Returns the TimeZone for the current request, if this has been set (via Time.zone=). 
-          # If <tt>Time.zone</tt> has not been set for the current request, returns the TimeZone specified in <tt>config.time_zone</tt>.
-          def zone
-            Thread.current[:time_zone] || zone_default
-          end
+require 'active_support/time_with_zone'
+
+class Time
+  class << self
+    attr_accessor :zone_default
+
+    # Returns the TimeZone for the current request, if this has been set (via Time.zone=). 
+    # If <tt>Time.zone</tt> has not been set for the current request, returns the TimeZone specified in <tt>config.time_zone</tt>.
+    def zone
+      Thread.current[:time_zone] || zone_default
+    end
 
-          # Sets <tt>Time.zone</tt> to a TimeZone object for the current request/thread. 
-          #
-          # This method accepts any of the following:
-          #
-          # * A Rails TimeZone object.
-          # * An identifier for a Rails TimeZone object (e.g., "Eastern Time (US & Canada)", <tt>-5.hours</tt>).
-          # * A TZInfo::Timezone object.
-          # * An identifier for a TZInfo::Timezone object (e.g., "America/New_York").
-          #
-          # Here's an example of how you might set <tt>Time.zone</tt> on a per request basis -- <tt>current_user.time_zone</tt>
-          # just needs to return a string identifying the user's preferred TimeZone:
-          #
-          #   class ApplicationController < ActionController::Base
-          #     before_filter :set_time_zone
-          #
-          #     def set_time_zone
-          #       Time.zone = current_user.time_zone
-          #     end
-          #   end
-          def zone=(time_zone)
-            Thread.current[:time_zone] = get_zone(time_zone)
-          end
-          
-          # Allows override of <tt>Time.zone</tt> locally inside supplied block; resets <tt>Time.zone</tt> to existing value when done.
-          def use_zone(time_zone)
-            old_zone, ::Time.zone = ::Time.zone, get_zone(time_zone)
-            yield
-          ensure
-            ::Time.zone = old_zone
-          end
-          
-          # Returns <tt>Time.zone.now</tt> when <tt>config.time_zone</tt> is set, otherwise just returns <tt>Time.now</tt>.
-          def current
-            ::Time.zone_default ? ::Time.zone.now : ::Time.now
-          end
-          
-          private
-            def get_zone(time_zone)
-              return time_zone if time_zone.nil? || time_zone.is_a?(TimeZone)
-              # lookup timezone based on identifier (unless we've been passed a TZInfo::Timezone)
-              unless time_zone.respond_to?(:period_for_local)
-                time_zone = TimeZone[time_zone] || TZInfo::Timezone.get(time_zone) rescue nil
-              end
-              # Return if a TimeZone instance, or wrap in a TimeZone instance if a TZInfo::Timezone
-              if time_zone
-                time_zone.is_a?(TimeZone) ? time_zone : TimeZone.create(time_zone.name, nil, time_zone)
-              end
-            end
+    # Sets <tt>Time.zone</tt> to a TimeZone object for the current request/thread. 
+    #
+    # This method accepts any of the following:
+    #
+    # * A Rails TimeZone object.
+    # * An identifier for a Rails TimeZone object (e.g., "Eastern Time (US & Canada)", <tt>-5.hours</tt>).
+    # * A TZInfo::Timezone object.
+    # * An identifier for a TZInfo::Timezone object (e.g., "America/New_York").
+    #
+    # Here's an example of how you might set <tt>Time.zone</tt> on a per request basis -- <tt>current_user.time_zone</tt>
+    # just needs to return a string identifying the user's preferred TimeZone:
+    #
+    #   class ApplicationController < ActionController::Base
+    #     before_filter :set_time_zone
+    #
+    #     def set_time_zone
+    #       Time.zone = current_user.time_zone
+    #     end
+    #   end
+    def zone=(time_zone)
+      Thread.current[:time_zone] = get_zone(time_zone)
+    end
+
+    # Allows override of <tt>Time.zone</tt> locally inside supplied block; resets <tt>Time.zone</tt> to existing value when done.
+    def use_zone(time_zone)
+      old_zone, ::Time.zone = ::Time.zone, get_zone(time_zone)
+      yield
+    ensure
+      ::Time.zone = old_zone
+    end
+
+    # Returns <tt>Time.zone.now</tt> when <tt>config.time_zone</tt> is set, otherwise just returns <tt>Time.now</tt>.
+    def current
+      ::Time.zone_default ? ::Time.zone.now : ::Time.now
+    end
+
+    private
+      def get_zone(time_zone)
+        return time_zone if time_zone.nil? || time_zone.is_a?(ActiveSupport::TimeZone)
+        # lookup timezone based on identifier (unless we've been passed a TZInfo::Timezone)
+        unless time_zone.respond_to?(:period_for_local)
+          time_zone = ActiveSupport::TimeZone[time_zone] || TZInfo::Timezone.get(time_zone) rescue nil
         end
-        
-        # Returns the simultaneous time in <tt>Time.zone</tt>.
-        #
-        #   Time.zone = 'Hawaii'         # => 'Hawaii'
-        #   Time.utc(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>.
-        #
-        #   Time.utc(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))
+        # Return if a TimeZone instance, or wrap in a TimeZone instance if a TZInfo::Timezone
+        if time_zone
+          time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone.create(time_zone.name, nil, time_zone)
         end
       end
-    end
   end
-end
+
+  # Returns the simultaneous time in <tt>Time.zone</tt>.
+  #
+  #   Time.zone = 'Hawaii'         # => 'Hawaii'
+  #   Time.utc(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>.
+  #
+  #   Time.utc(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/uri.rb

@@ -4,7 +4,8 @@ if RUBY_VERSION >= '1.9'
   str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
   str.force_encoding(Encoding::UTF_8) if str.respond_to?(:force_encoding)
 
-  unless str == URI.unescape(URI.escape(str))
+  parser = URI::Parser.new
+  unless str == parser.unescape(parser.escape(str))
     URI::Parser.class_eval do
       remove_method :unescape
       def unescape(str, escaped = @regexp[:ESCAPED])

data/lib/active_support/core_ext.rb

@@ -1,8 +1,3 @@
-filenames = Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.map do |path|
-  File.basename(path, '.rb')
+Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
+  require "active_support/core_ext/#{File.basename(path, '.rb')}"
 end
-
-# deprecated
-filenames -= %w(blank)
-
-filenames.each { |filename| require "active_support/core_ext/#{filename}" }

data/lib/active_support/dependencies/autoload.rb

@@ -0,0 +1,50 @@
+require "active_support/inflector/methods"
+require "active_support/lazy_load_hooks"
+
+module ActiveSupport
+  module Autoload
+    @@autoloads = {}
+    @@under_path = nil
+    @@at_path = nil
+    @@eager_autoload = false
+
+    def autoload(const_name, path = @@at_path)
+      full = [self.name, @@under_path, const_name.to_s, path].compact.join("::")
+      location = path || Inflector.underscore(full)
+
+      if @@eager_autoload
+        @@autoloads[const_name] = location
+      end
+      super const_name, location
+    end
+
+    def autoload_under(path)
+      @@under_path, old_path = path, @@under_path
+      yield
+    ensure
+      @@under_path = old_path
+    end
+
+    def autoload_at(path)
+      @@at_path, old_path = path, @@at_path
+      yield
+    ensure
+      @@at_path = old_path
+    end
+
+    def eager_autoload
+      old_eager, @@eager_autoload = @@eager_autoload, true
+      yield
+    ensure
+      @@eager_autoload = old_eager
+    end
+
+    def self.eager_autoload!
+      @@autoloads.values.each { |file| require file }
+    end
+
+    def autoloads
+      @@autoloads
+    end
+  end
+end