slimmer 13.2.2 → 13.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dad0beacc561e5407f29aaeabea18a46087d12b5bc22b28fa9bffbc4c17c0fd
-  data.tar.gz: 11bc7fc2a2e3d9add7485fd327751be25aa1b744ed5e90dfde7bd6f0a58991bf
+  metadata.gz: 29c95c6ec5fcb3d786e88628da00aa44018de1a338e49359d19088db092ea025
+  data.tar.gz: 5c2f32ef832e751dc5812af7cb9d388fd4a36c8bde03d9525f58b7a46b5f0e87
 SHA512:
-  metadata.gz: 13594f752cdecb7288c867c063d83237a1a6aee22720bee8b6cdc233c377a3c7c7bb4664591a51962b82c2f8d72325038621230270d1e37c4d58b3b46464fb81
-  data.tar.gz: f03a441b1f847173daf557889a5acc52fae82f5a7763cb03bb4baa53160443a52666fc457d7e2e108907f0a3f16552d33a1a4e2bbe4106effad350d4ed81c356
+  metadata.gz: 111d7b5964863534428a2a6b9f46252f49624cb226c524e6c048cbff155c2a37d96cf14f85ade73d71b9b8bbeef1065596f9e795682f7f4fe913529fb0225116
+  data.tar.gz: 182cab20358b7ae4b69b17c11b19ddb6697e54bd94cd66575478bdc0fa11d6a03597d9788ec4c03b6da22f6ccbb5a4156042aaecb433b1c7ddc907c2e3b7934f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 13.3.0
+
+* Add X-Slimmer-Ignore-Error header flag to prevent overriding non-200 status responses
+
 # 13.2.2
 
 * Fix bug where parent_name was called without app

data/lib/slimmer/app.rb

@@ -64,6 +64,10 @@ module Slimmer
       !!response.headers[Headers::SKIP_HEADER]
     end
 
+    def ignore_error_header?(response)
+      !!response.headers[Headers::IGNORE_ERROR_HEADER]
+    end
+
     def s(body)
       return body.to_s unless body.respond_to?(:each)
 
@@ -84,26 +88,32 @@ module Slimmer
       # Store the request id so it can be passed on with any template requests
       GovukRequestId.value = env["HTTP_GOVUK_REQUEST_ID"]
 
-      rewritten_body = case response.status
-                       when 200
-                         @skin.success request, response, s(response.body)
-                       when 403
-                         @skin.error "403", s(response.body), request.env
-                       when 404
-                         @skin.error "404", s(response.body), request.env
-                       when 410
-                         @skin.error "410", s(response.body), request.env
-                       else
-                         @skin.error "500", s(response.body), request.env
-                       end
-
-      rewritten_body = [rewritten_body] unless rewritten_body.respond_to?(:each)
-      response.body = rewritten_body
+      body = rewritten_body(request, response)
+
+      body = [body] unless body.respond_to?(:each)
+      response.body = body
       response.headers["Content-Length"] = content_length(response.body)
 
       response.finish
     end
 
+    def rewritten_body(request, response)
+      return @skin.success request, response, s(response.body) if ignore_error_header?(response)
+
+      case response.status
+      when 200
+        @skin.success request, response, s(response.body)
+      when 403
+        @skin.error "403", s(response.body), request.env
+      when 404
+        @skin.error "404", s(response.body), request.env
+      when 410
+        @skin.error "410", s(response.body), request.env
+      else
+        @skin.error "500", s(response.body), request.env
+      end
+    end
+
     def strip_slimmer_headers(headers)
       headers.reject { |k, _v| k =~ /\A#{Headers::HEADER_PREFIX}/ }
     end

data/lib/slimmer/headers.rb

@@ -20,6 +20,7 @@ module Slimmer
       skip:                 "Skip",
       template:             "Template",
       remove_search:        "Remove-Search",
+      ignore_error:         "Ignore-Error",
     }.freeze
 
     # @private
@@ -55,10 +56,15 @@ module Slimmer
     # @private
     REMOVE_SEARCH_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:remove_search]}".freeze
 
+    # @private
+    IGNORE_ERROR_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:ignore_error]}".freeze
+
+
     # Set the "slimmer headers" to configure the page
     #
     # @param hash [Hash] the options
     # @option hash [String] application_name
+    # @option hash [String] ignore_error
     # @option hash [String] format
     # @option hash [String] organisations
     # @option hash [String] page_owner

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = "13.2.2".freeze
+  VERSION = "13.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 13.2.2
+  version: 13.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport