Changeset 6612

Timestamp:

Mar 16, 2006, 1:52:56 PM (20 years ago)

Author:

jhoblitt

Message:

add DataStore::Utils
change DataStore::Product & DataStore::FileSet to use DataStore::Utils
change DataStore::FileSet to validate all ->new() params
change DataStore::FileSet tests to use a valid type

Location:

trunk/DataStore

Files:

• MANIFEST (modified) (1 diff)
• lib/DataStore.pm (modified) (3 diffs)
• lib/DataStore/FileSet.pm (modified) (3 diffs)
• lib/DataStore/Product.pm (modified) (3 diffs)
• lib/DataStore/Utils.pm (added)
• t/01_load.t (modified) (2 diffs)
• t/06_fileset.t (modified) (6 diffs)

trunk/DataStore/MANIFEST

@@ -15 +15 @@
 lib/DataStore/Record.pm
 lib/DataStore/Response.pm
+lib/DataStore/Utils.pm
 t/00_distribution.t
 t/01_load.t

trunk/DataStore/lib/DataStore.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: DataStore.pm,v 1.2 2006-03-16 21:44:57 jhoblitt Exp $
+# $Id: DataStore.pm,v 1.3 2006-03-16 23:52:56 jhoblitt Exp $
 
 package DataStore;
@@ -29 +29 @@
     use DataStore::Product;
     use DataStore::Response;
+    use DataStore::Utils;
 
 =head1 DESCRIPTION
@@ -112 +113 @@
 use DataStore::Product;
 use DataStore::Response;
+use DataStore::Utils;
 
 =head1 CREDITS

trunk/DataStore/lib/DataStore/FileSet.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: FileSet.pm,v 1.6 2006-03-16 21:57:29 jhoblitt Exp $
+# $Id: FileSet.pm,v 1.7 2006-03-16 23:52:56 jhoblitt Exp $
 
 package DataStore::FileSet;
@@ -16 +16 @@
 use DataStore::File::Parser;
 use DataStore::Response;
+use DataStore::Utils qw( $STD_FIELD $TIME_FIELD %KNOWN_FILESET_TYPES );
 use LWP::UserAgent;
 use Params::Validate qw( validate SCALAR );
@@ -116 +117 @@
                 },
             },
-            fileset     => 1,
-            datetime    => 1,
-            type        => 1,
+            fileset     => {
+                type    => SCALAR,
+                regex   => $STD_FIELD,
+            },
+            datetime    => {
+                type    => SCALAR,
+                regex   => $TIME_FIELD,
+            },
+            type        => {
+                type    => SCALAR,
+                callbacks => {
+                    'is valid type' => 
+                        sub { exists $KNOWN_FILESET_TYPES{$_[0]} },
+                },
+            },
         },
     );

trunk/DataStore/lib/DataStore/Product.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Product.pm,v 1.6 2006-03-16 21:57:29 jhoblitt Exp $
+# $Id: Product.pm,v 1.7 2006-03-16 23:52:56 jhoblitt Exp $
 
 package DataStore::Product;
@@ -17 +17 @@
 use DataStore::Record;
 use DataStore::Response;
+use DataStore::Utils qw( $STD_FIELD );
 use LWP::UserAgent;
 use Params::Validate qw( validate SCALAR);
-
-my $std_field = qr/^[a-z0-9-_.]+$/;
 
 use vars qw( @BASE_FIELDS );
@@ -110 +109 @@
                 type        => SCALAR,
                 callbacks   => {
-                    'is valid fileset ID' => sub { $_[0] =~ $std_field },
+                    'is valid fileset ID' => sub { $_[0] =~ $STD_FIELD },
                 },
                 optional    => 1,

trunk/DataStore/t/01_load.t

@@ -5 +5 @@
 use lib qw( ./lib ./t );
 
-use Test::More tests => 8;
+use Test::More tests => 9;
 
 BEGIN { use_ok('DataStore'); }
@@ -15 +15 @@
 BEGIN { use_ok('DataStore::Record'); }
 BEGIN { use_ok('DataStore::Response'); }
+BEGIN { use_ok('DataStore::Utils'); }

trunk/DataStore/t/06_fileset.t

@@ -3 +3 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: 06_fileset.t,v 1.3 2006-03-15 22:06:58 jhoblitt Exp $
+# $Id: 06_fileset.t,v 1.4 2006-03-16 23:52:56 jhoblitt Exp $
 
 use strict;
@@ -36 +36 @@
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
-        type        => 'foo',
+        type        => 'object',
     );
 
@@ -47 +47 @@
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
-        type        => 'foo',
+        type        => 'object',
         foo         => 1,
     );
@@ -119 +119 @@
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
-        type        => 'foo',
+        type        => 'object',
     );
 
@@ -130 +130 @@
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
-        type        => 'foo',
+        type        => 'object',
     );
 
@@ -157 +157 @@
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
-        type        => 'foo',
+        type        => 'object',
     );