Merge branch 'unparseable_expires' of https://github.com/boone/rack-c…

…ache into boone-unparseable_expires
rtomayko · Oct 8, 2015 · 20b6f5c · 20b6f5c
2 parents 4bd96f0 + 3913262
commit 20b6f5c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/lib/rack/cache/response.rb b/lib/rack/cache/response.rb
@@ -164,6 +164,8 @@ def max_age
     # The value of the Expires header as a Time object.
     def expires
       headers['Expires'] && Time.httpdate(headers['Expires'])
+    rescue ArgumentError
+      nil
     end
 
     # The number of seconds after which the response should no longer

diff --git a/test/response_test.rb b/test/response_test.rb
@@ -190,4 +190,19 @@
         ['Accept-Language', 'User-Agent', 'X-Foo']
     end
   end
+
+  describe '#expires' do
+    it 'returns nil if there is no Expires header' do
+      @res.headers['Expires'] = nil
+      @res.expires.should.be.nil
+    end
+    it 'returns a Time if the Expires header is parseable' do
+      @res.headers['Expires'] = "Mon, 30 Jun 2014 20:10:46 GMT"
+      @res.expires.should.equal Time.httpdate(@res.headers['Expires'])
+    end
+    it 'returns nil if the Expires header is not parseable' do
+      @res.headers['Expires'] = "Jun, 30 Mon 2014 20:10:46 GMT"
+      @res.expires.should.be.nil
+    end
+  end
 end