activesupport 1.1.1 → 1.2.1

data/CHANGELOG

@@ -1,3 +1,86 @@
+*1.2.1* (October 19th, 2005)
+
+* Classify generated routing code as framework code to avoid appearing in application traces. [Nicholas Seckar]
+
+* Show all framework frames in the framework trace. [Nicholas Seckar]
+
+
+*1.2.0* (October 16th, 2005)
+
+* Update Exception extension to show the first few framework frames in an application trace. [Nicholas Seckar] 
+
+* Added Exception extension to provide support for clean backtraces. [Nicholas Seckar]
+
+* Updated whiny nil to be more concise and useful. [Nicholas Seckar]
+
+* Added Enumerable#first_match [Nicholas Seckar]
+
+* Fixed that Time#change should also reset usec when also resetting minutes #2459 [ikeda@dream.big.or.jp]
+
+* Fix Logger compatibility for distributions that don't keep Ruby and its standard library in sync.
+
+* Replace '%e' from long and short time formats as Windows does not support it. #2344. [Tom Ward <tom@popdog.net>]
+
+* Added to_s(:db) to Range, so you can get "BETWEEN '2005-12-10' AND '2005-12-12'" from Date.new(2005, 12, 10)..Date.new(2005, 12, 12) (and likewise with Times)
+
+* Moved require_library_or_gem into Kernel. #1992 [Michael Schuerig <michael@schuerig.de>]
+
+* Add :rfc822 as an option for Time#to_s (to get rfc822-formatted times)
+
+* Chain the const_missing hook to any previously existing hook so rails can play nicely with rake
+
+* Clean logger is compatible with both 1.8.2 and 1.8.3 Logger.  #2263 [Michael Schuerig <michael@schuerig.de>]
+
+* Added native, faster implementations of .blank? for the core types #2286 [skae]
+
+* Fixed clean logger to work with Ruby 1.8.3 Logger class #2245
+
+* Fixed memory leak with Active Record classes when Dependencies.mechanism = :load #1704 [c.r.mcgrath@gmail.com]
+
+* Fixed Inflector.underscore for use with acronyms, so HTML becomes html instead of htm_l #2173 [k@v2studio.com]
+
+* Fixed dependencies related infinite recursion bug when a controller file does not contain a controller class. Closes #1760. [rcolli2@tampabay.rr.com]
+
+* Fixed inflections for status, quiz, move #2056 [deirdre@deirdre.net]
+
+* Added Hash#reverse_merge, Hash#reverse_merge!, and Hash#reverse_update to ease the use of default options
+
+* Added Array#to_sentence that'll turn ['one', 'two', 'three'] into "one, two, and three" #2157 [m.stienstra@fngtps.com]
+
+* Added Kernel#silence_warnings to turn off warnings temporarily for the passed block
+
+* Added String#starts_with? and String#ends_with? #2118 [thijs@vandervossen.net]
+
+* Added easy extendability to the inflector through Inflector.inflections (using the Inflector::Inflections singleton class). Examples:
+
+    Inflector.inflections do |inflect|
+      inflect.plural /^(ox)$/i, '\1\2en'
+      inflect.singular /^(ox)en/i, '\1'
+    
+      inflect.irregular 'octopus', 'octopi'
+    
+      inflect.uncountable "equipment"
+    end
+
+* Added String#at, String#from, String#to, String#first, String#last in ActiveSupport::CoreExtensions::String::Access to ease access to individual characters and substrings in a string serving basically as human names for range access.
+
+* Make Time#last_month work when invoked on the 31st of a month.
+
+* Add Time.days_in_month, and make Time#next_month work when invoked on the 31st of a month
+
+* Fixed that Time#midnight would have a non-zero usec on some platforms #1836
+
+* Fixed inflections of "index/indices" #1766 [damn_pepe@gmail.com]
+
+* Added stripping of _id to String#humanize, so "employee_id" becomes "Employee" #1574 [Justin French]
+
+* Factor Fixnum and Bignum extensions into Integer extensions [Nicholas Seckar]
+
+* Hooked #ordinalize into Fixnum and Bignum classes. [Nicholas Seckar, danp]
+
+* Added Fixnum#ordinalize to turn 1.ordinalize to "1st", 3.ordinalize to "3rd", and 10.ordinalize to "10th" and so on #1724 [paul@cnt.org]
+
+
 *1.1.1* (11 July, 2005)
 
 * Added more efficient implementation of the development mode reset of classes #1638 [Chris McGrath]

data/lib/active_support.rb

@@ -29,7 +29,8 @@ require 'active_support/inflector'
 
 require 'active_support/core_ext'
 require 'active_support/clean_logger'
-require 'active_support/misc'
 require 'active_support/dependencies'
 
+require 'active_support/ordered_options'
+
 require 'active_support/values/time_zone'

data/lib/active_support/clean_logger.rb

@@ -4,15 +4,23 @@ 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
+    yield self
   ensure
     self.level = old_logger_level
   end
 
   private
-    remove_const "Format"
-    Format = "%s\n"
-    def format_message(severity, timestamp, msg, progname)
-      Format % [msg]
+    # Ruby 1.8.3 transposed the msg and progname arguments to format_message.
+    # We can't test RUBY_VERSION because some distributions don't keep Ruby
+    # and its standard library in sync, leading to installations of Ruby 1.8.2
+    # with Logger from 1.8.3 and vice versa.
+    if method_defined?(:formatter=)
+      def format_message(severity, timestamp, progname, msg)
+        "#{msg}\n"
+      end
+    else
+      def format_message(severity, timestamp, msg, progname)
+        "#{msg}\n"
+      end
     end
-end
+end

data/lib/active_support/core_ext/array.rb

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

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

@@ -0,0 +1,30 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Array #:nodoc:
+      # Enables to conversion of Arrays to human readable lists. ['one', 'two', 'three'] => "one, two, and three"
+      module Conversions
+        # Converts the array to comma-seperated sentence where the last element is joined by the connector word. Options:
+        # * <tt>:connector</tt>: The word used to join the last element in arrays with more than two elements (default: "and")
+        # * <tt>:skip_last_comma</tt>: Set to true to return "a, b and c" instead of "a, b, and c".
+        def to_sentence(options = {})
+          options.assert_valid_keys(:connector, :skip_last_comma)
+          options.reverse_merge! :connector => 'and', :skip_last_comma => false
+          
+          case length
+            when 1
+              self[0]
+            when 2
+              "#{self[0]} #{options[:connector]} #{self[1]}"
+            else
+              "#{self[0...-1].join(', ')}#{options[:skip_last_comma] ? '' : ','} #{options[:connector]} #{self[-1]}"
+          end
+        end
+
+        # 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/blank.rb

@@ -0,0 +1,36 @@
+# The methods here are provided to speed up function blank? in class Object
+class NilClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+class FalseClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+class TrueClass #:nodoc:
+  def blank?
+    false
+  end
+end
+
+class Array #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class Hash #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class String #:nodoc:
+  def blank?
+    empty? || strip.empty?
+  end
+end
+
+class Numeric #:nodoc:
+  alias_method :blank?, :zero?
+end

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

@@ -8,8 +8,7 @@ module ActiveSupport #:nodoc:
           :long  => "%B %e, %Y"
         }
         
-        def self.append_features(klass) #:nodoc:
-          super
+        def self.included(klass) #:nodoc:
           klass.send(:alias_method, :to_default_s, :to_s)
           klass.send(:alias_method, :to_s, :to_formatted_s)
         end

data/lib/active_support/core_ext/enumerable.rb

@@ -0,0 +1,9 @@
+module Enumerable #:nodoc:
+  def first_match
+    match = nil
+    each do |items|
+      break if match = yield(items)
+    end
+    match
+  end
+end

data/lib/active_support/core_ext/exception.rb

@@ -0,0 +1,29 @@
+class Exception
+  
+  alias :clean_message :message
+  
+  TraceSubstitutions = []
+  FrameworkRegexp = /generated_code|vendor|dispatch|ruby|script\/\w+/
+  
+  def clean_backtrace
+    backtrace.collect do |line|
+      TraceSubstitutions.inject(line) do |line, (regexp, sub)|
+        line.gsub regexp, sub
+      end
+    end
+  end
+  
+  def application_backtrace
+    before_application_frame = true
+    
+    clean_backtrace.reject do |line|
+      non_app_frame = !! (line =~ FrameworkRegexp)
+      before_application_frame = false unless non_app_frame
+      non_app_frame && ! before_application_frame
+    end
+  end
+  
+  def framework_backtrace
+    clean_backtrace.select {|line| line =~ FrameworkRegexp}
+  end
+end

data/lib/active_support/core_ext/hash.rb

@@ -1,7 +1,9 @@
 require File.dirname(__FILE__) + '/hash/keys'
 require File.dirname(__FILE__) + '/hash/indifferent_access'
+require File.dirname(__FILE__) + '/hash/reverse_merge'
 
 class Hash #:nodoc:
   include ActiveSupport::CoreExtensions::Hash::Keys
   include ActiveSupport::CoreExtensions::Hash::IndifferentAccess
+  include ActiveSupport::CoreExtensions::Hash::ReverseMerge
 end

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

@@ -43,8 +43,8 @@ module ActiveSupport #:nodoc:
         alias_method :to_options,  :symbolize_keys
         alias_method :to_options!, :symbolize_keys!
 
-        def assert_valid_keys(valid_keys)
-          unknown_keys = keys - valid_keys
+        def assert_valid_keys(*valid_keys)
+          unknown_keys = keys - [valid_keys].flatten
           raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
         end
       end

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

@@ -0,0 +1,25 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Hash #:nodoc:
+      # Allows for reverse merging where its the keys in the calling hash that wins over those in the <tt>other_hash</tt>.
+      # This is particularly useful for initializing an incoming option hash with default values:
+      #
+      #   def setup(options = {})
+      #     options.reverse_merge! :size => 25, :velocity => 10
+      #   end
+      #
+      # The default :size and :velocity is only set if the +options+ passed in doesn't already have those keys set.
+      module ReverseMerge
+        def reverse_merge(other_hash)
+          other_hash.merge(self)
+        end
+
+        def reverse_merge!(other_hash)
+          replace(reverse_merge(other_hash))
+        end
+
+        alias_method :reverse_update, :reverse_merge
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/integer.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/integer/even_odd'
+require File.dirname(__FILE__) + '/integer/inflections'
+
+class Integer #:nodoc:
+  include ActiveSupport::CoreExtensions::Integer::EvenOdd
+  include ActiveSupport::CoreExtensions::Integer::Inflections
+end

data/lib/active_support/core_ext/{fixnum → integer}/even_odd.rb

@@ -1,6 +1,6 @@
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
-    module Fixnum #:nodoc:
+    module Integer #:nodoc:
       # For checking if a fixnum is even or odd. 
       # * 1.even? # => false
       # * 1.odd?  # => true

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

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../../inflector'
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Integer #:nodoc:
+      module Inflections
+        # 1.ordinalize  # => "1st"
+        # 3.ordinalize  # => "3rd"
+        # 10.ordinalize # => "10th"
+        def ordinalize
+          Inflector.ordinalize(self)
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/kernel.rb

@@ -14,4 +14,40 @@ module Kernel
     yield
     value
   end
+  
+  # Sets $VERBOSE to nil for the duration of the block and back to its original value afterwards.
+  #
+  #   silence_warnings do
+  #     value = noisy_call # no warning voiced
+  #   end
+  #
+  #   noisy_call # warning voiced
+  def silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+
+  # Method that requires a library, ensuring that rubygems is loaded
+  def require_library_or_gem(library_name)
+    begin
+      require library_name
+    rescue LoadError => cannot_require
+      # 1. Requiring the module is unsuccessful, maybe it's a gem and nobody required rubygems yet. Try.
+      begin
+        require 'rubygems'
+      rescue LoadError => rubygems_not_installed
+        raise cannot_require
+      end
+      # 2. Rubygems is installed and loaded. Try to load the library again
+      begin
+        require library_name
+      rescue LoadError => gem_not_installed
+        raise cannot_require
+      end
+    end
+  end
+
+
 end

data/lib/active_support/core_ext/object_and_class.rb

@@ -1,19 +1,10 @@
 class Object #:nodoc:
   def remove_subclasses_of(*superclasses)
     subclasses_of(*superclasses).each do |subclass|
-      subclass.instance_variables.each { |v| subclass.send(:remove_instance_variable, v) }
       Object.send(:remove_const, subclass.to_s) rescue nil
     end
   end
   
-  def remove_instance_variables_of(klass)
-    ObjectSpace.each_object(Class) do |k|
-      if k.to_s == klass
-        k.instance_variables.each { |v| k.send(:remove_instance_variable, v) }
-      end  
-    end   
-  end
-
   def subclasses_of(*superclasses)
     subclasses = []
     ObjectSpace.each_object(Class) do |k|

data/lib/active_support/core_ext/range.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/range/conversions'
+
+class Range #:nodoc:
+  include ActiveSupport::CoreExtensions::Range::Conversions
+end

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

@@ -0,0 +1,21 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Range #:nodoc:
+      # Getting dates in different convenient string representations and other objects
+      module Conversions
+        DATE_FORMATS = {
+          :db => Proc.new { |start, stop| "BETWEEN '#{start.to_s(:db)}' AND '#{stop.to_s(:db)}'" }
+        }
+        
+        def self.included(klass) #:nodoc:
+          klass.send(:alias_method, :to_default_s, :to_s)
+          klass.send(:alias_method, :to_s, :to_formatted_s)
+        end
+        
+        def to_formatted_s(format = :default)
+          DATE_FORMATS[format] ? DATE_FORMATS[format].call(first, last) : to_default_s   
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/string.rb

@@ -1,7 +1,11 @@
 require File.dirname(__FILE__) + '/string/inflections'
 require File.dirname(__FILE__) + '/string/conversions'
+require File.dirname(__FILE__) + '/string/access'
+require File.dirname(__FILE__) + '/string/starts_ends_with'
 
 class String #:nodoc:
-  include ActiveSupport::CoreExtensions::String::Inflections
+  include ActiveSupport::CoreExtensions::String::Access
   include ActiveSupport::CoreExtensions::String::Conversions
+  include ActiveSupport::CoreExtensions::String::Inflections
+  include ActiveSupport::CoreExtensions::String::StartsEndsWith
 end

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

@@ -0,0 +1,58 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Makes it easier to access parts of a string, such as specific characters and substrings.
+      module Access
+        # Returns the character at the +position+ treating the string as an array (where 0 is the first character).
+        #
+        # Examples: 
+        #   "hello".at(0)  # => "h"
+        #   "hello".at(4)  # => "o"
+        #   "hello".at(10) # => nil
+        def at(position)
+          self[position, 1]
+        end
+        
+        # Returns the remaining of the string from the +position+ treating the string as an array (where 0 is the first character).
+        #
+        # Examples: 
+        #   "hello".from(0)  # => "hello"
+        #   "hello".from(2)  # => "llo"
+        #   "hello".from(10) # => nil
+        def from(position)
+          self[position..-1]
+        end
+        
+        # Returns the beginning of the string up to the +position+ treating the string as an array (where 0 is the first character).
+        #
+        # Examples: 
+        #   "hello".to(0)  # => "h"
+        #   "hello".to(2)  # => "hel"
+        #   "hello".to(10) # => "hello"
+        def to(position)
+          self[0..position]
+        end
+
+        # Returns the first character of the string or the first +limit+ characters.
+        #
+        # Examples: 
+        #   "hello".first     # => "h"
+        #   "hello".first(2)  # => "he"
+        #   "hello".first(10) # => "hello"
+        def first(limit = 1)
+          self[0..(limit - 1)]
+        end
+        
+        # Returns the last character of the string or the last +limit+ characters.
+        #
+        # Examples: 
+        #   "hello".last     # => "o"
+        #   "hello".last(2)  # => "lo"
+        #   "hello".last(10) # => "hello"
+        def last(limit = 1)
+          self[(-limit)..-1]
+        end
+      end
+    end
+  end
+end

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

@@ -32,6 +32,8 @@ module ActiveSupport #:nodoc:
           Inflector.classify(self)
         end
         
+        # Capitalizes the first word and turns underscores into spaces and strips _id, so "employee_salary" becomes "Employee salary" 
+        # and "author_id" becomes "Author".
         def humanize
           Inflector.humanize(self)
         end

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

@@ -0,0 +1,20 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Additional string tests.
+      module StartsEndsWith
+        # Does the string start with the specified +prefix+?
+        def starts_with?(prefix)
+          prefix = prefix.to_s
+          self[0, prefix.length] == prefix
+        end
+
+        # Does the string end with the specified +suffix+?
+        def ends_with?(suffix)
+          suffix = suffix.to_s
+          self[-suffix.length, suffix.length] == suffix      
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,27 @@ module ActiveSupport #:nodoc:
     module Time #:nodoc:
       # Enables the use of time calculations within Time itself
       module Calculations
