From 934f537b458778f4786716c95b73fc72bc1ce256 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 28 Jan 2011 23:46:47 +0000 Subject: Import rubygems 1.5.0 (release candidate @ 09893d9) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/indexer.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib/rubygems/indexer.rb') diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb index e1265c2d34..1a585c3c25 100644 --- a/lib/rubygems/indexer.rb +++ b/lib/rubygems/indexer.rb @@ -63,7 +63,7 @@ class Gem::Indexer require 'tmpdir' require 'zlib' - unless ''.respond_to? :to_xs then + unless defined?(Builder::XChar) then raise "Gem::Indexer requires that the XML Builder library be installed:" \ "\n\tgem install builder" end @@ -555,10 +555,18 @@ class Gem::Indexer # Sanitize a single string. def sanitize_string(string) + return string unless string + # HACK the #to_s is in here because RSpec has an Array of Arrays of - # Strings for authors. Need a way to disallow bad values on gempsec + # Strings for authors. Need a way to disallow bad values on gemspec # generation. (Probably won't happen.) - string ? string.to_s.to_xs : string + string = string.to_s + + begin + Builder::XChar.encode string + rescue NameError, NoMethodError + string.to_xs + end end ## -- cgit v1.2.3