===================================================================
RCS file: /cvs/todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm,v
retrieving revision 1.2
retrieving revision 1.10
diff -u -r1.2 -r1.10
--- todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm	2010/01/17 23:15:00	1.2
+++ todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm	2010/01/24 04:17:39	1.10
@@ -1,61 +1,44 @@
 package Text::Todo::REST::API;
 
-# $AFresh1$
+# $AFresh1: API.pm,v 1.9 2010/01/23 07:15:40 andrew Exp $
 
 use warnings;
 use strict;
 use Carp;
 
-use Data::Dumper;
 use Text::Todo;
+use Text::Todo::REST::API::Response;
 
-use Class::Std;
+use Class::Std::Utils;
 use Digest::MD5 qw/ md5_hex /;
-use File::Spec;
 
 use version; our $VERSION = qv('0.0.1');
 
-&RegisterActionHandler(
-    'GET',
-    [ list  => 'get_list' ],
-    [ entry => 'get_entry' ],
-    [ tags  => 'get_tags' ],
-    [ files => 'get_files' ],
-);
-
 {
-    my (%todo_of,         %basedir_of,    %subdir_of,
-        %suffix_of,       %file_regex_of, %user_of,
-        %list_of,         %action_of,     %args_of,
-        %action_handlers, %format_handlers,
-    ) : ATTRS;
+    my @attr_refs = \(
+        my %todo_of,
 
-    sub BUILD {
-        my ( $self, $ident, $options ) = @_;
+        my %suffix_of,
+        my %file_regex_of,
 
-        my $format = $options->{default_format};
+        my %format_of,
+
+        my %action_handlers,
+    );
+
+    sub new {
+        my ( $class, $options ) = @_;
+
+        my $self = bless anon_scalar(), $class;
+        my $ident = ident($self);
+
+        $format_of{$ident} = $options->{default_format};
         if ( $options->{format} ) {
-            $format = $options->{format};
+            $format_of{$ident} = $options->{format};
         }
-        elsif ($options->{path_info}
-            && $options->{path_info} =~ s/\.(\w+)$//xms )
-        {
-            $format = $1;
-        }
 
-        if ( ref $self eq __PACKAGE__ && $format ) {
-            if ( $format_handlers{$format} ) {
-                bless $self, $format_handlers{$format};
-            }
-            else {
-                croak("Unable to find handler for [$format]\n");
-            }
-        }
+        $suffix_of{$ident} = $options->{suffix} || '.txt';
 
-        $basedir_of{$ident} = $options->{basedir};
-        $subdir_of{$ident}  = $options->{subdir};
-        $suffix_of{$ident}  = $options->{suffix} || '.txt';
-
         $file_regex_of{$ident} = $options->{file_regex} || qr{
             .*
             todo
@@ -64,95 +47,152 @@
             $
         }ixms;
 
-        if ( !$basedir_of{$ident} ) {
-            return $self->fail('Required option [basedir]');
+        eval {
+            $todo_of{$ident} = Text::Todo->new(
+                {   todo_dir  => $options->{todo_dir},
+                    todo_file => $options->{todo_file},
+                }
+            );
+        };
+        if ($@) {
+            $self->fail( 'Unable to create Text::Todo object' . $@ );
         }
 
-        $options->{path_info} ||= q{};
-        $options->{path_info} =~ s{^/}{}xms;
-        (   $user_of{$ident},   $list_of{$ident},
-            $action_of{$ident}, @{ $args_of{$ident} },
-        ) = split '/', $options->{path_info};
+        return $self;
+    }
 
-        if ( $list_of{$ident} ) {
-            $action_of{$ident} ||= 'list';
-        }
-        elsif ( $user_of{$ident} ) {
-            $action_of{$ident} = 'files';
-        }
+    sub _parse_options {
+        my ( $self, $method, @args ) = @_;
 
-        my @todo_dir = $basedir_of{$ident};
+        my %options = (
+            method => lc $method,
+            list   => '',
+            action => 'files',
+            args   => [],
+        );
 
-        my $todo_dir;
-        if ( $user_of{$ident} ) {
-            push @todo_dir, $user_of{$ident};
-            if ( $subdir_of{$ident} ) {
-                push @todo_dir, $subdir_of{$ident};
+        if (@args) {
+            if ( !ref $args[0] ) {
+                $options{path} = shift @args;
             }
 
-            $todo_dir = File::Spec->catdir(@todo_dir);
+            if ( ref $args[0] eq 'HASH' ) {
+                my $opts = shift @args;
+                foreach my $o ( keys %{$opts} ) {
+                    $options{$o} = $opts->{$o};
+                }
+            }
         }
 
-        my $todo_file;
-        if ( $list_of{$ident} ) {
-            $todo_file = $list_of{$ident} . $suffix_of{$ident};
+        if ( exists $options{path} ) {
+            my %opts = $self->_split_path( $options{path} );
+            delete $options{path};
+
+            foreach my $o ( keys %opts ) {
+                if ( defined $opts{$o} ) {
+                    $options{$o} = $opts{$o};
+                }
+            }
         }
 
-        $todo_of{$ident} = Text::Todo->new(
-            {   todo_dir  => $todo_dir,
-                todo_file => $todo_file,
+        if ( $options{action} eq 'entry' && @{ $options{args} } ) {
+            $options{entry} = shift @{ $options{args} };
+            if ( @{ $options{args} } ) {
+                $options{action} = lc shift @{ $options{args} };
             }
-        ) or $self->fail('Unable to create Text::Todo object');
+        }
 
-        $todo_of{$ident}->load('todo_file')
-            or $self->fail('Unable to create Text::Todo object');
+        push @{ $options{args} }, @args;
 
-        return;
-    }
+        $options{list}
+            = defined $options{list} ? $options{list} : 'todo_file';
 
-    sub RegisterFormatHandler {
-        my ( $handler, @types ) = @_;
+        if ( $options{format} ) {
+            $format_of{ ident $self } = $options{format};
+            delete $options{format};
+        }
 
-        foreach my $type (@types) {
-            $format_handlers{$type} = $handler;
+        my @method;
+        foreach my $o qw( method action ) {
+            if ( $options{$o} ) {
+                push @method, $options{$o};
+            }
         }
+        $method = join q{_}, @method;
 
-        return 1;
+        return $method, %options;
     }
 
-    sub RegisterActionHandler {
-        my ( $handler, @types ) = @_;
+    sub _handle_action {
+        my ( $self, @args ) = @_;
 
-        foreach my $type (@types) {
-            $action_handlers{$handler}{ $type->[0] } = $type->[1];
+        my ( $method, %options ) = $self->_parse_options(@args);
+
+        my $todo = $self->_todo;
+        $todo->load( $options{list} );
+
+        foreach my $class ($self) {
+            if ( $class->can($method) ) {
+                my @data = $class->$method( $todo, \%options );
+
+                return Text::Todo::REST::API::Response->new({
+                    type   => $options{action},
+                    format => $self->_format,
+                    data   => \@data,
+                });
+            }
         }
 
-        return 1;
+        return $self->fail( 'Unable to handle [' . $method . ']' );
     }
 
-    sub Dump {
-        my ($self) = @_;
-        return $self->fail( 'Unable to Dump [' . $self->_action . ']' );
-    }
+    sub _split_path {
+        my ( $self, $path ) = @_;
 
-    sub Load {
-        my ($self) = @_;
-        return $self->fail( 'Unable to Load [' . $self->_action . ']' );
-    }
+        my %options = (
+            list   => undef,
+            action => undef,
+            args   => [],
+        );
 
-    sub GET {
-        my ( $self, $params ) = @_;
+        $path = defined $path ? $path : q{};
+        $path =~ s{^/}{}xms;
 
-        if ( exists $action_handlers{GET}{ $self->_action } ) {
-            my $method = $action_handlers{GET}{ $self->_action };
-            return $self->$method( $self->_args, $params );
+        if ( $path =~ s/\.(\w+)$//xms ) {
+            $options{format} = $1;
         }
 
-        return $self->fail( 'Unable to handle GET [' . $self->_action . ']' );
+        ( $options{list}, $options{action}, @{ $options{args} } ) = split '/',
+            $path;
+
+        if ( $options{list} ) {
+            $options{action} ||= 'list';
+
+            my $suffix = $self->_suffix;
+
+            if ( ( lc $options{list} ) eq 'files' ) {
+                $options{action} = lc $options{list};
+                $options{list}   = q{};
+            }
+            elsif ( $self->_todo->file( $options{list} ) ) {
+                $options{list} = $self->_todo->file( $options{list} );
+            }
+        }
+
+        if ( @{ $options{args} } && ( lc $options{args}[0] ) eq 'entry' ) {
+            $options{action} = lc shift @{ $options{args} };
+        }
+
+        return %options;
     }
 
+    sub GET {
+        my ( $self, @args ) = @_;
+        return $self->_handle_action( 'GET', @args );
+    }
+
     sub get_entry {
-        my ( $self, $key ) = @_;
+        my ( $self, $todo, $key ) = @_;
 
         if ( !$key ) {
             return $self->fail("get_entry requires arguments");
@@ -164,8 +204,16 @@
             }
             return @entries;
         }
+        elsif ( ref $key eq 'HASH' ) {
+            if ( exists $key->{entry} ) {
+                $key = $key->{entry};
+            }
+            else {
+                return $self->fail('get_entry requires key [entry]');
+            }
+        }
 
-        my @list = $self->get_list;
+        my @list = $self->get_list($todo);
 
         my $entry;
         if ( $key =~ /^[[:xdigit:]]{32}$/xms ) {
@@ -190,7 +238,7 @@
     }
 
     sub get_list {
-        my ($self) = @_;
+        my ( $self, $todo ) = @_;
 
         my $line = 1;
         return map ( {
@@ -198,12 +246,12 @@
                 md5  => md5_hex( $_->text ),
                 text => $_->text,
             },
-            $self->_todo->list );
+            $todo->list );
     }
 
     sub get_files {
-        my ($self) = @_;
-        my $dir = $self->_todo->file('todo_dir');
+        my ( $self, $todo ) = @_;
+        my $dir = $todo->file('todo_dir');
 
         if ( !$dir ) {
             return $self->fail('Unable to find todo_dir');
@@ -219,31 +267,42 @@
     }
 
     sub get_tags {
-        my ( $self, $tag ) = @_;
-        my $ident = ident($self);
+        my ( $self, $todo, $tag ) = @_;
+        return $todo->listtag($tag);
+    }
 
-        return $todo_of{$ident}->listtag($tag);
+    sub POST {
+        my ( $self, @args ) = @_;
+        return $self->_handle_action( 'POST', @args );
     }
 
-    sub POST   { croak "Unsupported [POST]" }
-    sub PUT    { croak "Unsupported [PUT]" }
-    sub DELETE { croak "Unsupported [DELETE]" }
+    sub PUT {
+        my ( $self, @args ) = @_;
+        return $self->_handle_action( 'PUT', @args );
+    }
 
+    sub DELETE {
+        my ( $self, @args ) = @_;
+        return $self->_handle_action( 'DELETE', @args );
+    }
+
     sub fail {
         my ( $self, @message ) = @_;
         croak(@message);
     }
 
     sub _todo       { my ($self) = @_; return $todo_of{ ident $self }; }
-    sub _basedir    { my ($self) = @_; return $basedir_of{ ident $self}; }
-    sub _subdir     { my ($self) = @_; return $subdir_of{ ident $self}; }
     sub _suffix     { my ($self) = @_; return $suffix_of{ ident $self}; }
     sub _file_regex { my ($self) = @_; return $file_regex_of{ ident $self}; }
-    sub _user       { my ($self) = @_; return $user_of{ ident $self}; }
-    sub _list       { my ($self) = @_; return $list_of{ ident $self}; }
-    sub _action     { my ($self) = @_; return $action_of{ ident $self}; }
-    sub _args       { my ($self) = @_; return $args_of{ ident $self}; }
+    sub _format     { my ($self) = @_; return $format_of{ ident $self}; }
 
+    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__