mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	Added .document file for lib/uri.
Added mathew's patches to test_ftp.rb Fixed a minor typo in getoptlong.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									7591606c52
								
							
						
					
					
						commit
						51c919b387
					
				
					 3 changed files with 29 additions and 2 deletions
				
			
		| 
						 | 
					@ -113,7 +113,7 @@ class GetoptLong
 | 
				
			||||||
  # argument ordering must be a member of ORDERINGS, i.e one of
 | 
					  # argument ordering must be a member of ORDERINGS, i.e one of
 | 
				
			||||||
  # GetoptLong::REQUIRE_ORDER, GetoptLong::PERMUTE,
 | 
					  # GetoptLong::REQUIRE_ORDER, GetoptLong::PERMUTE,
 | 
				
			||||||
  # GetoptLong::RETURN_IN_ORDER.  A RuntimeError is raised if
 | 
					  # GetoptLong::RETURN_IN_ORDER.  A RuntimeError is raised if
 | 
				
			||||||
  # option processin has already started.
 | 
					  # option processing has already started.
 | 
				
			||||||
  #
 | 
					  #
 | 
				
			||||||
  def ordering=(ordering)
 | 
					  def ordering=(ordering)
 | 
				
			||||||
    #
 | 
					    #
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										7
									
								
								lib/uri/.document
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								lib/uri/.document
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,7 @@
 | 
				
			||||||
 | 
					common.rb
 | 
				
			||||||
 | 
					ftp.rb
 | 
				
			||||||
 | 
					generic.rb
 | 
				
			||||||
 | 
					http.rb
 | 
				
			||||||
 | 
					https.rb
 | 
				
			||||||
 | 
					ldap.rb
 | 
				
			||||||
 | 
					mailto.rb
 | 
				
			||||||
| 
						 | 
					@ -15,7 +15,7 @@ class TestFTP < Test::Unit::TestCase
 | 
				
			||||||
    exp = [
 | 
					    exp = [
 | 
				
			||||||
      'ftp',
 | 
					      'ftp',
 | 
				
			||||||
      'user:pass', 'host.com', URI::FTP.default_port, 
 | 
					      'user:pass', 'host.com', URI::FTP.default_port, 
 | 
				
			||||||
      '/abc/def', nil,
 | 
					      'abc/def', nil,
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
    ary = [
 | 
					    ary = [
 | 
				
			||||||
      url.scheme, url.userinfo, url.host, url.port,
 | 
					      url.scheme, url.userinfo, url.host, url.port,
 | 
				
			||||||
| 
						 | 
					@ -27,6 +27,26 @@ class TestFTP < Test::Unit::TestCase
 | 
				
			||||||
    assert_equal('pass', url.password)
 | 
					    assert_equal('pass', url.password)
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def test_paths
 | 
				
			||||||
 | 
					    # If you think what's below is wrong, please read RubyForge bug 2055, 
 | 
				
			||||||
 | 
					    # RFC 1738 section 3.2.2, and RFC 2396.
 | 
				
			||||||
 | 
					    u = URI.parse('ftp://ftp.example.com/foo/bar/file.ext')
 | 
				
			||||||
 | 
					    assert(u.path == 'foo/bar/file.ext')
 | 
				
			||||||
 | 
					    u = URI.parse('ftp://ftp.example.com//foo/bar/file.ext')
 | 
				
			||||||
 | 
					    assert(u.path == '/foo/bar/file.ext')
 | 
				
			||||||
 | 
					    u = URI.parse('ftp://ftp.example.com/%2Ffoo/bar/file.ext')
 | 
				
			||||||
 | 
					    assert(u.path == '/foo/bar/file.ext')
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def test_assemble
 | 
				
			||||||
 | 
					    # uri/ftp is conservative and uses the older RFC 1738 rules, rather than
 | 
				
			||||||
 | 
					    # assuming everyone else has implemented RFC 2396.
 | 
				
			||||||
 | 
					    uri = URI::FTP.build(['user:password', 'ftp.example.com', nil, 
 | 
				
			||||||
 | 
					                         '/path/file.zip', 'i'])
 | 
				
			||||||
 | 
					    assert(uri.to_s == 
 | 
				
			||||||
 | 
					           'ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i')
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def test_select
 | 
					  def test_select
 | 
				
			||||||
    assert_equal(['ftp', 'a.b.c', 21], URI.parse('ftp://a.b.c/').select(:scheme, :host, :port))
 | 
					    assert_equal(['ftp', 'a.b.c', 21], URI.parse('ftp://a.b.c/').select(:scheme, :host, :port))
 | 
				
			||||||
    u = URI.parse('ftp://a.b.c/')
 | 
					    u = URI.parse('ftp://a.b.c/')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue