activesupport 2.0.5 → 2.1.0

data/lib/active_support/deprecation.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'delegate'
 
 module ActiveSupport
   module Deprecation #:nodoc:
@@ -145,8 +144,8 @@ module ActiveSupport
         end
     end
 
-    # Stand-in for @request, @attributes, @params, etc which emits deprecation
-    # warnings on any method call (except #inspect).
+    # Stand-in for <tt>@request</tt>, <tt>@attributes</tt>, <tt>@params</tt>, etc.
+    # which emits deprecation warnings on any method call (except +inspect+).
     class DeprecatedInstanceVariableProxy #:nodoc:
       silence_warnings do
         instance_methods.each { |m| undef_method m unless m =~ /^__/ }
@@ -176,20 +175,7 @@ module ActiveSupport
           ActiveSupport::Deprecation.warn("#{@var} is deprecated! Call #{@method}.#{called} instead of #{@var}.#{called}. Args: #{args.inspect}", callstack)
         end
     end
-    
-    class DeprecatedInstanceVariable < Delegator
-      def initialize(value, method)
-        super(value)
-        @method = method
-        @value = value
-      end
 
-      def __getobj__
-        ActiveSupport::Deprecation.warn("Instance variable @#{@method} is deprecated! Call instance method #{@method} instead.")
-        @value
-      end
-    end
-    
   end
 end
 

data/lib/active_support/duration.rb

@@ -51,14 +51,14 @@ module ActiveSupport
 
     # Calculates a new Time or Date that is as far in the future
     # as this Duration represents.
-    def since(time = ::Time.now)
+    def since(time = ::Time.current)
       sum(1, time)
     end
     alias :from_now :since
 
     # Calculates a new Time or Date that is as far in the past
     # as this Duration represents.
-    def ago(time = ::Time.now)
+    def ago(time = ::Time.current)
       sum(-1, time)
     end
     alias :until :ago
@@ -73,7 +73,7 @@ module ActiveSupport
 
     protected
 
-      def sum(sign, time = ::Time.now) #:nodoc:
+      def sum(sign, time = ::Time.current) #:nodoc:
         parts.inject(time) do |t,(type,number)|
           if t.acts_like?(:time) || t.acts_like?(:date)
             if type == :seconds
@@ -82,7 +82,7 @@ module ActiveSupport
               t.advance(type => sign * number)
             end
           else
-            raise ArgumentError, "expected a time or date, got #{time.inspect}"
+            raise ::ArgumentError, "expected a time or date, got #{time.inspect}"
           end
         end
       end

data/lib/active_support/gzip.rb

@@ -0,0 +1,25 @@
+require 'zlib'
+require 'stringio'
+
+module ActiveSupport
+  # A convenient wrapper for the zlib standard library that allows compression/decompression of strings with gzip.
+  module Gzip
+    class Stream < StringIO
+      def close; rewind; end
+    end
+
+    # Decompresses a gzipped string.
+    def self.decompress(source)
+      Zlib::GzipReader.new(StringIO.new(source)).read
+    end
+
+    # Compresses a string using gzip.
+    def self.compress(source)
+      output = Stream.new
+      gz = Zlib::GzipWriter.new(output)
+      gz.write(source)
+      gz.close
+      output.string
+    end
+  end
+end

data/lib/active_support/inflector.rb

@@ -3,6 +3,11 @@ require 'singleton'
 # The Inflector transforms words from singular to plural, class names to table names, modularized class names to ones without,
 # and class names to foreign keys. The default inflections for pluralization, singularization, and uncountable words are kept
 # in inflections.rb.
+#
+# The Rails core team has stated patches for the inflections library will not be accepted
+# in order to avoid breaking legacy applications which may be relying on errant inflections.
+# If you discover an incorrect inflection and require it for your application, you'll need
+# to correct it yourself (explained below).
 module Inflector
   # A singleton instance of this class is yielded by Inflector.inflections, which can then be used to specify additional
   # inflection rules. Examples:
@@ -68,8 +73,9 @@ module Inflector
       (@uncountables << words).flatten!
     end
 
-    # Clears the loaded inflections within a given scope (default is :all). Give the scope as a symbol of the inflection type,
-    # the options are: :plurals, :singulars, :uncountables
+    # Clears the loaded inflections within a given scope (default is <tt>:all</tt>).
+    # Give the scope as a symbol of the inflection type, the options are: <tt>:plurals</tt>,
+    # <tt>:singulars</tt>, <tt>:uncountables</tt>.
     #
     # Examples:
     #   clear :all
@@ -86,6 +92,13 @@ module Inflector
 
   extend self
 
+  # Yields a singleton instance of Inflector::Inflections so you can specify additional
+  # inflector rules.
+  #
+  # Example:
+  #   Inflector.inflections do |inflect|
+  #     inflect.uncountable "rails"
+  #   end
   def inflections
     if block_given?
       yield Inflections.instance
@@ -96,13 +109,13 @@ module Inflector
 
   # Returns the plural form of the word in the string.
   #
-  # Examples
-  #   "post".pluralize #=> "posts"
-  #   "octopus".pluralize #=> "octopi"
-  #   "sheep".pluralize #=> "sheep"
-  #   "words".pluralize #=> "words"
-  #   "the blue mailman".pluralize #=> "the blue mailmen"
-  #   "CamelOctopus".pluralize #=> "CamelOctopi"
+  # Examples:
+  #   "post".pluralize             # => "posts"
+  #   "octopus".pluralize          # => "octopi"
+  #   "sheep".pluralize            # => "sheep"
+  #   "words".pluralize            # => "words"
+  #   "the blue mailman".pluralize # => "the blue mailmen"
+  #   "CamelOctopus".pluralize     # => "CamelOctopi"
   def pluralize(word)
     result = word.to_s.dup
 
@@ -114,15 +127,15 @@ module Inflector
     end
   end
 
-  # The reverse of pluralize, returns the singular form of a word in a string.
+  # The reverse of +pluralize+, returns the singular form of a word in a string.
   #
-  # Examples
-  #   "posts".singularize #=> "post"
-  #   "octopi".singularize #=> "octopus"
-  #   "sheep".singluarize #=> "sheep"
-  #   "word".singluarize #=> "word"
-  #   "the blue mailmen".singularize #=> "the blue mailman"
-  #   "CamelOctopi".singularize #=> "CamelOctopus"
+  # Examples:
+  #   "posts".singularize            # => "post"
+  #   "octopi".singularize           # => "octopus"
+  #   "sheep".singluarize            # => "sheep"
+  #   "word".singluarize             # => "word"
+  #   "the blue mailmen".singularize # => "the blue mailman"
+  #   "CamelOctopi".singularize      # => "CamelOctopus"
   def singularize(word)
     result = word.to_s.dup
 
@@ -134,44 +147,44 @@ module Inflector
     end
   end
 
-  # By default, camelize converts strings to UpperCamelCase. If the argument to camelize
-  # is set to ":lower" then camelize produces lowerCamelCase.
+  # By default, +camelize+ converts strings to UpperCamelCase. If the argument to +camelize+
+  # is set to <tt>:lower</tt> then +camelize+ produces lowerCamelCase.
   #
-  # camelize will also convert '/' to '::' which is useful for converting paths to namespaces
+  # +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces.
   #
-  # Examples
-  #   "active_record".camelize #=> "ActiveRecord"
-  #   "active_record".camelize(:lower) #=> "activeRecord"
-  #   "active_record/errors".camelize #=> "ActiveRecord::Errors"
-  #   "active_record/errors".camelize(:lower) #=> "activeRecord::Errors"
+  # Examples:
+  #   "active_record".camelize                # => "ActiveRecord"
+  #   "active_record".camelize(:lower)        # => "activeRecord"
+  #   "active_record/errors".camelize         # => "ActiveRecord::Errors"
+  #   "active_record/errors".camelize(:lower) # => "activeRecord::Errors"
   def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
     if first_letter_in_uppercase
-      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
     else
       lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
     end
   end
 
   # Capitalizes all the words and replaces some characters in the string to create
-  # a nicer looking title. Titleize is meant for creating pretty output. It is not
+  # a nicer looking title. +titleize+ is meant for creating pretty output. It is not
   # used in the Rails internals.
   #
-  # titleize is also aliased as as titlecase
+  # +titleize+ is also aliased as as +titlecase+.
   #
