activesupport 3.0.20 → 3.1.0.beta1

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

@@ -153,6 +153,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:
@@ -232,9 +238,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.rb

@@ -4,7 +4,7 @@ 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.
+  # 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

data/lib/active_support/log_subscriber/test_helper.rb

@@ -23,11 +23,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 +38,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/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

data/lib/active_support/multibyte/unicode.rb

@@ -247,7 +247,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.rb

@@ -44,8 +44,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 +64,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/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/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"
@@ -83,7 +92,7 @@ module ActiveSupport
       end
 
       def []=(key, value)
-        @keys << key if !has_key?(key)
+        @keys << key unless has_key?(key)
         super
       end
 
@@ -128,19 +137,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

data/lib/active_support/ordered_options.rb

@@ -1,7 +1,26 @@
 require 'active_support/ordered_hash'
 
+# Usually key value pairs are handled something like this:
+#
+#   h = {}
+#   h[:boy] = 'John'
+#   h[:girl] = 'Mary'
+#   h[:boy]  # => 'John'
+#   h[:girl] # => 'Mary'
+#
+# Using <tt>OrderedOptions</tt>, the above code could be reduced to:
+#
+#   h = ActiveSupport::OrderedOptions.new
+#   h.boy = 'John'
+#   h.girl = 'Mary'
+#   h.boy  # => 'John'
+#   h.girl # => 'Mary'
+#
 module ActiveSupport #:nodoc:
   class OrderedOptions < OrderedHash
+    alias_method :_get, :[] # preserve the original #[] method
+    protected :_get # make it protected
+
     def []=(key, value)
       super(key.to_sym, value)
     end
@@ -12,7 +31,7 @@ module ActiveSupport #:nodoc:
 
     def method_missing(name, *args)
       if name.to_s =~ /(.*)=$/
-        self[$1.to_sym] = args.first
+        self[$1] = args.first
       else
         self[name]
       end
@@ -20,8 +39,19 @@ module ActiveSupport #:nodoc:
   end
 
   class InheritableOptions < OrderedOptions
-    def initialize(parent)
-      super() { |h,k| parent[k] }
+    def initialize(parent = nil)
+      if parent.kind_of?(OrderedOptions)
+        # use the faster _get when dealing with OrderedOptions
+        super() { |h,k| parent._get(k) }
+      elsif parent
+        super() { |h,k| parent[k] }
+      else
+        super()
+      end
+    end
+
+    def inheritable_copy
+      self.class.new(self)
     end
   end
 end

data/lib/active_support/railtie.rb

@@ -46,7 +46,7 @@ module ActiveSupport
     # If assigned value cannot be matched to a TimeZone, an exception will be raised.
     initializer "active_support.initialize_time_zone" do |app|
       require 'active_support/core_ext/time/zones'
-      zone_default = Time.__send__(:get_zone, app.config.time_zone)
+      zone_default = Time.find_zone!(app.config.time_zone)
 
       unless zone_default
         raise \

data/lib/active_support/rescuable.rb

@@ -47,6 +47,7 @@ module ActiveSupport
       #         exception.record.new_record? ? ...
       #       end
       #   end
+      #
       def rescue_from(*klasses, &block)
         options = klasses.extract_options!
 

data/lib/active_support/secure_random.rb

@@ -46,8 +46,10 @@ module ActiveSupport
     #  p SecureRandom.random_bytes(10) # => "\016\t{\370g\310pbr\301"
     #  p SecureRandom.random_bytes(10) # => "\323U\030TO\234\357\020\a\337"
     #  ...
+    #
     module SecureRandom
-      # SecureRandom.random_bytes generates a random binary string.
+
+      # Generates a random binary string.
       #
       # The argument n specifies the length of the result string.
       #
@@ -56,6 +58,7 @@ module ActiveSupport
       #
       # If secure random number generator is not available,
       # NotImplementedError is raised.
+      #
       def self.random_bytes(n=nil)
         n ||= 16
 
@@ -92,7 +95,7 @@ module ActiveSupport
           end
         end
 
-        if !defined?(@has_win32)
+        unless defined?(@has_win32)
           begin
             require 'Win32API'
 
@@ -124,7 +127,7 @@ module ActiveSupport
         raise NotImplementedError, "No random device"
       end
 
-      # SecureRandom.hex generates a random hex string.
+      # Generates a random hex string.
       #
       # The argument n specifies the length of the random length.
       # The length of the result string is twice of n.
@@ -134,11 +137,12 @@ module ActiveSupport
       #
       # If secure random number generator is not available,
       # NotImplementedError is raised.
+      #
       def self.hex(n=nil)
         random_bytes(n).unpack("H*")[0]
       end
 
-      # SecureRandom.base64 generates a random base64 string.
+      # Generates a random base64 string.
       #
       # The argument n specifies the length of the random length.
       # The length of the result string is about 4/3 of n.
@@ -148,11 +152,12 @@ module ActiveSupport
       #
       # If secure random number generator is not available,
       # NotImplementedError is raised.
+      #
       def self.base64(n=nil)
         [random_bytes(n)].pack("m*").delete("\n")
       end
 
-      # SecureRandom.random_number generates a random number.
+      # Generates a random number.
       #
       # If an positive integer is given as n,
       # SecureRandom.random_number returns an integer:
@@ -161,6 +166,7 @@ module ActiveSupport
       # If 0 is given or an argument is not given,
       # SecureRandom.random_number returns an float:
       # 0.0 <= SecureRandom.random_number() < 1.0.
+      #
       def self.random_number(n=0)
         if 0 < n
           hex = n.to_s(16)