activesupport 3.0.0.beta3 → 3.0.0.beta4

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

@@ -2,7 +2,7 @@ module Kernel
   unless respond_to?(:debugger)
     # Starts a debugging session if ruby-debug has been loaded (call rails server --debugger to do load it).
     def debugger
-      message = "\n***** Debugger requested, but was not available: Start server with --debugger to enable *****\n"
+      message = "\n***** Debugger requested, but was not available (ensure ruby-debug is listed in Gemfile/installed as gem): Start server with --debugger to enable *****\n"
       defined?(Rails) ? Rails.logger.info(message) : $stderr.puts(message)
     end
   end

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

@@ -1,3 +1,4 @@
+require 'rbconfig'
 module Kernel
   # Sets $VERBOSE to nil for the duration of the block and back to its original value afterwards.
   #
@@ -37,7 +38,7 @@ module Kernel
   #   puts 'But this will'
   def silence_stream(stream)
     old_stream = stream.dup
-    stream.reopen(RUBY_PLATFORM =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.reopen(Config::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
     stream.sync = true
     yield
   ensure

data/lib/active_support/core_ext/load_error.rb

@@ -3,6 +3,7 @@ class LoadError
     /^no such file to load -- (.+)$/i,
     /^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
     /^Missing API definition file in (.+)$/i,
+    /^cannot load such file -- (.+)$/i,
   ]
 
   def path

data/lib/active_support/core_ext/logger.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/class/attribute_accessors'
 # Adds the 'around_level' method to Logger.
 class Logger #:nodoc:
   def self.define_around_helper(level)
-    module_eval <<-end_eval
+    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)

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

@@ -2,14 +2,14 @@ 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"
+      module_eval "def #{attr}() #{attr_internal_ivar_name(attr)} end", __FILE__, __LINE__
     end
   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"
+      module_eval "def #{attr}=(v) #{attr_internal_ivar_name(attr)} = v end", __FILE__, __LINE__
     end
   end
 

data/lib/active_support/core_ext/object/to_param.rb

@@ -38,9 +38,9 @@ class Hash
   # passed to enclose the param names (see example below).
   #
   # ==== Examples
-  #   { :name => 'David', :nationality => 'Danish' }.to_query # => "name=David&nationality=Danish"
+  #   { :name => 'David', :nationality => 'Danish' }.to_param # => "name=David&nationality=Danish"
   #
-  #   { :name => 'David', :nationality => 'Danish' }.to_query('user') # => "user[name]=David&user[nationality]=Danish"
+  #   { :name => 'David', :nationality => 'Danish' }.to_param('user') # => "user[name]=David&user[nationality]=Danish"
   def to_param(namespace = nil)
     collect do |key, value|
       value.to_query(namespace ? "#{namespace}[#{key}]" : key)

data/lib/active_support/core_ext/object/with_options.rb

@@ -1,3 +1,5 @@
+require 'active_support/option_merger'
+
 class Object
   # An elegant way to factor duplication out of options passed to a series of
   # method calls. Each method called in the block, with the block variable as

data/lib/active_support/core_ext/string.rb

@@ -9,3 +9,4 @@ require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/string/interpolation'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/string/exclude'
+require 'active_support/core_ext/string/encoding'

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

@@ -3,25 +3,59 @@ require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/core_ext/time/calculations'
 
 class String
