activesupport 2.2.3 → 2.3.2

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

@@ -1,4 +1,4 @@
-require 'active_support/inflector'
+require 'active_support/inflector' unless defined?(ActiveSupport::Inflector)
 
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
@@ -102,8 +102,8 @@ module ActiveSupport #:nodoc:
         # 
         #   <%= link_to(@person.name, person_path %>
         #   # => <a href="/person/1-donald-e-knuth">Donald E. Knuth</a>
-        def parameterize
-          Inflector.parameterize(self)
+        def parameterize(sep = '-')
+          Inflector.parameterize(self, sep)
         end
 
         # Creates the name of a table like Rails does for models to table names. This method

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

@@ -201,8 +201,7 @@ module ActiveSupport #:nodoc:
 
         # Returns a new Time representing the start of the day (0:00)
         def beginning_of_day
-          #(self - seconds_since_midnight).change(:usec => 0)
-          change(:hour => 0, :min => 0, :sec => 0, :usec => 0)
+          (self - self.seconds_since_midnight).change(:usec => 0)
         end
         alias :midnight :beginning_of_day
         alias :at_midnight :beginning_of_day

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

@@ -10,7 +10,7 @@ module ActiveSupport #:nodoc:
           :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       => "%a, %d %b %Y %H:%M:%S %z"
+          :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
         }
 
         def self.included(base) #:nodoc:

data/lib/active_support/core_ext/try.rb

@@ -0,0 +1,36 @@
+class Object
+  # Invokes the method identified by the symbol +method+, passing it any arguments 
+  # and/or the block specified, just like the regular Ruby <tt>Object#send</tt> does.
+  #
+  # *Unlike* that method however, a +NoMethodError+ exception will *not* be raised 
+  # and +nil+ will be returned instead, if the receiving object is a +nil+ object or NilClass.
+  #
+  # ==== Examples
+  #
+  # Without try
+  #   @person && @person.name
+  # or
+  #   @person ? @person.name : nil
+  #
+  # With try
+  #   @person.try(:name)
+  #
+  # +try+ also accepts arguments and/or a block, for the method it is trying
+  #   Person.try(:find, 1)
+  #   @people.try(:collect) {|p| p.name}
+  #--
+  # This method definition below is for rdoc purposes only. The alias_method call 
+  # below overrides it as an optimization since +try+ behaves like +Object#send+,
+  # unless called on +NilClass+.
+  def try(method, *args, &block)
+    send(method, *args, &block)
+  end
+  remove_method :try
+  alias_method :try, :__send__
+end
+
+class NilClass
+  def try(*args)
+    nil
+  end
+end

data/lib/active_support/dependencies.rb

@@ -51,6 +51,9 @@ module ActiveSupport #:nodoc:
     mattr_accessor :constant_watch_stack
     self.constant_watch_stack = []
 
+    mattr_accessor :constant_watch_stack_mutex
+    self.constant_watch_stack_mutex = Mutex.new
+
     # Module includes this module
     module ModuleConstMissing #:nodoc:
       def self.included(base) #:nodoc:
@@ -319,12 +322,7 @@ module ActiveSupport #:nodoc:
         rescue NameError
           next
         end
-
-        [
-          nesting.camelize,
-          # Special case: application.rb might define ApplicationControlller.
-          ('ApplicationController' if nesting == 'application')
-        ]
+        [ nesting_camel ]
       end.flatten.compact.uniq
     end
 
@@ -514,7 +512,9 @@ module ActiveSupport #:nodoc:
         [mod_name, initial_constants]
       end
 
-      constant_watch_stack.concat watch_frames
+      constant_watch_stack_mutex.synchronize do
+        constant_watch_stack.concat watch_frames
+      end
 
       aborting = true
       begin
@@ -531,8 +531,10 @@ module ActiveSupport #:nodoc:
           new_constants = mod.local_constant_names - prior_constants
 
           # Make sure no other frames takes credit for these constants.
-          constant_watch_stack.each do |frame_name, constants|
-            constants.concat new_constants if frame_name == mod_name
+          constant_watch_stack_mutex.synchronize do
+            constant_watch_stack.each do |frame_name, constants|
+              constants.concat new_constants if frame_name == mod_name
+            end
           end
 
           new_constants.collect do |suffix|
@@ -554,8 +556,10 @@ module ActiveSupport #:nodoc:
       # Remove the stack frames that we added.
       if defined?(watch_frames) && ! watch_frames.blank?
         frame_ids = watch_frames.collect { |frame| frame.object_id }
