slimmer 11.1.1 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882c71d5e22c37f0dfe1f0598975f4c19e27ceb9
-  data.tar.gz: 6c115e9e40c73fa7216316ffe727663eb26f2b8c
+  metadata.gz: 55f0a341bbb309da449a52a668b281087674586c
+  data.tar.gz: e090f9302dfd9dea5d91184a50942bfe9751bd02
 SHA512:
-  metadata.gz: 25ec33d5397c26d2392389bf173619c617ad41c8c54f64d7028c575b217f58f9c4104659c4eee671630412c2d367303c442f502d22bd204eed68cb1bbb4d380e
-  data.tar.gz: aa90a515cae94a8d23d530cf4543be9dba85955ca0421bd59848805803dd7d40d20b9362e2bcb1b009e985ccd898d6bb74b6a6e2b0aa2e07ddcf1e7d98415094
+  metadata.gz: 464f4d805159cd667d1cdc3478fba42e18741e4f7d3978c717b608098099fb3b87f56b83c9b31f61ee8bd2fa1acaf7778ab62be006d363365bd673162b2d18ad
+  data.tar.gz: 7aa2bb20cb3c5a3151949436d6e2d36cae311ee31552ef17cb7e254f2a2569c93205dec13b0e5baf6e155c862714af4a1ec6379165cd23275929ffcec2bec1b7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 12.0.0
+
+* Remove the "report a problem" feature. This is now being covered by the
+  feedback component (#213)
+
 # 11.1.1
 
 * Make the 'Inside Header Inserter' more resillient so that it doesn't throw

data/lib/slimmer.rb

@@ -43,7 +43,6 @@ module Slimmer
     autoload :HeaderContextInserter, 'slimmer/processors/header_context_inserter'
     autoload :InsideHeaderInserter, 'slimmer/processors/inside_header_inserter'
     autoload :NavigationMover, 'slimmer/processors/navigation_mover'
-    autoload :ReportAProblemInserter, 'slimmer/processors/report_a_problem_inserter'
     autoload :SearchIndexSetter, 'slimmer/processors/search_index_setter'
     autoload :SearchPathSetter, 'slimmer/processors/search_path_setter'
     autoload :SearchParameterInserter, 'slimmer/processors/search_parameter_inserter'

data/lib/slimmer/headers.rb

@@ -13,7 +13,6 @@ module Slimmer
       format:               "Format",
       page_owner:           "Page-Owner",
       organisations:        "Organisations",
-      report_a_problem:     "Report-a-Problem",
       world_locations:      "World-Locations",
       result_count:         "Result-Count",
       search_parameters:    "Search-Parameters",
@@ -32,9 +31,6 @@ module Slimmer
     # @private
     ORGANISATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:organisations]}"
 
-    # @private
-    REPORT_A_PROBLEM_FORM = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:report_a_problem]}"
-
     # @private
     WORLD_LOCATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:world_locations]}"
 
@@ -67,7 +63,6 @@ module Slimmer
     # @option hash [String] organisations
     # @option hash [String] page_owner
     # @option hash [String] remove_search
-    # @option hash [String] report_a_problem
     # @option hash [String] result_count
     # @option hash [String] search_parameters
     # @option hash [String] section

data/lib/slimmer/skin.rb

@@ -94,11 +94,6 @@ module Slimmer
     def success(source_request, response, body)
       wrapper_id = options[:wrapper_id] || 'wrapper'
 
-      # The variables set in the source request might not be encoded as UTF-8,
-      # Unicorn, for instance, will set them to be ASCII. This shouldn't matter
-      # normally because URI's should have UTF-8 characters percent encoded,
-      # but not all agents follow this.
-      request_url = source_request.url.force_encoding(Encoding::UTF_8)
       processors = [
         Processors::TitleInserter.new(),
         Processors::TagMover.new(),
@@ -111,10 +106,6 @@ module Slimmer
         Processors::MetadataInserter.new(response, options[:app_name]),
         Processors::SearchParameterInserter.new(response),
         Processors::SearchPathSetter.new(response),
-        Processors::ReportAProblemInserter.new(self,
-                                               request_url,
-                                               response.headers,
-                                               wrapper_id),
         Processors::SearchRemover.new(response.headers),
       ]
 

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '11.1.1'
+  VERSION = '12.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 11.1.1
+  version: 12.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -252,7 +252,6 @@ files:
 - lib/slimmer/processors/inside_header_inserter.rb
 - lib/slimmer/processors/metadata_inserter.rb
 - lib/slimmer/processors/navigation_mover.rb
-- lib/slimmer/processors/report_a_problem_inserter.rb
 - lib/slimmer/processors/search_parameter_inserter.rb
 - lib/slimmer/processors/search_path_setter.rb
 - lib/slimmer/processors/search_remover.rb

data/lib/slimmer/processors/report_a_problem_inserter.rb

@@ -1,32 +0,0 @@
-module Slimmer::Processors
-  class ReportAProblemInserter
-    include ERB::Util
-
-    def initialize(skin, url, headers, wrapper_id)
-      @skin = skin
-      @request_url = url
-      @headers = headers
-      @wrapper_id = wrapper_id
-    end
-
-    def filter(content_document, page_template)
-      if enabled? && container = page_template.at_css('#' + @wrapper_id)
-        container.add_child(report_a_problem_block)
-      end
-    end
-
-    def report_a_problem_block
-      request_url = @request_url
-      source      = @headers[Slimmer::Headers::APPLICATION_NAME_HEADER]
-      page_owner  = @headers[Slimmer::Headers::PAGE_OWNER_HEADER]
-      report_a_problem_template = @skin.template('report_a_problem.raw')
-      html = ERB.new(report_a_problem_template).result(binding)
-      Nokogiri::HTML.fragment(html)
-    end
-
-  private
-    def enabled?
-      @headers[Slimmer::Headers::REPORT_A_PROBLEM_FORM] != 'false'
-    end
-  end
-end