metadata_presenter 3.3.23 → 3.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6854382610b99865f2af30a38c5807393211a160d3ab4af1000964daf082caa9
-  data.tar.gz: 6c9cd5e2ecd9c4057cb59f12fdc34fb551398b490f52f020cea167838011f6f8
+  metadata.gz: c820cccd9aed599a87d7f383a7464504fb73470e11ea2aa47c107d8660474833
+  data.tar.gz: d73786672c233b5ca1371c65d24844eae9c9f63cbe7e144ed59d3dad71575a48
 SHA512:
-  metadata.gz: b9924fc2c8e9b45e8f75468b474c166f78251faa4083d060acacff409c0a96da4b3be773d87970f13affa03d81ebda56c06a071dc7d897ca90254c395ebedf13
-  data.tar.gz: 0261d65fac2f0f0a07236abe4cfad1fdf06b3199ddebb4ad2c408597ae90bf2c46f08ff7ab1af18137f177ed7cd40d64c393e4599f7f167236032a1e0398b40f
+  metadata.gz: 60cd34263a60622ede633dad425c2049b6df5d2dd1163674cc22eb82a68e6eaf07664bb435b93cb31af2c48aacfc3023a387fee84b170ca9b7d3a57d8bbee270
+  data.tar.gz: 4dd4eef3fe6c479c1e962bc41ca4f7db41a1e8959a19e9974319d30afa801b7e0e1352248d7184e131b44c4858cdd30a18cc02e443e0397345b14bb0c9296988

data/app/models/metadata_presenter/page_answers.rb

@@ -146,7 +146,7 @@ module MetadataPresenter
     end
 
     def sanitize_filename(answer)
-      sanitize(filename(update_filename(answer)))
+      sanitize(filename(normalise_file_extension(answer)))
     end
 
     def filename(path)
@@ -165,15 +165,17 @@ module MetadataPresenter
       filename
     end
 
-    def update_filename(answer)
-      jfif_or_jpg_extension?(answer) ? "#{File.basename(answer, '.*')}.jpeg" : answer
-    end
-
-    def jfif_or_jpg_extension?(answer)
-      return false if answer.nil?
+    def normalise_file_extension(answer)
+      return if answer.nil?
 
       file_extension = File.extname(answer)
-      %w[.jfif .jpg].include?(file_extension)
+      file_basename  = answer.delete_suffix(file_extension)
+
+      # Handle less common `image/jpeg` MIME type extensions
+      file_extension.downcase!
+      file_extension = '.jpeg' if %w[.jpg .jpe .jif .jfif].include?(file_extension)
+
+      [file_basename, file_extension].join
     end
 
     # NOTE: Address component is different to other components in the sense it can

data/app/views/metadata_presenter/page/multiplequestions.html.erb

@@ -8,11 +8,11 @@
       <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
 
       <%= render 'metadata_presenter/attribute/section_heading' %>
-      <%= render 'metadata_presenter/attribute/heading' %>
 
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post, authenticity_token: false do |f| %>
         <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
         <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
+        <%= render 'metadata_presenter/attribute/heading' %>
 
           <%= render partial: 'metadata_presenter/component/components', locals: {
               f: f,

data/app/views/metadata_presenter/save_and_return/email_confirmation.html.erb

@@ -7,7 +7,7 @@
         <div class="govuk-form-group">
           <%=
           f.govuk_email_field :email_confirmation,
-            label: { size: 'l', text: t('presenter.save_and_return.confirm_email.heading') },
+            label: { tag: 'h1', size: 'l', text: t('presenter.save_and_return.confirm_email.heading') },
             name: "email_confirmation",
             spellcheck: "false",
             autocomplete: "email"

data/app/views/metadata_presenter/save_and_return/show.html.erb

@@ -1,11 +1,12 @@
 <div class="fb-main-grid-wrapper">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-    <h1 id="page-heading" class="govuk-heading-xl"><%= t('presenter.save_and_return.show.heading') %></h1>
-    <p class="mojf-settings-screen__description"><%= t('presenter.save_and_return.show.description') %></p>
-
       <%= form_for @saved_form do |f| %>
         <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
+
+        <h1 id="page-heading" class="govuk-heading-xl"><%= t('presenter.save_and_return.show.heading') %></h1>
+        <p class="mojf-settings-screen__description"><%= t('presenter.save_and_return.show.description') %></p>
+
         <div class="govuk-form-group">
         <%= f.hidden_field(:page_slug, value: page_slug) %>
           <%=

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.23'.freeze
+  VERSION = '3.3.24'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.23
+  version: 3.3.24
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder