diff options
| author | Xavier Noria <fxn@hashref.com> | 2009-06-13 12:46:09 +0200 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-06-13 15:01:14 -0700 |
| commit | b56169c26240db1b1cff3c6f65a34b7516a9fc15 (patch) | |
| tree | 8f1d6ff26fd993afedbead7c1a4bd79ced5844a9 /actionpack | |
| parent | 9eeb5fed2ff8e781e56202f62b125bfadc486999 (diff) | |
| download | rails-b56169c26240db1b1cff3c6f65a34b7516a9fc15.tar.gz rails-b56169c26240db1b1cff3c6f65a34b7516a9fc15.tar.bz2 rails-b56169c26240db1b1cff3c6f65a34b7516a9fc15.zip | |
moves reopening of core classes to add generic stuff from Action Pack to AS/core_ext and adds tests
[#2798 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/routing/routing_ext.rb | 53 |
1 files changed, 4 insertions, 49 deletions
diff --git a/actionpack/lib/action_controller/routing/routing_ext.rb b/actionpack/lib/action_controller/routing/routing_ext.rb index 4a82b2af5f..5e5b22b6c2 100644 --- a/actionpack/lib/action_controller/routing/routing_ext.rb +++ b/actionpack/lib/action_controller/routing/routing_ext.rb @@ -1,49 +1,4 @@ -class Object - def to_param - to_s - end -end - -class TrueClass - def to_param - self - end -end - -class FalseClass - def to_param - self - end -end - -class NilClass - def to_param - self - end -end - -class Regexp #:nodoc: - def number_of_captures - Regexp.new("|#{source}").match('').captures.length - end - - def multiline? - options & MULTILINE == MULTILINE - end - - class << self - def optionalize(pattern) - case unoptionalize(pattern) - when /\A(.|\(.*\))\Z/ then "#{pattern}?" - else "(?:#{pattern})?" - end - end - - def unoptionalize(pattern) - [/\A\(\?:(.*)\)\?\Z/, /\A(.|\(.*\))\?\Z/].each do |regexp| - return $1 if regexp =~ pattern - end - return pattern - end - end -end +require 'active_support/core_ext/object/conversions' +require 'active_support/core_ext/boolean/conversions' +require 'active_support/core_ext/nil/conversions' +require 'active_support/core_ext/regexp' |