rack-wwwhisper 1.0.4 → 1.0.5

data/lib/rack/wwwhisper.rb

@@ -19,10 +19,14 @@ class NoPublicCache
     status, headers, body = @app.call(env)
     if cache_control = headers['Cache-Control']
       # If caching is enabled, make sure it is private.
-      if (not cache_control.gsub!(/public/, 'private') and
+      cache_control = cache_control.gsub(/public/, 'private')
+      if (not cache_control.include? 'private' and
           cache_control.index(/max-age\s*=\s*0*[1-9]/))
-          cache_control.insert(0, 'private, ')
+        # max-age > 0 without 'public' or 'private' directive is
+        # treated as 'public', so 'private' needs to be prepended.
+        cache_control.insert(0, 'private, ')
       end
+      headers['Cache-Control'] = cache_control
     end
     [status, headers, body]
   end

data/test/test_wwwhisper.rb

@@ -29,7 +29,8 @@ class MockBackend
   end
 
   def add_response_header(key, value)
-    @response[1][key] = value
+    # Frozen strings as header values must be handled correctly.
+    @response[1][key] = value.freeze
   end
 
 end
@@ -354,8 +355,8 @@ class TestWWWhisper < Test::Unit::TestCase
     path = '/foo/bar'
     stub_request(:get, full_url(@wwwhisper.auth_query(path))).
       to_return(granted())
-    @backend.add_response_header('Cache-Control', 'public, max-age=60')
 
+    @backend.add_response_header('Cache-Control', 'public, max-age=60')
     get path
     assert last_response.ok?
     assert_equal 'private, max-age=60', last_response['Cache-Control']
@@ -364,6 +365,12 @@ class TestWWWhisper < Test::Unit::TestCase
     get path
     assert last_response.ok?
     assert_equal 'private, max-age=60', last_response['Cache-Control']
+
+    @backend.add_response_header('Cache-Control', 'private, max-age=60')
+    get path
+    assert last_response.ok?
+    assert_equal 'private, max-age=60', last_response['Cache-Control']
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-wwwhisper
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4405127786806447004
+      hash: 411330195400284462
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4405127786806447004
+      hash: 411330195400284462
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24