===================================================================
RCS file: /cvs/todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm,v
retrieving revision 1.14
retrieving revision 1.19
diff -u -r1.14 -r1.19
--- todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm	2010/01/26 05:05:00	1.14
+++ todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm	2010/02/16 06:12:26	1.19
@@ -1,6 +1,6 @@
 package Text::Todo::REST::API;
 
-# $AFresh1: API.pm,v 1.13 2010/01/26 04:30:13 andrew Exp $
+# $AFresh1: API.pm,v 1.18 2010/02/13 21:48:28 andrew Exp $
 
 use warnings;
 use strict;
@@ -66,26 +66,26 @@
     }
 
     sub _parse_options {
-        my ( $self, $method, @args ) = @_;
+        my ( $self, $method, @options) = @_;
 
         my %options = (
             method => lc $method,
             list   => '',
             action => 'files',
-            args   => [],
+            args   => {},
 
             suffix     => $self->_suffix,
             file_regex => $self->_file_regex,
             format     => $self->_format,
         );
 
-        if (@args) {
-            if ( !ref $args[0] ) {
-                $options{path} = shift @args;
+        if (@options) {
+            if ( !ref $options[0] ) {
+                $options{path} = shift @options;
             }
 
-            if ( ref $args[0] eq 'HASH' ) {
-                my $opts = shift @args;
+            if ( ref $options[0] eq 'HASH' ) {
+                my $opts = shift @options;
                 foreach my $o ( keys %{$opts} ) {
                     $options{$o} = $opts->{$o};
                 }
@@ -103,22 +103,21 @@
             }
         }
 
-        if ( $options{action} eq 'entry' && @{ $options{args} } ) {
-            $options{entry} = shift @{ $options{args} };
-            if ( @{ $options{args} } ) {
-                $options{action} .= q{_} . lc shift @{ $options{args} };
-            }
+        if ( $options{action} eq 'entry' && @{ $options{extra} } ) {
+            $options{action} .= q{_} . lc shift @{ $options{extra} };
         }
+	
+        push @{ $options{extra} }, @options;
 
-        push @{ $options{args} }, @args;
+        my $list = $self->_todo->file( $options{list} );
 
-        $options{list}
-            = defined $options{list} ? $options{list} : 'todo_file';
- 
-        if ($options{list} !~ /\Q $options{suffix} \E$/xms) {
-            $options{list} .= $options{suffix};
+        my $suffix = $self->_suffix || q{};
+        if ( $list !~ / \Q$suffix\E $/ixms ) {
+            $list .= $suffix;
         }
 
+        $options{list} = $list;
+
         if ( $options{format} ) {
             $format_of{ ident $self } = $options{format};
             delete $options{format};
@@ -161,9 +160,10 @@
         my ( $self, $path ) = @_;
 
         my %options = (
-            list   => undef,
             action => undef,
-            args   => [],
+            list   => undef,
+            entry  => undef,
+            extra  => [],
         );
 
         $path = defined $path ? $path : q{};
@@ -173,23 +173,24 @@
             $options{format} = $1;
         }
 
-        ( $options{list}, $options{action}, @{ $options{args} } ) = split '/',
-            $path;
+        ( $options{list}, $options{action}, 
+          @{ $options{extra} } ) = split '/', $path;
 
-        if ( $options{list} ) {
-            $options{action} ||= 'list';
-
-            if ( ( lc $options{list} ) eq 'files' ) {
-                $options{action} = lc $options{list};
-                $options{list}   = q{};
+        if (!defined $options{action}) {
+            if ( $options{list} ) {
+                $options{action} = 'list';
             }
-            elsif ( $self->_todo->file( $options{list} ) ) {
-                $options{list} = $self->_todo->file( $options{list} );
+            else {
+                $options{action} = 'files';
             }
         }
 
-        if ( @{ $options{args} } && ( lc $options{args}[0] ) eq 'entry' ) {
-            $options{action} = lc shift @{ $options{args} };
+        $options{action} = lc( $options{action} );
+
+        if ($options{action} eq 'entry'
+         || $options{action} eq 'tags'
+        ) {
+            $options{ $options{action} } = shift @{ $options{extra} };
         }
 
         return %options;