===================================================================
RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo/Entry.pm,v
retrieving revision 1.2
retrieving revision 1.10
diff -u -r1.2 -r1.10
--- todotxt/Text-Todo/lib/Text/Todo/Entry.pm	2009/07/10 23:28:28	1.2
+++ todotxt/Text-Todo/lib/Text/Todo/Entry.pm	2010/01/09 07:07:31	1.10
@@ -1,6 +1,6 @@
 package Text::Todo::Entry;
 
-# $RedRiver: Entry.pm,v 1.1 2009/07/10 22:26:14 andrew Exp $
+# $RedRiver: Entry.pm,v 1.9 2010/01/08 17:41:56 andrew Exp $
 
 use warnings;
 use strict;
@@ -14,10 +14,42 @@
 {
     my %text_of;
 
-    my %contexts_of;
-    my %projects_of;
+    my %tags_of;
     my %priority_of;
+    my %completion_status_of;
 
+    my %tags = (
+        context => q{@},
+        project => q{+},
+    );
+
+    # XXX Should the completion (x) be case sensitive?
+    my $priority_completion_regex = qr/
+        ^ \s*
+        (?i:   (x)        \s+)?
+        (?i:\( ([A-Z]) \) \s+)?
+    /xms;
+
+    for my $tag ( keys %tags ) {
+        ## no critic strict
+        no strict 'refs';    # Violates use strict, but allows code generation
+        ## use critic
+
+        *{ $tag . 's' } = sub {
+            my ($self) = @_;
+            return $self->_tags($tag);
+        };
+
+        *{ 'in_' . $tag } = sub {
+            my ( $self, $item ) = @_;
+            return $self->_is_in( $tag . 's', $item );
+        };
+    }
+
+    sub replace { _update_entry(@_) }
+    sub depri   { _set_priority( @_, '' ) }
+    sub pri     { _set_priority(@_) }
+
     sub new {
         my ( $class, $text ) = @_;
 
@@ -37,87 +69,106 @@
 
         $text_of{$ident} = $text;
 
-        %{ $contexts_of{$ident} } = map { $_ => q{} } $text =~ /\@ (\S+)/gxms;
-        %{ $projects_of{$ident} } = map { $_ => q{} } $text =~ /\+ (\S+)/gxms;
-        ( $priority_of{$ident} ) = $text =~ /\( ([A-Z]) \)/ixms;
+        foreach my $tag ( keys %tags ) {
+            my $symbol = quotemeta $tags{$tag};
+            $tags_of{$ident}{$tag} = { map { $_ => q{} }
+                    $text =~ / (?:^|\s) $symbol  (\S+)/gxms };
+        }
+        ( $completion_status_of{$ident}, $priority_of{$ident} )
+            = $text =~ / $priority_completion_regex /xms;
 
         return 1;
     }
 
-    sub text {
-        my ($self) = @_;
+    sub _tags {
+        my ( $self, $tag ) = @_;
         my $ident = ident($self);
 
-        return $text_of{$ident};
+        my @tags = sort keys %{ $tags_of{$ident}{$tag} };
+        return wantarray ? @tags : \@tags;
     }
 
-    sub contexts {
+    sub _is_in {
+        my ( $self, $tags, $item ) = @_;
+        return defined first { $_ eq $item } $self->$tags;
+    }
+
+    sub text {
         my ($self) = @_;
         my $ident = ident($self);
 
-        my @contexts = sort keys %{ $contexts_of{$ident} };
-        return wantarray ? @contexts : \@contexts;
+        return $text_of{$ident};
     }
 
-    sub in_context {
-        my ( $self, $context ) = @_;
-        return $self->_is_in( $context, 'contexts' );
-    }
-
-    sub projects {
-        my ($self) = @_;
+    sub _set_priority {
+        my ( $self, $new_pri ) = @_;
         my $ident = ident($self);
 
-        my @projects = sort keys %{ $projects_of{$ident} };
-        return wantarray ? @projects : \@projects;
-    }
+        if ( $new_pri !~ /^[a-zA-Z]?$/xms ) {
+            croak "Invalid priority [$new_pri]";
+        }
 
-    sub in_project {
-        my ( $self, $project ) = @_;
-        return $self->_is_in( $project, 'projects' );
+        $priority_of{$ident} = $new_pri;
+
+        return $self->prepend();
     }
 
     sub priority {
-        my ($self) = @_;
+        my ( $self, $new_pri ) = @_;
         my $ident = ident($self);
 
         return $priority_of{$ident};
     }
 
-    sub _is_in {
-        my ( $self, $item, $type ) = @_;
-        my $ident = ident($self);
-
-        return defined first { $_ eq $item } $self->$type;
-    }
-
-    sub change {
-        my ( $self, $text ) = @_;
-        return $self->_update_entry($text);
-    }
-
     sub prepend {
         my ( $self, $addition ) = @_;
 
         my $new = $self->text;
+        my @new;
 
-        if ( my $priority = $self->priority ) {
-            $new =~ s/^( \s* \( $priority \))/$1 $addition/xms;
+        $new =~ s/$priority_completion_regex//xms;
+
+        if ( $self->done ) {
+            push @new, $self->done;
         }
-        else {
-            $new = join q{ }, $addition, $new;
+
+        if ( $self->priority ) {
+            push @new, '(' . $self->priority . ')';
         }
 
-        return $self->change($new);
+        if ( defined $addition && length $addition ) {
+            push @new, $addition;
+        }
+
+        return $self->_update_entry( join q{ }, @new, $new );
     }
 
     sub append {
         my ( $self, $addition ) = @_;
-        return $self->change( join q{ }, $self->text, $addition );
+        return $self->_update_entry( join q{ }, $self->text, $addition );
     }
 
-}
+    sub do {
+        my ($self) = @_;
+        my $ident = ident($self);
 
+        if ( $self->done ) {
+            return 1;
+        }
+
+        $completion_status_of{$ident} = 'x';
+
+        return $self->prepend();
+    }
+
+    sub done {
+        my ($self) = @_;
+        my $ident = ident($self);
+
+        return $completion_status_of{$ident};
+    }
+
+}
 1;    # Magic true value required at end of module
 __END__
 
@@ -170,12 +221,19 @@
 
 =head2 in_project
 
-=head2 change
+=head2 replace
 
 =head2 prepend
 
 =head2 append
 
+=head2 do
+
+=head2 done
+
+=head2 pri
+
+=head2 depri
 
 =head1 DIAGNOSTICS