activesupport 2.3.3 → 2.3.4

data/CHANGELOG

@@ -1,4 +1,10 @@
-*2.3.3 (July 20, 2009)*
+*2.3.4 (September 4, 2009)*
+
+* Introduce ActiveSupport::Multibyte.clean to clean invalid multibyte strings.
+
+* Bug fixes
+
+*2.3.3 (July 12, 2009)*
 
 * JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON-library-agnostic.  [Jeremy Kemper]
 

data/lib/active_support/all.rb

@@ -0,0 +1,8 @@
+# For forward compatibility with Rails 3.
+#
+# require 'active_support' loads a very bare minumum in Rails 3.
+# require 'active_support/all' loads the whole suite like Rails 2 did.
+#
+# To prepare for Rails 3, switch to require 'active_support/all' now.
+
+require 'active_support'

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

@@ -163,6 +163,7 @@ module ActiveSupport #:nodoc:
           raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml }
           require 'builder' unless defined?(Builder)
 
+          options = options.dup
           options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize : "records"
           options[:children] ||= options[:root].singularize
           options[:indent]   ||= 2

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

@@ -92,6 +92,7 @@ module ActiveSupport #:nodoc:
         # Provides precise Date calculations for years, months, and days.  The +options+ parameter takes a hash with
         # any of these keys: <tt>:years</tt>, <tt>:months</tt>, <tt>:weeks</tt>, <tt>:days</tt>.
         def advance(options)
+          options = options.dup
           d = self
           d = d >> options.delete(:years) * 12 if options[:years]
           d = d >> options.delete(:months)     if options[:months]

data/lib/active_support/core_ext/enumerable.rb

@@ -55,12 +55,10 @@ module Enumerable
   #  [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0)
   #
   def sum(identity = 0, &block)
-    return identity unless size > 0
-
     if block_given?
-      map(&block).sum
+      map(&block).sum(identity)
     else
-      inject { |sum, element| sum + element }
+      inject { |sum, element| sum + element } || identity
     end
   end
 

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

@@ -99,6 +99,7 @@ module ActiveSupport #:nodoc:
         def to_xml(options = {})
           require 'builder' unless defined?(Builder)
 
+          options = options.dup
           options[:indent] ||= 2
           options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
                                    :root => "hash" })

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

@@ -120,10 +120,15 @@ class Module
         end
 
       module_eval(<<-EOS, file, line)
-        def #{prefix}#{method}(*args, &block)                           # def customer_name(*args, &block)
-          #{on_nil} if #{to}.nil?
-          #{to}.__send__(#{method.inspect}, *args, &block)  #   client && client.__send__(:name, *args, &block)
-        end                                                             # end
+        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
+          if #{to}.nil?                                     #   if client.nil?
+            #{on_nil}
+          else                                              #   else
+            raise                                           #     raise
+          end                                               #   end
+        end                                                 # end
       EOS
     end
   end

data/lib/active_support/core_ext/string.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/string/bytesize'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/string/access'
 require 'active_support/core_ext/string/starts_ends_with'

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

@@ -0,0 +1,5 @@
+unless '1.9'.respond_to?(:bytesize)
+  class String
+    alias :bytesize :size
+  end
+end

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

@@ -207,9 +207,9 @@ module ActiveSupport #:nodoc:
         alias :at_midnight :beginning_of_day
         alias :at_beginning_of_day :beginning_of_day
 
-        # Returns a new Time representing the end of the day (23:59:59)
+        # Returns a new Time representing the end of the day, 23:59:59.999999 (.999999999 in ruby1.9)
         def end_of_day
-          change(:hour => 23, :min => 59, :sec => 59)
+          change(:hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
         end
 
         # Returns a new Time representing the start of the month (1st of the month, 0:00)
@@ -219,11 +219,11 @@ module ActiveSupport #:nodoc:
         end
         alias :at_beginning_of_month :beginning_of_month
 
-        # Returns a new Time representing the end of the month (last day of the month, 0:00)
+        # Returns a new Time representing the end of the month (end of the last day of the month)
         def end_of_month
           #self - ((self.mday-1).days + self.seconds_since_midnight)
           last_day = ::Time.days_in_month( self.month, self.year )
-          change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => 0)
+          change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
         end
         alias :at_end_of_month :end_of_month
 
