@@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Komodo Project File - DO NOT EDIT --> -<project id="b72b9183-37e2-407e-9b95-ec64ccfca0e5" kpf_version="4" name="Mango.kpf"> -<preference-set idref="b72b9183-37e2-407e-9b95-ec64ccfca0e5"> - <string id="import_exclude_matches">*.*~;*.bak;*.tmp;CVS;.#*;*.pyo;*.pyc;.svn;*%*;tmp*.html;.DS_Store;blib;inc;Makefile;var</string> - <boolean id="import_recursive">1</boolean> - <string id="rubyExtraPaths"></string> - <string id="phpExtraPaths"></string> - <string id="pythonExtraPaths"></string> - <string relative="path" id="perlExtraPaths">lib:/home/claco/CPAN/Mango/t/lib:/home/claco/CPAN/Mango/inc:/Users/claco/Documents/Mango/t/lib;C:/Development/CPAN/Mango/lib</string> - <boolean id="import_live">1</boolean> - <string id="import_type">useFolders</string> - <string id="mappedPaths"></string> - <string id="import_include_matches"></string> - <string id="javascriptExtraPaths"></string> -</preference-set> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Komodo Project File - DO NOT EDIT --> +<project id="b72b9183-37e2-407e-9b95-ec64ccfca0e5" kpf_version="4" name="Mango.kpf"> +<preference-set idref="b72b9183-37e2-407e-9b95-ec64ccfca0e5"> + <string id="import_exclude_matches">*.*~;*.bak;*.tmp;CVS;.#*;*.pyo;*.pyc;.svn;*%*;tmp*.html;.DS_Store;blib;inc;Makefile;var</string> + <boolean id="import_recursive">1</boolean> + <string id="rubyExtraPaths"></string> + <string id="phpExtraPaths"></string> + <string id="pythonExtraPaths"></string> + <string relative="path" id="perlExtraPaths">lib:/home/claco/CPAN/Mango/t/lib:/home/claco/CPAN/Mango/inc:/Users/claco/Documents/Mango/t/lib:/Development/CPAN/Mango/lib</string> + <boolean id="import_live">1</boolean> + <string id="import_type">useFolders</string> + <string id="mappedPaths"></string> + <string id="import_include_matches"></string> + <string id="javascriptExtraPaths"></string> +</preference-set> +</project> Mango.kpf @@ -121,6 +121,10 @@ sub add_config { $config->{'default_view'} = 'XHTML'; $config->{'authorization'}->{'mango'}->{'admin_role'} = $self->{'adminrole'}; +$config->{cache}->{backend} = { + store => "Memory", +}; + YAML::DumpFile($file, $config); return; lib/Catalyst/Helper/Mango.pm @@ -12,12 +12,14 @@ sub _parse_PathPrefix_attr { return PathPart => $self->path_prefix; }; -sub page { - return shift->context->request->param('page') || 1; +sub current_page { + my $c = shift->context; + return $c->request->param('current_page') || 1; }; -sub rows { - return shift->context->request->param('rows') || 10; +sub entries_per_page { + my $c = shift->context; + return $c->request->param('entries_per_page') || 10; }; 1; \ No newline at end of file lib/Mango/Catalyst/Controller.pm @@ -6,6 +6,7 @@ use warnings; BEGIN { use base qw/Catalyst::Controller::REST/; use MIME::Types; + use Scalar::Util qw/blessed/; }; __PACKAGE__->config( @@ -78,10 +79,18 @@ sub begin : Private { }; sub entity { - my ($self, $data) = @_; + my ($self, $data, $pager) = @_; my $key = $self->{'serialize'}->{'stash_key'}; if (defined $data) { + if (blessed $pager && $pager->isa('Data::Page')) { + $data->{'current_page'} = $pager->current_page; + $data->{'entries_per_page'} = $pager->entries_per_page; + $data->{'total_entries'} = $pager->total_entries; + $data->{'first_page'} = $pager->first_page; + $data->{'last_page'} = $pager->last_page; + }; + $self->context->stash->{$key} = $data; }; lib/Mango/Catalyst/Controller/REST.pm @@ -31,8 +31,8 @@ returns a collection of user data. sub index_GET : Private { my ($self, $c) = @_; my $users = $c->model('Users')->search(undef, { - page => $self->page, - rows => $self->rows + page => $self->current_page, + rows => $self->entries_per_page }); my $pager = $users->pager; @@ -46,7 +46,7 @@ sub index_GET : Private { $self->entity({ users => \@users - }); + }, $pager); }; }; lib/Mango/Catalyst/Controller/Users.pm @@ -9,6 +9,8 @@ BEGIN { Mango::Catalyst::Plugin::Authentication Mango::Catalyst::Plugin::I18N Mango::Catalyst::Plugin::Forms + Catalyst::Plugin::Cache + Catalyst::Plugin::Cache::Store::Memory /; }; lib/Mango/Catalyst/Plugin/Application.pm @@ -5,7 +5,7 @@ use warnings; our $VERSION = $Mango::VERSION; BEGIN { - use base qw/Catalyst::Plugin::Authentication/; + use base qw/Catalyst::Plugin::Authentication Catalyst::Plugin::Authentication::Credential::HTTP/; use Mango (); use Mango::I18N (); @@ -41,9 +41,10 @@ sub is_admin { sub unauthorized { my $c = shift; - $c->response->status(401); - $c->stash->{'template'} = 'errors/401'; - $c->detach; + $c->response->status(401); + $c->stash->{'template'} = 'errors/401'; + $c->authorization_required(realm => $c->config->{'authentication'}->{'default_realm'}); + $c->detach; }; 1; lib/Mango/Catalyst/Plugin/Authentication.pm @@ -44,26 +44,71 @@ BEGIN { }; -## index is only allowed in html/xhtml/text +## GET /users { my $m = Test::WWW::Mechanize::Catalyst->new; - ## using friendly view name + ## REST using friendly view name my $r = $m->get('/users/?view=yaml'); - is($r->code, 400); + is($r->code, 200); is($r->header('Content-Type'), 'text/x-yaml'); - diag $r->content; + is_deeply(YAML::Load($r->content), { + users => [ + {id => 1, username => 'admin'} + ], + current_page => 1, + entries_per_page => 10, + total_entries => 1, + first_page => 1, + last_page => 1 + }); - ## using content-type param + ## REST using content-type param $r = $m->get('/users/?content-type=text/x-yaml'); - is($r->code, 400); + is($r->code, 200); is($r->header('Content-Type'), 'text/x-yaml'); - diag $r->content; + is_deeply(YAML::Load($r->content), { + users => [ + {id => 1, username => 'admin'} + ], + current_page => 1, + entries_per_page => 10, + total_entries => 1, + first_page => 1, + last_page => 1 + }); - ## using Content-Type header + ## REST using Content-Type header $m->add_header('Content-Type', 'text/x-yaml'); $r = $m->get('/users/'); - is($r->code, 400); + is($r->code, 200); is($r->header('Content-Type'), 'text/x-yaml'); - diag $r->content; + is_deeply(YAML::Load($r->content), { + users => [ + {id => 1, username => 'admin'} + ], + current_page => 1, + entries_per_page => 10, + total_entries => 1, + first_page => 1, + last_page => 1 + }); }; + + +## POST /users +{ + my $m = Test::WWW::Mechanize::Catalyst->new; + +#$m->credentials( 'localhost:3000', $realm, $uname, $pass ) + + ## access denied for anonymous users + my $r = $m->post('/users/?view=yaml'); + diag $r->as_string; + is($r->code, 401); + is($r->header('Content-Type'), 'text/x-yaml'); +}; + + + + t/catalyst/live_rest_users.t 6045c3ac40244838f5763d3ecf260b4087891dc7 claco claco@52a70e3a-55ec-0310-b14e-7917f69ecacc http://github.com/claco/mango/commit/affdd1edc23110ebdd8679a2754e66d31a5787ab affdd1edc23110ebdd8679a2754e66d31a5787ab 2007-11-08T19:42:18-08:00 2007-11-08T19:42:18-08:00 r2001@mbp: claco | 2007-11-08 22:44:18 -0500 Added HTTP Auth to unauthorized REST->entity now takes $pager param git-svn-id: http://svn.icantfocus.com/CPAN/Mango/trunk@1990 52a70e3a-55ec-0310-b14e-7917f69ecacc 76e49463187cbf353307d51beda3c223eb93addb claco claco@52a70e3a-55ec-0310-b14e-7917f69ecacc