-  # Examples
-  #   "man from the boondocks".titleize #=> "Man From The Boondocks"
-  #   "x-men: the last stand".titleize #=> "X Men: The Last Stand"
+  # Examples:
+  #   "man from the boondocks".titleize # => "Man From The Boondocks"
+  #   "x-men: the last stand".titleize  # => "X Men: The Last Stand"
   def titleize(word)
     humanize(underscore(word)).gsub(/\b('?[a-z])/) { $1.capitalize }
   end
 
-  # The reverse of +camelize+. Makes an underscored form from the expression in the string.
+  # The reverse of +camelize+. Makes an underscored, lowercase form from the expression in the string.
   #
   # Changes '::' to '/' to convert namespaces to paths.
   #
-  # Examples
-  #   "ActiveRecord".underscore #=> "active_record"
-  #   "ActiveRecord::Errors".underscore #=> active_record/errors
+  # Examples:
+  #   "ActiveRecord".underscore         # => "active_record"
+  #   "ActiveRecord::Errors".underscore # => active_record/errors
   def underscore(camel_cased_word)
     camel_cased_word.to_s.gsub(/::/, '/').
       gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
@@ -182,52 +195,52 @@ module Inflector
 
   # Replaces underscores with dashes in the string.
   #
-  # Example
-  #   "puni_puni" #=> "puni-puni"
+  # Example:
+  #   "puni_puni" # => "puni-puni"
   def dasherize(underscored_word)
     underscored_word.gsub(/_/, '-')
   end
 
-  # Capitalizes the first word and turns underscores into spaces and strips _id.
-  # Like titleize, this is meant for creating pretty output.
+  # Capitalizes the first word and turns underscores into spaces and strips a
+  # trailing "_id", if any. Like +titleize+, this is meant for creating pretty output.
   #
-  # Examples
-  #   "employee_salary" #=> "Employee salary"
-  #   "author_id" #=> "Author"
+  # Examples:
+  #   "employee_salary" # => "Employee salary"
+  #   "author_id"       # => "Author"
   def humanize(lower_case_and_underscored_word)
     lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
   end
 
-  # Removes the module part from the expression in the string
+  # Removes the module part from the expression in the string.
   #
-  # Examples
-  #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize #=> "Inflections"
-  #   "Inflections".demodulize #=> "Inflections"
+  # Examples:
+  #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
+  #   "Inflections".demodulize                                       # => "Inflections"
   def demodulize(class_name_in_module)
     class_name_in_module.to_s.gsub(/^.*::/, '')
   end
 
   # Create the name of a table like Rails does for models to table names. This method
-  # uses the pluralize method on the last word in the string.
+  # uses the +pluralize+ method on the last word in the string.
   #
   # Examples
-  #   "RawScaledScorer".tableize #=> "raw_scaled_scorers"
-  #   "egg_and_ham".tableize #=> "egg_and_hams"
-  #   "fancyCategory".tableize #=> "fancy_categories"
+  #   "RawScaledScorer".tableize # => "raw_scaled_scorers"
+  #   "egg_and_ham".tableize     # => "egg_and_hams"
+  #   "fancyCategory".tableize   # => "fancy_categories"
   def tableize(class_name)
     pluralize(underscore(class_name))
   end
 
   # Create a class name from a plural table name like Rails does for table names to models.
   # Note that this returns a string and not a Class. (To convert to an actual class
-  # follow classify with constantize.)
+  # follow +classify+ with +constantize+.)
   #
-  # Examples
-  #   "egg_and_hams".classify #=> "EggAndHam"
-  #   "posts".classify #=> "Post"
+  # Examples:
+  #   "egg_and_hams".classify # => "EggAndHam"
+  #   "posts".classify        # => "Post"
   #
-  # Singular names are not handled correctly
-  #   "business".classify #=> "Busines"
+  # Singular names are not handled correctly:
+  #   "business".classify     # => "Busines"
   def classify(table_name)
     # strip out any leading schema name
     camelize(singularize(table_name.to_s.sub(/.*\./, '')))
@@ -237,21 +250,31 @@ module Inflector
   # +separate_class_name_and_id_with_underscore+ sets whether
   # the method should put '_' between the name and 'id'.
   #
-  # Examples
-  #   "Message".foreign_key #=> "message_id"
-  #   "Message".foreign_key(false) #=> "messageid"
-  #   "Admin::Post".foreign_key #=> "post_id"
+  # Examples:
+  #   "Message".foreign_key        # => "message_id"
+  #   "Message".foreign_key(false) # => "messageid"
+  #   "Admin::Post".foreign_key    # => "post_id"
   def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
     underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
   end
 
-  # Constantize tries to find a declared constant with the name specified
-  # in the string. It raises a NameError when the name is not in CamelCase
-  # or is not initialized.
+  # Tries to find a constant with the name specified in the argument string:
   #
-  # Examples
-  #   "Module".constantize #=> Module
-  #   "Class".constantize #=> Class
+  #   "Module".constantize     # => Module
+  #   "Test::Unit".constantize # => Test::Unit
+  #
+  # The name is assumed to be the one of a top-level constant, no matter whether
+  # it starts with "::" or not. No lexical context is taken into account:
+  #
+  #   C = 'outside'
+  #   module M
+  #     C = 'inside'
+  #     C               # => 'inside'
+  #     "C".constantize # => 'outside', same as ::C
+  #   end
+  #
+  # NameError is raised when the name is not in CamelCase or the constant is
+  # unknown.
   def constantize(camel_cased_word)
     unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
       raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
@@ -260,10 +283,10 @@ module Inflector
     Object.module_eval("::#{$1}", __FILE__, __LINE__)
   end
 
-  # Ordinalize turns a number into an ordinal string used to denote the
-  # position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
+  # Turns a number into an ordinal string used to denote the position in an
+  # ordered sequence such as 1st, 2nd, 3rd, 4th.
   #
-  # Examples
+  # Examples:
   #   ordinalize(1)     # => "1st"
   #   ordinalize(2)     # => "2nd"
   #   ordinalize(1002)  # => "1002nd"

data/lib/active_support/json.rb

@@ -1,31 +1,23 @@
-require 'active_support/json/encoding'
-require 'active_support/json/decoding'
-
 module ActiveSupport
-  module JSON
-    RESERVED_WORDS = %w(
-      abstract      delete        goto          private       transient
-      boolean       do            if            protected     try
-      break         double        implements    public        typeof
-      byte          else          import        return        var
-      case          enum          in            short         void
-      catch         export        instanceof    static        volatile
-      char          extends       int           super         while
-      class         final         interface     switch        with
-      const         finally       long          synchronized
-      continue      float         native        this
-      debugger      for           new           throw
-      default       function      package       throws
-    ) #:nodoc:
+  # If true, use ISO 8601 format for dates and times.  Otherwise, fall back to the Active Support legacy format.
+  mattr_accessor :use_standard_json_time_format
 
-    class << self
-      def valid_identifier?(key) #:nodoc:
-        key.to_s =~ /^[[:alpha:]_$][[:alnum:]_$]*$/ && !reserved_word?(key)
-      end
+  class << self
+    def escape_html_entities_in_json
+      @escape_html_entities_in_json
+    end
 
-      def reserved_word?(key) #:nodoc:
-        RESERVED_WORDS.include?(key.to_s)
-      end
+    def escape_html_entities_in_json=(value)
+      ActiveSupport::JSON::Encoding.escape_regex = \
+        if value
+          /[\010\f\n\r\t"\\><&]/
+        else
+          /[\010\f\n\r\t"\\]/
+        end
+      @escape_html_entities_in_json = value
     end
   end
 end
+
+require 'active_support/json/encoding'
+require 'active_support/json/decoding'

data/lib/active_support/json/decoding.rb

@@ -31,7 +31,7 @@ module ActiveSupport
                 if json[pos..scanner.pos-2] =~ DATE_REGEX
                   # found a date, track the exact positions of the quotes so we can remove them later.
                   # oh, and increment them for each current mark, each one is an extra padded space that bumps
-                  # the position in the final yaml output
+                  # the position in the final YAML output
                   total_marks = marks.size
                   times << pos+total_marks << scanner.pos+total_marks
                 end

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

@@ -1,5 +1,14 @@
 class Date
-  def to_json(options = nil) #:nodoc:
-    %("#{strftime("%Y/%m/%d")}")
+  # Returns a JSON string representing the date.
+  #
+  # ==== Example:
+  #   Date.new(2005,2,1).to_json
+  #   # => "2005/02/01"
+  def to_json(options = nil)
+    if ActiveSupport.use_standard_json_time_format
+      %("#{strftime("%Y-%m-%d")}")
+    else
+      %("#{strftime("%Y/%m/%d")}")
+    end
   end
 end

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

@@ -1,5 +1,14 @@
 class DateTime
-  def to_json(options = nil) #:nodoc:
-    %("#{strftime("%Y/%m/%d %H:%M:%S %z")}")
+  # Returns a JSON string representing the datetime.
+  #
+  # ==== Example:
+  #   DateTime.civil(2005,2,1,15,15,10).to_json
+  #   # => "2005/02/01 15:15:10 +0000"
+  def to_json(options = nil)
+    if ActiveSupport.use_standard_json_time_format
+      xmlschema.inspect
+    else
+      %("#{strftime("%Y/%m/%d %H:%M:%S %z")}")
+    end
   end
 end