-        constant_watch_stack.delete_if do |watch_frame|
-          frame_ids.include? watch_frame.object_id
+        constant_watch_stack_mutex.synchronize do
+          constant_watch_stack.delete_if do |watch_frame|
+            frame_ids.include? watch_frame.object_id
+          end
         end
       end
     end
@@ -564,9 +568,9 @@ module ActiveSupport #:nodoc:
       # Old style environment.rb referenced this method directly.  Please note, it doesn't
       # actually *do* anything any more.
       def self.root(*args)
-        if defined?(RAILS_DEFAULT_LOGGER)
-          RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
-          RAILS_DEFAULT_LOGGER.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
+        if defined?(Rails) && Rails.logger
+          Rails.logger.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
+          Rails.logger.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
         end
       end
     end

data/lib/active_support/deprecation.rb

@@ -13,7 +13,7 @@ module ActiveSupport
                          $stderr.puts callstack.join("\n  ") if debug
                        },
       'development' => Proc.new { |message, callstack|
-                         logger = defined?(::RAILS_DEFAULT_LOGGER) ? ::RAILS_DEFAULT_LOGGER : Logger.new($stderr)
+                         logger = defined?(Rails) ? Rails.logger : Logger.new($stderr)
                          logger.warn message
                          logger.debug callstack.join("\n  ") if debug
                        }
@@ -90,10 +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)
-                ::ActiveSupport::Deprecation.warn(self.class.deprecated_method_warning(:#{method_name}, #{options[method_name].inspect}), caller)
-                #{target}_without_deprecation#{punctuation}(*args, &block)
-              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
+                )                                                           #   )
+                #{target}_without_deprecation#{punctuation}(*args, &block)  #   generate_secret_without_deprecation(*args, &block)
+              end                                                           # end
             EOS
           end
         end
@@ -113,37 +118,6 @@ module ActiveSupport
       end
     end
 
-    module Assertions #:nodoc:
-      def assert_deprecated(match = nil, &block)
-        result, warnings = collect_deprecations(&block)
-        assert !warnings.empty?, "Expected a deprecation warning within the block but received none"
-        if match
-          match = Regexp.new(Regexp.escape(match)) unless match.is_a?(Regexp)
-          assert warnings.any? { |w| w =~ match }, "No deprecation warning matched #{match}: #{warnings.join(', ')}"
-        end
-        result
-      end
-
-      def assert_not_deprecated(&block)
-        result, deprecations = collect_deprecations(&block)
-        assert deprecations.empty?, "Expected no deprecation warning within the block but received #{deprecations.size}: \n  #{deprecations * "\n  "}"
-        result
-      end
-
-      private
-        def collect_deprecations
-          old_behavior = ActiveSupport::Deprecation.behavior
-          deprecations = []
-          ActiveSupport::Deprecation.behavior = Proc.new do |message, callstack|
-            deprecations << message
-          end
-          result = yield
-          [result, deprecations]
-        ensure
-          ActiveSupport::Deprecation.behavior = old_behavior
-        end
-    end
-
     class DeprecationProxy #:nodoc:
       silence_warnings do
         instance_methods.each { |m| undef_method m unless m =~ /^__/ }
@@ -220,24 +194,3 @@ end
 class Module
   include ActiveSupport::Deprecation::ClassMethods
 end
-
-require 'test/unit/error'
-
-module Test
-  module Unit
-    class TestCase
-      include ActiveSupport::Deprecation::Assertions
-    end
-
-    class Error # :nodoc:
-      # Silence warnings when reporting test errors.
-      def message_with_silenced_deprecation
-        ActiveSupport::Deprecation.silence do
-          message_without_silenced_deprecation
-        end
-      end
-
-      alias_method_chain :message, :silenced_deprecation
-    end
-  end
-end

data/lib/active_support/duration.rb

@@ -1,3 +1,5 @@
+require 'active_support/basic_object'
+
 module ActiveSupport
   # Provides accurate date and time measurements using Date#advance and 
   # Time#advance, respectively. It mainly supports the methods on Numeric,
@@ -68,7 +70,7 @@ module ActiveSupport
       [:years, :months, :days, :minutes, :seconds].map do |length|
         n = consolidated[length]
         "#{n} #{n == 1 ? length.to_s.singularize : length.to_s}" if n.nonzero?
-      end.compact.to_sentence
+      end.compact.to_sentence(:locale => :en)
     end
 
     protected

data/lib/active_support/inflections.rb

@@ -42,6 +42,7 @@ module ActiveSupport
     inflect.singular(/(vert|ind)ices$/i, '\1ex')
     inflect.singular(/(matr)ices$/i, '\1ix')
     inflect.singular(/(quiz)zes$/i, '\1')
+    inflect.singular(/(database)s$/i, '\1')
 
     inflect.irregular('person', 'people')
     inflect.irregular('man', 'men')

data/lib/active_support/inflector.rb

@@ -254,18 +254,20 @@ module ActiveSupport
     #   @person = Person.find(1)
     #   # => #<Person id: 1, name: "Donald E. Knuth">
     #
-    #   <%= link_to(@person.name, person_path %>
+    #   <%= link_to(@person.name, person_path(@person)) %>
     #   # => <a href="/person/1-donald-e-knuth">Donald E. Knuth</a>
     def parameterize(string, sep = '-')
-      re_sep = Regexp.escape(sep)
       # replace accented chars with ther ascii equivalents
       parameterized_string = transliterate(string)
       # Turn unwanted chars into the seperator
       parameterized_string.gsub!(/[^a-z0-9\-_\+]+/i, sep)
-      # No more than one of the separator in a row.
-      parameterized_string.squeeze!(sep)
-      # Remove leading/trailing separator.
-      parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/i, '')
+      unless sep.blank?
+        re_sep = Regexp.escape(sep)
+        # No more than one of the separator in a row.
+        parameterized_string.gsub!(/#{re_sep}{2,}/, sep)
+        # Remove leading/trailing separator.
+        parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/i, '')
+      end
       parameterized_string.downcase
     end
 
