document and test new accepts idiom

mojolicious · Feb 7, 2014 · c5c4878 · c5c4878
1 parent 54b7670
commit c5c4878
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -138,6 +138,9 @@ if no preference could be detected.
   # Check if JSON is acceptable
   $self->render(json => {hello => 'world'}) if $self->accepts('json');
 
+  # Check if JSON was specifically requested
+  $self->render(json => {hello => 'world'}) if $self->accepts('', 'json');
+
   # Unsupported representation
   $self->render(data => '', status => 204)
     unless my $format = $self->accepts('html', 'json');

diff --git a/t/mojo/json.t b/t/mojo/json.t
@@ -289,6 +289,10 @@ is $json->encode({false => \!!$bytes}), '{"false":false}',
 is $json->encode({false => \$bytes}), '{"false":false}',
   'encode false boolean from reference';
 
+# Stringify booleans
+is(Mojo::JSON->true,  1, 'right value');
+is(Mojo::JSON->false, 0, 'right value');
+
 # Upgraded numbers
 my $num = 3;
 my $str = "$num";

diff --git a/t/mojolicious/restful_lite_app.t b/t/mojolicious/restful_lite_app.t
@@ -19,6 +19,11 @@ get '/accepts' => sub {
   $self->render(json => {best => $self->accepts('html', 'json', 'txt')});
 };
 
+get '/wants_json' => sub {
+  my $self = shift;
+  $self->render(json => {wants_json => \$self->accepts('', 'json')});
+};
+
 under '/rest';
 
 get sub {
@@ -84,6 +89,16 @@ $t->get_ok('/accepts' => {Accept => 'text/plain'})->status_is(200)
 $t->get_ok('/accepts.html?format=json' => {Accept => 'text/plain'})
   ->status_is(200)->json_is({best => 'txt'});
 
+# Nothing
+$t->get_ok('/wants_json')->status_is(200)->json_is({wants_json => 0});
+
+# Unsupported
+$t->get_ok('/wants_json.xml')->status_is(200)->json_is({wants_json => 0});
+
+# Accept "json"
+$t->get_ok('/wants_json' => {Accept => 'application/json'})->status_is(200)
+  ->json_is({wants_json => 1});
+
 # Ajax
 my $ajax = 'text/html;q=0.1,application/json';
 $t->get_ok(