Changeset 6609

Timestamp:

Mar 16, 2006, 12:00:29 PM (20 years ago)

Author:

jhoblitt

Message:

be consistent about how HTTP URIs are validated

Location:

trunk/DataStore/lib/DataStore

Files:

• File/Parser.pm (modified) (3 diffs)
• FileSet/Parser.pm (modified) (3 diffs)

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

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.8 2006-03-16 21:48:50 jhoblitt Exp $
+# $Id: Parser.pm,v 1.9 2006-03-16 22:00:29 jhoblitt Exp $
 
 package DataStore::File::Parser;
@@ -14 +14 @@
 
 use Carp qw( carp );
+use Data::Validate::URI qw( is_uri ); 
 use DataStore::File;
 use Params::Validate qw( validate validate_pos SCALAR );
@@ -91 +92 @@
                 type        => SCALAR,
                 callbacks   => {
-                    'is valid http uri' => sub { is_http_uri($_[0]) },
+                    'is valid http uri' =>
+                        sub { is_uri($_[0]) and $_[0] =~ /^http:/ },
                 },
                 default =>  'http://example.org/',

trunk/DataStore/lib/DataStore/FileSet/Parser.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.10 2006-03-16 21:50:09 jhoblitt Exp $
+# $Id: Parser.pm,v 1.11 2006-03-16 22:00:29 jhoblitt Exp $
 
 package DataStore::FileSet::Parser;
@@ -14 +14 @@
 
 use Carp qw( carp );
-use Data::Validate::URI qw( is_http_uri );
+use Data::Validate::URI qw( is_uri );
 use DataStore::FileSet;
 use Params::Validate qw( validate validate_pos SCALAR);
@@ -90 +90 @@
                 type        => SCALAR,
                 callbacks   => {
-                    'is valid http uri' => sub { is_http_uri($_[0]) },
+                    'is valid http uri' =>
+                        sub { is_uri($_[0]) and $_[0] =~ /^http:/ },
                     'uri ends with /'   => sub { $_[0] =~ m|/$| },
                 },