slimmer 15.5.0 → 15.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc08f967bc13790ee7db7c1ee0b8ef0aaf07f5d7fb904c6ef1f3e6ce16650287
-  data.tar.gz: 8807bcfc49959843c3c1beeae148aa3c3a89e2dce1bb1ecbaf450543de62049f
+  metadata.gz: 9586ef4f9680eee337f141f0ca07d36786edf1a2e42db7324981fe0b7f64fdcd
+  data.tar.gz: 382289841b35dab136c22cefec16581bb5633f0cbe5036b8299e7d4f737c4159
 SHA512:
-  metadata.gz: b2f694bacade80d4c78994adc2df5a0e9feaa202ca27bcf982cfa68142a31642ebbdde19fc7a2ef0222411a0a632ebbae969244f43d625644b25fb4bfd0fed85
-  data.tar.gz: 063ee728d14b6342bbb53247a7bb231a5fea95f4f7aebc839cc67117a6ca104c8fdea8ce5dcdb2ab83f18dfebc7397d9dab6143bd384b9b13367b91e4d79d50e
+  metadata.gz: d065546672150a1ffa4d9ad548881770d9e62438d54902767d5bd9bc5386ae0b6122e6e5bfd3807a183b2aeb8bc131625962fdde64c3aaae4ec99f102dc378f0
+  data.tar.gz: 12bf26edb4237369c579e557e31773deb2341f9b088389c895d73609a860552f8518783589e49f4f7411bb6981b6d45be9c83d9b52336dd65a6d97a0b0bdd8e1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 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/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::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 = "15.5.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 15.5.0
+  version: 15.5.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport