slimmer 15.1.1 → 15.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4146598de4151ad771c4b288b7556ab2a8e6ef88378870a11e108188b8ff248a
-  data.tar.gz: 06377c22b246a77ac2faad4abed3e10b9cc8ed5d16c6515088ce949a2ea748df
+  metadata.gz: adfdc8dd1fa7b69450bbbae9daf9cbd352704a621947aad067fc5aabad239132
+  data.tar.gz: ef11b30a4f27806579d0a7e690f9e71b08210d10625722de29b6a320d5cf1840
 SHA512:
-  metadata.gz: 8a5d1c2d0f54b7cbdf75c2e82ab4dacf27086786b505a1b63983d97751f64439927bcc81aabf24aa5deeeb0e179616edb246f756a15328d659fdc6a3df218538
-  data.tar.gz: 3543e2879ef471c1cf87012661c18199c094d4467b5af95aad6979dc68c678a1c1746028faa299eda135b58617c1655e3f73ded277aa98808a5a2173dd8194b3
+  metadata.gz: 75bba48992276cc1d656c72271dd6ecb192af0467205cfc12411a8b53b26d65d534f25801b5e70b4a0304fbf08fa6202440891956bd36547f03dc488ec1aee64
+  data.tar.gz: '038f855917b3f9fe4d66c0e15737efadd8b4724e23b47dab25573f18962e0b525449780566421f8b07759d17bda1947bdbc1e75ef032752645126fda9a3378d3'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 15.2.0
+
+* Add X-Slimmer-Show-Accounts header to choose between accounts
+  header components. (#255)
+* Update to Ruby 2.7.2. (#254)
+
 # 15.1.1
 
 * Amend toggle button selector (#251)

data/lib/slimmer.rb

@@ -28,6 +28,7 @@ module Slimmer
   autoload :HTTPClient, "slimmer/http_client"
 
   module Processors
+    autoload :AccountsShower, "slimmer/processors/accounts_shower"
     autoload :BodyClassCopier, "slimmer/processors/body_class_copier"
     autoload :BodyInserter, "slimmer/processors/body_inserter"
     autoload :ConditionalCommentMover, "slimmer/processors/conditional_comment_mover"

data/lib/slimmer/headers.rb

@@ -20,6 +20,7 @@ module Slimmer
       skip: "Skip",
       template: "Template",
       remove_search: "Remove-Search",
+      show_accounts: "Show-Accounts",
     }.freeze
 
     # @private
@@ -55,6 +56,9 @@ module Slimmer
     # @private
     REMOVE_SEARCH_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:remove_search]}".freeze
 
+    # @private
+    SHOW_ACCOUNTS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:show_accounts]}".freeze
+
     # Set the "slimmer headers" to configure the page
     #
     # @param hash [Hash] the options
@@ -66,6 +70,7 @@ module Slimmer
     # @option hash [String] result_count
     # @option hash [String] search_parameters
     # @option hash [String] section
+    # @option hash [String] show_accounts
     # @option hash [String] skip
     # @option hash [String] template
     # @option hash [String] world_locations

data/lib/slimmer/processors/accounts_shower.rb

@@ -0,0 +1,29 @@
+module Slimmer::Processors
+  class AccountsShower
+    def initialize(headers)
+      @headers = headers
+    end
+
+    def filter(_src, dest)
+      header_value = @headers[Slimmer::Headers::SHOW_ACCOUNTS_HEADER]
+      if header_value == "signed-in"
+        remove_signed_out(dest)
+      elsif header_value == "signed-out"
+        remove_signed_in(dest)
+      else
+        remove_signed_out(dest)
+        remove_signed_in(dest)
+      end
+    end
+
+    def remove_signed_out(dest)
+      signed_out = dest.at_css("#global-header #accounts-signed-out")
+      signed_out.remove if signed_out
+    end
+
+    def remove_signed_in(dest)
+      signed_in = dest.at_css("#global-header #accounts-signed-in")
+      signed_in.remove if signed_in
+    end
+  end
+end

data/lib/slimmer/skin.rb

@@ -107,6 +107,7 @@ module Slimmer
         Processors::SearchParameterInserter.new(response),
         Processors::SearchPathSetter.new(response),
         Processors::SearchRemover.new(response.headers),
+        Processors::AccountsShower.new(response.headers),
       ]
 
       template_name = response.headers[Headers::TEMPLATE_HEADER] || "core_layout"

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = "15.1.1".freeze
+  VERSION = "15.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 15.1.1
+  version: 15.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -252,6 +252,7 @@ files:
 - lib/slimmer/govuk_request_id.rb
 - lib/slimmer/headers.rb
 - lib/slimmer/http_client.rb
+- lib/slimmer/processors/accounts_shower.rb
 - lib/slimmer/processors/body_class_copier.rb
 - lib/slimmer/processors/body_inserter.rb
 - lib/slimmer/processors/conditional_comment_mover.rb
@@ -294,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Thinner than the skinner