activesupport 1.0.4 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,40 @@
+*SVN*
+
+* Fixed conflict with Glue gem #1606 [Rick Olson]
+
+* Added new rules to the Inflector to deal with more unusual plurals mouse/louse => mice/lice, information => information, ox => oxen, virus => viri, archive => archives #1571, #1583, #1490, #1599, #1608 [foamdino@gmail.com/others]
+
+* Fixed memory leak with Object#remove_subclasses_of, which inflicted a Rails application running in development mode with a ~20KB leak per request #1289 [c.r.mcgrath@gmail.com]
+
+* Made 1.year == 365.25.days to account for leap years.  This allows you to do User.find(:all, :conditions => ['birthday > ?', 50.years.ago]) without losing a lot of days.  #1488 [tuxie@dekadance.se]
+
+* Added an exception if calling id on nil to WhinyNil #584 [kevin-temp@writesoon.com]
+
+* Added Fix/Bignum#multiple_of? which returns true on 14.multiple_of?(7) and false on 16.multiple_of?(7) #1464 [Thomas Fuchs]
+
+* Added even? and odd? to work with Bignums in addition to Fixnums #1464 [Thomas Fuchs]
+
+* Fixed Time#at_beginning_of_week returned the next Monday instead of the previous one when called on a Sunday #1403 [jean.helou@gmail.com]
+
+* Increased the speed of indifferent hash access by using Hash#default.  #1436 [Nicholas Seckar]
+
+* Added that "   " is now also blank? (using strip if available)
+
+* Fixed Dependencies so all modules are able to load missing constants #1173 [Nicholas Seckar]
+
+* Fixed the Inflector to underscore strings containing numbers, so Area51Controller becomes area51_controller #1176 [Nicholas Seckar]
+
+* Fixed that HashWithIndifferentAccess stringified all keys including symbols, ints, objects, and arrays #1162 [Nicholas Seckar]
+
+* Fixed Time#last_year to go back in time, not forward #1278 [fabien@odilat.com]
+
+* Fixed the pluralization of analysis to analyses #1295 [seattle@rootimage.msu.edu]
+
+* Fixed that Time.local(2005,12).months_since(1) would raise "ArgumentError: argument out of range" #1311 [jhahn@niveon.com]
+
+* Added silencing to the default Logger class
+
+
 *1.0.4* (19th April, 2005)
 
 * Fixed that in some circumstances controllers outside of modules may have hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 [Nicholas Seckar]
@@ -11,7 +48,7 @@
 
 *1.0.3* (27th March, 2005)
 
-* Fixed Inflector.pluralize to handle capitalized words #932 [bitsweat]
+* Fixed Inflector.pluralize to handle capitalized words #932 [Jeremy Kemper]
 
 * Added Object#suppress which allows you to make a saner choice around with exceptions to swallow #980. Example:
 
@@ -90,7 +127,7 @@
 
 * Added Inflector.humanize to turn attribute names like employee_salary into "Employee salary". Used by automated error reporting in AR.
 
-* Added availability of class inheritable attributes to the masses #477 [bitsweat]
+* Added availability of class inheritable attributes to the masses #477 [Jeremy Kemper]
 
     class Foo
       class_inheritable_reader :read_me
@@ -108,14 +145,14 @@
     Bar.read_and_write_me = 'bar'
     Bar.read_and_write_me != Foo.read_and_write_me
 
-* Added Inflections as an extension on String, so Inflector.pluralize(Inflector.classify(name)) becomes name.classify.pluralize #476 [bitsweat]
+* Added Inflections as an extension on String, so Inflector.pluralize(Inflector.classify(name)) becomes name.classify.pluralize #476 [Jeremy Kemper]
 
 * Added Byte operations to Numeric, so 5.5.megabytes + 200.kilobytes #461 [Marcel Molina]
 
 * Fixed that Dependencies.reload can't load the same file twice #420 [Kent Sibilev]
 
