=================================================================== RCS file: /cvs/todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm 2010/01/19 03:18:34 1.8 +++ todotxt/Text-Todo-REST-API/lib/Text/Todo/REST/API.pm 2010/01/23 07:15:40 1.9 @@ -1,32 +1,18 @@ package Text::Todo::REST::API; -# $AFresh1: API.pm,v 1.7 2010/01/18 13:47:53 andrew Exp $ +# $AFresh1: API.pm,v 1.8 2010/01/19 03:18:34 andrew Exp $ use warnings; use strict; use Carp; -use Data::Dumper; use Text::Todo; use Class::Std::Utils; use Digest::MD5 qw/ md5_hex /; -use Module::Pluggable - instantiate => 'new', - search_path => __PACKAGE__ . '::Representations', - sub_name => 'representations'; - use version; our $VERSION = qv('0.0.1'); -&RegisterActionHandler( - 'GET', - [ list => 'get_list' ], - [ entry => 'get_entry' ], - [ tags => 'get_tags' ], - [ files => 'get_files' ], -); - { my @attr_refs = \( my %todo_of, @@ -35,10 +21,6 @@ my %file_regex_of, my %format_of, - my %user_of, - my %list_of, - my %action_of, - my %args_of, my %action_handlers, ); @@ -53,11 +35,6 @@ if ( $options->{format} ) { $format_of{$ident} = $options->{format}; } - elsif ($options->{path_info} - && $options->{path_info} =~ s/\.(\w+)$//xms ) - { - $format_of{$ident} = $1; - } $suffix_of{$ident} = $options->{suffix} || '.txt'; @@ -69,18 +46,6 @@ $ }ixms; - $options->{path_info} ||= q{}; - $options->{path_info} =~ s{^/}{}xms; - ( $list_of{$ident}, $action_of{$ident}, @{ $args_of{$ident} }, ) - = split '/', $options->{path_info}; - - if ( $list_of{$ident} ) { - $action_of{$ident} ||= 'list'; - } - else { - $action_of{$ident} = 'files'; - } - eval { $todo_of{$ident} = Text::Todo->new( { todo_dir => $options->{todo_dir}, @@ -92,56 +57,125 @@ $self->fail( 'Unable to create Text::Todo object' . $@ ); } - $todo_of{$ident}->load('todo_file') - or $self->fail('Unable to load todo_file in Text::Todo object'); - return $self; } - sub RegisterActionHandler { - my ( $handler, @types ) = @_; + sub _parse_options { + my ( $self, $method, @args ) = @_; - foreach my $type (@types) { - $action_handlers{$handler}{ $type->[0] } = $type->[1]; + my %options = ( + method => lc $method, + list => '', + action => 'files', + args => [], + ); + + if (@args) { + if ( !ref $args[0] ) { + $options{path} = shift @args; + } + + if ( ref $args[0] eq 'HASH' ) { + my $opts = shift @args; + foreach my $o ( keys %{$opts} ) { + $options{$o} = $opts->{$o}; + } + } } - return 1; - } + if ( exists $options{path} ) { + my %opts = $self->_split_path( $options{path} ); + delete $options{path}; - sub content_type {return} + foreach my $o ( keys %opts ) { + if ( defined $opts{$o} ) { + $options{$o} = $opts{$o}; + } + } + } - sub _handle_representation { - my ( $self, $type, @args ) = @_; + if ($options{action} eq 'entry' && @{ $options{args} }) { + $options{entry} = shift @{ $options{args} }; + if (@{ $options{args} }) { + $options{action} = lc shift @{ $options{args} }; + } + } - my $method = join q{_}, $type, $self->_action; + push @{ $options{args} }, @args; - foreach my $class ( $self->representations ) { - if ( $class->can_format( $self->_format ) - && $class->can( $method ) ) - { - return $class->$method($self->_format, @args); + $options{list} = defined $options{list} ? $options{list} : 'todo_file'; + + if ( $options{format} ) { + $format_of{ ident $self } = $options{format}; + delete $options{format}; + } + + my @method; + foreach my $o qw( method action ) { + if ( $options{$o} ) { + push @method, $options{$o}; } } + $method = join q{_}, @method; - return $self->fail( - 'Unable to ' . $type . ' [' . $self->_action . ']' ); + return $method, %options; } - sub Dump { + sub _handle_action { my ( $self, @args ) = @_; - return $self->_handle_representation( 'dump', @args ); + + my ($method, %options) = $self->_parse_options(@args); + + my $todo = $self->_todo; + $todo->load( $options{list} ); + + foreach my $class ( $self ) { + if ($class->can($method) ) { + return $class->$method( $todo, \%options ); + } + } + + return $self->fail( 'Unable to handle [' . $method . ']' ); } - sub _handle_action { - my ( $self, $method, $params ) = @_; + sub _split_path { + my ( $self, $path ) = @_; - if ( exists $action_handlers{$method}{ $self->_action } ) { - my $a = $action_handlers{$method}{ $self->_action }; - return $self->$a( $self->_args, $params ); + my %options = ( + list => undef, + action => undef, + args => [], + ); + + $path = defined $path ? $path : q{}; + $path =~ s{^/}{}xms; + + if ( $path =~ s/\.(\w+)$//xms ) { + $options{format} = $1; } - return $self->fail( - 'Unable to handle ' . $method . ' [' . $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 { @@ -150,7 +184,7 @@ } sub get_entry { - my ( $self, $key ) = @_; + my ( $self, $todo, $key ) = @_; if ( !$key ) { return $self->fail("get_entry requires arguments"); @@ -162,8 +196,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 ) { @@ -188,7 +230,7 @@ } sub get_list { - my ($self) = @_; + my ($self, $todo) = @_; my $line = 1; return map ( { @@ -196,12 +238,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'); @@ -217,10 +259,8 @@ } sub get_tags { - my ( $self, $tag ) = @_; - my $ident = ident($self); - - return $todo_of{$ident}->listtag($tag); + my ( $self, $todo, $tag ) = @_; + return $todo->listtag($tag); } sub POST { @@ -246,11 +286,7 @@ sub _todo { my ($self) = @_; return $todo_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 { my ($self) = @_;