diff options
author | akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-04 06:26:45 +0000 |
---|---|---|
committer | akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-04 06:26:45 +0000 |
commit | 05e476c941e41132d40b4bcbfcc7eea90cae7318 (patch) | |
tree | abe5147994e8566c8c4f7f49e59378f9683df2d3 /lib/uri/mailto.rb | |
parent | 396c29d1952642868874cace40615c2f1aae153b (diff) | |
download | ruby-05e476c941e41132d40b4bcbfcc7eea90cae7318.tar.gz |
updated uri.rb and uri/*.rb to uri-0.9.7
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/uri/mailto.rb')
-rw-r--r-- | lib/uri/mailto.rb | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb index b1c18f4364..100cd6430b 100644 --- a/lib/uri/mailto.rb +++ b/lib/uri/mailto.rb @@ -46,22 +46,21 @@ module URI # hname = *urlc # hvalue = *urlc # header = hname "=" hvalue - header_pattern = "(?:[^?=&]*=[^?=&]*)" - HEADER_REGEXP = /#{header_pattern}/ + HEADER_PATTERN = "(?:[^?=&]*=[^?=&]*)".freeze + HEADER_REGEXP = Regexp.new(HEADER_PATTERN, 'N').freeze # headers = "?" header *( "&" header ) # to = #mailbox # mailtoURL = "mailto:" [ to ] [ headers ] - mailbox_pattern = "(?:[^(),%?=&]|#{PATTERN::ESCAPED})" - MAILBOX_REGEXP = /#{mailbox_pattern}/ + MAILBOX_PATTERN = "(?:[^(),%?=&]|#{PATTERN::ESCAPED})".freeze MAILTO_REGEXP = Regexp.new(" \\A - (#{mailbox_pattern}*?) (?# 1: to) + (#{MAILBOX_PATTERN}*?) (?# 1: to) (?: \\? - (#{header_pattern}(?:\\&#{header_pattern})*) (?# 2: headers) + (#{HEADER_PATTERN}(?:\\&#{HEADER_PATTERN})*) (?# 2: headers) )? \\z - ", Regexp::EXTENDED, 'N') + ", Regexp::EXTENDED, 'N').freeze =begin @@ -155,7 +154,7 @@ module URI return true unless v return true if v.size == 0 - if OPAQUE !~ v || /\A#{MAILBOX_REGEXP}*\z/o !~ v + if OPAQUE !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v raise InvalidComponentError, "bad component(expected opaque component): #{v}" end @@ -191,7 +190,7 @@ module URI return true if v.size == 0 if OPAQUE !~ v || - /\A(#{HEADER_REGEXP}(?:\&#{HEADER_REGEXP})*)\z/o !~ v + /\A(#{HEADER_PATTERN}(?:\&#{HEADER_PATTERN})*)\z/o !~ v raise InvalidComponentError, "bad component(expected opaque component): #{v}" end |