-* Added Fixnum#ago/until, Fixnum#since/from_now #450 [bitsweat]
+* Added Fixnum#ago/until, Fixnum#since/from_now #450 [Jeremy Kemper]
 
 * Added that Inflector now accepts Symbols and Classes by calling .to_s on the word supplied
 
-* Added time unit extensions to Fixnum that'll return the period in seconds, like 2.days + 4.hours.
+* Added time unit extensions to Fixnum that'll return the period in seconds, like 2.days + 4.hours.

data/lib/active_support/class_attribute_accessors.rb

@@ -2,7 +2,7 @@
 # just like the native attr* accessors for instance attributes.
 class Class # :nodoc:
   def cattr_reader(*syms)
-    syms.each do |sym|
+    syms.select { |sym| sym.respond_to?(:id2name) }.each do |sym|
       class_eval <<-EOS
         if ! defined? @@#{sym.id2name}
           @@#{sym.id2name} = nil
@@ -29,7 +29,7 @@ class Class # :nodoc:
   end
   
   def cattr_writer(*syms)
-    syms.each do |sym|
+    syms.select { |sym| sym.respond_to?(:id2name) }.each do |sym|
       class_eval <<-EOS
         if ! defined? @@#{sym.id2name}
           @@#{sym.id2name} = nil
@@ -54,4 +54,4 @@ class Class # :nodoc:
     cattr_reader(*syms)
     cattr_writer(*syms)
   end
-end
+end

data/lib/active_support/clean_logger.rb

@@ -1,6 +1,14 @@
 require 'logger'
 
 class Logger #:nodoc:
+  # Silences the logger for the duration of the block.
+  def silence(temporary_level = Logger::ERROR)
+    old_logger_level, self.level = level, temporary_level
+    yield
+  ensure
+    self.level = old_logger_level
+  end
+
   private
     remove_const "Format"
     Format = "%s\n"

data/lib/active_support/core_ext/array.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/array/to_param'
+
+class Array #:nodoc:
+  include ActiveSupport::CoreExtensions::Array::ToParam
+end

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

@@ -0,0 +1,12 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Array #:nodoc:
+      module ToParam #:nodoc:
+        # When an array is given to url_for, it is converted to a slash separated string.
+        def to_param
+          join '/'
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/cgi.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/cgi/escape_skipping_slashes'
+
+class CGI #:nodoc:
+  extend(ActiveSupport::CoreExtensions::CGI::EscapeSkippingSlashes)
+end

data/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb

@@ -0,0 +1,14 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module CGI #:nodoc:
+      module EscapeSkippingSlashes #:nodoc:
+        def escape_skipping_slashes(str)
+          str = str.join('/') if str.respond_to? :join
+          str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do
+            "%#{$1.unpack('H2').first.upcase}"
+          end.tr(' ', '+')
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,11 @@ module ActiveSupport #:nodoc:
     module Date #:nodoc:
       # Getting dates in different convenient string representations and other objects
       module Conversions
+        DATE_FORMATS = {
+          :short => "%e %b",
+          :long  => "%B %e, %Y"
+        }
+        
         def self.append_features(klass) #:nodoc:
           super
           klass.send(:alias_method, :to_default_s, :to_s)
@@ -10,11 +15,7 @@ module ActiveSupport #:nodoc:
         end
         
         def to_formatted_s(format = :default)
-          case format
-            when :default then to_default_s
-            when :short   then strftime("%e %b").strip
-            when :long    then strftime("%B %e, %Y").strip
-          end
+          DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s   
         end
 
         # To be able to keep Dates and Times interchangeable on conversions

data/lib/active_support/core_ext/fixnum.rb

@@ -3,3 +3,7 @@ require File.dirname(__FILE__) + '/fixnum/even_odd'
 class Fixnum #:nodoc:
   include ActiveSupport::CoreExtensions::Fixnum::EvenOdd
 end
+
+class Bignum #:nodoc:
+  include ActiveSupport::CoreExtensions::Fixnum::EvenOdd
+end

data/lib/active_support/core_ext/fixnum/even_odd.rb

@@ -7,8 +7,12 @@ module ActiveSupport #:nodoc:
       # * 2.even? # => true
       # * 2.odd? # => false
       module EvenOdd
+        def multiple_of?(number)
+          self % number == 0
+        end
+        
         def even?
-          self % 2 == 0
+          multiple_of? 2
         end
         
         def odd?

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

@@ -3,21 +3,15 @@ class HashWithIndifferentAccess < Hash
   def initialize(constructor = {})
     if constructor.is_a?(Hash)
       super()
-      update(constructor.stringify_keys)
+      update(constructor)
     else
       super(constructor)
     end
   end
-  
-  alias_method :regular_reader, :[] unless method_defined?(:regular_reader)
-  
-  def [](key)
-    case key
-      when Symbol: regular_reader(key.to_s) || regular_reader(key)
-      when String: regular_reader(key) || regular_reader(key.to_sym)
-      else regular_reader(key)
-    end
-  end
+ 
+  def default(key)
+    self[key.to_s] if key.is_a?(Symbol)
+  end  
 
   alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
   
@@ -56,7 +50,7 @@ end
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Hash #:nodoc:
-      module IndifferentAccess
+      module IndifferentAccess #:nodoc:
         def with_indifferent_access
           HashWithIndifferentAccess.new(self)
         end

data/lib/active_support/core_ext/load_error.rb

@@ -1,4 +1,4 @@
-class MissingSourceFile < LoadError
+class MissingSourceFile < LoadError #:nodoc:
   attr_reader :path
   def initialize(message, path)
     super(message)
@@ -24,10 +24,10 @@ class MissingSourceFile < LoadError
   ]
 end
 
-module ActiveSupport
-  module CoreExtensions
-    module LoadErrorExtensions
-      module LoadErrorClassMethods
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module LoadErrorExtensions #:nodoc:
+      module LoadErrorClassMethods #:nodoc:
         def new(*args)
           (self == LoadError && MissingSourceFile.from_message(args.first)) || super
         end

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

@@ -32,9 +32,9 @@ module ActiveSupport #:nodoc:
           self * 30.days
         end
         alias :month :months
-        
+
         def years
-          self * 365.days
+          (self * 365.25.days).to_i
         end
         alias :year :years
 

data/lib/active_support/core_ext/object_and_class.rb

@@ -1,6 +1,13 @@
 class Object #:nodoc:
   def remove_subclasses_of(superclass)
-    subclasses_of(superclass).each { |subclass| Object.send(:remove_const, subclass) rescue nil }
+    subclasses_of(superclass).each do |subclass|
+      ObjectSpace.each_object(Class) do |k|
+        if k.to_s == subclass
+          k.instance_variables.each { |v| k.send(:remove_instance_variable, v) }
+        end  
+      end   
+      Object.send(:remove_const, subclass) rescue nil
+    end 
   end
 
   def subclasses_of(superclass)
@@ -12,8 +19,11 @@ class Object #:nodoc:
     subclasses
   end
 
+  # "", "   ", nil, and 0 are all blank
   def blank?
-    if respond_to? :empty?
+    if respond_to?(:empty?) && respond_to?(:strip)
+      strip.empty?
+    elsif respond_to? :empty?
       empty?
     elsif respond_to? :zero?
       zero?

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

@@ -48,7 +48,8 @@ module ActiveSupport #:nodoc:
 
         def months_since(months)
           if months + self.month > 12
-            change(:year => self.year + 1, :month => 1).months_since(months - (self.month == 1 ? 12 : (self.month + 1)))
+            old_time = self
+            change(:year => self.year + 1, :month => 1).months_since(months + old_time.month - 12 - 1)
           else
             change(:year => self.year, :month => self.month + months)
           end
@@ -63,12 +64,12 @@ module ActiveSupport #:nodoc:
           change(:year => self.year + years)
         end
 
-        # Short-hand for months_ago(1)
+        # Short-hand for years_ago(1)
         def last_year
-          years_since(1)
+          years_ago(1)
         end
         
-        # Short-hand for months_since(1)
+        # Short-hand for years_since(1)
         def next_year
           years_since(1)
         end
@@ -86,7 +87,8 @@ module ActiveSupport #:nodoc:
         
         # Returns a new Time representing the "start" of this week (Monday, 0:00)
         def beginning_of_week
-          (self - self.wday.days).midnight + 1.day
+          days_to_monday = self.wday!=0 ? self.wday-1 : 6
+          (self - days_to_monday.days).midnight
         end
         alias :monday :beginning_of_week
         alias :at_beginning_of_week :beginning_of_week

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

@@ -5,6 +5,12 @@ module ActiveSupport #:nodoc:
     module Time #:nodoc:
       # Getting times in different convenient string representations and other objects
       module Conversions
+        DATE_FORMATS = {
+          :db    => "%Y-%m-%d %H:%M:%S",
+          :short => "%e %b %H:%M",
+          :long  => "%B %e, %Y %H:%M"
+        }
+
         def self.append_features(klass)
           super
           klass.send(:alias_method, :to_default_s, :to_s)
@@ -12,12 +18,7 @@ module ActiveSupport #:nodoc:
         end
         
         def to_formatted_s(format = :default)
-          case format
-            when :default then to_default_s
-            when :db      then strftime("%Y-%m-%d %H:%M:%S")
-            when :short   then strftime("%e %b %H:%M").strip
-            when :long    then strftime("%B %e, %Y %H:%M").strip
-          end
+          DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s          
         end
 
         def to_date

data/lib/active_support/dependencies.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/module_attribute_accessors'
 
-module Dependencies
+module Dependencies #:nodoc:
   extend self
 
   @@loaded = [ ]
@@ -14,7 +14,7 @@ module Dependencies
   end
   
   def depend_on(file_name, swallow_load_errors = false)
-    if !loaded.include?(file_name)
+    unless loaded.include?(file_name)
       loaded << file_name
 
       begin
@@ -34,7 +34,7 @@ module Dependencies
   end
   
   def require_or_load(file_name)
-    file_name = "#{file_name}.rb" unless ! load? || /\.rb$/ =~ file_name
+    file_name = "#{file_name}.rb" unless ! load? || file_name[-3..-1] == '.rb'
     load? ? load(file_name) : require(file_name)
   end
   
@@ -48,12 +48,14 @@ module Dependencies
   # load the relavent files automatically.
   #
   # Ruby-style modules are supported, as a folder named 'submodule' will load 'submodule.rb' when available.
-  class LoadingModule < Module
+  class LoadingModule < Module #:nodoc:
     attr_reader :path
     attr_reader :root
     
-    def self.root(*load_paths)
-      RootLoadingModule.new(*load_paths)
+    class << self
+      def root(*load_paths)
+        RootLoadingModule.new(*load_paths)
+      end
     end
     
     def initialize(root, path=[])
@@ -61,7 +63,7 @@ module Dependencies
       @root = root
     end
     
-    def root?() self.root == self end
+    def root?()      self.root == self    end
     def load_paths() self.root.load_paths end
     
     # Load missing constants if possible.
@@ -71,13 +73,15 @@ module Dependencies
   
     # Load the controller class or a parent module.
     def const_load!(name, file_name = nil)
+      file_name ||= 'application' if root? && name.to_s == 'ApplicationController'
       path = self.path + [file_name || name]
 
       load_paths.each do |load_path|
         fs_path = load_path.filesystem_path(path)
         next unless fs_path
 
-        if File.directory?(fs_path)
+        case 
+        when File.directory?(fs_path)
           new_module = LoadingModule.new(self.root, self.path + [name])
           self.const_set name, new_module
           if self.root?
@@ -88,7 +92,7 @@ module Dependencies
             Object.const_set(name, new_module)
           end
           break