+        def self.append_features(base) #:nodoc:
+          super
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+          # Return the number of days in the given month. If a year is given,
+          # February will return the correct number of days for leap years.
+          # Otherwise, this method will always report February as having 28
+          # days.
+          def days_in_month(month, year=nil)
+            if month == 2
+              !year.nil? && (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)) ?  29 : 28
+            elsif month <= 7
+              month % 2 == 0 ? 30 : 31
+            else
+              month % 2 == 0 ? 31 : 30
+            end
+          end
+        end
+
         # Seconds since midnight: Time.now.seconds_since_midnight
         def seconds_since_midnight
           self.hour.hours + self.min.minutes + self.sec + (self.usec/1.0e+6)
@@ -20,7 +41,7 @@ module ActiveSupport #:nodoc:
             options[:hour]  || self.hour, 
             options[:min]   || (options[:hour] ? 0 : self.min),
             options[:sec]   || ((options[:hour] || options[:min]) ? 0 : self.sec),
-            options[:usec]  || ((options[:hour] || options[:min] || options[:usec]) ? 0 : self.usec)
+            options[:usec]  || ((options[:hour] || options[:min] || options[:sec]) ? 0 : self.usec)
           )
         end
 
@@ -39,20 +60,30 @@ module ActiveSupport #:nodoc:
 
         # Returns a new Time representing the time a number of specified months ago
         def months_ago(months)
-          if months >= self.month 
-            change(:year => self.year - 1, :month => 12).months_ago(months - self.month)
-          else
-            change(:year => self.year, :month => self.month - months)
-          end
+          months_since(-months)
         end
 
         def months_since(months)
-          if months + self.month > 12
-            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)
+          year, month, mday = self.year, self.month, self.mday
+
+          month += months
+
+          # in case months is negative
+          while month < 1
+            month += 12
+            year -= 1
+          end
+
+          # in case months is positive
+          while month > 12
+            month -= 12
+            year += 1
           end
+
+          max = ::Time.days_in_month(month, year)
+          mday = max if mday > max
+
+          change(:year => year, :month => month, :mday => mday)
         end
 
         # Returns a new Time representing the time a number of specified years ago
@@ -101,7 +132,7 @@ module ActiveSupport #:nodoc:
         
         # Returns a new Time representing the start of the day (0:00)
         def beginning_of_day
-          self - self.seconds_since_midnight
+          (self - self.seconds_since_midnight).change(:usec => 0)
         end
         alias :midnight :beginning_of_day
         alias :at_midnight :beginning_of_day
@@ -132,4 +163,4 @@ module ActiveSupport #:nodoc:
       end
     end
   end
-end
+end

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

@@ -6,9 +6,10 @@ module ActiveSupport #: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"
+          :db     => "%Y-%m-%d %H:%M:%S",
+          :short  => "%d %b %H:%M",
+          :long   => "%B %d, %Y %H:%M",
+          :rfc822 => "%a, %d %b %Y %H:%M:%S %z"
         }
 
         def self.append_features(klass)
@@ -32,4 +33,4 @@ module ActiveSupport #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_support/dependencies.rb

@@ -93,10 +93,16 @@ module Dependencies #:nodoc:
           end
           break
         when File.file?(fs_path)
-          self.root.load_file!(fs_path)
+          loaded_file = self.root.load_file!(fs_path)
           
           # Import the loaded constant from Object provided we are the root node.
           self.const_set(name, Object.const_get(name)) if self.root? && Object.const_defined?(name)
+          
+          # Throw an error if we load the file but we don't find the Object we expect
+          if loaded_file and not self.const_defined?(name)
+            msg = "Already loaded file '#{fs_path}' but '#{name.to_s}' was not set, perhaps you need to rename '#{fs_path}'?"
+            raise LoadError, msg
+          end
           break
         end
       end
@@ -172,6 +178,9 @@ Object.send(:define_method, :require_dependency)  { |file_name| Dependencies.dep
 Object.send(:define_method, :require_association) { |file_name| Dependencies.associate_with(file_name) }  unless Object.respond_to?(:require_association)
 
 class Module #:nodoc:
+  # Rename the original handler so we can chain it to the new one
+  alias :rails_original_const_missing :const_missing
+
   # Use const_missing to autoload associations so we don't have to
   # require_association when using single-table inheritance.
   def const_missing(class_id)
@@ -183,7 +192,11 @@ class Module #:nodoc:
       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)
