Merge URI-0.12.2 for Bundler
This commit is contained in:
parent
4aa73f8f8a
commit
c7af39ecd8
@ -497,8 +497,8 @@ module Bundler::URI
|
|||||||
ret = {}
|
ret = {}
|
||||||
|
|
||||||
# for Bundler::URI::split
|
# for Bundler::URI::split
|
||||||
ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
|
ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
|
||||||
ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
|
ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
|
||||||
|
|
||||||
# for Bundler::URI::extract
|
# for Bundler::URI::extract
|
||||||
ret[:URI_REF] = Regexp.new(pattern[:URI_REF])
|
ret[:URI_REF] = Regexp.new(pattern[:URI_REF])
|
||||||
|
@ -100,7 +100,7 @@ module Bundler::URI
|
|||||||
QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
|
QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
|
||||||
FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
|
FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
|
||||||
OPAQUE: /\A(?:[^\/].*)?\z/,
|
OPAQUE: /\A(?:[^\/].*)?\z/,
|
||||||
PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/,
|
PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
2
lib/bundler/vendor/uri/lib/uri/version.rb
vendored
2
lib/bundler/vendor/uri/lib/uri/version.rb
vendored
@ -1,6 +1,6 @@
|
|||||||
module Bundler::URI
|
module Bundler::URI
|
||||||
# :stopdoc:
|
# :stopdoc:
|
||||||
VERSION_CODE = '001201'.freeze
|
VERSION_CODE = '001202'.freeze
|
||||||
VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
|
VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
|
||||||
# :startdoc:
|
# :startdoc:
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user