1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #4076 from lest/remove-1-8-code

remove support for ruby 1.8 in AS String extensions
This commit is contained in:
José Valim 2011-12-21 00:32:31 -08:00
commit afea8c7948
2 changed files with 1 additions and 38 deletions

View file

@ -89,9 +89,6 @@ class Hash
end
class String
# 0x3000: fullwidth whitespace
NON_WHITESPACE_REGEXP = %r![^\s#{[0x3000].pack("U")}]!
# A string is blank if it's empty or contains whitespaces only:
#
# "".blank? # => true
@ -100,12 +97,7 @@ class String
# " something here ".blank? # => false
#
def blank?
# 1.8 does not takes [:space:] properly
if encoding_aware?
self !~ /[^[:space:]]/
else
self !~ NON_WHITESPACE_REGEXP
end
self !~ /[^[:space:]]/
end
end

View file

@ -1,37 +1,8 @@
# encoding: utf-8
require 'date'
require 'active_support/core_ext/time/publicize_conversion_methods'
require 'active_support/core_ext/time/calculations'
class String
# 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)
# +getbyte+ backport from Ruby 1.9
alias_method :getbyte, :[] unless method_defined?(:getbyte)
# Form can be either :utc (default) or :local.
def to_time(form = :utc)
return nil if self.blank?