diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-08 22:31:54 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-08 22:49:31 -0800 |
| commit | 8e32830412c051d97613ea4b84c0d8b64e612538 (patch) | |
| tree | bce030015ca5e374038e33e805b6f0a9fceb4e57 | |
| parent | deddd55086ad3e9ae43bb0fa44911a77c8ee4495 (diff) | |
| download | rails-8e32830412c051d97613ea4b84c0d8b64e612538.tar.gz rails-8e32830412c051d97613ea4b84c0d8b64e612538.tar.bz2 rails-8e32830412c051d97613ea4b84c0d8b64e612538.zip | |
Fix unresolved string extension dependencies
| -rw-r--r-- | activesupport/lib/active_support/multibyte/chars.rb | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb index d372b0ab1f..c7225fec06 100644 --- a/activesupport/lib/active_support/multibyte/chars.rb +++ b/activesupport/lib/active_support/multibyte/chars.rb @@ -1,4 +1,5 @@ # encoding: utf-8 +require 'active_support/core_ext/string/access' require 'active_support/core_ext/string/behavior' module ActiveSupport #:nodoc: @@ -197,7 +198,7 @@ module ActiveSupport #:nodoc: # 'Café périferôl'.mb_chars.index('ô') #=> 12 # 'Café périferôl'.mb_chars.index(/\w/u) #=> 0 def index(needle, offset=0) - wrapped_offset = self.first(offset).wrapped_string.length + wrapped_offset = first(offset).wrapped_string.length index = @wrapped_string.index(needle, wrapped_offset) index ? (self.class.u_unpack(@wrapped_string.slice(0...index)).size) : nil end @@ -211,7 +212,7 @@ module ActiveSupport #:nodoc: # 'Café périferôl'.mb_chars.rindex(/\w/u) #=> 13 def rindex(needle, offset=nil) offset ||= length - wrapped_offset = self.first(offset).wrapped_string.length + wrapped_offset = first(offset).wrapped_string.length index = @wrapped_string.rindex(needle, wrapped_offset) index ? (self.class.u_unpack(@wrapped_string.slice(0...index)).size) : nil end diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 53a4c7acf5..e7583bef1b 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext/object/blank' require 'active_support/core_ext/time' require 'active_support/core_ext/date' require 'active_support/core_ext/date_time' |