Index: /trunk/DataStore/MANIFEST =================================================================== --- /trunk/DataStore/MANIFEST (revision 6486) +++ /trunk/DataStore/MANIFEST (revision 6487) @@ -10,2 +10,3 @@ t/00_distribution.t t/01_load.t +t/03_file_parse.t Index: /trunk/DataStore/lib/DataStore/File/Parser.pm =================================================================== --- /trunk/DataStore/lib/DataStore/File/Parser.pm (revision 6486) +++ /trunk/DataStore/lib/DataStore/File/Parser.pm (revision 6487) @@ -1,5 +1,5 @@ # Copyright (C) 2006 Joshua Hoblitt # -# $Id: Parser.pm,v 1.2 2006-02-24 03:19:28 jhoblitt Exp $ +# $Id: Parser.pm,v 1.3 2006-02-25 00:09:10 jhoblitt Exp $ package DataStore::File::Parser; @@ -15,4 +15,6 @@ my $std_field = qr/^[a-z0-9-_.]+$/; +my $byte_field = qr/^\d+$/; +my $md5_field = qr/^[0-9a-f]{32}$/; my %known_types = map { $_ => 1 } qw( chip ); @@ -100,5 +102,5 @@ } - # fields are not allowed to contain # + # fields are not allowed to contain \# foreach my $field (@fields) { if ($field =~ /\#/) { @@ -110,5 +112,5 @@ my ($fileid, $bytes, $md5sum, $type) = @fields; - # validate format of filed and type + # validate format of fileid and type foreach my $field ($fileid, $type) { unless ($field =~ $std_field) { @@ -120,18 +122,19 @@ # validate format of bytes + unless ($bytes =~ $byte_field) { + carp "line $lineno: field $bytes:" + . " does not conform to $byte_field: $line"; + next LINE; + } - # validate format of md5sum -# unless ($datetime =~ $time_field) { -# carp "line $lineno: field $datetime:" -# . " does not conform to $time_field"; -# next LINE; -# } -# -# unless (exists $known_types{$type}) { -# carp "line $lineno: type $type unknown: $line"; -# next LINE; -# } -# - unshift @data, DataStore::File::Record->new({ + # validate format of md5sum, hex encoded + unless ($md5sum =~ $md5_field) { + carp "line $lineno: field $md5sum:" + . " does not conform to $md5_field: $line"; + next LINE; + } + + # lifo + push @data, DataStore::File::Record->new({ fileid => $fileid, bytes => $bytes, @@ -152,5 +155,7 @@ use vars qw( @BASE_FIELDS ); -@BASE_FIELDS = qw( filed bytes md5sum type ); +@BASE_FIELDS = qw( fileid bytes md5sum type ); + +__PACKAGE__->mk_accessors(@BASE_FIELDS); 1; Index: /trunk/DataStore/t/03_file_parse.t =================================================================== --- /trunk/DataStore/t/03_file_parse.t (revision 6487) +++ /trunk/DataStore/t/03_file_parse.t (revision 6487) @@ -0,0 +1,182 @@ +#!/usr/bin/env perl + +# Copyright (C) 2006 Joshua Hoblitt +# +# $Id: 03_file_parse.t,v 1.1 2006-02-25 00:09:10 jhoblitt Exp $ + +use strict; +use warnings; + +use lib qw( ./lib ./t ); + +use Test::More tests => 45; +use Test::Warn; + +=head1 NAME + +t/parser.t - tests DataStore::File::Parser + +=head1 SYNOPSIS + + prove t/configure/configure.t + +=cut + +use DataStore::File::Parser; +#use Test::Warn; + +can_ok('DataStore::File::Parser', qw( + new + parse +)); + +# ->new() + +{ + my $parser = DataStore::File::Parser->new; + + isa_ok($parser, 'DataStore::File::Parser'); +} + +# ->parse() + +eval { + my $parser = DataStore::File::Parser->new; + + $parser->parse(undef); +}; +like($@, qr/is not one of the allowed types/, + '->parse() fails when passed undef'); + +eval { + my $parser = DataStore::File::Parser->new; + + $parser->parse(''); +}; +like($@, qr/ did not pass regex check/, + '->parse() fails when passed a zero length string'); + +warning_like { + my $parser = DataStore::File::Parser->new; + + is($parser->parse('asdf|asdf'), undef, + '->parse() returns undef on failure'); +} qr/not enough fields/, + '->parse() fails when there are too few fields'; + +warning_like { + my $parser = DataStore::File::Parser->new; + + is($parser->parse( + 'foo+++bar|83002312|fe6a2b6564c0d4cfb3bbf1db813824ba|chip|'), undef, + '->parse() returns undef on failure'); +} qr/does not conform/, + '->parse() fails when the fileID field is not in the proper format'; + +warning_like { + my $parser = DataStore::File::Parser->new; + + is($parser->parse( + 'otis0123456.01|a83002312|fe6a2b6564c0d4cfb3bbf1db813824ba|chip|'), undef, + '->parse() returns undef on failure'); +} qr/does not conform/, + '->parse() fails when the bytes field is not in the proper format'; + +warning_like { + my $parser = DataStore::File::Parser->new; + + is($parser->parse( + 'otis0123456.01|83002312|zfe6a2b6564c0d4cfb3bbf1db813824ba|chip|'), undef, + '->parse() returns undef on failure'); +} qr/does not conform/, + '->parse() fails when the md5sum field is not in the proper format'; + +warning_like { + my $parser = DataStore::File::Parser->new; + + is($parser->parse( + 'otis0123456.01|83002312|fe6a2b6564c0d4cfb3bbf1db813824ba|c+hip|'), undef, + '->parse() returns undef on failure'); +} qr/does not conform/, + '->parse() fails when the fileID field is not in the proper format'; + +warning_like { + my $parser = DataStore::File::Parser->new; + + is($parser->parse( + 'otis012#3456.01|83002312|fe6a2b6564c0d4cfb3bbf1db813824ba|chip|'), undef, + '->parse() returns undef on failure'); +} qr/contains #/, + '->parse() fails when a field contains #'; + +warning_like { + my $parser = DataStore::File::Parser->new; + + is($parser->parse( + 'otis0123456.01|83002312|fe6a2b6564c0d4cfb3bbf1db813824ba|chip| # foo'), undef, + '->parse() returns undef on failure'); +} qr/contains #/, + '->parse() comments are not allowed after the last field'; + +{ + # multi-row example +my $example1 =<new->parse($example1); + + is(scalar @$results, 4, "correct number of item returned"); + + isa_ok(@$results[0], 'DataStore::File::Record'); + is(@$results[0]->fileid, 'otis0123456.01', 'correct fileid'); + is(@$results[0]->bytes, '83002312', 'correct datetime'); + is(@$results[0]->md5sum, 'fe6a2b6564c0d4cfb3bbf1db813824ba', 'correct md5'); + is(@$results[0]->type, 'chip', 'correct type'); + + isa_ok(@$results[1], 'DataStore::File::Record'); + is(@$results[1]->fileid, 'otis0123456.02', 'correct fileid'); + is(@$results[1]->bytes, '83002312', 'correct datetime'); + is(@$results[1]->md5sum, 'a2b4a7d7b94dc6076c5f3f67239a48c6', 'correct md5'); + is(@$results[1]->type, 'chip', 'correct type'); + + isa_ok(@$results[2], 'DataStore::File::Record'); + is(@$results[2]->fileid, 'otis0123456.03', 'correct fileid'); + is(@$results[2]->bytes, '83002312', 'correct datetime'); + is(@$results[2]->md5sum, 'a39b1510484c7833e27454b181f13981', 'correct md5'); + is(@$results[2]->type, 'chip', 'correct type'); + + isa_ok(@$results[3], 'DataStore::File::Record'); + is(@$results[3]->fileid, 'otis0123456.04', 'correct fileid'); + is(@$results[3]->bytes, '83002312', 'correct datetime'); + is(@$results[3]->md5sum, '7bb35e1e30f3f833c0416aea75f90304', 'correct md5'); + is(@$results[3]->type, 'chip', 'correct type'); +} + +{ + # example with blank lines & comments +my $example1 =<new->parse($example1); + + is(scalar @$results, 1, "correct number of item returned"); + + isa_ok(@$results[0], 'DataStore::File::Record'); + is(@$results[0]->fileid, 'otis0123456.01', 'correct fileid'); + is(@$results[0]->bytes, '83002312', 'correct datetime'); + is(@$results[0]->md5sum, 'fe6a2b6564c0d4cfb3bbf1db813824ba', 'correct md5'); + is(@$results[0]->type, 'chip', 'correct type'); +}