slimmer 1.1.17 → 1.1.18

data/lib/slimmer/app.rb

@@ -98,7 +98,7 @@ module Slimmer
     end
 
     def filter_headers(header_hash)
-      valid_keys = %w{vary set-cookie location content-type expires cache-control www-authenticate}
+      valid_keys = %w{vary set-cookie location content-type expires cache-control www-authenticate last-modified etag}
       logger.debug "Slimmer: removing headers except #{valid_keys} from #{header_hash.keys}"
       removed_keys = []
       header_hash.keys.each do |key|

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '1.1.17'
+  VERSION = '1.1.18'
 end

data/test/header_filtering_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+
+class HeaderFilteringTest < SlimmerIntegrationTest
+  ALLOWED_HEADERS = ["Vary", "Set-Cookie", "Location", "Content-Type", "Expires", "Cache-Control", "WWW-Authenticate", "Last-Modified", "ETag"]
+  FORBIDDEN_HEADERS = ["Anything-Else"]
+
+  given_response 200, %{Anything}, (ALLOWED_HEADERS + FORBIDDEN_HEADERS).inject({}) {|memo, header| memo[header] = header.downcase; memo}
+
+  def test_allows_whitelisted_headers
+    ALLOWED_HEADERS.each do |header|
+      assert last_response.headers.keys.include?(header)
+    end
+  end
+
+  def test_filters_other_headers
+    FORBIDDEN_HEADERS.each do |header|
+      refute last_response.headers.keys.include?(header)
+    end
+  end
+end

metadata

@@ -1,139 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slimmer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.18
   prerelease: 
-  version: 1.1.17
 platform: ruby
-authors: 
+authors:
 - Ben Griffiths
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70351908621780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908621780
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70351908620040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908620040
+- !ruby/object:Gem::Dependency
   name: plek
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70351908619480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908619480
+- !ruby/object:Gem::Dependency
   name: json
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70351908618940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908618940
+- !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70351908617580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908617580
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70351908611760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908611760
+- !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70351908609820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908609820
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70351908606800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908606800
+- !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70351908602140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.7"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70351908602140
+- !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70351908599800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *70351908599800
 description: Rack middleware for skinning pages using a specific template
-email: 
+email:
 - bengriffiths@gmail.com
 - james.stewart@digital.cabinet-office.gov.uk
-executables: 
+executables:
 - render_slimmer_error
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - CHANGELOG.md
 - lib/slimmer/admin_title_inserter.rb
@@ -160,6 +157,7 @@ files:
 - test/fixtures/500.html.erb
 - test/fixtures/wrapper.html.erb
 - test/google_analytics_test.rb
+- test/header_filtering_test.rb
 - test/headers_test.rb
 - test/processors/body_inserter_test.rb
 - test/processors/header_context_inserter_test.rb
@@ -169,42 +167,34 @@ files:
 - bin/render_slimmer_error
 homepage: http://github.com/alphagov/slimmer
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4136330702604149835
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4136330702604149835
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: slimmer
-rubygems_version: 1.8.13
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Thinner than the skinner
-test_files: 
+test_files:
 - test/fixtures/404.html.erb
 - test/fixtures/500.html.erb
 - test/fixtures/wrapper.html.erb
 - test/google_analytics_test.rb
+- test/header_filtering_test.rb
 - test/headers_test.rb
 - test/processors/body_inserter_test.rb
 - test/processors/header_context_inserter_test.rb