Changeset 16203

Timestamp:

Jan 23, 2008, 12:27:51 PM (18 years ago)

Author:

jhoblitt

Message:

add Nebulous::Util::parse_neb_key()

Location:

trunk

Files:

• Nebulous-Server/Build.PL (modified) (1 diff)
• Nebulous-Server/Changes (modified) (1 diff)
• Nebulous-Server/MANIFEST (modified) (1 diff)
• Nebulous-Server/t/75_parse_neb_key.t (added)
• Nebulous/Build.PL (modified) (1 diff)
• Nebulous/Changes (modified) (1 diff)
• Nebulous/MANIFEST (modified) (1 diff)
• Nebulous/lib/Nebulous/Util.pm (modified) (4 diffs)
• Nebulous/t/75_parse_neb_key.t (added)

trunk/Nebulous-Server/Build.PL

@@ -80 +80 @@
     create_makefile_pl  => 'passthrough',
     requires            => {
+        'Class::Accessor::Fast' => 0,
         'Config::YAML'          => '1.42',
+        'DBD::mysql'            => '3.0007',
+        'DBI'                   => '1.53',
+        'File::ExtAttr'         => '1.03',
+        'File::Spec::Functions' => 0,
+        'Log::Log4perl'         => '0.48',
+        'Net::Server::Daemonize'=> '0.05',
+        'Params::Validate'      => '0.73',
+        'SOAP::Lite'            => '0.69',
+        'Sys::Statistics::Linux::DiskUsage' => '0.02',
         'URI'                   => '1.30',
-        'SOAP::Lite'            => '0.69',
-        'Log::Log4perl'         => '0.48',
-        'DBI'                   => '1.53',
-        'DBD::mysql'            => '3.0007',
-        'Class::Accessor::Fast' => 0,
-        'Params::Validate'      => '0.73',
-        'Net::Server::Daemonize'=> '0.05',
-        'Sys::Statistics::Linux::DiskUsage' => '0.02',
-        'File::ExtAttr'         => '1.03',
     },
     build_requires      => {

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.06
+    - add Nebulous::Util::parse_neb_key()
     - change bin/* scripts to conistently use --volume instead of --node,
       etc.

trunk/Nebulous-Server/MANIFEST

@@ -110 +110 @@
 t/63_client_stat.t
 t/64_client_find_objects.t
+t/75_parse_neb_key.t
 t/90_nebclient.t
 t/TEST.PL

trunk/Nebulous/Build.PL

@@ -80 +80 @@
     create_makefile_pl  => 'passthrough',
     requires            => {
+        'Class::Accessor::Fast' => 0,
         'Config::YAML'          => '1.42',
+        'DBD::mysql'            => '3.0007',
+        'DBI'                   => '1.53',
+        'File::ExtAttr'         => '1.03',
+        'File::Spec::Functions' => 0,
+        'Log::Log4perl'         => '0.48',
+        'Net::Server::Daemonize'=> '0.05',
+        'Params::Validate'      => '0.73',
+        'SOAP::Lite'            => '0.69',
+        'Sys::Statistics::Linux::DiskUsage' => '0.02',
         'URI'                   => '1.30',
-        'SOAP::Lite'            => '0.69',
-        'Log::Log4perl'         => '0.48',
-        'DBI'                   => '1.53',
-        'DBD::mysql'            => '3.0007',
-        'Class::Accessor::Fast' => 0,
-        'Params::Validate'      => '0.73',
-        'Net::Server::Daemonize'=> '0.05',
-        'Sys::Statistics::Linux::DiskUsage' => '0.02',
-        'File::ExtAttr'         => '1.03',
     },
     build_requires      => {

trunk/Nebulous/Changes

@@ -2 +2 @@
 
 0.06
+    - add Nebulous::Util::parse_neb_key()
     - change bin/* scripts to conistently use --volume instead of --node,
       etc.

trunk/Nebulous/MANIFEST

@@ -110 +110 @@
 t/63_client_stat.t
 t/64_client_find_objects.t
+t/75_parse_neb_key.t
 t/90_nebclient.t
 t/TEST.PL

trunk/Nebulous/lib/Nebulous/Util.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Util.pm,v 1.7 2007-05-08 02:27:42 jhoblitt Exp $
+# $Id: Util.pm,v 1.8 2008-01-23 22:27:51 jhoblitt Exp $
 
 package Nebulous::Util;
@@ -12 +12 @@
 use base qw( Exporter );
 
+use File::Spec::Functions;
 use Log::Log4perl qw( :levels );
 use URI::file;
@@ -22 +23 @@
     _get_filehandle
     _open_uri
+    parse_neb_key
 );
 
@@ -78 +80 @@
 }
 
+sub parse_neb_key
+{
+    my $text = shift;
+
+    # white space is not allowed
+    if ($text =~ qr/\s+/) {
+        die "keys and URIs may not contain whitespace";
+    }
+
+    my $uri = URI->new($text);
+    my $scheme = $uri->scheme;
+    my $path = $uri->opaque;
+    
+    my $volume;
+    # if this is a valid uri 
+    if (defined $scheme) {
+        # if so, does it use the neb scheme?
+        die "URI does not use the 'neb' scheme"
+            unless $scheme eq 'neb'; 
+
+        # neb:path (not allowed)
+        # neb://<volume name>/...
+        # neb:/path... (leading '/' is stripped)
+        # neb:///path... (same as neb:/path)
+
+        # volume specifier must be at least one character
+        # strip off volume component if it exists
+        $path =~ s|^//([^/]+)||;
+        $volume = $1;
+
+        # require a leading slash if there is no volume name
+        if ((not defined $volume) and (not $path =~ m|^/|)) {
+            die "neb URI scheme requires a leading slash, eg. neb:/";
+        }
+    }
+
+    # strip leading slashes
+    $path =~ s|^/+||;
+
+    # remove multiple /'s and trailing slashes
+    $path = canonpath($path);
+
+    return ($path, $volume);
+}
+
 1;