diff options
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
3 files changed, 21 insertions, 20 deletions
diff --git a/activesupport/lib/active_support/core_ext/benchmark.rb b/activesupport/lib/active_support/core_ext/benchmark.rb index ae57b152e8..2d110155a5 100644 --- a/activesupport/lib/active_support/core_ext/benchmark.rb +++ b/activesupport/lib/active_support/core_ext/benchmark.rb @@ -1,18 +1,6 @@ require 'benchmark' class << Benchmark - # Earlier Ruby had a slower implementation. - if RUBY_VERSION < '1.8.7' - remove_method :realtime - - def realtime - r0 = Time.now - yield - r1 = Time.now - r1.to_f - r0.to_f - end - end - def ms 1000 * realtime { yield } end diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb index 52946f9037..4cc36147f8 100644 --- a/activesupport/lib/active_support/core_ext/string/conversions.rb +++ b/activesupport/lib/active_support/core_ext/string/conversions.rb @@ -3,7 +3,27 @@ require 'active_support/core_ext/time/publicize_conversion_methods' require 'active_support/core_ext/time/calculations' class String - # 'a'.ord == 'a'[0] for Ruby 1.9 forward compatibility. + # Returns the codepoint of the first character of the string, assuming a + # single-byte character encoding: + # + # "a".ord # => 97 + # "à".ord # => 224, in ISO-8859-1 + # + # This method is defined in Ruby 1.8 for Ruby 1.9 forward compatibility on + # these character encodings. + # + # <tt>ActiveSupport::Multibyte::Chars#ord</tt> is forward compatible with + # Ruby 1.9 on UTF8 strings: + # + # "a".mb_chars.ord # => 97 + # "à".mb_chars.ord # => 224, in UTF8 + # + # Note that the 224 is different in both examples. In ISO-8859-1 "à" is + # represented as a single byte, 224. In UTF8 it is represented with two + # bytes, namely 195 and 160, but its Unicode codepoint is 224. If we + # call +ord+ on the UTF8 string "à" the return value will be 195. That is + # not an error, because UTF8 is unsupported, the call itself would be + # bogus. def ord self[0] end unless method_defined?(:ord) diff --git a/activesupport/lib/active_support/core_ext/string/multibyte.rb b/activesupport/lib/active_support/core_ext/string/multibyte.rb index 13208c6ee2..42e053d0f8 100644 --- a/activesupport/lib/active_support/core_ext/string/multibyte.rb +++ b/activesupport/lib/active_support/core_ext/string/multibyte.rb @@ -49,13 +49,6 @@ class String def is_utf8? ActiveSupport::Multibyte::Chars.consumes?(self) end - - unless '1.8.7 and later'.respond_to?(:chars) - def chars - ActiveSupport::Deprecation.warn('String#chars has been deprecated in favor of String#mb_chars.', caller) - mb_chars - end - end else def mb_chars #:nodoc self |