Changeset 15025

Timestamp:

Sep 25, 2007, 2:13:29 PM (19 years ago)

Author:

jhoblitt

Message:

convert DataStore::Root to use URIs that end as /index.txt$ instead of /$

Location:

trunk/DataStore

Files:

• MANIFEST (modified) (1 diff)
• lib/DataStore/Product/Parser.pm (modified) (5 diffs)
• lib/DataStore/Root.pm (modified) (3 diffs)

trunk/DataStore/MANIFEST

@@ -37 +37 @@
 t/12_dsfilesetls.t
 t/13_dsrootls.t
+t/14_root.t

trunk/DataStore/lib/DataStore/Product/Parser.pm

@@ -3 +3 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.1 2006-07-22 01:17:34 smalle Exp $
+# $Id: Parser.pm,v 1.2 2007-09-26 00:13:29 jhoblitt Exp $
 
 package DataStore::Product::Parser;
@@ -34 +34 @@
 
     my $parser = DataStore::Product::Parser->new(
-        base_uri => 'http://example.org/',
+        base_uri => 'http://example.org/index.txt',
     );
 
@@ -63 +63 @@
 
     my $parser = DataStore::Product::Parser->new(
-        base_uri => 'http://example.org/',
+        base_uri => 'http://example.org/index.txt',
     );
 
@@ -91 +91 @@
                     'is valid http uri' =>
                         sub { is_uri($_[0]) and $_[0] =~ /^http:/ },
-                    'uri ends with /'   => sub { $_[0] =~ m|/$| },
+                    'uri ends with /index.txt' =>
+                        sub { $_[0] =~ m|/index.txt$| },
+
                 },
-                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;
@@ -188 +193 @@
             type          => $type,
             desc          => $desc,
-            uri           => $self->base_uri . $product . '/',
+            uri           => $self->base_uri . $product . '/index.txt',
         });
     } continue {

trunk/DataStore/lib/DataStore/Root.pm

@@ -3 +3 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Root.pm,v 1.3 2006-08-04 22:18:04 smalle Exp $
+# $Id: Root.pm,v 1.4 2007-09-26 00:13:29 jhoblitt Exp $
 
 package DataStore::Root;
@@ -16 +16 @@
 
 use Carp qw( carp );
-use DataStore::FileSet::Parser;
+use DataStore::Product::Parser;
 use DataStore::Record;
 use DataStore::Response;
@@ -94 +94 @@
                 type        => SCALAR,
                 callbacks   => {
-                    'is valid uri dirname'   => sub { $_[0] =~ m|/$| },
+                    'uri ends with /index.txt' =>
+                        sub { $_[0] =~ m|/index.txt$| },
                 }
             },