diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-20 02:49:10 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-20 02:49:10 +0000 |
commit | 0d1abb904e9eda11dfed19181553725764a3d950 (patch) | |
tree | 0fc7858ebbc6c76f81249c37ce3ed0c31a8d5253 /lib/rexml/namespace.rb | |
parent | 0b38221d4ea75d8ac96b2adb1f7fafb0b20f9d29 (diff) |
rexml: upgrade to 3.1.8
See https://github.com/ruby/rexml/blob/master/NEWS.md for change summary.
Changes for spec/ has been reported: https://github.com/ruby/spec/pull/639
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/namespace.rb')
-rw-r--r-- | lib/rexml/namespace.rb | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/rexml/namespace.rb b/lib/rexml/namespace.rb index 4a7174eaeb..924edf9506 100644 --- a/lib/rexml/namespace.rb +++ b/lib/rexml/namespace.rb @@ -1,4 +1,5 @@ # frozen_string_literal: false + require_relative 'xmltokens' module REXML @@ -14,14 +15,24 @@ module REXML # Sets the name and the expanded name def name=( name ) @expanded_name = name - name =~ NAMESPLIT - if $1 - @prefix = $1 + case name + when NAMESPLIT + if $1 + @prefix = $1 + else + @prefix = "" + @namespace = "" + end + @name = $2 + when "" + @prefix = nil + @namespace = nil + @name = nil else - @prefix = "" - @namespace = "" + message = "name must be \#{PREFIX}:\#{LOCAL_NAME} or \#{LOCAL_NAME}: " + message += "<#{name.inspect}>" + raise ArgumentError, message end - @name = $2 end # Compares names optionally WITH namespaces |