Changeset 15027

Timestamp:

Sep 25, 2007, 2:44:43 PM (19 years ago)

Author:

jhoblitt

Message:

fix DataStore::File::Parser URI handling

Location:

trunk/DataStore

Files:

• lib/DataStore/File/Parser.pm (modified) (2 diffs)
• t/03_file_parse.t (modified) (6 diffs)

trunk/DataStore/lib/DataStore/File/Parser.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.13 2007-09-25 23:52:46 jhoblitt Exp $
+# $Id: Parser.pm,v 1.14 2007-09-26 00:44:43 jhoblitt Exp $
 
 package DataStore::File::Parser;
@@ -94 +94 @@
 
                 },
-                default =>  'http://example.org/',
+                default =>  'http://example.org/index.txt',
             },
         },
     );
 
-    my $self = bless \%p, ref $class || $class;
+    my $self = bless {}, ref $class || $class;
+
+    $p{base_uri} =~ qr|(.*?/)index.txt|;
+    $self->{base_uri} = $1;
 
     return $self;

trunk/DataStore/t/03_file_parse.t

@@ -3 +3 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: 03_file_parse.t,v 1.4 2006-03-16 21:51:46 jhoblitt Exp $
+# $Id: 03_file_parse.t,v 1.5 2007-09-26 00:44:43 jhoblitt Exp $
 
 use strict;
@@ -10 +10 @@
 use lib qw( ./lib ./t );
 
-use Test::More tests => 46;
+use Test::More tests => 50;
 use Test::Warn;
 
@@ -147 +147 @@
 
     isa_ok(@$results[0], 'DataStore::File');
+    is(@$results[0]->uri, 'http://example.org/otis0123456.01', 'correct uri');
     is(@$results[0]->fileid, 'otis0123456.01', 'correct fileid');
     is(@$results[0]->bytes, '83002312', 'correct datetime');
@@ -153 +154 @@
 
     isa_ok(@$results[1], 'DataStore::File');
+    is(@$results[1]->uri, 'http://example.org/otis0123456.02', 'correct uri');
     is(@$results[1]->fileid, 'otis0123456.02', 'correct fileid');
     is(@$results[1]->bytes, '83002312', 'correct datetime');
@@ -159 +161 @@
 
     isa_ok(@$results[2], 'DataStore::File');
+    is(@$results[2]->uri, 'http://example.org/otis0123456.03', 'correct uri');
     is(@$results[2]->fileid, 'otis0123456.03', 'correct fileid');
     is(@$results[2]->bytes, '83002312', 'correct datetime');
@@ -165 +168 @@
 
     isa_ok(@$results[3], 'DataStore::File');
+    is(@$results[3]->uri, 'http://example.org/otis0123456.04', 'correct uri');
     is(@$results[3]->fileid, 'otis0123456.04', 'correct fileid');
     is(@$results[3]->bytes, '83002312', 'correct datetime');