slimmer 15.5.1 → 16.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9586ef4f9680eee337f141f0ca07d36786edf1a2e42db7324981fe0b7f64fdcd
-  data.tar.gz: 382289841b35dab136c22cefec16581bb5633f0cbe5036b8299e7d4f737c4159
+  metadata.gz: b9fa11bce76f394cdd62bf87754f0a9fe701d12318de438129e6d09c8595ce6d
+  data.tar.gz: d12897d944a227f8bef8c7c07038136e598ac2ab6f285698d4a75a70855c716a
 SHA512:
-  metadata.gz: d065546672150a1ffa4d9ad548881770d9e62438d54902767d5bd9bc5386ae0b6122e6e5bfd3807a183b2aeb8bc131625962fdde64c3aaae4ec99f102dc378f0
-  data.tar.gz: 12bf26edb4237369c579e557e31773deb2341f9b088389c895d73609a860552f8518783589e49f4f7411bb6981b6d45be9c83d9b52336dd65a6d97a0b0bdd8e1
+  metadata.gz: f6bc30a38aa60c2582b5fb4b7fbdc9c542e4852f75941dc72edf783a145f9a347c4c2ac8afe454b4d130da4767cb22056cea63f6b6866c6cf080c521d0d95b90
+  data.tar.gz: 82a4a80af07e8c9554fab7934a02055b30f125a6239ee429375e7a16d893805ab3ad374f77ca2c4b76cacdba1a4d4010b80ea0c9cd760d4502712ad1bac4502c

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 16.0.1
+* Resolve Nokogiri deprecation warning (#277)
+
+# 16.0.0
+* BREAKING: Remove NavigationMover processor (#275)
+
+# 15.6.1
+* Use safe navigation operator in feedback url swapper (#273)
+
+# 15.6.0
+
+* Add feedback url swapper (#271)
+
 # 15.5.1
 * Update gem_layout template support (#267)
 

data/lib/slimmer/processors/feedback_url_swapper.rb

@@ -0,0 +1,34 @@
+module Slimmer::Processors
+  class FeedbackURLSwapper
+    def initialize(request, headers)
+      @headers = headers
+      @request = request
+    end
+
+    def filter(_src, dest)
+      return dest unless is_gem_layout?
+
+      original_url_without_pii = remove_pii(@request.base_url + @request.fullpath)
+      dest.at_css(".gem-c-feedback input[name='url']")&.set_attribute("value", original_url_without_pii)
+
+      full_path_without_pii = remove_pii(@request.fullpath)
+      dest.at_css(".gem-c-feedback input[name='email_survey_signup[survey_source]']")&.set_attribute("value", full_path_without_pii)
+
+      dest
+    end
+
+  private
+
+    # This PII removal is also found in the [feedback component in the GOV.UK
+    # Publishing Components gem](https://git.io/JcCIE), and any changes made
+    # need to be kept in sync.
+    def remove_pii(string)
+      email_regex = /[^\s=\/?&]+(?:@|%40)[^\s=\/?&]+/
+      string.dup.force_encoding("UTF-8").gsub(email_regex, "[email]")
+    end
+
+    def is_gem_layout?
+      @headers[Slimmer::Headers::TEMPLATE_HEADER]&.starts_with?("gem_layout")
+    end
+  end
+end

data/lib/slimmer/processors/metadata_inserter.rb

@@ -5,21 +5,21 @@ module Slimmer::Processors
       @app_name = app_name
     end
 
-    def filter(_src, dest)
-      head = dest.at_css("head")
+    def filter(_old_doc, new_doc)
+      head = new_doc.at_css("head")
 
-      add_meta_tag("analytics:organisations", @headers[Slimmer::Headers::ORGANISATIONS_HEADER], head)
-      add_meta_tag("analytics:world-locations", @headers[Slimmer::Headers::WORLD_LOCATIONS_HEADER], head)
-      add_meta_tag("format", @headers[Slimmer::Headers::FORMAT_HEADER], head)
-      add_meta_tag("search-result-count", @headers[Slimmer::Headers::RESULT_COUNT_HEADER], head)
-      add_meta_tag("rendering-application", @app_name, head)
+      add_meta_tag("analytics:organisations", @headers[Slimmer::Headers::ORGANISATIONS_HEADER], head, new_doc)
+      add_meta_tag("analytics:world-locations", @headers[Slimmer::Headers::WORLD_LOCATIONS_HEADER], head, new_doc)
+      add_meta_tag("format", @headers[Slimmer::Headers::FORMAT_HEADER], head, new_doc)
+      add_meta_tag("search-result-count", @headers[Slimmer::Headers::RESULT_COUNT_HEADER], head, new_doc)
+      add_meta_tag("rendering-application", @app_name, head, new_doc)
     end
 
   private
 
-    def add_meta_tag(name, content, head)
+    def add_meta_tag(name, content, head, doc)
       if content
-        meta_node = Nokogiri::XML::Node.new("meta", head)
+        meta_node = Nokogiri::XML::Node.new("meta", doc)
         meta_node["name"] = "govuk:#{name}"
         meta_node["content"] = content
 

data/lib/slimmer/processors/search_parameter_inserter.rb

@@ -6,25 +6,25 @@ module Slimmer::Processors
       @response = response
     end
 
-    def filter(_content_document, page_template)
-      search_form = page_template.at_css("form#search")
+    def filter(_old_doc, new_doc)
+      search_form = new_doc.at_css("form#search")
       if search_parameters && search_form
         search_parameters.each_pair do |name, value|
           # Value can either be a string or an array of values
           if value.is_a? Array
             array_name = "#{name}[]"
             value.each do |array_value|
-              add_hidden_input(search_form, array_name, array_value)
+              add_hidden_input(search_form, array_name, array_value, new_doc)
             end
           else
-            add_hidden_input(search_form, name, value)
+            add_hidden_input(search_form, name, value, new_doc)
           end
         end
       end
     end
 
-    def add_hidden_input(search_form, name, value)
-      element = Nokogiri::XML::Node.new("input", search_form)
+    def add_hidden_input(search_form, name, value, doc)
+      element = Nokogiri::XML::Node.new("input", doc)
       element["type"] = "hidden"
       element["name"] = name
       element["value"] = value.to_s

data/lib/slimmer/skin.rb

@@ -106,9 +106,9 @@ module Slimmer
       processors = [
         Processors::TitleInserter.new,
         Processors::TagMover.new,
-        Processors::NavigationMover.new(self),
         Processors::ConditionalCommentMover.new,
         Processors::BodyInserter.new(wrapper_id, template_wrapper_id, response.headers),
+        Processors::FeedbackURLSwapper.new(source_request, response.headers),
         Processors::BodyClassCopier.new,
         Processors::InsideHeaderInserter.new,
         Processors::HeaderContextInserter.new,

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = "15.5.1".freeze
+  VERSION = "16.0.1".freeze
 end

data/lib/slimmer.rb

@@ -32,10 +32,10 @@ module Slimmer
     autoload :BodyClassCopier, "slimmer/processors/body_class_copier"
     autoload :BodyInserter, "slimmer/processors/body_inserter"
     autoload :ConditionalCommentMover, "slimmer/processors/conditional_comment_mover"
+    autoload :FeedbackURLSwapper, "slimmer/processors/feedback_url_swapper"
     autoload :MetadataInserter, "slimmer/processors/metadata_inserter"
     autoload :HeaderContextInserter, "slimmer/processors/header_context_inserter"
     autoload :InsideHeaderInserter, "slimmer/processors/inside_header_inserter"
-    autoload :NavigationMover, "slimmer/processors/navigation_mover"
     autoload :SearchPathSetter, "slimmer/processors/search_path_setter"
     autoload :SearchParameterInserter, "slimmer/processors/search_parameter_inserter"
     autoload :SearchRemover, "slimmer/processors/search_remover"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 15.5.1
+  version: 16.0.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -256,10 +256,10 @@ files:
 - lib/slimmer/processors/body_class_copier.rb
 - lib/slimmer/processors/body_inserter.rb
 - lib/slimmer/processors/conditional_comment_mover.rb
+- lib/slimmer/processors/feedback_url_swapper.rb
 - lib/slimmer/processors/header_context_inserter.rb
 - lib/slimmer/processors/inside_header_inserter.rb
 - lib/slimmer/processors/metadata_inserter.rb
-- lib/slimmer/processors/navigation_mover.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/navigation_mover.rb

@@ -1,24 +0,0 @@
-class Slimmer::Processors::NavigationMover
-  def initialize(skin)
-    @skin = skin
-  end
-
-  def filter(src, dest)
-    proposition_header = src.at_css("#proposition-menu")
-    global_header = dest.at_css("#global-header")
-    if proposition_header && global_header
-      proposition_header.remove
-
-      global_header["class"] = [global_header["class"], "with-proposition"].compact.join(" ")
-
-      header_block = Nokogiri::HTML.fragment(proposition_header_block)
-      header_block.at_css(".content") << proposition_header
-
-      global_header.at_css(".header-wrapper") << header_block
-    end
-  end
-
-  def proposition_header_block
-    @proposition_header_block ||= @skin.template("proposition_menu")
-  end
-end