a few more is_fresh tests

mojolicious · Aug 6, 2014 · b7c67a4 · b7c67a4
1 parent 19a8da6
commit b7c67a4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -282,7 +282,7 @@ Alias for C<Mojolicious::Controller/"render_to_string">.
   my $bool = $c->is_fresh(last_modified => $epoch);
 
 Check freshness of response by comparing the C<If-None-Match> and
-C<If-Modified-Since> request headers with the C<ETag> and C<Last-Modified>
+C<If-Modified-Since> request headers to the C<ETag> and C<Last-Modified>
 response headers with L<Mojolicious::Static/"is_fresh">.
 
   # Add ETag header and check freshness before rendering

diff --git a/lib/Mojolicious/Static.pm b/lib/Mojolicious/Static.pm
@@ -84,11 +84,11 @@ sub serve_asset {
   my ($self, $c, $asset) = @_;
 
   # Last-Modified and ETag
-  my $mtime = $asset->is_file ? (stat $asset->path)[9] : $MTIME;
   my $res = $c->res;
   $res->code(200)->headers->accept_ranges('bytes');
-  return $res->code(304)
-    if $self->is_fresh($c, {etag => md5_sum($mtime), last_modified => $mtime});
+  my $mtime = $asset->is_file ? (stat $asset->path)[9] : $MTIME;
+  my $options = {etag => md5_sum($mtime), last_modified => $mtime};
+  return $res->code(304) if $self->is_fresh($c, $options);
 
   # Range
   my $size = $asset->size;
@@ -213,7 +213,7 @@ protect from traversing to parent directories.
   my $bool = $static->is_fresh(Mojolicious::Controller->new, {etag => 'abc'});
 
 Check freshness of response by comparing the C<If-None-Match> and
-C<If-Modified-Since> request headers with the C<ETag> and C<Last-Modified>
+C<If-Modified-Since> request headers to the C<ETag> and C<Last-Modified>
 response headers.
 
 These options are currently available:
@@ -224,13 +224,13 @@ These options are currently available:
 
   etag => 'abc'
 
-Add C<ETag> header.
+Add C<ETag> header before comparing.
 
 =item last_modified
 
   last_modified => $epoch
 
-Add C<Last-Modified> header.
+Add C<Last-Modified> header before comparing.
 
 =back
 

diff --git a/t/mojolicious/static_lite_app.t b/t/mojolicious/static_lite_app.t
@@ -39,6 +39,10 @@ ok $c->is_fresh(etag => 'abc', last_modified => $date->epoch),
   'content is fresh';
 is $c->res->headers->etag,          '"abc"', 'right "ETag" value';
 is $c->res->headers->last_modified, "$date", 'right "Last-Modified" value';
+$c = $t->app->build_controller;
+ok !$c->is_fresh(last_modified => $date->epoch), 'content is stale';
+is $c->res->headers->etag,          undef,   'no "ETag" value';
+is $c->res->headers->last_modified, "$date", 'right "Last-Modified" value';
 
 # Static file
 $t->get_ok('/hello.txt')->status_is(200)