activesupport 3.0.20 → 3.1.0

data/lib/active_support/descendants_tracker.rb

@@ -1,5 +1,3 @@
-require 'active_support/dependencies'
-
 module ActiveSupport
   # This module provides an internal implementation to track descendants
   # which is faster than iterating through ObjectSpace.
@@ -18,12 +16,16 @@ module ActiveSupport
     end
 
     def self.clear
-      @@direct_descendants.each do |klass, descendants|
-        if ActiveSupport::Dependencies.autoloaded?(klass)
-          @@direct_descendants.delete(klass)
-        else
-          descendants.reject! { |v| ActiveSupport::Dependencies.autoloaded?(v) }
+      if defined? ActiveSupport::Dependencies
+        @@direct_descendants.each do |klass, descendants|
+          if ActiveSupport::Dependencies.autoloaded?(klass)
+            @@direct_descendants.delete(klass)
+          else
+            descendants.reject! { |v| ActiveSupport::Dependencies.autoloaded?(v) }
+          end
         end
+      else
+        @@direct_descendants.clear
       end
     end
 

data/lib/active_support/duration.rb

@@ -10,6 +10,7 @@ module ActiveSupport
   #   1.month.ago       # equivalent to Time.now.advance(:months => -1)
   class Duration < BasicObject
     attr_accessor :value, :parts
+    delegate :duplicable?, :to => :value # required when using ActiveSupport's BasicObject on 1.8
 
     def initialize(value, parts) #:nodoc:
       @value, @parts = value, parts
@@ -80,6 +81,10 @@ module ActiveSupport
       parts.to_sentence(:locale => :en)
     end
 
+    def as_json(options = nil) #:nodoc:
+      to_i
+    end
+
     protected
 
       def sum(sign, time = ::Time.current) #:nodoc:

data/lib/active_support/file_update_checker.rb

@@ -8,7 +8,7 @@ module ActiveSupport
   #     I18n.reload!
   #   end
   #
-  #   ActionDispatch::Callbacks.to_prepare do
+  #   ActionDispatch::Reloader.to_prepare do
   #     i18n_reloader.execute_if_updated
   #   end
   #

data/lib/active_support/file_watcher.rb

@@ -0,0 +1,36 @@
+module ActiveSupport
+  class FileWatcher
+    class Backend
+      def initialize(path, watcher)
+        @watcher = watcher
+        @path    = path
+      end
+
+      def trigger(files)
+        @watcher.trigger(files)
+      end
+    end
+
+    def initialize
+      @regex_matchers = {}
+    end
+
+    def watch(pattern, &block)
+      @regex_matchers[pattern] = block
+    end
+
+    def trigger(files)
+      trigger_files = Hash.new { |h,k| h[k] = Hash.new { |h2,k2| h2[k2] = [] } }
+
+      files.each do |file, state|
+        @regex_matchers.each do |pattern, block|
+          trigger_files[block][state] << file if pattern === file
+        end
+      end
+
+      trigger_files.each do |block, payload|
+        block.call payload
+      end
+    end
+  end
+end

data/lib/active_support/hash_with_indifferent_access.rb

@@ -1,15 +1,21 @@
 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']
+# people can write <tt>params[:key]</tt> instead of <tt>params['key']</tt>
 # and they get the same value for both keys.
 
 module ActiveSupport
   class HashWithIndifferentAccess < Hash
+    
+    # Always returns true, so that <tt>Array#extract_options!</tt> finds members of this class.
     def extractable_options?
       true
     end
 
+    def with_indifferent_access
+      dup
+    end
+
     def initialize(constructor = {})
       if constructor.is_a?(Hash)
         super()
@@ -28,7 +34,7 @@ module ActiveSupport
     end
 
     def self.new_from_hash_copying_default(hash)
-      ActiveSupport::HashWithIndifferentAccess.new(hash).tap do |new_hash|
+      new(hash).tap do |new_hash|
         new_hash.default = hash.default
       end
     end
@@ -58,8 +64,12 @@ module ActiveSupport
     #   hash_1.update(hash_2) # => {"key"=>"New Value!"}
     #
     def update(other_hash)
-      other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
-      self
+      if other_hash.is_a? HashWithIndifferentAccess
+        super(other_hash)
+      else
+        other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
+        self
+      end
     end
 
     alias_method :merge!, :update
@@ -97,7 +107,9 @@ module ActiveSupport
 
     # Returns an exact copy of the hash.
     def dup
-      HashWithIndifferentAccess.new(self)
+      self.class.new(self).tap do |new_hash|
+        new_hash.default = default
+      end
     end
 
     # Merges the instantized and the specified hashes together, giving precedence to the values from the second hash
