kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Applied Nobu's patch to the XML document encoding structure in REXML. It

Browse source 
passes all of REXML's native tests as well as a couple of others, and should
fix potential threading issues.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ser 2005-04-09 17:03:32 +00:00
parent ff866f0a8f
commit 47bd6a4f37
9 changed files with 98 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/rexml/encoding.rb
View file

@ -1,6 +1,16 @@
# -*- mode: ruby; ruby-indent-level: 2; indent-tabs-mode: t; tab-width: 2 -*- vim: sw=2 ts=2
module REXML
module Encoding
@@uconv_available = false
@encoding_methods = {}
def self.register(enc, &block)
@encoding_methods[enc] = block
end
def self.apply(obj, enc)
@encoding_methods[enc][obj]
end
def self.encoding_method(enc)
@encoding_methods[enc]
end
# Native, default format is UTF-8, so it is declared here rather than in
# an encodings/ definition.
@ -18,26 +28,24 @@ module REXML
if enc and enc != UTF_8
@encoding = enc.upcase
begin
load 'rexml/encodings/ICONV.rb'
instance_eval @@__REXML_encoding_methods
Iconv::iconv( UTF_8, @encoding, "" )
require 'rexml/encodings/ICONV.rb'
Encoding.apply(self, "ICONV")
rescue LoadError, Exception => err
raise "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
raise ArgumentError, "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
@encoding.untaint
enc_file = File.join( "rexml", "encodings", "#@encoding.rb" )
begin
load enc_file
instance_eval @@__REXML_encoding_methods
require enc_file
Encoding.apply(self, @encoding)
rescue LoadError
puts $!.message
raise Exception.new( "No decoder found for encoding #@encoding. Please install iconv." )
puts $!.message
raise ArgumentError, "No decoder found for encoding #@encoding. Please install iconv."
end
end
else
enc = UTF_8
@encoding = enc.upcase
load 'rexml/encodings/UTF-8.rb'
instance_eval @@__REXML_encoding_methods
@encoding = UTF_8
require 'rexml/encodings/UTF-8.rb'
Encoding.apply(self, @encoding)
end
ensure
$VERBOSE = old_verbosity