govuk_publishing_components 13.1 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a042523ef71aff602f228aa3916918363168cc82423775a0e7c305527f9165
-  data.tar.gz: ea84c5d9b0f1b5eaf85baddbb62ca91948c61b4c3381e44b130240ece1c07c59
+  metadata.gz: a6ae1813c5f24b844139e7a5d57697718fc515e14a20fc5e3f5337474d085c98
+  data.tar.gz: d2212c52c0b6ee05d6edc95621faf347726fce80d84bc562ba24c163af92d91b
 SHA512:
-  metadata.gz: f644184cc8dbbfe0c85a5312e3f4caa789ee4c4b1177505c835bafad1ba3ac45e6d4d2f6bcba60ac11261c58a7398f810cab9a82c59aa8f04be60cb4bf85f4f8
-  data.tar.gz: 96b16387733e32766bdd067ed9f611184797de877f770bb0faacdfd971ebebd5d17c6ddf48a3864581698e28a874dcf0b3c476fcd9a5b9a0b643bffcf36b1dec
+  metadata.gz: 4cb079269b5f24931adb289c8eafb83f450ec4601d577dc6fc1a40aed673f6e713e60a62c322b861d52d5b1169581320a44082c13b6f692a480f881013549dd4
+  data.tar.gz: a44bf1a137d8fe11d3dd1f0547b162ff998525ff1fdbf7eb9bd2f17365ec0dcf7364bae12917ec9f0b006c029c1a5b292aa3e772fb012f3b4dc2a59a06191d72

data/app/views/govuk_publishing_components/components/_feedback.html.erb

@@ -3,9 +3,13 @@
   margin_top ||= 1
   margin_top_class = "gem-c-feedback--top-margin" if margin_top == 1
   email_regex = /[^\s=\/?&]+(?:@|%40)[^\s=\/?&]+/
-  stripped_path = request.original_url.gsub(email_regex, '[email]').encode
-  stripped_url = request.fullpath.gsub(email_regex, '[email]').encode
-  user_agent = request.user_agent.encode
+  stripped_path = request.original_url.gsub(email_regex, '[email]')
+  stripped_url = request.fullpath.gsub(email_regex, '[email]')
+  user_agent = request.user_agent
+
+  def utf_encode element
+    element.is_a?(String) ? element.encode : element
+  end
 %>
 
 <div class="gem-c-feedback <%= margin_top_class %>" data-module="feedback">
@@ -90,8 +94,8 @@
       <div class="gem-c-feedback__column-two-thirds">
         <div class="gem-c-feedback__error-summary gem-c-feedback__js-show js-hidden js-errors" tabindex="-1"></div>
 
-        <input type="hidden" name="url" value="<%= stripped_path -%>">
-        <input type="hidden" name="user_agent" value="<%= user_agent -%>">
+        <input type="hidden" name="url" value="<%= utf_encode(stripped_path) -%>">
+        <input type="hidden" name="user_agent" value="<%= utf_encode(user_agent) -%>">
 
         <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
         <p id="feedback_explanation" class="gem-c-feedback__form-paragraph">Don’t include personal or financial information like your National Insurance number or credit card details.</p>
@@ -136,11 +140,11 @@
       <div class="gem-c-feedback__column-two-thirds">
         <div class="gem-c-feedback__error-summary js-hidden js-errors" tabindex="-1"></div>
 
-        <input type="hidden" name="url" value="<%= stripped_path -%>">
-        <input type="hidden" name="user_agent" value="<%= user_agent -%>">
+        <input type="hidden" name="url" value="<%= utf_encode(stripped_path) -%>">
+        <input type="hidden" name="user_agent" value="<%= utf_encode(user_agent) -%>">
 
         <input name="email_survey_signup[survey_id]" type="hidden" value="footer_satisfaction_survey">
-        <input name="email_survey_signup[survey_source]" type="hidden" value="<%= stripped_path -%>">
+        <input name="email_survey_signup[survey_source]" type="hidden" value="<%= utf_encode(stripped_path) -%>">
         <input name="email_survey_signup[ga_client_id]" type="hidden" value="1627485790.1515403243">
 
         <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
@@ -158,7 +162,7 @@
         <%= render "govuk_publishing_components/components/button", {
           text: "Send me the survey"
         } %>
-        <a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=<%= stripped_url -%>&amp;gcl=1627485790.1515403243" class="gem-c-feedback__email-link govuk-link" id="take-survey" target="_blank" rel="noopener noreferrer">Don’t have an email address?</a>
+        <a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=<%= utf_encode(stripped_url) -%>&amp;gcl=1627485790.1515403243" class="gem-c-feedback__email-link govuk-link" id="take-survey" target="_blank" rel="noopener noreferrer">Don’t have an email address?</a>
       </div>
     </div>
   </form>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '13.1'.freeze
+  VERSION = '13.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: '13.1'
+  version: 13.2.0
 platform: ruby
 authors:
 - GOV.UK Dev