Skip to content

Commit

Permalink
Merge branch 'release/1.2002_02'
Browse files Browse the repository at this point in the history
  • Loading branch information
xsawyerx committed Dec 8, 2010
2 parents 740eb7a + 19b08e3 commit 70d1d69
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
8 changes: 8 additions & 0 deletions CHANGES
@@ -1,3 +1,11 @@
Dancer 1.2002_02
[ Danijel Tasov ]
* Correct HTTP.pm POD's 503 entry with 403.

[ Paul Tomlin ]
* Tests for URI object in uri_for.
* Update Plack middleware tests compatibility.

Dancer 1.2002_01
[ Joel Roth ]
* Code fixes in documentation (Dancer::Session, Dancer::Introduction).
Expand Down
2 changes: 1 addition & 1 deletion lib/Dancer.pm
Expand Up @@ -31,7 +31,7 @@ use File::Basename 'basename';
use base 'Exporter';

$AUTHORITY = 'SUKRIA';
$VERSION = '1.2002_01';
$VERSION = '1.2002_02';
@EXPORT = qw(
after
any
Expand Down
8 changes: 4 additions & 4 deletions lib/Dancer/HTTP.pm
Expand Up @@ -103,6 +103,10 @@ from a Dancer script.
returns 200 OK, alias : 'ok'
=head2 403
returns 403 Forbidden, alias 'forbidden'
=head2 404
returns 404 Not Found, alias : 'not_found'
Expand All @@ -111,10 +115,6 @@ returns 404 Not Found, alias : 'not_found'
returns 500 Internal Server Error, alias: 'error'
=head2 503
returns 503 Forbidden, alias 'forbidden'
=head1 AUTHOR
This module has been written by Alexis Sukrieh <sukria@cpan.org>
Expand Down
4 changes: 3 additions & 1 deletion t/02_request/12_base.t
@@ -1,7 +1,7 @@
use Test::More;
use Dancer::Request;

plan tests => 8;
plan tests => 10;

my $env = {
'psgi.url_scheme' => 'http',
Expand All @@ -22,6 +22,8 @@ is $req->uri_for('bar', { baz => 'baz' }),
'http://localhost:5000/foo/bar?baz=baz';

is $req->uri_for('/bar'), 'http://localhost:5000/foo/bar';
ok $req->uri_for('/bar')->isa('URI'), 'uri_for returns a URI';
ok $req->uri_for('/bar', undef, 1)->isa('URI'), 'uri_for returns a URI (with $dont_escape)';

is $req->request_uri, '/foo/bar/baz';
is $req->path_info, '/bar/baz';
Expand Down
2 changes: 1 addition & 1 deletion t/07_apphandlers/05_psgi_api.t
Expand Up @@ -30,7 +30,7 @@ my $app = sub {
$handler->handle_request($request);
};

setting 'plack_middlewares' => { 'Runtime' => [], };
setting 'plack_middlewares' => [['Runtime']];
setting 'public' => '.';

ok $app = $handler->apply_plack_middlewares($app);
Expand Down

0 comments on commit 70d1d69

Please sign in to comment.