=================================================================== RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo/Entry.pm,v retrieving revision 1.17 retrieving revision 1.21 diff -u -r1.17 -r1.21 --- todotxt/Text-Todo/lib/Text/Todo/Entry.pm 2010/01/11 01:08:35 1.17 +++ todotxt/Text-Todo/lib/Text/Todo/Entry.pm 2010/01/18 00:19:55 1.21 @@ -1,24 +1,20 @@ package Text::Todo::Entry; -# $RedRiver: Entry.pm,v 1.16 2010/01/10 22:49:53 andrew Exp $ +# $AFresh1: Entry.pm,v 1.20 2010/01/12 20:09:02 andrew Exp $ use warnings; use strict; use Carp; -use Class::Std::Utils; +use Class::Std; use List::Util qw/ first /; use version; our $VERSION = qv('0.0.1'); { - my %text_of; + my ( %text_of, %tags_of, %priority_of, %completion_status_of, + %known_tags_of, ) : ATTR; - my %tags_of; - my %priority_of; - my %completion_status_of; - my %known_tags_of; - # XXX Should the completion (x) be case sensitive? my $priority_completion_regex = qr{ ^ \s* @@ -26,12 +22,9 @@ (?i:\( ([A-Z]) \) \s*)? }xms; - sub new { - my ( $class, $options ) = @_; + sub BUILD { + my ( $self, $ident, $options ) = @_; - my $self = bless anon_scalar(), $class; - my $ident = ident($self); - if ( !ref $options ) { $options = { text => $options }; } @@ -93,7 +86,7 @@ = $text =~ / $priority_completion_regex /xms; $completion_status_of{$ident} = _clean_completed($completed); - $priority_of{$ident} = $priority; + $priority_of{$ident} = $priority; return 1; } @@ -104,11 +97,11 @@ $completed ||= q{}; $completed =~ s/^\s+|\s+$//gxms; - if (!$completed) { + if ( !$completed ) { return; } - if ($completed =~ s/(x)\s*//ixms) { + if ( $completed =~ s/(x)\s*//ixms ) { my $status = $1; if ($completed) { return $completed; @@ -172,6 +165,9 @@ $new =~ s/$priority_completion_regex//xms; if ( $self->done ) { + if ( $self->done !~ /^x/ixms ) { + push @new, 'x'; + } push @new, $self->done; } @@ -201,7 +197,10 @@ return 1; } - $completion_status_of{$ident} = 'x'; + $completion_status_of{$ident} = sprintf "%04d-%02d-%02d", + ( (localtime)[5] + 1900 ), + ( (localtime)[4] + 1 ), + ( (localtime)[3] ); return $self->prepend(); } @@ -227,7 +226,7 @@ Since the $VERSION can't be automatically included, here is the RCS Id instead, you'll have to look up $VERSION. - $Id: Entry.pm,v 1.17 2010/01/11 01:08:35 andrew Exp $ + $Id: Entry.pm,v 1.21 2010/01/18 00:19:55 andrew Exp $ =head1 SYNOPSIS @@ -253,7 +252,7 @@ =head1 INTERFACE -=head2 new +=head2 BUILD Creates an entry that can be manipulated. @@ -386,16 +385,19 @@ $entry->do; -Does this by prepending an 'x' to the beginning of the entry. +Does this by prepending "x `date '%Y-%m-%d'`" to the beginning of the entry. =head2 done Returns true if an entry is marked complete and false if not. - - if (!$entry->done) { + + if (!my $status = $entry->done) { # remind me to do it } +If the entry starts as 'x date', for example 'x 2010-01-01', $status is now +'2010-01-01'. +If the entry just starts with 'x', then $status will be 'x'. =head1 DIAGNOSTICS