@@ -275,9 +277,16 @@ module ActiveSupport
       Iconv.iconv('ascii//ignore//translit', 'utf-8', string).to_s
     end
 
+    if RUBY_VERSION >= '1.9'
+      undef_method :transliterate
+      def transliterate(string)
+        warn "Ruby 1.9 doesn't support Unicode normalization yet"
+        string.dup
+      end
+
     # The iconv transliteration code doesn't function correctly
     # on some platforms, but it's very fast where it does function.
-    if "foo" != (Inflector.transliterate("föö") rescue nil)
+    elsif "foo" != (Inflector.transliterate("föö") rescue nil)
       undef_method :transliterate
       def transliterate(string)
         string.mb_chars.normalize(:kd). # Decompose accented characters

data/lib/active_support/json/decoding.rb

@@ -16,7 +16,7 @@ module ActiveSupport
       
       protected
         # matches YAML-formatted dates
-        DATE_REGEX = /^\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[ \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?)?$/
+        DATE_REGEX = /^(?:\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[ \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?)?)$/
 
         # Ensure that ":" and "," are always followed by a space
         def convert_json_to_yaml(json) #:nodoc:
@@ -43,14 +43,32 @@ module ActiveSupport
           end
 
           if marks.empty?
-            json.gsub(/\\\//, '/')
+            json.gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do
+              ustr = $1
+              if ustr.starts_with?('u')
+                [ustr[1..-1].to_i(16)].pack("U")
+              elsif ustr == '\\'
+                '\\\\'
+              else
+                ustr
+              end
+            end
           else
             left_pos  = [-1].push(*marks)
             right_pos = marks << scanner.pos + scanner.rest_size
             output    = []
             left_pos.each_with_index do |left, i|
               scanner.pos = left.succ
-              output << scanner.peek(right_pos[i] - scanner.pos + 1)
+              output << scanner.peek(right_pos[i] - scanner.pos + 1).gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do
+                ustr = $1
+                if ustr.starts_with?('u')
+                  [ustr[1..-1].to_i(16)].pack("U")
+                elsif ustr == '\\'
+                '\\\\'
+                else
+                  ustr
+                end
+              end
             end
             output = output * " "
             

data/lib/active_support/json/encoders/date.rb

@@ -2,7 +2,7 @@ class Date
   # Returns a JSON string representing the date. If ActiveSupport.use_standard_json_time_format is set to true, the
   # ISO 8601 format is used.
   #
-  # ==== Examples:
+  # ==== Examples
   #
   #   # With ActiveSupport.use_standard_json_time_format = true
   #   Date.new(2005,2,1).to_json

data/lib/active_support/json/encoders/date_time.rb

@@ -2,7 +2,7 @@ class DateTime
   # Returns a JSON string representing the datetime. If ActiveSupport.use_standard_json_time_format is set to true, the
   # ISO 8601 format is used.
   #
-  # ==== Examples:
+  # ==== Examples
   #
   #   # With ActiveSupport.use_standard_json_time_format = true
   #   DateTime.civil(2005,2,1,15,15,10).to_json

data/lib/active_support/json/encoders/hash.rb

@@ -5,7 +5,7 @@ class Hash
   # the hash keys. For example:
   #
   #   { :name => "Konata Izumi", 'age' => 16, 1 => 2 }.to_json
-  #   # => {"name": "Konata Izumi", 1: 2, "age": 16}
+  #   # => {"name": "Konata Izumi", "1": 2, "age": 16}
   #
   # The keys in the JSON string are unordered due to the nature of hashes.
   #
@@ -31,17 +31,16 @@ class Hash
   def to_json(options = {}) #:nodoc:
     hash_keys = self.keys
 
-    if options[:except]
-      hash_keys = hash_keys - Array(options[:except])
-    elsif options[:only]
-      hash_keys = hash_keys & Array(options[:only])
+    if except = options[:except]
+      hash_keys = hash_keys - Array.wrap(except)
+    elsif only = options[:only]
+      hash_keys = hash_keys & Array.wrap(only)
     end
 
-    returning result = '{' do
-      result << hash_keys.map do |key|
-        "#{ActiveSupport::JSON.encode(key)}: #{ActiveSupport::JSON.encode(self[key], options)}"
-      end * ', '
-      result << '}'
-    end
+    result = '{'
+    result << hash_keys.map do |key|
+      "#{ActiveSupport::JSON.encode(key.to_s)}: #{ActiveSupport::JSON.encode(self[key], options)}"
+    end * ', '
+    result << '}'
   end
 end

data/lib/active_support/json/encoders/time.rb

@@ -2,7 +2,7 @@ class Time
   # Returns a JSON string representing the time. If ActiveSupport.use_standard_json_time_format is set to true, the
   # ISO 8601 format is used.
   #
-  # ==== Examples:
+  # ==== Examples
   #
   #   # With ActiveSupport.use_standard_json_time_format = true
   #   Time.utc(2005,2,1,15,15,10).to_json

data/lib/active_support/json/encoding.rb

@@ -1,37 +1,31 @@
-require 'active_support/json/variable'
-require 'active_support/json/encoders/object' # Require explicitly for rdoc.
-Dir["#{File.dirname(__FILE__)}/encoders/**/*.rb"].each do |file|
-  basename = File.basename(file, '.rb')
-  unless basename == 'object'
-    require "active_support/json/encoders/#{basename}"
-  end
-end
-
 module ActiveSupport
   module JSON
     class CircularReferenceError < StandardError
     end
 
-    class << self
-      REFERENCE_STACK_VARIABLE = :json_reference_stack #:nodoc:
-
-      # Converts a Ruby object into a JSON string.
-      def encode(value, options = {})
-        raise_on_circular_reference(value) do
-          value.send(:to_json, options)
-        end
-      end
-
-      protected
-        def raise_on_circular_reference(value) #:nodoc:
-          stack = Thread.current[REFERENCE_STACK_VARIABLE] ||= []
-          raise CircularReferenceError, 'object references itself' if
-            stack.include? value
-          stack << value
-          yield
-        ensure
-          stack.pop
-        end
+    # Converts a Ruby object into a JSON string.
+    def self.encode(value, options = {})
+      seen = (options[:seen] ||= [])
+      raise CircularReferenceError, 'object references itself' if seen.include?(value)
+      seen << value
+      value.send(:to_json, options)
+    ensure
+      seen.pop
     end
   end
 end
+
+require 'active_support/json/variable'
+require 'active_support/json/encoders/date'
+require 'active_support/json/encoders/date_time'
+require 'active_support/json/encoders/enumerable'
+require 'active_support/json/encoders/false_class'
+require 'active_support/json/encoders/hash'
+require 'active_support/json/encoders/nil_class'
+require 'active_support/json/encoders/numeric'
+require 'active_support/json/encoders/object'
+require 'active_support/json/encoders/regexp'
+require 'active_support/json/encoders/string'
+require 'active_support/json/encoders/symbol'
+require 'active_support/json/encoders/time'
+require 'active_support/json/encoders/true_class'