Re: uri test failures. (Re: [ruby-cvs] ruby/lib, ruby/lib/uri: Lovely RDOC patches from mathew (metaATpoboxDOTcom) on URI/* and getoptlong.rb)

Warren Brown wrote:

>As I pointed out in
>http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/5285 (the
>last time this issue came up), RFC1738 was updated by RFC1808 and
>RFC2396 to include FTP URLs under the URI "umbrella".  This means that
>although the second slash *is* required for absolute paths, it is *not*
>required to be encoded as "%2F", it can just be a regular slash ("/"). 
> [...] Hopefully the patched code allows this as well.
>

Yes, it does.

Here's a patch for the test cases, I added a few extra tests as well to 
check the two ways to put a leading slash on the path, and to test 
assembling FTP URIs. The library uses the older way to put a leading '/' 
in the URI when assembling one; I think that's probably appropriate, as 
it's the safest way to do it if you assume there's lots of out-of-date 
software out there.

[I'll send this to Ryan Davis too.]


Index: test_ftp.rb
===================================================================
RCS file: /src/ruby/test/uri/test_ftp.rb,v
retrieving revision 1.2
diff -u -b -d -d -r1.2 test_ftp.rb
--- test_ftp.rb    5 Oct 2003 06:09:26 -0000    1.2
+++ test_ftp.rb    5 Sep 2005 16:18:08 -0000
@@ -15,7 +15,7 @@
     exp = [
       'ftp',
       'user:pass', 'host.com', URI::FTP.default_port,
-      '/abc/def', nil,
+      'abc/def', nil,
     ]
     ary = [
       url.scheme, url.userinfo, url.host, url.port,
@@ -27,6 +27,26 @@
     assert_equal('pass', url.password)
   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:[e-mail]/%2Fpath/file.zip;type=i')
+  end
+
   def test_select
     assert_equal(['ftp', 'a.b.c', 21], 
URI.parse('ftp://a.b.c/').select(:scheme, :host, :port))
     u = URI.parse('ftp://a.b.c/')

===


mathew