slimmer 15.5.0 → 16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc08f967bc13790ee7db7c1ee0b8ef0aaf07f5d7fb904c6ef1f3e6ce16650287
-  data.tar.gz: 8807bcfc49959843c3c1beeae148aa3c3a89e2dce1bb1ecbaf450543de62049f
+  metadata.gz: 118378e1ad3f656164da144437d42085b0e7d69ffc567d922266e531001aeab5
+  data.tar.gz: e96c1f6bd1fe7d479a217dfa6ec3c76793c140063377d146bc418e0756f46dea
 SHA512:
-  metadata.gz: b2f694bacade80d4c78994adc2df5a0e9feaa202ca27bcf982cfa68142a31642ebbdde19fc7a2ef0222411a0a632ebbae969244f43d625644b25fb4bfd0fed85
-  data.tar.gz: 063ee728d14b6342bbb53247a7bb231a5fea95f4f7aebc839cc67117a6ca104c8fdea8ce5dcdb2ab83f18dfebc7397d9dab6143bd384b9b13367b91e4d79d50e
+  metadata.gz: 0fd17a9971da4ab0c6d43883b9ce7cff0556384e1470c9c26dc4c6e1c97e9a9c7510fd5b938a315d8ead09cb70af05e0e644257849aa15c950bdc31cc6ad373d
+  data.tar.gz: 76d732124e4efc8ec9b62c5ea7747a5316f740f38f2f9e80595bcda08ab3c864bf1bbe89985cade4ee2cdec10d70b866ac081e2b482f851ec7135c5660580c21

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 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)
+
 # 15.5.0
 * Add support for gem layout in static (#265)
 

data/lib/slimmer/processors/accounts_shower.rb

@@ -23,8 +23,15 @@ module Slimmer::Processors
         remove_signed_out(dest)
         remove_signed_in(dest)
       end
+
+      if is_navigation_empty?(dest)
+        header_content = dest.at_css(".govuk-header__content")
+        header_content.remove if header_content
+      end
     end
 
+  private
+
     def remove_signed_out(dest)
       signed_out = dest.at_css("#global-header #accounts-signed-out")
       signed_out_link = dest.css(".gem-c-layout-header [data-link-for='accounts-signed-out']")
@@ -45,7 +52,9 @@ module Slimmer::Processors
       end
     end
 
-  private
+    def is_navigation_empty?(dest)
+      dest.at_css(".govuk-header__navigation a").nil?
+    end
 
     def is_gem_layout?
       @headers[Slimmer::Headers::TEMPLATE_HEADER]&.starts_with?("gem_layout")

data/lib/slimmer/processors/body_inserter.rb

@@ -1,13 +1,28 @@
 module Slimmer::Processors
   class BodyInserter
-    def initialize(source_id = "wrapper", destination_id = "wrapper")
+    def initialize(source_id = "wrapper", destination_id = "wrapper", headers = {})
       @source_selector = "#" + source_id
       @destination_selector = "#" + destination_id
+      @headers = headers
     end
 
     def filter(src, dest)
-      body = Nokogiri::HTML.fragment(src.at_css(@source_selector).to_html)
+      source_markup = src.at_css(@source_selector)
+      destination_markup = dest.at_css(@destination_selector)
+
+      css_classes = []
+      css_classes << source_markup.attributes["class"].to_s.split(/ +/) if source_markup.has_attribute?("class")
+      css_classes << destination_markup.attributes["class"].to_s.split(/ +/) if destination_markup.has_attribute?("class")
+
+      body = Nokogiri::HTML.fragment(source_markup.to_html)
       dest.at_css(@destination_selector).replace(body)
+      dest.at_css(@destination_selector).set_attribute("class", css_classes.flatten.uniq.join(" ")) if is_gem_layout? && css_classes.any?
+    end
+
+  private
+
+    def is_gem_layout?
+      @headers[Slimmer::Headers::TEMPLATE_HEADER]&.starts_with?("gem_layout")
     end
   end
 end

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/skin.rb

@@ -101,13 +101,14 @@ module Slimmer
 
     def success(source_request, response, body)
       wrapper_id = options[:wrapper_id] || "wrapper"
+      template_wrapper_id = "wrapper" # All templates in Static use `#wrapper`
 
       processors = [
         Processors::TitleInserter.new,
         Processors::TagMover.new,
-        Processors::NavigationMover.new(self),
         Processors::ConditionalCommentMover.new,
-        Processors::BodyInserter.new(wrapper_id),
+        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.0".freeze
+  VERSION = "16.0.0".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.0
+  version: 16.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2022-01-24 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