-        elsif File.file?(fs_path)
+        when File.file?(fs_path)
           self.root.load_file!(fs_path)
           
           # Import the loaded constant from Object provided we are the root node.
@@ -97,7 +101,7 @@ module Dependencies
         end
       end
       
-      return self.const_defined?(name)
+      self.const_defined?(name)
     end
     
     # Is this name present or loadable?
@@ -107,7 +111,7 @@ module Dependencies
     end
   end
   
-  class RootLoadingModule < LoadingModule
+  class RootLoadingModule < LoadingModule #:nodoc:
     attr_reader :load_paths
 
     def initialize(*paths)
@@ -133,7 +137,7 @@ module Dependencies
   end
   
   # This object defines a path from which Constants can be loaded.
-  class ConstantLoadPath
+  class ConstantLoadPath #:nodoc:
     # Create a new load path with the filesystem path
     def initialize(root) @root = root end
     
@@ -141,7 +145,7 @@ module Dependencies
     # if the path leads to a module, or the path to a file if it leads to an object.
     def filesystem_path(path, allow_module=true)
       fs_path = [@root]
-      fs_path += path[0..-2].collect {|name| const_name_to_module_name name}
+      fs_path += path[0..-2].map {|name| const_name_to_module_name name}
 
       if allow_module
         result = File.join(fs_path, const_name_to_module_name(path.last))
@@ -150,7 +154,7 @@ module Dependencies
 
       result = File.join(fs_path, const_name_to_file_name(path.last))
 
-      return File.file?(result) ? result : nil
+      File.file?(result) ? result : nil
     end
     
     def const_name_to_file_name(name)
@@ -164,46 +168,44 @@ module Dependencies
 end
 
 Object.send(:define_method, :require_or_load)     { |file_name| Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)
-Object.send(:define_method, :require_dependency)  { |file_name| Dependencies.depend_on(file_name) } unless Object.respond_to?(:require_dependency)
-Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) } unless Object.respond_to?(:require_association)
-
-class Object #:nodoc:
-  class << self
-    # Use const_missing to autoload associations so we don't have to
-    # require_association when using single-table inheritance.
-    def const_missing(class_id)
-      if Object.const_defined?(:Controllers) and Object::Controllers.const_available?(class_id)
-        return Object::Controllers.const_get(class_id)
-      end
-
-      begin
-        require_dependency(class_id.to_s.demodulize.underscore)
-        if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end
-      rescue LoadError => e
-        raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)
-      end
+Object.send(:define_method, :require_dependency)  { |file_name| Dependencies.depend_on(file_name) }       unless Object.respond_to?(:require_dependency)
+Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
+
+class Module #:nodoc:
+  # Use const_missing to autoload associations so we don't have to
+  # require_association when using single-table inheritance.
+  def const_missing(class_id)
+    if Object.const_defined?(:Controllers) and Object::Controllers.const_available?(class_id)
+      return Object::Controllers.const_get(class_id)
+    end
+    
+    begin
+      require_dependency(class_id.to_s.demodulize.underscore)
+      if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end
+    rescue LoadError => e
+      raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)
     end
   end
+end
 
+class Object #:nodoc:
   def load(file, *extras)
-    begin super(file, *extras)
-    rescue Object => exception
-      exception.blame_file! file
-      raise
-    end
+    super(file, *extras)
+  rescue Object => exception
+    exception.blame_file! file
+    raise
   end
 
   def require(file, *extras)
-    begin super(file, *extras)
-    rescue Object => exception
-      exception.blame_file! file
-      raise
-    end
+    super(file, *extras)
+  rescue Object => exception
+    exception.blame_file! file
+    raise
   end
 end
 
 # Add file-blaming to exceptions
-class Exception
+class Exception #:nodoc:
   def blame_file!(file)
     (@blamed_files ||= []).unshift file
   end

data/lib/active_support/inflector.rb

@@ -5,18 +5,24 @@ module Inflector
 
   def pluralize(word)
     result = word.to_s.dup
