Changeset 5498

Timestamp:

Nov 10, 2005, 11:31:26 AM (21 years ago)

Author:

jhoblitt

Message:

factor class id verification check into _is_valid_class_id()

Location:

trunk

Files:

• Nebulous-Server/lib/Nebulous/Server.pm (modified) (4 diffs)
• Nebulous-Server/t/09_server_is_valid_class_id.t (added)
• Nebulous/lib/Nebulous/Server.pm (modified) (4 diffs)
• Nebulous/t/09_server_is_valid_class_id.t (added)

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.13 2005-11-09 01:31:07 jhoblitt Exp $
+# $Id: Server.pm,v 1.14 2005-11-10 21:31:26 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -75 +75 @@
             callbacks   => {
                 'is + integer' => sub { $_[0] =~ /^\d+$/ },
+                # check that the class requested is valid
+                'is valid class id' => sub { _is_valid_class_id( $_[0] ) },
             },
             default     => 0,
@@ -96 +98 @@
     # check that the comment isn't too long
     # check that the volume requested is valid
-
-    # check that the class requested is valid
-    if ( $class ) {
-        my $class_id;
-        eval {
-            my $query = $db->prepare_cached( $sql->get_class ); 
-            $query->execute( $class );
-            ( $class_id ) = $query->fetchrow_array;
-
-            $query->finish;
-        };
-        if ( $@ ) {
-            $db->rollback;
-            $log->logdie( "database error: $@" );
-        }
-
-        unless ( $class_id ) {
-            $log->logdie( "Invalid class ID: $class" );
-        }
-    }
 
     my $uri;
@@ -701 +683 @@
 }
 
+sub _is_valid_class_id {
+    my $class = shift;
+
+    my $class_id;
+    eval {
+        my $query = $db->prepare_cached( $sql->get_class ); 
+        $query->execute( $class );
+        ( $class_id ) = $query->fetchrow_array;
+
+        $query->finish;
+    };
+    if ( $@ ) {
+        $db->rollback;
+        $log->logdie( "database error: $@" );
+    }
+
+    return ( defined $class_id ) ? 1 : undef;
+}
+
 1;
 

trunk/Nebulous/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.13 2005-11-09 01:31:07 jhoblitt Exp $
+# $Id: Server.pm,v 1.14 2005-11-10 21:31:26 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -75 +75 @@
             callbacks   => {
                 'is + integer' => sub { $_[0] =~ /^\d+$/ },
+                # check that the class requested is valid
+                'is valid class id' => sub { _is_valid_class_id( $_[0] ) },
             },
             default     => 0,
@@ -96 +98 @@
     # check that the comment isn't too long
     # check that the volume requested is valid
-
-    # check that the class requested is valid
-    if ( $class ) {
-        my $class_id;
-        eval {
-            my $query = $db->prepare_cached( $sql->get_class ); 
-            $query->execute( $class );
-            ( $class_id ) = $query->fetchrow_array;
-
-            $query->finish;
-        };
-        if ( $@ ) {
-            $db->rollback;
-            $log->logdie( "database error: $@" );
-        }
-
-        unless ( $class_id ) {
-            $log->logdie( "Invalid class ID: $class" );
-        }
-    }
 
     my $uri;
@@ -701 +683 @@
 }
 
+sub _is_valid_class_id {
+    my $class = shift;
+
+    my $class_id;
+    eval {
+        my $query = $db->prepare_cached( $sql->get_class ); 
+        $query->execute( $class );
+        ( $class_id ) = $query->fetchrow_array;
+
+        $query->finish;
+    };
+    if ( $@ ) {
+        $db->rollback;
+        $log->logdie( "database error: $@" );
+    }
+
+    return ( defined $class_id ) ? 1 : undef;
+}
+
 1;