@@ -107,7 +119,7 @@ module ActiveSupport
     end
 
     # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
-    # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess.
+    # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a <tt>HashWithDifferentAccess</tt>.
     def reverse_merge(other_hash)
       super self.class.new_from_hash_copying_default(other_hash)
     end
@@ -138,8 +150,8 @@ module ActiveSupport
       end
 
       def convert_value(value)
-        if value.class == Hash
-          self.class.new_from_hash_copying_default(value)
+        if value.is_a? Hash
+          value.nested_under_indifferent_access
         elsif value.is_a?(Array)
           value.dup.replace(value.map { |e| convert_value(e) })
         else

data/lib/active_support/i18n.rb

@@ -7,4 +7,3 @@ rescue LoadError => e
 end
 
 I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
-ActiveSupport.run_load_hooks(:i18n)

data/lib/active_support/i18n_railtie.rb

@@ -14,12 +14,12 @@ module I18n
       @reloader ||= ActiveSupport::FileUpdateChecker.new([]){ I18n.reload! }
     end
 
-    # Add I18n::Railtie.reloader to ActionDispatch callbacks. Since, at this
+    # Add <tt>I18n::Railtie.reloader</tt> to ActionDispatch callbacks. Since, at this
     # point, no path was added to the reloader, I18n.reload! is not triggered
     # on to_prepare callbacks. This will only happen on the config.after_initialize
     # callback below.
     initializer "i18n.callbacks" do
-      ActionDispatch::Callbacks.to_prepare do
+      ActionDispatch::Reloader.to_prepare do
         I18n::Railtie.reloader.execute_if_updated
       end
     end

data/lib/active_support/inflections.rb

@@ -54,6 +54,7 @@ module ActiveSupport
     inflect.irregular('sex', 'sexes')
     inflect.irregular('move', 'moves')
     inflect.irregular('cow', 'kine')
+    inflect.irregular('zombie', 'zombies')
 
     inflect.uncountable(%w(equipment information rice money species series fish sheep jeans))
   end

data/lib/active_support/inflector/inflections.rb

@@ -96,7 +96,7 @@ module ActiveSupport
       def clear(scope = :all)
         case scope
           when :all
-            @plurals, @singulars, @uncountables = [], [], []
+            @plurals, @singulars, @uncountables, @humans = [], [], [], []
           else
             instance_variable_set "@#{scope}", []
         end

data/lib/active_support/inflector/methods.rb

@@ -135,11 +135,13 @@ module ActiveSupport
     #   ordinalize(2)     # => "2nd"
     #   ordinalize(1002)  # => "1002nd"
     #   ordinalize(1003)  # => "1003rd"
+    #   ordinalize(-11)   # => "-11th"
+    #   ordinalize(-1021) # => "-1021st"
     def ordinalize(number)
-      if (11..13).include?(number.to_i % 100)
+      if (11..13).include?(number.to_i.abs % 100)
         "#{number}th"
       else
-        case number.to_i % 10
+        case number.to_i.abs % 10
           when 1; "#{number}st"
           when 2; "#{number}nd"
           when 3; "#{number}rd"
@@ -148,4 +150,4 @@ module ActiveSupport
       end
     end
   end
-end
+end

data/lib/active_support/json/decoding.rb

@@ -1,32 +1,31 @@
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/delegation'
+require 'multi_json'
 
 module ActiveSupport
   # Look for and parse json strings that look like ISO 8601 times.
   mattr_accessor :parse_json_times
 
   module JSON
-    # Listed in order of preference.
-    DECODERS = %w(Yajl OkJson)
-
     class << self
-      attr_reader :parse_error
-      delegate :decode, :to => :backend
+      def decode(json, options ={})
+        data = MultiJson.decode(json, options)
+        if ActiveSupport.parse_json_times
+          convert_dates_from(data)
+        else
+          data
+        end
+      end
 
-      def backend
-        set_default_backend unless defined?(@backend)
-        @backend
+      def engine
+        MultiJson.engine
       end
+      alias :backend :engine
 
-      def backend=(name)
-        if name.is_a?(Module)
-          @backend = name
-        else
-          require "active_support/json/backends/#{name.to_s.downcase}"
-          @backend = ActiveSupport::JSON::Backends::const_get(name)
-        end
-        @parse_error = @backend::ParseError
+      def engine=(name)
+        MultiJson.engine = name
       end
+      alias :backend= :engine=
 
       def with_backend(name)
         old_backend, self.backend = backend, name