-  # 'a'.ord == 'a'[0] for Ruby 1.9 forward compatibility.
+  # Returns the codepoint of the first character of the string, assuming a
+  # single-byte character encoding:
+  #
+  #   "a".ord # => 97
+  #   "à".ord # => 224, in ISO-8859-1
+  #
+  # This method is defined in Ruby 1.8 for Ruby 1.9 forward compatibility on
+  # these character encodings.
+  #
+  # <tt>ActiveSupport::Multibyte::Chars#ord</tt> is forward compatible with
+  # Ruby 1.9 on UTF8 strings:
+  #
+  #   "a".mb_chars.ord # => 97
+  #   "à".mb_chars.ord # => 224, in UTF8
+  #
+  # Note that the 224 is different in both examples. In ISO-8859-1 "à" is
+  # represented as a single byte, 224. In UTF8 it is represented with two
+  # bytes, namely 195 and 160, but its Unicode codepoint is 224. If we
+  # call +ord+ on the UTF8 string "à" the return value will be 195. That is
+  # not an error, because UTF8 is unsupported, the call itself would be
+  # bogus.
   def ord
     self[0]
   end unless method_defined?(:ord)
 
   # Form can be either :utc (default) or :local.
   def to_time(form = :utc)
+    return nil if self.blank?
     d = ::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction).map { |arg| arg || 0 }
     d[6] *= 1000000
     ::Time.send("#{form}_time", *d)
   end
 
   def to_date
+    return nil if self.blank?
     ::Date.new(*::Date._parse(self, false).values_at(:year, :mon, :mday))
   end
 
   def to_datetime
+    return nil if self.blank?
     d = ::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :sec_fraction).map { |arg| arg || 0 }
     d[5] += d.pop
     ::DateTime.civil(*d)
   end
+
+  # +constantize+ tries to find a declared constant with the name specified
+  # in the string. It raises a NameError when the name is not in CamelCase
+  # or is not initialized.
+  #
+  # Examples
+  #   "Module".constantize # => Module
+  #   "Class".constantize  # => Class
+  def constantize
+    ActiveSupport::Inflector.constantize(self)
+  end
 end

data/lib/active_support/core_ext/string/encoding.rb

@@ -0,0 +1,11 @@
+class String
+  if defined?(Encoding) && "".respond_to?(:encode)
+    def encoding_aware?
+      true
+    end
+  else
+    def encoding_aware?
+      false
+    end
+  end
+end

data/lib/active_support/core_ext/string/filters.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string/multibyte'
+
 class String
   # Returns the string, first removing all whitespace on both ends of
   # the string, and then changing remaining consecutive whitespace
@@ -17,4 +19,31 @@ class String
     gsub!(/\s+/, ' ')
     self
   end
+
+  # Truncates a given +text+ after a given <tt>length</tt> if +text+ is longer than <tt>length</tt>:
+  #
+  #   "Once upon a time in a world far far away".truncate(27)
+  #   # => "Once upon a time in a wo..."
+  #
+  # The last characters will be replaced with the <tt>:omission</tt> string (defaults to "...")
+  # for a total length not exceeding <tt>:length</tt>:
+  #
+  #   "Once upon a time in a world far far away".truncate(27, :separator => ' ')
+  #   # => "Once upon a time in a..."
+  #
+  # Pass a <tt>:separator</tt> to truncate +text+ at a natural break:
+  #
+  #   "And they found that many people were sleeping better.".truncate(25, :omission => "... (continued)")
+  #   # => "And they f... (continued)"
+  def truncate(length, options = {})
+    text = self.dup
+    options[:omission] ||= "..."
+
+    length_with_room_for_omission = length - options[:omission].mb_chars.length
+    chars = text.mb_chars
+    stop = options[:separator] ?
+      (chars.rindex(options[:separator].mb_chars, length_with_room_for_omission) || length_with_room_for_omission) : length_with_room_for_omission
+
+    (chars.length > length ? chars[0...stop] + options[:omission] : text).to_s
+  end
 end

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

@@ -146,15 +146,4 @@ class String
   def foreign_key(separate_class_name_and_id_with_underscore = true)
     ActiveSupport::Inflector.foreign_key(self, separate_class_name_and_id_with_underscore)
   end
-
-  # +constantize+ tries to find a declared constant with the name specified
-  # in the string. It raises a NameError when the name is not in CamelCase
-  # or is not initialized.
-  #
-  # Examples
-  #   "Module".constantize # => Module
-  #   "Class".constantize  # => Class
-  def constantize
-    ActiveSupport::Inflector.constantize(self)
-  end
 end

