From 5d3712a81e502f46b2745d238d9bb76fcdb31f5b Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 23 Nov 2008 14:43:05 -0800 Subject: Hack builder to look for fast_xs instead of insisting on its own String#to_xs --- .../lib/active_support/vendor/builder-2.1.2/builder/xchar.rb | 4 ++-- activesupport/test/core_ext/hash_ext_test.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb index 8bdbd05899..a1990be37a 100644 --- a/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb +++ b/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb @@ -18,7 +18,6 @@ module Builder end if ! defined?(Builder::XChar) - Builder.check_for_name_collision(String, "to_xs") Builder.check_for_name_collision(Fixnum, "xchr") end @@ -105,11 +104,12 @@ end # Enhance the String class with a XML escaped character version of # to_s. # +require 'active_support/core_ext/string/xchar' class String # XML escaped version of to_s def to_xs unpack('U*').map {|n| n.xchr}.join # ASCII, UTF-8 rescue unpack('C*').map {|n| n.xchr}.join # ISO-8859-1, WIN-1252 - end + end unless method_defined?(:to_xs) end diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index 1e5cd25527..30cbba26b0 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -1,4 +1,5 @@ require 'abstract_unit' +require 'builder' class HashExtTest < Test::Unit::TestCase def setup -- cgit v1.2.3