@@ -35,15 +34,30 @@ module ActiveSupport
         self.backend = old_backend
       end
 
-      def set_default_backend
-        DECODERS.find do |name|
+      def parse_error
+        MultiJson::DecodeError
+      end
+
+      private
+
+      def convert_dates_from(data)
+        case data
+        when nil
+          nil
+        when DATE_REGEX
           begin
-            self.backend = name
-            true
-          rescue LoadError
-            # Try next decoder.
-            false
+            DateTime.parse(data)
+          rescue ArgumentError
+            data
           end
+        when Array
+          data.map! { |d| convert_dates_from(d) }
+        when Hash
+          data.each do |key, value|
+            data[key] = convert_dates_from(value)
+          end
+        else
+          data
         end
       end
     end

data/lib/active_support/json/encoding.rb

@@ -2,6 +2,7 @@ require 'active_support/core_ext/object/to_json'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/deprecation'
 require 'active_support/json/variable'
+require 'active_support/ordered_hash'
 
 require 'bigdecimal'
 require 'active_support/core_ext/big_decimal/conversions' # for #to_s
@@ -153,6 +154,12 @@ class Object
   end
 end
 
+class Struct
+  def as_json(options = nil) #:nodoc:
+    Hash[members.zip(values)]
+  end
+end
+
 class TrueClass
   AS_JSON = ActiveSupport::JSON::Variable.new('true').freeze
   def as_json(options = nil) AS_JSON end #:nodoc:
@@ -199,7 +206,9 @@ class Regexp
 end
 
 module Enumerable
-  def as_json(options = nil) to_a end #:nodoc:
+  def as_json(options = nil) #:nodoc:
+    to_a.as_json(options)
+  end
 end
 
 class Array
@@ -232,9 +241,8 @@ class Hash
 
     # use encoder as a proxy to call as_json on all values in the subset, to protect from circular references
     encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
-    pairs = subset.map { |k, v| [k.to_s, encoder.as_json(v)] }
-    result = self.is_a?(ActiveSupport::OrderedHash) ? ActiveSupport::OrderedHash.new : Hash.new
-    pairs.inject(result) { |hash, pair| hash[pair.first] = pair.last; hash }
+    result = self.is_a?(ActiveSupport::OrderedHash) ? ActiveSupport::OrderedHash : Hash
+    result[subset.map { |k, v| [k.to_s, encoder.as_json(v)] }]
   end
 
   def encode_json(encoder)

data/lib/active_support/lazy_load_hooks.rb

@@ -5,17 +5,17 @@
 #
 # Here is an example where +on_load+ method is called to register a hook.
 #
-#  initializer "active_record.initialize_timezone" do
-#    ActiveSupport.on_load(:active_record) do
-#      self.time_zone_aware_attributes = true
-#      self.default_timezone = :utc
-#    end
-#  end
+#   initializer "active_record.initialize_timezone" do
+#     ActiveSupport.on_load(:active_record) do
+#       self.time_zone_aware_attributes = true
+#       self.default_timezone = :utc
+#     end
+#   end
 #
 # When the entirety of +activerecord/lib/active_record/base.rb+ has been evaluated then +run_load_hooks+ is invoked.
 # The very last line of +activerecord/lib/active_record/base.rb+ is:
 #
-#  ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
+#   ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
 #
 module ActiveSupport
   @load_hooks = Hash.new {|h,k| h[k] = [] }

data/lib/active_support/log_subscriber/test_helper.rb

@@ -1,5 +1,6 @@
 require 'active_support/log_subscriber'
 require 'active_support/buffered_logger'
+require 'active_support/notifications'
 
 module ActiveSupport
   class LogSubscriber
@@ -23,11 +24,11 @@ module ActiveSupport
     #   end
     #
     # All you need to do is to ensure that your log subscriber is added to Rails::Subscriber,
-    # as in the second line of the code above. The test helpers is reponsible for setting
+    # as in the second line of the code above. The test helpers are responsible for setting
     # up the queue, subscriptions and turning colors in logs off.
     #
     # The messages are available in the @logger instance, which is a logger with limited
-    # powers (it actually do not send anything to your output), and you can collect them
+    # powers (it actually does not send anything to your output), and you can collect them
     # doing @logger.logged(level), where level is the level used in logging, like info,
     # debug, warn and so on.
     #
@@ -38,13 +39,14 @@ module ActiveSupport
 
         ActiveSupport::LogSubscriber.colorize_logging = false
 
+        @old_notifier = ActiveSupport::Notifications.notifier
         set_logger(@logger)
         ActiveSupport::Notifications.notifier = @notifier
       end
 
       def teardown
         set_logger(nil)
-        ActiveSupport::Notifications.notifier = nil
+        ActiveSupport::Notifications.notifier = @old_notifier
       end
 
       class MockLogger

data/lib/active_support/log_subscriber.rb

@@ -3,8 +3,8 @@ require 'active_support/core_ext/class/attribute'
 
 module ActiveSupport
   # ActiveSupport::LogSubscriber is an object set to consume ActiveSupport::Notifications
-  # with solely purpose of logging. The log subscriber dispatches notifications to a
-  # regirested object based on its given namespace.
+  # with the sole purpose of logging them. The log subscriber dispatches notifications to 
+  # a registered object based on its given namespace.
   #
   # An example would be Active Record log subscriber responsible for logging queries:
   #
@@ -16,12 +16,12 @@ module ActiveSupport
   #     end
   #   end
   #
-  # And it's finally registed as:
+  # And it's finally registered as:
   #
   #   ActiveRecord::LogSubscriber.attach_to :active_record
   #
   # Since we need to know all instance methods before attaching the log subscriber,
-  # the line above should be called after your ActiveRecord::LogSubscriber definition.
+  # the line above should be called after your <tt>ActiveRecord::LogSubscriber</tt> definition.
   #
   # After configured, whenever a "sql.active_record" notification is published,
   # it will properly dispatch the event (ActiveSupport::Notifications::Event) to
@@ -109,8 +109,8 @@ module ActiveSupport
 
     # Set color by using a string or one of the defined constants. If a third
     # option is set to true, it also adds bold to the string. This is based
-    # on Highline implementation and it automatically appends CLEAR to the end
-    # of the returned String.
+    # on the Highline implementation and will automatically append CLEAR to the
+    # end of the returned String.
     #
     def color(text, color, bold=false)
       return text unless colorize_logging

data/lib/active_support/message_encryptor.rb

@@ -7,7 +7,7 @@ module ActiveSupport
   #
   # The cipher text and initialization vector are base64 encoded and returned to you.
   #
-  # This can be used in situations similar to the MessageVerifier, but where you don't
+  # This can be used in situations similar to the <tt>MessageVerifier</tt>, but where you don't
   # want users to be able to determine the value of the payload.
   class MessageEncryptor
     class InvalidMessage < StandardError; end

data/lib/active_support/message_verifier.rb

@@ -2,7 +2,7 @@ require 'active_support/base64'
 require 'active_support/core_ext/object/blank'
 
 module ActiveSupport
-  # MessageVerifier makes it easy to generate and verify messages which are signed
+  # +MessageVerifier+ makes it easy to generate and verify messages which are signed
   # to prevent tampering.
   #
   # This is useful for cases like remember-me tokens and auto-unsubscribe links where the

data/lib/active_support/multibyte/chars.rb

@@ -64,7 +64,7 @@ module ActiveSupport #:nodoc:
       # Returns +true+ if _obj_ responds to the given method. Private methods are included in the search
       # only if the optional second parameter evaluates to +true+.
       def respond_to?(method, include_private=false)
-        super || @wrapped_string.respond_to?(method, include_private) || false
+        super || @wrapped_string.respond_to?(method, include_private)
       end
 
       # Enable more predictable duck-typing on String-like classes. See Object#acts_like?.
@@ -270,13 +270,14 @@ module ActiveSupport #:nodoc:
           @wrapped_string[*args] = replace_by
         else
           result = Unicode.u_unpack(@wrapped_string)
-          if args[0].is_a?(Fixnum)
+          case args.first
+          when Fixnum
             raise IndexError, "index #{args[0]} out of string" if args[0] >= result.length
             min = args[0]
             max = args[1].nil? ? min : (min + args[1] - 1)
             range = Range.new(min, max)
             replace_by = [replace_by].pack('U') if replace_by.is_a?(Fixnum)
-          elsif args.first.is_a?(Range)
+          when Range
             raise RangeError, "#{args[0]} out of range" if args[0].min >= result.length
             range = args[0]
           else
@@ -330,8 +331,7 @@ module ActiveSupport #:nodoc:
       # when the storage for a string is limited for some reason.
       #
       # Example:
-      #   s = 'こんにちは'
-      #   s.mb_chars.limit(7) # => "こに"
+      #   'こんにちは'.mb_chars.limit(7).to_s # => "こん"
       def limit(limit)
         slice(0...translate_offset(limit))
       end

data/lib/active_support/multibyte/unicode.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module ActiveSupport
   module Multibyte
     module Unicode