data/lib/active_support/core_ext/string/interpolation.rb

@@ -1 +1,2 @@
+require 'active_support/i18n'
 require 'i18n/core_ext/string/interpolate'

data/lib/active_support/core_ext/string/multibyte.rb

@@ -2,7 +2,7 @@
 require 'active_support/multibyte'
 
 class String
-  unless '1.9'.respond_to?(:force_encoding)
+  if '1.9'.respond_to?(:force_encoding)
     # == Multibyte proxy
     #
     # +mb_chars+ is a multibyte safe proxy for string methods.
@@ -37,30 +37,13 @@ class String
     # For more information about the methods defined on the Chars proxy see ActiveSupport::Multibyte::Chars. For
     # information about how to change the default Multibyte behaviour see ActiveSupport::Multibyte.
     def mb_chars
-      if ActiveSupport::Multibyte.proxy_class.wants?(self)
+      if ActiveSupport::Multibyte.proxy_class.consumes?(self)
         ActiveSupport::Multibyte.proxy_class.new(self)
       else
         self
       end
     end
-    
-    # Returns true if the string has UTF-8 semantics (a String used for purely byte resources is unlikely to have
-    # them), returns false otherwise.
-    def is_utf8?
-      ActiveSupport::Multibyte::Chars.consumes?(self)
-    end
 
-    unless '1.8.7 and later'.respond_to?(:chars)
-      def chars
-        ActiveSupport::Deprecation.warn('String#chars has been deprecated in favor of String#mb_chars.', caller)
-        mb_chars
-      end
-    end
-  else
-    def mb_chars #:nodoc
-      self
-    end
-    
     def is_utf8? #:nodoc
       case encoding
       when Encoding::UTF_8
@@ -71,5 +54,19 @@ class String
         false
       end
     end
+  else
+    def mb_chars
+      if ActiveSupport::Multibyte.proxy_class.wants?(self)
+        ActiveSupport::Multibyte.proxy_class.new(self)
+      else
+        self
+      end
+    end
+
+    # Returns true if the string has UTF-8 semantics (a String used for purely byte resources is unlikely to have
+    # them), returns false otherwise.
+    def is_utf8?
+      ActiveSupport::Multibyte::Chars.consumes?(self)
+    end
   end
 end

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

@@ -1,6 +1,7 @@
 require 'active_support/duration'
 require 'active_support/core_ext/date/acts_like'
 require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date_time/conversions'
 
 class Time
   COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
@@ -23,10 +24,11 @@ class Time
     # (i.e., if year is within either 1970..2038 or 1902..2038, depending on system architecture);
     # otherwise returns a DateTime
     def time_with_datetime_fallback(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0, usec=0)
-      ::Time.send(utc_or_local, year, month, day, hour, min, sec, usec)
+      time = ::Time.send(utc_or_local, year, month, day, hour, min, sec, usec)
+      # This check is needed because Time.utc(y) returns a time object in the 2000s for 0 <= y <= 138.
+      time.year == year ? time : ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
     rescue
-      offset = utc_or_local.to_sym == :local ? ::DateTime.local_offset : 0
-      ::DateTime.civil(year, month, day, hour, min, sec, offset)
+      ::DateTime.civil_from_format(utc_or_local, year, month, day, hour, min, sec)
     end
 
     # Wraps class method +time_with_datetime_fallback+ with +utc_or_local+ set to <tt>:utc</tt>.
@@ -131,7 +133,7 @@ class Time
   end
 
   # Short-hand for years_ago(1)
-  def last_year
+  def prev_year
     years_ago(1)
   end
 
@@ -140,9 +142,8 @@ class Time
     years_since(1)
   end
 
-
   # Short-hand for months_ago(1)
-  def last_month
+  def prev_month
     months_ago(1)
   end
 

