=================================================================== RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo/Entry.pm,v retrieving revision 1.17 retrieving revision 1.26 diff -u -r1.17 -r1.26 --- 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/22 01:30:45 1.26 @@ -1,24 +1,26 @@ package Text::Todo::Entry; -# $RedRiver: Entry.pm,v 1.16 2010/01/10 22:49:53 andrew Exp $ +# $AFresh1: Entry.pm,v 1.25 2010/01/20 21:53:01 andrew Exp $ use warnings; use strict; use Carp; use Class::Std::Utils; -use List::Util qw/ first /; -use version; our $VERSION = qv('0.0.1'); +use version; our $VERSION = qv('0.1.1'); { - my %text_of; - my %tags_of; - my %priority_of; - my %completion_status_of; - my %known_tags_of; + my @attr_refs = \( + my %text_of, + 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* @@ -93,7 +95,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 +106,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; @@ -131,7 +133,10 @@ sub _is_in { my ( $self, $tags, $item ) = @_; - return defined first { $_ eq $item } $self->$tags; + foreach ($self->$tags) { + return 1 if $_ eq $item; + } + return 0; } sub text { @@ -172,6 +177,9 @@ $new =~ s/$priority_completion_regex//xms; if ( $self->done ) { + if ( $self->done !~ /^x/ixms ) { + push @new, 'x'; + } push @new, $self->done; } @@ -201,7 +209,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(); } @@ -213,6 +224,13 @@ return $completion_status_of{$ident}; } + sub DESTROY { + my ($self) = @_; + my $ident = ident $self; + foreach my $attr_ref (@attr_refs) { + delete $attr_ref->{$ident}; + } + } } 1; # Magic true value required at end of module __END__ @@ -227,7 +245,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.26 2010/01/22 01:30:45 andrew Exp $ =head1 SYNOPSIS @@ -386,16 +404,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