Changeset 23852

Timestamp:

Apr 14, 2009, 10:50:32 AM (17 years ago)

Author:

jhoblitt

Message:

Nebulous::Key parsing and testing improvements

Location:

branches/neb_distrib_20081210/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Key.pm (modified) (5 diffs)
• t/75_parse_neb_key.t (modified) (3 diffs)

branches/neb_distrib_20081210/Nebulous-Server/Changes

@@ -13 +13 @@
       hash of a key to change
     - create a pseduo directory structure on key creation
+    - Nebulous::Key parsing and testing improvements
       
 0.16

branches/neb_distrib_20081210/Nebulous-Server/lib/Nebulous/Key.pm

@@ -54 +54 @@
         # strip off volume component if it exists
         $path =~ s|^//([^/]+)||;
+
+        # a new is not allowed to be just a volume specifier, it must have a
+        # path component to it
+        unless (length $path) {
+            die "neb URI scheme requires a path component"; 
+        }
         
         # ignore key supplied volume name if one is passed as a parameter
@@ -81 +87 @@
     # strip leading slashes
     $path =~ s|^/+||;
+
+    # strip leading '.' or '..'
+    $path =~ s|^\.{1,2}||;
 
     # remove multiple /'s and trailing slashes
@@ -92 +101 @@
 }
 
+
 sub parse_neb_volume
 {
@@ -106 +116 @@
 }
 
+
 sub _stringify_key
 {
@@ -116 +127 @@
     return "neb://${soft_volume}${volume}/$path";
 }
+
 
 1;

branches/neb_distrib_20081210/Nebulous-Server/t/75_parse_neb_key.t

@@ -10 +10 @@
 use Test::More;
 
-plan tests => 80;
+plan tests => 99;
 
 use lib qw( ./t ./lib );
@@ -224 +224 @@
 }
 
+# root volume references
+{
+    my $key = parse_neb_key('neb:///');
+
+    is($key->path, '', 'path');
+    is($key->volume, undef, 'volume name');
+    is($key->soft_volume, undef, 'soft volume name');
+}
+
+{
+    my $key = parse_neb_key('neb:///.');
+
+    is($key->path, '', 'path');
+    is($key->volume, undef, 'volume name');
+    is($key->soft_volume, undef, 'soft volume name');
+}
+
+{
+    my $key = parse_neb_key('neb:///..');
+
+    is($key->path, '', 'path');
+    is($key->volume, undef, 'volume name');
+    is($key->soft_volume, undef, 'soft volume name');
+}
+
+{
+    my $key = parse_neb_key('/');
+
+    is($key->path, '', 'path');
+    is($key->volume, undef, 'volume name');
+    is($key->soft_volume, undef, 'soft volume name');
+}
+
+{
+    my $key = parse_neb_key('.');
+
+    is($key->path, '', 'path');
+    is($key->volume, undef, 'volume name');
+    is($key->soft_volume, undef, 'soft volume name');
+}
+
+{
+    my $key = parse_neb_key('..');
+
+    is($key->path, '', 'path');
+    is($key->volume, undef, 'volume name');
+    is($key->soft_volume, undef, 'soft volume name');
+}
+
 # key w/ whitespace
 eval {
@@ -267 +316 @@
 };
 like( $@, qr/requires a leading slash/, "leading slash" );
+
+# URI w/ volume but w/o path
+eval {
+    my $key = parse_neb_key('neb://foo');
+};
+like( $@, qr/requires a path/, "no path" );