@@ -247,7 +248,7 @@ module ActiveSupport
           if is_unused || is_restricted
             bytes[i] = tidy_byte(byte)
           elsif is_cont
-            # Not expecting contination byte? Clean up. Otherwise, now expect one less.
+            # Not expecting continuation byte? Clean up. Otherwise, now expect one less.
             conts_expected == 0 ? bytes[i] = tidy_byte(byte) : conts_expected -= 1
           else
             if conts_expected > 0

data/lib/active_support/notifications/fanout.rb

@@ -1,7 +1,7 @@
 module ActiveSupport
   module Notifications
-    # This is a default queue implementation that ships with Notifications. It
-    # just pushes events to all registered log subscribers.
+    # This is a default queue implementation that ships with Notifications.
+    # It just pushes events to all registered log subscribers.
     class Fanout
       def initialize
         @subscribers = []
@@ -33,7 +33,7 @@ module ActiveSupport
         listeners_for(name).any?
       end
 
-      # This is a sync queue, so there is not waiting.
+      # This is a sync queue, so there is no waiting.
       def wait
       end
 

data/lib/active_support/notifications/instrumenter.rb

@@ -29,7 +29,7 @@ module ActiveSupport
 
       private
         def unique_id
-          SecureRandom.hex(10)
+          ::SecureRandom.hex(10)
         end
     end
 

data/lib/active_support/notifications.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/module/delegation'
-
 module ActiveSupport
   # Notifications provides an instrumentation API for Ruby. To instrument an
   # action in Ruby you just need to do:
@@ -44,8 +42,11 @@ module ActiveSupport
     @instrumenters = Hash.new { |h,k| h[k] = notifier.listening?(k) }
 
     class << self
-      attr_writer :notifier
-      delegate :publish, :to => :notifier
+      attr_accessor :notifier
+
+      def publish(name, *args)
+        notifier.publish(name, *args)
+      end
 
       def instrument(name, payload = {})
         if @instrumenters[name]
@@ -61,18 +62,16 @@ module ActiveSupport
         end
       end
 
-      def unsubscribe(*args)
-        notifier.unsubscribe(*args)
+      def unsubscribe(args)
+        notifier.unsubscribe(args)
         @instrumenters.clear
       end
 
-      def notifier
-        @notifier ||= Fanout.new
-      end
-
       def instrumenter
         Thread.current[:"instrumentation_#{notifier.object_id}"] ||= Instrumenter.new(notifier)
       end
     end
+
+    self.notifier = Fanout.new
   end
 end

data/lib/active_support/ordered_hash.rb

@@ -9,8 +9,17 @@ YAML.add_builtin_type("omap") do |type, val|
   ActiveSupport::OrderedHash[val.map(&:to_a).map(&:first)]
 end
 
-# OrderedHash is namespaced to prevent conflicts with other implementations
 module ActiveSupport
+  # The order of iteration over hashes in Ruby 1.8 is undefined. For example, you do not know the
+  # order in which +keys+ will return keys, or +each+ yield pairs. <tt>ActiveSupport::OrderedHash</tt>
+  # implements a hash that preserves insertion order, as in Ruby 1.9:
+  #
+  #   oh = ActiveSupport::OrderedHash.new
+  #   oh[:a] = 1
+  #   oh[:b] = 2
+  #   oh.keys # => [:a, :b], this order is guaranteed
+  #
+  # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
   class OrderedHash < ::Hash #:nodoc:
     def to_yaml_type
       "!tag:yaml.org,2002:omap"
@@ -34,6 +43,10 @@ module ActiveSupport
       end
     end
 
+    def nested_under_indifferent_access
+      self
+    end
+
     # Hash is ordered in Ruby 1.9!
     if RUBY_VERSION < '1.9'
 
@@ -83,7 +96,7 @@ module ActiveSupport
       end
 
       def []=(key, value)
-        @keys << key if !has_key?(key)
+        @keys << key unless has_key?(key)
         super
       end
 
@@ -128,19 +141,27 @@ module ActiveSupport
       end
 
       def each_key
+        return to_enum(:each_key) unless block_given?
         @keys.each { |key| yield key }
+        self
       end
 
       def each_value
+        return to_enum(:each_value) unless block_given?
         @keys.each { |key| yield self[key]}
+        self
       end
 
       def each
+        return to_enum(:each) unless block_given?
         @keys.each {|key| yield [key, self[key]]}
+        self
       end
 
       alias_method :each_pair, :each
 
+      alias_method :select, :find_all
+
       def clear
         super
         @keys.clear