Changeset 24362 for trunk/Nebulous-Server/lib/Nebulous/Key.pm

Timestamp:

Jun 9, 2009, 2:42:18 PM (17 years ago)

Author:

jhoblitt

Message:

rename Nebulous::Key->soft_volume Nebulous::Key->hard_volume and invert the semantics

File:

• trunk/Nebulous-Server/lib/Nebulous/Key.pm (modified) (8 diffs)

trunk/Nebulous-Server/lib/Nebulous/Key.pm

@@ -8 +8 @@
 use warnings FATAL => qw( all );
 
-our $VERSION = '0.02';
+our $VERSION = '0.03';
 
 use base qw( Exporter Class::Accessor::Fast );
@@ -23 +23 @@
 );
 
-__PACKAGE__->mk_ro_accessors(qw( path volume soft_volume ));
+__PACKAGE__->mk_ro_accessors(qw( path volume hard_volume ));
 
 sub parse_neb_key
@@ -42 +42 @@
     
     my $volume_name;
-    my $soft_volume;
+    my $hard_volume;
     # if this is a valid uri 
     if (defined $scheme) {
@@ -71 +71 @@
         if (defined $volume_info->{volume} and $volume_info->{volume} ne 'any') {
             $volume_name = $volume_info->{volume};
-            $soft_volume = $volume_info->{soft_volume};
+            $hard_volume = $volume_info->{hard_volume};
         }
 
@@ -84 +84 @@
         if (defined $volume_info->{volume} and $volume_info->{volume} ne 'any') {
             $volume_name = $volume_info->{volume};
-            $soft_volume = $volume_info->{soft_volume};
+            $hard_volume = $volume_info->{hard_volume};
         }
     }
@@ -99 +99 @@
     return __PACKAGE__->new({
         volume      => $volume_name,
-        soft_volume => $soft_volume,
+        hard_volume => $hard_volume,
         path        => $path,
     });
@@ -110 +110 @@
     return unless defined $volume;
 
-    my $soft_volume;
+    my $hard_volume;
     # check to see if there is a tilde and remove it if found
-    unless (defined $volume and $volume =~ s/^~//) {
-        $soft_volume = 1;
+    if (defined $volume and $volume =~ s/^~//) {
+        $hard_volume = 1;
     }
 
-    return({ volume => $volume, soft_volume => $soft_volume });
+    return({ volume => $volume, hard_volume => $hard_volume });
 }
 
@@ -125 +125 @@
 
     my $path        = $self->path;
-    my $volume      = $self->volume || "";
-    my $soft_volume = $self->soft_volume ? '~' : "";
-
-    return "neb://${soft_volume}${volume}/$path";
+    my $volume      = $self->volume || '';
+    my $hard_volume = $self->hard_volume ? '~' : '';
+
+    return "neb://${hard_volume}${volume}/$path";
 }