slimmer 15.5.1 → 15.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9586ef4f9680eee337f141f0ca07d36786edf1a2e42db7324981fe0b7f64fdcd
-  data.tar.gz: 382289841b35dab136c22cefec16581bb5633f0cbe5036b8299e7d4f737c4159
+  metadata.gz: 6f9dab4037bbee9ec372a2d3093b8645d973ef8db63c8accd2d83bfb6a0f0e46
+  data.tar.gz: e8551a6f783608f5216ef2caa3ab23b7f15c6e8dca7ef27d1e7cad5b0f58fa2c
 SHA512:
-  metadata.gz: d065546672150a1ffa4d9ad548881770d9e62438d54902767d5bd9bc5386ae0b6122e6e5bfd3807a183b2aeb8bc131625962fdde64c3aaae4ec99f102dc378f0
-  data.tar.gz: 12bf26edb4237369c579e557e31773deb2341f9b088389c895d73609a860552f8518783589e49f4f7411bb6981b6d45be9c83d9b52336dd65a6d97a0b0bdd8e1
+  metadata.gz: 5644a0a8217c1774a288573c9c6953db43c9f8a7b9f6d629a5515a79b953f05f4013cd9e7d55405f6df7e536213569d3e400ec5ae751e5b4a46828a4c93e81f4
+  data.tar.gz: b5e5d006ad1c69f687efc1201a13b3da4dd5efcbe6620cebf181a4fee49d4bebfc18beb15f2e9b370835c955baa58fa9b79d992d8c4e89484cab2e49c8734733

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 15.6.0
+
+* Add feedback url swapper (#271)
+
 # 15.5.1
 * Update gem_layout template support (#267)
 

data/lib/slimmer.rb

@@ -32,6 +32,7 @@ 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"

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

@@ -109,6 +109,7 @@ module Slimmer
         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 = "15.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 15.5.1
+  version: 15.6.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -256,6 +256,7 @@ 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