@@ -233,7 +233,7 @@ module ActiveSupport #:nodoc:
         end
         alias :at_beginning_of_quarter :beginning_of_quarter
 
-        # Returns a new Time representing the end of the quarter (last day of march, june, september, december, 23:59:59)
+        # Returns a new Time representing the end of the quarter (end of the last day of march, june, september, december)
         def end_of_quarter
           beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
         end
@@ -245,9 +245,9 @@ module ActiveSupport #:nodoc:
         end
         alias :at_beginning_of_year :beginning_of_year
 
-        # Returns a new Time representing the end of the year (31st of december, 23:59:59)
+        # Returns a new Time representing the end of the year (end of the 31st of december)
         def end_of_year
-          change(:month => 12,:day => 31,:hour => 23, :min => 59, :sec => 59)
+          change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
         end
         alias :at_end_of_year :end_of_year
 

data/lib/active_support/deprecation.rb

@@ -90,15 +90,15 @@ module ActiveSupport
         method_names.each do |method_name|
           alias_method_chain(method_name, :deprecation) do |target, punctuation|
             class_eval(<<-EOS, __FILE__, __LINE__)
-              def #{target}_with_deprecation#{punctuation}(*args, &block)   # def generate_secret_with_deprecation(*args, &block)
-                ::ActiveSupport::Deprecation.warn(                          #   ::ActiveSupport::Deprecation.warn(
-                  self.class.deprecated_method_warning(                     #     self.class.deprecated_method_warning(
-                    :#{method_name},                                        #       :generate_secret,
-                    #{options[method_name].inspect}),                       #       "You should use ActiveSupport::SecureRandom.hex(64)"),
-                  caller                                                    #     caller
-                )                                                           #   )
-                #{target}_without_deprecation#{punctuation}(*args, &block)  #   generate_secret_without_deprecation(*args, &block)
-              end                                                           # end
+              def #{target}_with_deprecation#{punctuation}(*args, &block)          # def generate_secret_with_deprecation(*args, &block)
+                ::ActiveSupport::Deprecation.warn(                                 #   ::ActiveSupport::Deprecation.warn(
+                  self.class.deprecated_method_warning(                            #     self.class.deprecated_method_warning(
+                    :#{method_name},                                               #       :generate_secret,
+                    #{options[method_name].inspect}),                              #       "You should use ActiveSupport::SecureRandom.hex(64)"),
+                  caller                                                           #     caller
+                )                                                                  #   )
+                send(:#{target}_without_deprecation#{punctuation}, *args, &block)  #   send(:generate_secret_without_deprecation, *args, &block)
+              end                                                                  # end
             EOS
           end
         end

data/lib/active_support/json/backends/yaml.rb

@@ -17,7 +17,7 @@ module ActiveSupport
         rescue ArgumentError => e
           raise ParseError, "Invalid JSON string"
         end
-    
+
         protected
           # Ensure that ":" and "," are always followed by a space
           def convert_json_to_yaml(json) #:nodoc:
@@ -41,6 +41,8 @@ module ActiveSupport
                 end
               when ":",","
                 marks << scanner.pos - 1 unless quoting
+              when "\\"
+                scanner.skip(/\\/)
               end
             end
 
@@ -82,4 +84,5 @@ module ActiveSupport
       end
     end
   end
-end
+end
+

data/lib/active_support/memoizable.rb

@@ -43,7 +43,7 @@ module ActiveSupport
 
       def flush_cache(*syms, &block)
         syms.each do |sym|
-          methods.each do |m|
+          (methods + private_methods + protected_methods).each do |m|
             if m.to_s =~ /^_unmemoized_(#{sym})/
               ivar = ActiveSupport::Memoizable.memoized_ivar_for($1)
               instance_variable_get(ivar).clear if instance_variable_defined?(ivar)

data/lib/active_support/message_verifier.rb

@@ -25,10 +25,10 @@ module ActiveSupport
     
     def verify(signed_message)
       data, digest = signed_message.split("--")
-      if digest != generate_digest(data)
-        raise InvalidSignature
-      else
+      if secure_compare(digest, generate_digest(data))
         Marshal.load(ActiveSupport::Base64.decode64(data))
+      else
+        raise InvalidSignature
       end
     end
     
@@ -38,6 +38,19 @@ module ActiveSupport
     end
     
     private
+      # constant-time comparison algorithm to prevent timing attacks
+      def secure_compare(a, b)
+        if a.length == b.length
+          result = 0
+          for i in 0..(a.length - 1)
+            result |= a[i] ^ b[i]
+          end
+          result == 0
+        else
+          false
+        end
+      end
+
       def generate_digest(data)
         require 'openssl' unless defined?(OpenSSL)
         OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(@digest), @secret, data)

data/lib/active_support/multibyte.rb

@@ -1,9 +1,5 @@
 # encoding: utf-8
 
-require 'active_support/multibyte/chars'
-require 'active_support/multibyte/exceptions'
-require 'active_support/multibyte/unicode_database'
-
 module ActiveSupport #:nodoc:
   module Multibyte
     # A list of all available normalization forms. See http://www.unicode.org/reports/tr15/tr15-29.html for more
@@ -27,7 +23,35 @@ module ActiveSupport #:nodoc:
     #
     # Example:
     #   ActiveSupport::Multibyte.proxy_class = CharsForUTF32
-    mattr_accessor :proxy_class
-    self.proxy_class = ActiveSupport::Multibyte::Chars
+    def self.proxy_class=(klass)
+      @proxy_class = klass
+    end
+
+    # Returns the currect proxy class
+    def self.proxy_class
+      @proxy_class ||= ActiveSupport::Multibyte::Chars
+    end
+
+    # Regular expressions that describe valid byte sequences for a character
+    VALID_CHARACTER = {
+      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
+      'UTF-8' => /\A(?:
+                  [\x00-\x7f]                                         |
+                  [\xc2-\xdf] [\x80-\xbf]                             |
+                  \xe0        [\xa0-\xbf] [\x80-\xbf]                 |
+                  [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]                 |
+                  \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                  [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                  \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
+      # Quick check for valid Shift-JIS characters, disregards the odd-even pairing
+      'Shift_JIS' => /\A(?:
+                  [\x00-\x7e \xa1-\xdf]                                     |
+                  [\x81-\x9f \xe0-\xef] [\x40-\x7e \x80-\x9e \x9f-\xfc])\z /xn
+    }
   end
 end
+
+require 'active_support/multibyte/chars'
+require 'active_support/multibyte/exceptions'
+require 'active_support/multibyte/unicode_database'
+require 'active_support/multibyte/utils'

data/lib/active_support/multibyte/chars.rb

@@ -73,16 +73,7 @@ module ActiveSupport #:nodoc:
       UNICODE_TRAILERS_PAT = /(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+\Z/
       UNICODE_LEADERS_PAT = /\A(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+/
 
-      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
-      UTF8_PAT = /\A(?:
-                     [\x00-\x7f]                                     |
-                     [\xc2-\xdf] [\x80-\xbf]                         |
-                     \xe0        [\xa0-\xbf] [\x80-\xbf]             |
-                     [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]             |
-                     \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                     [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                     \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
-                    )*\z/xn
+      UTF8_PAT = ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8']
 
       attr_reader :wrapped_string
       alias to_s wrapped_string
@@ -205,7 +196,22 @@ module ActiveSupport #:nodoc:
       #   'Café périferôl'.mb_chars.index('ô') #=> 12
       #   'Café périferôl'.mb_chars.index(/\w/u) #=> 0
       def index(needle, offset=0)
-        index = @wrapped_string.index(needle, offset)
+        wrapped_offset = self.first(offset).wrapped_string.length
+        index = @wrapped_string.index(needle, wrapped_offset)
+        index ? (self.class.u_unpack(@wrapped_string.slice(0...index)).size) : nil
+      end
+
+      # Returns the position _needle_ in the string, counting in
+      # codepoints, searching backward from _offset_ or the end of the
+      # string. Returns +nil+ if _needle_ isn't found.
+      #
+      # Example:
+      #   'Café périferôl'.mb_chars.rindex('é') #=> 6
+      #   'Café périferôl'.mb_chars.rindex(/\w/u) #=> 13
+      def rindex(needle, offset=nil)
+        offset ||= length
+        wrapped_offset = self.first(offset).wrapped_string.length
+        index = @wrapped_string.rindex(needle, wrapped_offset)
         index ? (self.class.u_unpack(@wrapped_string.slice(0...index)).size) : nil
       end
 
@@ -292,23 +298,23 @@ module ActiveSupport #:nodoc:
       def rstrip
         chars(@wrapped_string.gsub(UNICODE_TRAILERS_PAT, ''))
       end
-      
+
       # Strips entire range of Unicode whitespace from the left of the string.
       def lstrip
         chars(@wrapped_string.gsub(UNICODE_LEADERS_PAT, ''))
       end
-      
+
       # Strips entire range of Unicode whitespace from the right and left of the string.
       def strip
         rstrip.lstrip
       end
-      
+
       # Returns the number of codepoints in the string
       def size
         self.class.u_unpack(@wrapped_string).size
       end
       alias_method :length, :size
-      
+
       # Reverses all characters in the string.
       #
       # Example:
@@ -316,7 +322,7 @@ module ActiveSupport #:nodoc:
       def reverse
         chars(self.class.u_unpack(@wrapped_string).reverse.pack('U*'))
       end
-      
+
       # Implements Unicode-aware slice with codepoints. Slicing on one point returns the codepoints for that
       # character.
       #
@@ -631,7 +637,7 @@ module ActiveSupport #:nodoc:
           string.split(//u).map do |c|
             c.force_encoding(Encoding::ASCII) if c.respond_to?(:force_encoding)
 
-            if !UTF8_PAT.match(c)
+            if !ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'].match(c)
               n = c.unpack('C')[0]
               n < 128 ? n.chr :
               n < 160 ? [UCD.cp1252[n] || n].pack('U') :

data/lib/active_support/multibyte/utils.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+module ActiveSupport #:nodoc:
+  module Multibyte #:nodoc:
+    if Kernel.const_defined?(:Encoding)
+      # Returns a regular expression that matches valid characters in the current encoding
+      def self.valid_character
+        VALID_CHARACTER[Encoding.default_internal.to_s]
+      end
+    else
+      def self.valid_character
+        case $KCODE
+        when 'UTF8'
+          VALID_CHARACTER['UTF-8']
+        when 'SJIS'
+          VALID_CHARACTER['Shift_JIS']
+        end
+      end
+    end
+
+    if 'string'.respond_to?(:valid_encoding?)
+      # Verifies the encoding of a string
+      def self.verify(string)
+        string.valid_encoding?
+      end
+    else
+      def self.verify(string)
+        if expression = valid_character
+          for c in string.split(//)
+            return false unless valid_character.match(c)
+          end
+        end
+        true
+      end
+    end
+
+    # Verifies the encoding of the string and raises an exception when it's not valid
+    def self.verify!(string)
+      raise EncodingError.new("Found characters with invalid encoding") unless verify(string)
+    end
+
+    if 'string'.respond_to?(:force_encoding)
+      # Removes all invalid characters from the string.
+      #
+      # Note: this method is a no-op in Ruby 1.9
+      def self.clean(string)
+        string
+      end
+    else
+      def self.clean(string)
+        if expression = valid_character
+          stripped = []; for c in string.split(//)
+            stripped << c if valid_character.match(c)
+          end; stripped.join
+        else
+          string
+        end
+      end
+    end
+  end
+end

data/lib/active_support/test_case.rb

@@ -17,7 +17,8 @@ module ActiveSupport
   class TestCase < ::Test::Unit::TestCase
     if defined? MiniTest
       Assertion = MiniTest::Assertion
-      alias_method :method_name, :name
+      alias_method :method_name, :name if method_defined? :name
+      alias_method :method_name, :__name__ if method_defined? :__name__
     else
       # TODO: Figure out how to get the Rails::BacktraceFilter into minitest/unit
       if defined?(Rails) && ENV['BACKTRACE'].nil?

data/lib/active_support/version.rb

@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -05:00
+date: 2009-09-04 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -24,24 +24,20 @@ extra_rdoc_files: []
 files: 
 - CHANGELOG
 - README
-- lib/active_support
+- lib/active_support/all.rb
 - lib/active_support/backtrace_cleaner.rb
 - lib/active_support/base64.rb
 - lib/active_support/basic_object.rb
 - lib/active_support/buffered_logger.rb
-- lib/active_support/cache
 - lib/active_support/cache/compressed_mem_cache_store.rb
 - lib/active_support/cache/drb_store.rb
 - lib/active_support/cache/file_store.rb
 - lib/active_support/cache/mem_cache_store.rb
 - lib/active_support/cache/memory_store.rb
-- lib/active_support/cache/strategy
 - lib/active_support/cache/strategy/local_cache.rb
 - lib/active_support/cache/synchronized_memory_store.rb
 - lib/active_support/cache.rb
 - lib/active_support/callbacks.rb
-- lib/active_support/core_ext
-- lib/active_support/core_ext/array
 - lib/active_support/core_ext/array/access.rb
 - lib/active_support/core_ext/array/conversions.rb
 - lib/active_support/core_ext/array/extract_options.rb
@@ -49,43 +45,34 @@ files:
 - lib/active_support/core_ext/array/random_access.rb
 - lib/active_support/core_ext/array/wrapper.rb
 - lib/active_support/core_ext/array.rb
-- lib/active_support/core_ext/base64
 - lib/active_support/core_ext/base64/encoding.rb
 - lib/active_support/core_ext/base64.rb
 - lib/active_support/core_ext/benchmark.rb
-- lib/active_support/core_ext/bigdecimal
 - lib/active_support/core_ext/bigdecimal/conversions.rb
 - lib/active_support/core_ext/bigdecimal.rb
 - lib/active_support/core_ext/blank.rb
-- lib/active_support/core_ext/cgi
 - lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
 - lib/active_support/core_ext/cgi.rb
-- lib/active_support/core_ext/class
 - lib/active_support/core_ext/class/attribute_accessors.rb
 - lib/active_support/core_ext/class/delegating_attributes.rb
 - lib/active_support/core_ext/class/inheritable_attributes.rb
 - lib/active_support/core_ext/class/removal.rb
 - lib/active_support/core_ext/class.rb
-- lib/active_support/core_ext/date
 - lib/active_support/core_ext/date/behavior.rb
 - lib/active_support/core_ext/date/calculations.rb
 - lib/active_support/core_ext/date/conversions.rb
 - lib/active_support/core_ext/date.rb
-- lib/active_support/core_ext/date_time
 - lib/active_support/core_ext/date_time/calculations.rb
 - lib/active_support/core_ext/date_time/conversions.rb
 - lib/active_support/core_ext/date_time.rb
 - lib/active_support/core_ext/duplicable.rb
 - lib/active_support/core_ext/enumerable.rb
 - lib/active_support/core_ext/exception.rb
-- lib/active_support/core_ext/file
 - lib/active_support/core_ext/file/atomic.rb
 - lib/active_support/core_ext/file.rb
-- lib/active_support/core_ext/float
 - lib/active_support/core_ext/float/rounding.rb
 - lib/active_support/core_ext/float/time.rb
 - lib/active_support/core_ext/float.rb
-- lib/active_support/core_ext/hash
 - lib/active_support/core_ext/hash/conversions.rb
 - lib/active_support/core_ext/hash/deep_merge.rb
 - lib/active_support/core_ext/hash/diff.rb
@@ -95,12 +82,10 @@ files:
 - lib/active_support/core_ext/hash/reverse_merge.rb
 - lib/active_support/core_ext/hash/slice.rb
 - lib/active_support/core_ext/hash.rb
-- lib/active_support/core_ext/integer
 - lib/active_support/core_ext/integer/even_odd.rb
 - lib/active_support/core_ext/integer/inflections.rb
 - lib/active_support/core_ext/integer/time.rb
 - lib/active_support/core_ext/integer.rb
-- lib/active_support/core_ext/kernel
 - lib/active_support/core_ext/kernel/agnostics.rb
 - lib/active_support/core_ext/kernel/daemonizing.rb
 - lib/active_support/core_ext/kernel/debugger.rb
@@ -109,7 +94,6 @@ files:
 - lib/active_support/core_ext/kernel.rb
 - lib/active_support/core_ext/load_error.rb
 - lib/active_support/core_ext/logger.rb
-- lib/active_support/core_ext/module
 - lib/active_support/core_ext/module/aliasing.rb
 - lib/active_support/core_ext/module/attr_accessor_with_default.rb
 - lib/active_support/core_ext/module/attr_internal.rb
@@ -122,35 +106,30 @@ files:
 - lib/active_support/core_ext/module/synchronization.rb
 - lib/active_support/core_ext/module.rb
 - lib/active_support/core_ext/name_error.rb
-- lib/active_support/core_ext/numeric
 - lib/active_support/core_ext/numeric/bytes.rb
 - lib/active_support/core_ext/numeric/conversions.rb
 - lib/active_support/core_ext/numeric/time.rb
 - lib/active_support/core_ext/numeric.rb
-- lib/active_support/core_ext/object
 - lib/active_support/core_ext/object/conversions.rb
 - lib/active_support/core_ext/object/extending.rb
 - lib/active_support/core_ext/object/instance_variables.rb
 - lib/active_support/core_ext/object/metaclass.rb
 - lib/active_support/core_ext/object/misc.rb
 - lib/active_support/core_ext/object.rb
-- lib/active_support/core_ext/pathname
 - lib/active_support/core_ext/pathname/clean_within.rb
 - lib/active_support/core_ext/pathname.rb
 - lib/active_support/core_ext/proc.rb
-- lib/active_support/core_ext/process
 - lib/active_support/core_ext/process/daemon.rb
 - lib/active_support/core_ext/process.rb
-- lib/active_support/core_ext/range
 - lib/active_support/core_ext/range/blockless_step.rb
 - lib/active_support/core_ext/range/conversions.rb
 - lib/active_support/core_ext/range/include_range.rb
 - lib/active_support/core_ext/range/overlaps.rb
 - lib/active_support/core_ext/range.rb
 - lib/active_support/core_ext/rexml.rb
-- lib/active_support/core_ext/string
 - lib/active_support/core_ext/string/access.rb
 - lib/active_support/core_ext/string/behavior.rb
+- lib/active_support/core_ext/string/bytesize.rb
 - lib/active_support/core_ext/string/conversions.rb
 - lib/active_support/core_ext/string/filters.rb
 - lib/active_support/core_ext/string/inflections.rb
@@ -160,7 +139,6 @@ files:
 - lib/active_support/core_ext/string/xchar.rb
 - lib/active_support/core_ext/string.rb
 - lib/active_support/core_ext/symbol.rb
-- lib/active_support/core_ext/time
 - lib/active_support/core_ext/time/behavior.rb
 - lib/active_support/core_ext/time/calculations.rb
 - lib/active_support/core_ext/time/conversions.rb
@@ -175,12 +153,9 @@ files:
 - lib/active_support/gzip.rb
 - lib/active_support/inflections.rb
 - lib/active_support/inflector.rb
-- lib/active_support/json
-- lib/active_support/json/backends
 - lib/active_support/json/backends/jsongem.rb
 - lib/active_support/json/backends/yaml.rb
 - lib/active_support/json/decoding.rb
-- lib/active_support/json/encoders
 - lib/active_support/json/encoders/date.rb
 - lib/active_support/json/encoders/date_time.rb
 - lib/active_support/json/encoders/enumerable.rb
@@ -197,15 +172,14 @@ files:
 - lib/active_support/json/encoding.rb
 - lib/active_support/json/variable.rb
 - lib/active_support/json.rb
-- lib/active_support/locale
 - lib/active_support/locale/en.yml
 - lib/active_support/memoizable.rb
 - lib/active_support/message_encryptor.rb
 - lib/active_support/message_verifier.rb
-- lib/active_support/multibyte
 - lib/active_support/multibyte/chars.rb
 - lib/active_support/multibyte/exceptions.rb
 - lib/active_support/multibyte/unicode_database.rb
+- lib/active_support/multibyte/utils.rb
 - lib/active_support/multibyte.rb
 - lib/active_support/option_merger.rb
 - lib/active_support/ordered_hash.rb
@@ -214,7 +188,6 @@ files:
 - lib/active_support/secure_random.rb
 - lib/active_support/string_inquirer.rb
 - lib/active_support/test_case.rb
-- lib/active_support/testing
 - lib/active_support/testing/assertions.rb
 - lib/active_support/testing/declarative.rb
 - lib/active_support/testing/default.rb
@@ -222,13 +195,9 @@ files:
 - lib/active_support/testing/performance.rb
 - lib/active_support/testing/setup_and_teardown.rb
 - lib/active_support/time_with_zone.rb
-- lib/active_support/values
 - lib/active_support/values/time_zone.rb
 - lib/active_support/values/unicode_tables.dat
-- lib/active_support/vendor
-- lib/active_support/vendor/builder-2.1.2
 - lib/active_support/vendor/builder-2.1.2/blankslate.rb
-- lib/active_support/vendor/builder-2.1.2/builder
 - lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb
 - lib/active_support/vendor/builder-2.1.2/builder/css.rb
 - lib/active_support/vendor/builder-2.1.2/builder/xchar.rb
@@ -236,35 +205,22 @@ files:
 - lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb
 - lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb
 - lib/active_support/vendor/builder-2.1.2/builder.rb
-- lib/active_support/vendor/i18n-0.1.1
-- lib/active_support/vendor/i18n-0.1.1/lib
-- lib/active_support/vendor/i18n-0.1.3
 - lib/active_support/vendor/i18n-0.1.3/i18n.gemspec
-- lib/active_support/vendor/i18n-0.1.3/lib
-- lib/active_support/vendor/i18n-0.1.3/lib/i18n
-- lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend
 - lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
 - lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
 - lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
 - lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE
 - lib/active_support/vendor/i18n-0.1.3/Rakefile
 - lib/active_support/vendor/i18n-0.1.3/README.textile
-- lib/active_support/vendor/i18n-0.1.3/test
 - lib/active_support/vendor/i18n-0.1.3/test/all.rb
 - lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
 - lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
-- lib/active_support/vendor/i18n-0.1.3/test/locale
 - lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb
 - lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml
 - lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
-- lib/active_support/vendor/memcache-client-1.7.4
 - lib/active_support/vendor/memcache-client-1.7.4/memcache.rb
-- lib/active_support/vendor/tzinfo-0.3.12
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone_info.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Algiers.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Cairo.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Casablanca.rb
@@ -272,8 +228,6 @@ files:
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Johannesburg.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Monrovia.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Africa/Nairobi.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/San_Juan.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Bogota.rb
@@ -284,7 +238,6 @@ files:
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Godthab.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Guatemala.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Halifax.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Indiana
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Indiana/Indianapolis.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Juneau.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/La_Paz.rb
@@ -300,7 +253,6 @@ files:
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Sao_Paulo.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/St_Johns.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Tijuana.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Almaty.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baghdad.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Baku.rb
@@ -339,11 +291,9 @@ files:
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yakutsk.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yekaterinburg.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Yerevan.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Azores.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/Cape_Verde.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Atlantic/South_Georgia.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Adelaide.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Brisbane.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Darwin.rb
@@ -351,9 +301,7 @@ files:
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Melbourne.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Perth.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Australia/Sydney.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Etc
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Etc/UTC.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Amsterdam.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Athens.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Belgrade.rb
@@ -386,7 +334,6 @@ files:
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Vilnius.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Warsaw.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Europe/Zagreb.rb
-- lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Auckland.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Fiji.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Pacific/Guam.rb
@@ -413,7 +360,6 @@ files:
 - lib/active_support/vendor.rb
 - lib/active_support/version.rb
 - lib/active_support/whiny_nil.rb
-- lib/active_support/xml_mini
 - lib/active_support/xml_mini/jdom.rb
 - lib/active_support/xml_mini/libxml.rb
 - lib/active_support/xml_mini/nokogiri.rb
@@ -423,6 +369,8 @@ files:
 - lib/activesupport.rb
 has_rdoc: true
 homepage: http://www.rubyonrails.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -443,9 +391,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activesupport
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Support and utility classes used by the Rails framework.
 test_files: []