slimmer 15.6.0 → 17.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f9dab4037bbee9ec372a2d3093b8645d973ef8db63c8accd2d83bfb6a0f0e46
-  data.tar.gz: e8551a6f783608f5216ef2caa3ab23b7f15c6e8dca7ef27d1e7cad5b0f58fa2c
+  metadata.gz: 0a6d7eb900be169022598a1a09b96d08394d90e55ca451e611bc9de803f900f0
+  data.tar.gz: 71243a607e6868ae847544cc1ed6d30acdf031f41b0572ac309fccf93e2814db
 SHA512:
-  metadata.gz: 5644a0a8217c1774a288573c9c6953db43c9f8a7b9f6d629a5515a79b953f05f4013cd9e7d55405f6df7e536213569d3e400ec5ae751e5b4a46828a4c93e81f4
-  data.tar.gz: b5e5d006ad1c69f687efc1201a13b3da4dd5efcbe6620cebf181a4fee49d4bebfc18beb15f2e9b370835c955baa58fa9b79d992d8c4e89484cab2e49c8734733
+  metadata.gz: 3d986e7ec508d57b6d949272db05a0a5b25184ffe9195760671d1e72dc5f6397857ae0f5dc35936749ca0eb1cb7880e750a72f36a83d5dddc9792eada2349694
+  data.tar.gz: 50f88ad62bb6530f70a8684f7427ce9933525440fbc131669526fc65ebdd8502c7d1e247771a54989842d77be31230b1e60b7f0692b3b5e91fa5767dbff5f73b

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 17.0.0
+
+* BREAKING: Set default template to `gem_layout` and remove references to the deprecated `core_layout`.
+
+# 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)

data/README.md

@@ -57,6 +57,10 @@ class ApplicationController < ActionController::Base
 end
 ```
 
+## Use in before_action renders
+
+If you have a non-default layout and want to render in a before_action method, note that you may have to explicitly call `slimmer_template(:your_template_name)` in the action before rendering. Rendering in a before_action immediately stops the action chain, and since slimmer usually calls slimmer_template as an after_action, it would be skipped over (and you'd get the default layout). 
+
 ## Logging
 
 Slimmer can be configured with a logger by passing in a logger instance

data/lib/slimmer/processors/feedback_url_swapper.rb

@@ -9,10 +9,10 @@ module Slimmer::Processors
       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)
+      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.at_css(".gem-c-feedback input[name='email_survey_signup[survey_source]']")&.set_attribute("value", full_path_without_pii)
 
       dest
     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,7 +106,6 @@ 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),
@@ -120,7 +119,7 @@ module Slimmer
         Processors::AccountsShower.new(response.headers),
       ]
 
-      template_name = response.headers[Headers::TEMPLATE_HEADER] || "core_layout"
+      template_name = response.headers[Headers::TEMPLATE_HEADER] || "gem_layout"
       process(processors, body, template(template_name), source_request.env)
     end
   end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = "15.6.0".freeze
+  VERSION = "17.0.0".freeze
 end

data/lib/slimmer.rb

@@ -36,7 +36,6 @@ module Slimmer
     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.6.0
+  version: 17.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -260,7 +260,6 @@ files:
 - 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