===================================================================
RCS file: /cvs/todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -r1.6 -r1.8
--- todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm	2010/01/18 03:51:40	1.6
+++ todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm	2010/01/19 03:18:34	1.8
@@ -1,6 +1,6 @@
 package Text::Todo::REST::API;
 
-# $AFresh1: API.pm,v 1.5 2010/01/18 03:10:42 andrew Exp $
+# $AFresh1: API.pm,v 1.7 2010/01/18 13:47:53 andrew Exp $
 
 use warnings;
 use strict;
@@ -10,12 +10,12 @@
 use Text::Todo;
 
 use Class::Std::Utils;
+use Digest::MD5 qw/ md5_hex /;
+
 use Module::Pluggable
-    require     => 1,
+    instantiate => 'new',
     search_path => __PACKAGE__ . '::Representations',
     sub_name    => 'representations';
-use Digest::MD5 qw/ md5_hex /;
-use File::Spec;
 
 use version; our $VERSION = qv('0.0.1');
 
@@ -31,12 +31,10 @@
     my @attr_refs = \(
         my %todo_of,
 
-        my %basedir_of,
-        my %subdir_of,
-
         my %suffix_of,
         my %file_regex_of,
 
+        my %format_of,
         my %user_of,
         my %list_of,
         my %action_of,
@@ -48,37 +46,21 @@
     sub new {
         my ( $class, $options ) = @_;
 
-        my $format = $options->{default_format};
+        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;
+            $format_of{$ident} = $1;
         }
 
-        my $self = bless anon_scalar(), $class;
-        my $ident = ident($self);
+        $suffix_of{$ident} = $options->{suffix} || '.txt';
 
-        if ( ref $self eq __PACKAGE__ && $format ) {
-            my $found_handler = 0;
-        REP: foreach my $rep ( $self->representations ) {
-                if ( $rep->_handles($format) ) {
-                    $self          = $rep->new($options);
-                    $found_handler = 1;
-                    last REP;
-                }
-            }
-            if ( !$found_handler ) {
-                croak("Unable to find handler for [$format]\n");
-            }
-        }
-
-        $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
@@ -87,48 +69,31 @@
             $
         }ixms;
 
-        if ( !$basedir_of{$ident} ) {
-            return $self->fail('Required option [basedir]');
-        }
-
         $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};
+        ( $list_of{$ident}, $action_of{$ident}, @{ $args_of{$ident} }, )
+            = split '/', $options->{path_info};
 
         if ( $list_of{$ident} ) {
             $action_of{$ident} ||= 'list';
         }
-        elsif ( $user_of{$ident} ) {
+        else {
             $action_of{$ident} = 'files';
         }
 
-        my @todo_dir = $basedir_of{$ident};
-
-        my $todo_dir;
-        if ( $user_of{$ident} ) {
-            push @todo_dir, $user_of{$ident};
-            if ( $subdir_of{$ident} ) {
-                push @todo_dir, $subdir_of{$ident};
-            }
-
-            $todo_dir = File::Spec->catdir(@todo_dir);
+        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' . $@ );
         }
 
-        my $todo_file;
-        if ( $list_of{$ident} ) {
-            $todo_file = $list_of{$ident} . $suffix_of{$ident};
-        }
-
-        $todo_of{$ident} = Text::Todo->new(
-            {   todo_dir  => $todo_dir,
-                todo_file => $todo_file,
-            }
-        ) or $self->fail('Unable to create Text::Todo object');
-
         $todo_of{$ident}->load('todo_file')
-            or $self->fail('Unable to create Text::Todo object');
+            or $self->fail('Unable to load todo_file in Text::Todo object');
 
         return $self;
     }
@@ -145,14 +110,26 @@
 
     sub content_type {return}
 
-    sub Dump {
-        my ($self) = @_;
-        return $self->fail( 'Unable to Dump [' . $self->_action . ']' );
+    sub _handle_representation {
+        my ( $self, $type, @args ) = @_;
+
+        my $method = join q{_}, $type, $self->_action;
+
+        foreach my $class ( $self->representations ) {
+            if (   $class->can_format( $self->_format )
+                && $class->can( $method ) )
+            {
+                return $class->$method($self->_format, @args);
+            }
+        }
+
+        return $self->fail(
+            'Unable to ' . $type . ' [' . $self->_action . ']' );
     }
 
-    sub Load {
-        my ($self) = @_;
-        return $self->fail( 'Unable to Load [' . $self->_action . ']' );
+    sub Dump {
+        my ( $self, @args ) = @_;
+        return $self->_handle_representation( 'dump', @args );
     }
 
     sub _handle_action {
@@ -267,13 +244,12 @@
     }
 
     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 _format     { my ($self) = @_; return $format_of{ ident $self}; }
     sub _args       { my ($self) = @_; return $args_of{ ident $self}; }
 
     sub DESTROY {