data/lib/active_support/core_ext/uri.rb

@@ -1,15 +1,20 @@
+# encoding: utf-8
+
 if RUBY_VERSION >= '1.9'
   require 'uri'
 
   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)
 
   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])
-        enc = (str.encoding == Encoding::US_ASCII) ? Encoding::UTF_8 : str.encoding
+      def unescape(str, escaped = /%[a-fA-F\d]{2}/)
+        # TODO: Are we actually sure that ASCII == UTF-8?
+        # YK: My initial experiments say yes, but let's be sure please
+        enc = str.encoding
+        enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
         str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc)
       end
     end

data/lib/active_support/dependencies.rb

@@ -47,6 +47,9 @@ module ActiveSupport #:nodoc:
     mattr_accessor :autoloaded_constants
     self.autoloaded_constants = []
 
+    mattr_accessor :references
+    self.references = {}
+
     # An array of constant names that need to be unloaded on every request. Used
     # to allow arbitrary constants to be marked for unloading.
     mattr_accessor :explicitly_unloadable_constants
@@ -66,7 +69,7 @@ module ActiveSupport #:nodoc:
       end
 
       def self.locked(*methods)
-        methods.each { |m| class_eval "def #{m}(*) lock { super } end" }
+        methods.each { |m| class_eval "def #{m}(*) lock { super } end", __FILE__, __LINE__ }
       end
 
       def get(key)
@@ -476,9 +479,37 @@ module ActiveSupport #:nodoc:
     def remove_unloadable_constants!
       autoloaded_constants.each { |const| remove_constant const }
       autoloaded_constants.clear
+      Reference.clear!
       explicitly_unloadable_constants.each { |const| remove_constant const }
     end
 
+    class Reference
+      @@constants = Hash.new { |h, k| h[k] = Inflector.constantize(k) }
+
+      attr_reader :name
+
+      def initialize(name)
+        @name = name.to_s
+        @@constants[@name] = name if name.respond_to?(:name)
+      end
+
+      def get
+        @@constants[@name]
+      end
+
+      def self.clear!
+        @@constants.clear
+      end
+    end
+
+    def ref(name)
+      references[name] ||= Reference.new(name)
+    end
+
+    def constantize(name)
+      ref(name).get
+    end
+
     # Determine if the given constant has been automatically loaded.
     def autoloaded?(desc)
       # No name => anonymous module.
@@ -572,6 +603,7 @@ module ActiveSupport #:nodoc:
 
       log "removing constant #{const}"
       parent.instance_eval { remove_const to_remove }
+
       return true
     end
 

data/lib/active_support/duration.rb

@@ -38,6 +38,7 @@ module ActiveSupport
     def is_a?(klass) #:nodoc:
       Duration == klass || value.is_a?(klass)
     end
+    alias :kind_of? :is_a?
 
     # Returns true if <tt>other</tt> is also a Duration instance with the
     # same <tt>value</tt>, or if <tt>other == value</tt>.

data/lib/active_support/hash_with_indifferent_access.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/keys'
+
 # This class has dubious semantics and we only have it so that
 # people can write params[:key] instead of params['key']
 # and they get the same value for both keys.
@@ -112,7 +114,9 @@ module ActiveSupport
     end
 
     def stringify_keys!; self end
-    def symbolize_keys!; self end
+    def stringify_keys; dup end
+    undef :symbolize_keys!
+    def symbolize_keys; to_hash.symbolize_keys end
     def to_options!; self end
 
     # Convert to a Hash with String keys.

data/lib/active_support/i18n.rb

@@ -1,3 +1,8 @@
-require 'i18n'
+begin
+  require 'i18n'
+rescue LoadError => e
+  $stderr.puts "You don't have i18n installed in your application. Please add it to your Gemfile and run bundle install"
+  raise e
+end
 I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
-ActiveSupport.run_load_hooks(:i18n)
+ActiveSupport.run_load_hooks(:i18n)