diff options
author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-08 04:03:11 +0000 |
---|---|---|
committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-08 04:03:11 +0000 |
commit | 33565505819b313857f55a1f0b6309719e8799b3 (patch) | |
tree | a4d0ee41e4a573eae7c72738aaf5abd41aa6f635 /lib/uri | |
parent | 62848326c88c7784b493a09f58798760971975d2 (diff) | |
download | ruby-33565505819b313857f55a1f0b6309719e8799b3.tar.gz |
* lib/uri/common.rb: new method URI.regexp. [ruby-dev:22121]
* test/uri/test_common.rb: add test for URI.regexp.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/uri')
-rw-r--r-- | lib/uri/common.rb | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb index 5d6a3b5519..fbb3558a32 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -396,28 +396,46 @@ module URI --- URI::extract(str[, schemes]) =end - def self.extract(str, schemes = []) - urls = [] - regexp = ABS_URI_REF - unless schemes.empty? - regexp = Regexp.new('(?=' + schemes.collect{|s| - Regexp.quote(s + ':') - }.join('|') + ')' + PATTERN::X_ABS_URI, - Regexp::EXTENDED, 'N') + def self.extract(str, schemes = nil, &block) + if block_given? + str.scan(regexp(schemes)) { yield $& } + nil + else + result = [] + str.scan(regexp(schemes)) { result.push $& } + result end + end - str.scan(regexp) { - if block_given? - yield($&) - else - urls << $& +=begin + +--- URI::regexp([match_schemes]) + + Returns a Regexp object which matches to URI-like strings. + If MATCH_SCHEMES given, resulting regexp matches to URIs + whose scheme is one of the MATCH_SCHEMES. + + The Regexp object returned by this method includes arbitrary + number of capture group (parentheses). Never rely on its + number. + + # extract first URI from html_string + html_string.slice(URI.regexp) + + # remove ftp URIs + html_string.sub(URI.regexp(['ftp']) + + # You should not rely on the number of parentheses + html_string.scan(URI.regexp) do |*matches| + p $& end - } - if block_given? - return nil +=end + def self.regexp(schemes = nil) + unless schemes + ABS_URI_REF else - return urls + /(?=#{Regexp.union(*schemes)}:)#{PATTERN::X_ABS_URI}/xn end end |