Changeset 6615

Timestamp:

Mar 16, 2006, 3:11:23 PM (20 years ago)

Author:

jhoblitt

Message:

change DataStore::File to use DataStore::Utils
change DataStore::File tests to use a valid type

Location:

trunk/DataStore

Files:

• lib/DataStore/File.pm (modified) (4 diffs)
• t/07_file.t (modified) (7 diffs)

trunk/DataStore/lib/DataStore/File.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: File.pm,v 1.8 2006-03-16 21:57:29 jhoblitt Exp $
+# $Id: File.pm,v 1.9 2006-03-17 01:11:23 jhoblitt Exp $
 
 package DataStore::File;
@@ -15 +15 @@
 use Carp qw( carp );
 use DataStore::Response;
+use DataStore::Utils qw( $STD_FIELD $BYTE_FIELD $MD5_FIELD %KNOWN_FILE_TYPES );
 use Digest::MD5::File qw( file_md5_hex );
 use File::stat;
@@ -117 +118 @@
     validate(@_,
         {
-            uri             => {
+            uri     => {
                 type        => SCALAR,
                 callbacks   => {
@@ -124 +125 @@
                 },
             },
-            fileid      => 1,
-            bytes       => 1,
-            md5sum      => 1,
-            type        => 1,
+            fileid  => {
+                type        => SCALAR,
+                regex       => $STD_FIELD,
+            },
+            bytes   => {
+                type        => SCALAR,
+                regex       => $BYTE_FIELD,
+            },
+            md5sum  => {
+                type        => SCALAR,
+                regex       => $MD5_FIELD,
+            },
+            type    => {
+                type        => SCALAR,
+                callbacks   => {
+                    'is valid type' =>
+                        sub { exists $KNOWN_FILE_TYPES{$_[0]} },
+                },
+            },
         },
     );

trunk/DataStore/t/07_file.t

@@ -3 +3 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: 07_file.t,v 1.2 2006-03-15 22:02:53 jhoblitt Exp $
+# $Id: 07_file.t,v 1.3 2006-03-17 01:11:23 jhoblitt Exp $
 
 use strict;
@@ -38 +38 @@
         bytes       => 12345,
         md5sum      => 'fe6a2b6564c0d4cfb3bbf1db813824ba',
-        type        => 'foo',
+        type        => 'chip',
     );
 
@@ -50 +50 @@
         bytes       => 12345,
         md5sum      => 'fe6a2b6564c0d4cfb3bbf1db813824ba',
-        type        => 'foo',
+        type        => 'chip',
         foo         => 1,
     );
@@ -117 +117 @@
         bytes       => 9,
         md5sum      => 'a0a6e1a375117c58d77221f10c5ce12e',
-        type        => 'foo',
+        type        => 'chip',
     );
 
@@ -131 +131 @@
         bytes       => 9,
         md5sum      => 'a0a6e1a375117c58d77221f10c5ce12e',
-        type        => 'foo',
+        type        => 'chip',
     );
 
@@ -154 +154 @@
         bytes       => 12345,
         md5sum      => 'fe6a2b6564c0d4cfb3bbf1db813824ba',
-        type        => 'foo',
+        type        => 'chip',
     );
     
@@ -168 +168 @@
         bytes       => 12345,
         md5sum      => 'fe6a2b6564c0d4cfb3bbf1db813824ba',
-        type        => 'foo',
+        type        => 'chip',
     );