-    plural_rules.each do |(rule, replacement)|
-      break if result.gsub!(rule, replacement)
+
+    if uncountable_words.include?(result.downcase)
+      result
+    else
+      plural_rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+      result
     end
-    return result
   end
 
   def singularize(word)
     result = word.to_s.dup
-    singular_rules.each do |(rule, replacement)|
-      break if result.gsub!(rule, replacement)
+
+    if uncountable_words.include?(result.downcase)
+      result
+    else
+      singular_rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+      result
     end
-    return result
   end
 
   def camelize(lower_case_and_underscored_word)
@@ -24,7 +30,7 @@ module Inflector
   end
   
   def underscore(camel_cased_word)
-    camel_cased_word.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z])/,'\1_\2').gsub(/([a-z])([A-Z])/,'\1_\2').downcase
+    camel_cased_word.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
   end
 
   def humanize(lower_case_and_underscored_word)
@@ -55,42 +61,64 @@ module Inflector
   end
 
   private
+    def uncountable_words #:doc
+      %w( equipment information rice money species series fish )
+    end
+  
     def plural_rules #:doc:
       [
-        [/(fish)$/i, '\1\2'],                 # fish
-        [/(x|ch|ss|sh)$/i, '\1es'],           # search, switch, fix, box, process, address
-        [/(series)$/i, '\1\2'],
+      	[/^(ox)$/i, '\1\2en'],		             # ox
+      	[/([m|l])ouse$/i, '\1ice'],	           # mouse, louse
+      	[/(matr|vert)ix|ex$/i, '\1ices'],      # matrix, vertex, index
+        [/(x|ch|ss|sh)$/i, '\1es'],            # search, switch, fix, box, process, address
         [/([^aeiouy]|qu)ies$/i, '\1y'],
-        [/([^aeiouy]|qu)y$/i, '\1ies'],       # query, ability, agency
+        [/([^aeiouy]|qu)y$/i, '\1ies'],        # query, ability, agency
+        [/(hive)$/i, '\1s'],                   # archive, hive
         [/(?:([^f])fe|([lr])f)$/i, '\1\2ves'], # half, safe, wife
-        [/sis$/i, 'ses'],                     # basis, diagnosis
-        [/([ti])um$/i, '\1a'],                # datum, medium
-        [/(p)erson$/i, '\1\2eople'],          # person, salesperson
-        [/(m)an$/i, '\1\2en'],                # man, woman, spokesman
-        [/(c)hild$/i, '\1\2hildren'],         # child
-        [/s$/i, 's'],                         # no change (compatibility)
+        [/sis$/i, 'ses'],                      # basis, diagnosis
+        [/([ti])um$/i, '\1a'],                 # datum, medium
+        [/(p)erson$/i, '\1eople'],             # person, salesperson
+        [/(m)an$/i, '\1en'],                   # man, woman, spokesman
+        [/(c)hild$/i, '\1hildren'],            # child
+      	[/(buffal|tomat)o$/i, '\1\2oes'],		   # buffalo, tomato
+      	[/(bu)s$/i, '\1\2ses'],	               # bus
+        [/(alias)/i, '\1es'],                  # alias
+      	[/(octop|vir)us$/i, '\1i'],            # octopus, virus - virus has no defined plural (according to Latin/dictionary.com), but viri is better than viruses/viruss
+      	[/(ax|cri|test)is$/i, '\1es'],         # axis, crisis  
+        [/s$/i, 's'],                          # no change (compatibility)
         [/$/, 's']
       ]
     end
 
     def singular_rules #:doc:
       [
-        [/(f)ish$/i, '\1\2ish'],
+        [/(matr)ices$/i, '\1ix'],
+      	[/(vert)ices$/i, '\1ex'],
+      	[/^(ox)en/i, '\1'],
+      	[/(alias)es$/i, '\1'],
+      	[/([octop|vir])i$/i, '\1us'],
+      	[/(cris|ax|test)es$/i, '\1is'],
+      	[/(shoe)s$/i, '\1'],
+      	[/(o)es$/i, '\1'],
+      	[/(bus)es$/i, '\1'],
+      	[/([m|l])ice$/i, '\1ouse'],
         [/(x|ch|ss|sh)es$/i, '\1'],
         [/(m)ovies$/i, '\1\2ovie'],
         [/(s)eries$/i, '\1\2eries'],
         [/([^aeiouy]|qu)ies$/i, '\1y'],
         [/([lr])ves$/i, '\1f'],
         [/(tive)s$/i, '\1'],
+        [/(hive)s$/i, '\1'],
         [/([^f])ves$/i, '\1fe'],
+        [/(^analy)ses$/i, '\1sis'],
         [/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis'],
         [/([ti])a$/i, '\1um'],
         [/(p)eople$/i, '\1\2erson'],
-        [/(m)en$/i, '\1\2an'],
+        [/(m)en$/i, '\1an'],
         [/(s)tatus$/i, '\1\2tatus'],
         [/(c)hildren$/i, '\1\2hild'],
         [/(n)ews$/i, '\1\2ews'],
         [/s$/i, '']
       ]
     end
-end
+end

data/lib/active_support/whiny_nil.rb

@@ -0,0 +1,46 @@
+# Extensions to nil which allow for more helpful error messages for 
+# people who are new to rails.
+#
+# The aim is to ensure that when users pass nil to methods where that isn't
+# appropriate, instead of NoMethodError and the name of some method used
+# by the framework users will see a message explaining what type of object 
+# was expected.
+
+class NilClass
+  WHINERS = [ ::ActiveRecord::Base, ::Array ]
+  
+  @@method_class_map = Hash.new
+  
+  WHINERS.each do |klass|
+    methods = klass.public_instance_methods - public_instance_methods
+    methods.each do |method|
+      @@method_class_map[method.to_sym] = klass
+    end
+  end
+  
+  def id
+    raise RuntimeError, "Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id", caller
+  end
+
+  private
+    def method_missing(method, *args, &block)
+      if @@method_class_map.include?(method)
+        raise_nil_warning_for @@method_class_map[method], caller
+      else
+        super
+      end
+    end
+
+    def raise_nil_warning_for(klass, with_caller = nil)
+      raise NoMethodError, NIL_WARNING_MESSAGE % klass, with_caller || caller
+    end
+
+    NIL_WARNING_MESSAGE = <<-end_message unless const_defined?(:NIL_WARNING_MESSAGE)
+WARNING:  You have a nil object when you probably didn't expect it!  Odds are you
+want an instance of %s instead.
+
+Look in the callstack to see where you're working with an object that could be nil.
+Investigate your methods and make sure the object is what you expect!
+    end_message
+end
+

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.8.10
 specification_version: 1
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
-date: 2005-04-19
+  version: 1.1.0
+date: 2005-07-06
 summary: Support and utility classes used by the Rails framework.
 require_paths: 
   - lib
@@ -42,6 +42,11 @@ files:
   - lib/active_support/misc.rb
   - lib/active_support/module_attribute_accessors.rb
   - lib/active_support/values
+  - lib/active_support/whiny_nil.rb
+  - lib/active_support/core_ext/array
+  - lib/active_support/core_ext/array.rb
+  - lib/active_support/core_ext/cgi
+  - lib/active_support/core_ext/cgi.rb
   - lib/active_support/core_ext/date
   - lib/active_support/core_ext/date.rb
   - lib/active_support/core_ext/fixnum
@@ -57,6 +62,8 @@ files:
   - lib/active_support/core_ext/string.rb
   - lib/active_support/core_ext/time
   - lib/active_support/core_ext/time.rb
+  - lib/active_support/core_ext/array/to_param.rb
+  - lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
   - lib/active_support/core_ext/date/conversions.rb
   - lib/active_support/core_ext/fixnum/even_odd.rb
   - lib/active_support/core_ext/hash/indifferent_access.rb