+      begin
+        rails_original_const_missing(class_id)
+      rescue Exception
+        raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)
+      end
     end
   end
 end

data/lib/active_support/inflections.rb

@@ -0,0 +1,53 @@
+Inflector.inflections do |inflect|
+  inflect.plural /$/, 's'
+  inflect.plural /s$/i, 's'
+  inflect.plural /(ax|test)is$/i, '\1es'
+  inflect.plural /(octop|vir)us$/i, '\1i'
+  inflect.plural /(alias|status)/i, '\1es'
+  inflect.plural /(bu)s$/i, '\1ses'
+  inflect.plural /(buffal|tomat)o$/i, '\1oes'
+  inflect.plural /([ti])um$/i, '\1a'
+  inflect.plural /sis$/i, 'ses'
+  inflect.plural /(?:([^f])fe|([lr])f)$/i, '\1\2ves'
+  inflect.plural /(hive)$/i, '\1s'
+  inflect.plural /([^aeiouy]|qu)y$/i, '\1ies'
+  inflect.plural /([^aeiouy]|qu)ies$/i, '\1y'
+  inflect.plural /(x|ch|ss|sh)$/i, '\1es'
+  inflect.plural /(matr|vert|ind)ix|ex$/i, '\1ices'
+  inflect.plural /([m|l])ouse$/i, '\1ice'
+  inflect.plural /^(ox)$/i, '\1en'
+  inflect.plural /(quiz)$/i, '\1zes'
+
+  inflect.singular /s$/i, ''
+  inflect.singular /(n)ews$/i, '\1ews'
+  inflect.singular /([ti])a$/i, '\1um'
+  inflect.singular /((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis'
+  inflect.singular /(^analy)ses$/i, '\1sis'
+  inflect.singular /([^f])ves$/i, '\1fe'
+  inflect.singular /(hive)s$/i, '\1'
+  inflect.singular /(tive)s$/i, '\1'
+  inflect.singular /([lr])ves$/i, '\1f'
+  inflect.singular /([^aeiouy]|qu)ies$/i, '\1y'
+  inflect.singular /(s)eries$/i, '\1eries'
+  inflect.singular /(m)ovies$/i, '\1ovie'
+  inflect.singular /(x|ch|ss|sh)es$/i, '\1'
+  inflect.singular /([m|l])ice$/i, '\1ouse'
+  inflect.singular /(bus)es$/i, '\1'
+  inflect.singular /(o)es$/i, '\1'
+  inflect.singular /(shoe)s$/i, '\1'
+  inflect.singular /(cris|ax|test)es$/i, '\1is'
+  inflect.singular /([octop|vir])i$/i, '\1us'
+  inflect.singular /(alias|status)es$/i, '\1'
+  inflect.singular /^(ox)en/i, '\1'
+  inflect.singular /(vert|ind)ices$/i, '\1ex'
+  inflect.singular /(matr)ices$/i, '\1ix'
+  inflect.singular /(quiz)zes$/i, '\1'
+
+  inflect.irregular 'person', 'people'
+  inflect.irregular 'man', 'men'
+  inflect.irregular 'child', 'children'
+  inflect.irregular 'sex', 'sexes'
+  inflect.irregular 'move', 'moves'
+
+  inflect.uncountable %w( equipment information rice money species series fish sheep )
+end

data/lib/active_support/inflector.rb

@@ -1,15 +1,99 @@
+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.
+# and class names to foreign keys. The default inflections for pluralization, singularization, and uncountable words are kept
+# in inflections.rb.
 module Inflector 
+  # A singleton instance of this class is yielded by Inflector.inflections, which can then be used to specify additional
+  # inflection rules. Examples:
+  #
+  #   Inflector.inflections do |inflect|
+  #     inflect.plural /^(ox)$/i, '\1\2en'
+  #     inflect.singular /^(ox)en/i, '\1'
+  #
+  #     inflect.irregular 'octopus', 'octopi'
+  #
+  #     inflect.uncountable "equipment"
+  #   end
+  #
+  # New rules are added at the top. So in the example above, the irregular rule for octopus will now be the first of the
+  # pluralization and singularization rules that is runs. This guarantees that your rules run before any of the rules that may
+  # already have been loaded.
+  class Inflections
+    include Singleton
+    
+    attr_reader :plurals, :singulars, :uncountables
+    
+    def initialize
+      @plurals, @singulars, @uncountables = [], [], []
+    end
+    
+    # Specifies a new pluralization rule and its replacement. The rule can either be a string or a regular expression. 
+    # The replacement should always be a string that may include references to the matched data from the rule.
+    def plural(rule, replacement)
+      @plurals.insert(0, [rule, replacement])
+    end
+    
+    # Specifies a new singularization rule and its replacement. The rule can either be a string or a regular expression. 
+    # The replacement should always be a string that may include references to the matched data from the rule.
+    def singular(rule, replacement)
+      @singulars.insert(0, [rule, replacement])
+    end
+
+    # Specifies a new irregular that applies to both pluralization and singularization at the same time. This can only be used
+    # for strings, not regular expressions. You simply pass the irregular in singular and plural form.
+    # 
+    # Examples:
+    #   irregular 'octopus', 'octopi'
+    #   irregular 'person', 'people'
+    def irregular(singular, plural)
+      plural(Regexp.new("(#{singular[0,1]})#{singular[1..-1]}$", "i"), '\1' + plural[1..-1])
+      singular(Regexp.new("(#{plural[0,1]})#{plural[1..-1]}$", "i"), '\1' + singular[1..-1])
+    end
+    
+    # Add uncountable words that shouldn't be attempted inflected.
+    # 
+    # Examples:
+    #   uncountable "money"
+    #   uncountable "money", "information"
+    #   uncountable %w( money information rice )
+    def uncountable(*words)
+      (@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
+    #
+    # Examples:
+    #   clear :all
+    #   clear :plurals
+    def clear(scope = :all)
+      case scope
+        when :all
+          @plurals, @singulars, @uncountables = [], [], []
+        else
+          instance_variable_set "@#{scope}", []
+      end
+    end
+  end
+
   extend self
 
+  def inflections
+    if block_given?
+      yield Inflections.instance
+    else
+      Inflections.instance
+    end
+  end
+
   def pluralize(word)
     result = word.to_s.dup
 
-    if uncountable_words.include?(result.downcase)
+    if inflections.uncountables.include?(result.downcase)
       result
     else
-      plural_rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+      inflections.plurals.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
       result
     end
   end
@@ -17,10 +101,10 @@ module Inflector
   def singularize(word)
     result = word.to_s.dup
 
-    if uncountable_words.include?(result.downcase)
+    if inflections.uncountables.include?(result.downcase)
       result
     else
-      singular_rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+      inflections.singulars.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
       result
     end
   end
@@ -30,11 +114,11 @@ module Inflector
   end
   
   def underscore(camel_cased_word)
-    camel_cased_word.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
+    camel_cased_word.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
   end
 
   def humanize(lower_case_and_underscored_word)
-    lower_case_and_underscored_word.to_s.gsub(/_/, " ").capitalize
+    lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
   end
 
   def demodulize(class_name_in_module)
@@ -50,8 +134,7 @@ module Inflector
   end
 
   def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
-    Inflector.underscore(Inflector.demodulize(class_name)) + 
-      (separate_class_name_and_id_with_underscore ? "_id" : "id")
+    underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
   end
 
   def constantize(camel_cased_word)
@@ -60,65 +143,18 @@ module Inflector
     end
   end
 
-  private
-    def uncountable_words #:doc
-      %w( equipment information rice money species series fish )
-    end
-  
-    def plural_rules #:doc:
-      [
-      	[/^(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
-        [/(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, '\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']
-      ]
+  def ordinalize(number)
+    if (11..13).include?(number.to_i % 100)
+      "#{number}th"
+    else
+      case number.to_i % 10
+        when 1: "#{number}st"
+        when 2: "#{number}nd"
+        when 3: "#{number}rd"
+        else    "#{number}th"
+      end
     end
+  end
+end
 
-    def singular_rules #:doc:
-      [
-        [/(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, '\1an'],
-        [/(s)tatus$/i, '\1\2tatus'],
-        [/(c)hildren$/i, '\1\2hild'],
-        [/(n)ews$/i, '\1\2ews'],
-        [/s$/i, '']
-      ]
-    end
-end
+require File.dirname(__FILE__) + '/inflections'

data/lib/active_support/ordered_options.rb

@@ -0,0 +1,31 @@
+class OrderedOptions < Array #:nodoc:
+  def []=(key, value)
+    key = key.to_sym
+    
+    if pair = find_pair(key)
+      pair.pop
+      pair << value
+    else
+      self << [key, value]
+    end
+  end
+  
+  def [](key)
+    pair = find_pair(key.to_sym)
+    pair ? pair.last : nil
+  end
+
+  def method_missing(name, *args)
+    if name.to_s =~ /(.*)=$/
+      self[$1.to_sym] = args.first
+    else
+      self[name]
+    end
+  end
+
+  private
+    def find_pair(key)
+      self.each { |i| return i if i.first == key }
+      return false
+    end
+end

data/lib/active_support/version.rb

@@ -0,0 +1,9 @@
+module ActiveSupport
+  module Version #:nodoc:
+    MAJOR = 1
+    MINOR = 2
+    TINY  = 1
+
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+end

data/lib/active_support/whiny_nil.rb

@@ -24,23 +24,15 @@ class NilClass
 
   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
+      raise_nil_warning_for @@method_class_map[method], method, caller
     end
 
-    def raise_nil_warning_for(klass, with_caller = nil)
-      raise NoMethodError, NIL_WARNING_MESSAGE % klass, with_caller || caller
+    def raise_nil_warning_for(klass = nil, selector = nil, with_caller = nil)
+      message = "You have a nil object when you didn't expect it!"
+      message << "\nYou might have expected an instance of #{klass}." if klass
+      message << "\nThe error occured while evaluating nil.#{selector}" if selector
+      
+      raise NoMethodError, message, 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

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2005-07-11
+  version: 1.2.1
+date: 2005-10-19
 summary: Support and utility classes used by the Rails framework.
 require_paths: 
   - lib
@@ -38,40 +38,52 @@ files:
   - lib/active_support/core_ext
   - lib/active_support/core_ext.rb
   - lib/active_support/dependencies.rb
+  - lib/active_support/inflections.rb
   - lib/active_support/inflector.rb
-  - lib/active_support/misc.rb
   - lib/active_support/module_attribute_accessors.rb
+  - lib/active_support/ordered_options.rb
   - lib/active_support/values
+  - lib/active_support/version.rb
   - lib/active_support/whiny_nil.rb
   - lib/active_support/core_ext/array
   - lib/active_support/core_ext/array.rb
+  - lib/active_support/core_ext/blank.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
-  - lib/active_support/core_ext/fixnum.rb
+  - lib/active_support/core_ext/enumerable.rb
+  - lib/active_support/core_ext/exception.rb
   - lib/active_support/core_ext/hash
   - lib/active_support/core_ext/hash.rb
+  - lib/active_support/core_ext/integer
+  - lib/active_support/core_ext/integer.rb
   - lib/active_support/core_ext/kernel.rb
   - lib/active_support/core_ext/load_error.rb
   - lib/active_support/core_ext/numeric
   - lib/active_support/core_ext/numeric.rb
   - lib/active_support/core_ext/object_and_class.rb
+  - lib/active_support/core_ext/range
+  - lib/active_support/core_ext/range.rb
   - lib/active_support/core_ext/string
   - 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/array/conversions.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
   - lib/active_support/core_ext/hash/keys.rb
+  - lib/active_support/core_ext/hash/reverse_merge.rb
+  - lib/active_support/core_ext/integer/even_odd.rb
+  - lib/active_support/core_ext/integer/inflections.rb
   - lib/active_support/core_ext/numeric/bytes.rb
   - lib/active_support/core_ext/numeric/time.rb
+  - lib/active_support/core_ext/range/conversions.rb
+  - lib/active_support/core_ext/string/access.rb
   - lib/active_support/core_ext/string/conversions.rb
   - lib/active_support/core_ext/string/inflections.rb
+  - lib/active_support/core_ext/string/starts_ends_with.rb
   - lib/active_support/core_ext/time/calculations.rb
   - lib/active_support/core_ext/time/conversions.rb
   - lib/active_support/values/time_zone.rb

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

@@ -1,12 +0,0 @@
-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/fixnum.rb

@@ -1,9 +0,0 @@
-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/misc.rb

@@ -1,8 +0,0 @@
-def silence_warnings
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  begin
-    yield
-  ensure
-    $VERBOSE = old_verbose
-  end
-end