slimmer 13.3.0 → 13.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29c95c6ec5fcb3d786e88628da00aa44018de1a338e49359d19088db092ea025
-  data.tar.gz: 5c2f32ef832e751dc5812af7cb9d388fd4a36c8bde03d9525f58b7a46b5f0e87
+  metadata.gz: b585bacc031b338e7fc26d91031217d8f9fd5d941f1ef7f0c7ed22570d8ca3d8
+  data.tar.gz: 0d887cb3278b139200586f525c0ad225c76aa0680f667a1d53ccd08555380c83
 SHA512:
-  metadata.gz: 111d7b5964863534428a2a6b9f46252f49624cb226c524e6c048cbff155c2a37d96cf14f85ade73d71b9b8bbeef1065596f9e795682f7f4fe913529fb0225116
-  data.tar.gz: 182cab20358b7ae4b69b17c11b19ddb6697e54bd94cd66575478bdc0fa11d6a03597d9788ec4c03b6da22f6ccbb5a4156042aaecb433b1c7ddc907c2e3b7934f
+  metadata.gz: 82f4f5819b2c58bf7609409342705cb326298b85532dc6a7e2731af5c8629b4b5bd1195797a2358fa6a959840a3d80bc9089e20659781c23ba91eff8419ffae7
+  data.tar.gz: 3de1edffa193308ff1e370e617dc7d503cec26398bdfe383edec856875ac0b6b4dba33ff975cc90adc3885688393d738452e5faf143578202d54b75fe8981693

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 13.4.0
+
+* Revert X-Slimmer-Ignore-Error header (#246)
+
 # 13.3.0
 
 * Add X-Slimmer-Ignore-Error header flag to prevent overriding non-200 status responses

data/lib/slimmer/app.rb

@@ -64,10 +64,6 @@ 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)
 
@@ -88,32 +84,26 @@ module Slimmer
       # Store the request id so it can be passed on with any template requests
       GovukRequestId.value = env["HTTP_GOVUK_REQUEST_ID"]
 
-      body = rewritten_body(request, response)
-
-      body = [body] unless body.respond_to?(:each)
-      response.body = body
+      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
       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,7 +20,6 @@ module Slimmer
       skip:                 "Skip",
       template:             "Template",
       remove_search:        "Remove-Search",
-      ignore_error:         "Ignore-Error",
     }.freeze
 
     # @private
@@ -56,15 +55,10 @@ 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.3.0".freeze
+  VERSION = "13.4.0".freeze
 end

metadata

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