mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
* lib/uri/common.rb: Ditto. * lib/uri/ftp.rb: Ditto. * lib/uri/generic.rb: Ditto. * lib/uri/http.rb: Ditto. * lib/uri/https.rb: Ditto. * lib/uri/ldap.rb: Ditto. * lib/uri/mailto.rb: Ditto. (All backported from 1.9) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gsinclair
parent
87d0ac02d4
commit
30d4c49b46
9 changed files with 968 additions and 968 deletions
130
lib/uri/ftp.rb
130
lib/uri/ftp.rb
|
|
@ -1,25 +1,18 @@
|
|||
#
|
||||
# $Id$
|
||||
# = uri/ftp.rb
|
||||
#
|
||||
# Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
|
||||
# You can redistribute it and/or modify it under the same term as Ruby.
|
||||
# Author:: Akira Yamada <akira@ruby-lang.org>
|
||||
# License:: You can redistribute it and/or modify it under the same term as Ruby.
|
||||
# Revision:: $Id$
|
||||
#
|
||||
|
||||
require 'uri/generic'
|
||||
|
||||
module URI
|
||||
|
||||
=begin
|
||||
|
||||
== URI::FTP
|
||||
|
||||
=== Super Class
|
||||
|
||||
((<URI::Generic>))
|
||||
|
||||
=end
|
||||
|
||||
#
|
||||
# RFC1738 section 3.2.
|
||||
#
|
||||
class FTP < Generic
|
||||
DEFAULT_PORT = 21
|
||||
|
||||
|
|
@ -28,82 +21,91 @@ module URI
|
|||
:userinfo, :host, :port,
|
||||
:path, :typecode
|
||||
].freeze
|
||||
|
||||
#
|
||||
# Typecode is, "a", "i" or "d".
|
||||
# As for "a" the text, as for "i" binary,
|
||||
# as for "d" the directory is displayed.
|
||||
# "A" with the text, as for "i" being binary,
|
||||
# is because the respective data type was called ASCII and
|
||||
# IMAGE with the protocol of FTP.
|
||||
#
|
||||
TYPECODE = ['a', 'i', 'd'].freeze
|
||||
TYPECODE_PREFIX = ';type='.freeze
|
||||
|
||||
=begin
|
||||
|
||||
=== Class Methods
|
||||
|
||||
--- URI::FTP::build
|
||||
Create a new URI::FTP object from components of URI::FTP with
|
||||
check. It is scheme, userinfo, host, port, path and typecode. It
|
||||
provided by an Array or a Hash. typecode is "a", "i" or "d".
|
||||
|
||||
--- URI::FTP::new
|
||||
Create a new URI::FTP object from ``generic'' components with no
|
||||
check.
|
||||
|
||||
=end
|
||||
|
||||
def self.new2(user, password, host, port, path,
|
||||
typecode = nil, arg_check = true)
|
||||
typecode = nil, arg_check = true)
|
||||
typecode = nil if typecode.size == 0
|
||||
if typecode && !TYPECODE.include?(typecode)
|
||||
raise ArgumentError,
|
||||
"bad typecode is specified: #{typecode}"
|
||||
raise ArgumentError,
|
||||
"bad typecode is specified: #{typecode}"
|
||||
end
|
||||
|
||||
# do escape
|
||||
|
||||
self.new('ftp',
|
||||
[user, password],
|
||||
host, port, nil,
|
||||
typecode ? path + TYPECODE_PREFIX + typecode : path,
|
||||
nil, nil, nil, arg_check)
|
||||
[user, password],
|
||||
host, port, nil,
|
||||
typecode ? path + TYPECODE_PREFIX + typecode : path,
|
||||
nil, nil, nil, arg_check)
|
||||
end
|
||||
|
||||
#
|
||||
# == Description
|
||||
#
|
||||
# Creates a new URI::FTP object from components of URI::FTP with
|
||||
# check. It is scheme, userinfo, host, port, path and typecode. It
|
||||
# provided by an Array or a Hash. typecode is "a", "i" or "d".
|
||||
#
|
||||
def self.build(args)
|
||||
tmp = Util::make_components_hash(self, args)
|
||||
|
||||
if tmp[:typecode]
|
||||
if tmp[:typecode].size == 1
|
||||
tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode]
|
||||
end
|
||||
tmp[:path] << tmp[:typecode]
|
||||
if tmp[:typecode].size == 1
|
||||
tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode]
|
||||
end
|
||||
tmp[:path] << tmp[:typecode]
|
||||
end
|
||||
|
||||
return super(tmp)
|
||||
end
|
||||
|
||||
#
|
||||
# == Description
|
||||
#
|
||||
# Create a new URI::FTP object from ``generic'' components with no
|
||||
# check.
|
||||
#
|
||||
# == Usage
|
||||
#
|
||||
# require 'uri'
|
||||
# p ftp = URI.parse("ftp://ftp.ruby-lang.org/pub/ruby/;type=d")
|
||||
# # => #<URI::FTP:0x201fad08 URL:ftp://ftp.ruby-lang.org/pub/ruby/;type=d>
|
||||
# p ftp.typecode
|
||||
# # => "d"
|
||||
#
|
||||
def initialize(*arg)
|
||||
super(*arg)
|
||||
@typecode = nil
|
||||
tmp = @path.index(TYPECODE_PREFIX)
|
||||
if tmp
|
||||
typecode = @path[tmp + TYPECODE_PREFIX.size..-1]
|
||||
self.set_path(@path[0..tmp - 1])
|
||||
|
||||
if arg[-1]
|
||||
self.typecode = typecode
|
||||
else
|
||||
self.set_typecode(typecode)
|
||||
end
|
||||
typecode = @path[tmp + TYPECODE_PREFIX.size..-1]
|
||||
self.set_path(@path[0..tmp - 1])
|
||||
|
||||
if arg[-1]
|
||||
self.typecode = typecode
|
||||
else
|
||||
self.set_typecode(typecode)
|
||||
end
|
||||
end
|
||||
end
|
||||
attr_reader :typecode
|
||||
|
||||
#
|
||||
# methods for typecode
|
||||
#
|
||||
|
||||
def check_typecode(v)
|
||||
if TYPECODE.include?(v)
|
||||
return true
|
||||
return true
|
||||
else
|
||||
raise InvalidComponentError,
|
||||
"bad typecode(expected #{TYPECODE.join(', ')}): #{v}"
|
||||
raise InvalidComponentError,
|
||||
"bad typecode(expected #{TYPECODE.join(', ')}): #{v}"
|
||||
end
|
||||
end
|
||||
private :check_typecode
|
||||
|
|
@ -119,32 +121,28 @@ module URI
|
|||
typecode
|
||||
end
|
||||
|
||||
=begin
|
||||
=end
|
||||
def merge(oth)
|
||||
def merge(oth) # :nodoc:
|
||||
tmp = super(oth)
|
||||
if self != tmp
|
||||
tmp.set_typecode(oth.typecode)
|
||||
tmp.set_typecode(oth.typecode)
|
||||
end
|
||||
|
||||
return tmp
|
||||
end
|
||||
|
||||
=begin
|
||||
=end
|
||||
def to_s
|
||||
save_path = nil
|
||||
if @typecode
|
||||
save_path = @path
|
||||
@path = @path + TYPECODE_PREFIX + @typecode
|
||||
save_path = @path
|
||||
@path = @path + TYPECODE_PREFIX + @typecode
|
||||
end
|
||||
str = super
|
||||
if @typecode
|
||||
@path = save_path
|
||||
@path = save_path
|
||||
end
|
||||
|
||||
return str
|
||||
end
|
||||
end # FTP
|
||||
end
|
||||
@@schemes['FTP'] = FTP
|
||||
end # URI
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue