metadata_presenter 2.19.3 → 2.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2279ffc71300e31a078526283d51dd9264d7b6dc8912e714758ea099a0f4b261
-  data.tar.gz: d1288a6835ee16441c6d267d9ac97c23178b63474b9b5b26100fd2bb93ab6836
+  metadata.gz: f0d20b5161033659492619628a0c1f26c1a69926193dbea87353a1b3a2a0a984
+  data.tar.gz: 15940e4f5bbf2656108d89a589535635d31bd2f8f813855b628ee67e4ef9ddf1
 SHA512:
-  metadata.gz: 0ed0cc7cb93eb72ce9708daf8dbde6f4a39d40a1bc94bf55900f807debe21c78d7674e89b2385301771bbaf9a7a31a3721345f3f893a53b118cffc0918913ac9
-  data.tar.gz: b6e2ec8a129bd962d64dc8b28811a9792d2f8458eb042cca80513647288102c7ec8050dfce3c694328273f658ccbb7a98d2b33ffb2085c7b2b72cac9be29fbd1
+  metadata.gz: 9b3db24698b1637328ba375d2676c903331cab7fcdc1789faeedc4b626b41f685f2a50225ea48f04c378d72be288928322eb24cccff816085dd66784c1d6377b
+  data.tar.gz: 47f23df2526d20da3066044b4224faee03113375c4654bce63154935b50e8df94cd588196b841a034641f591447577da8d9246dbbf2a1cd6ddb46f5c4fabba18

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -22,6 +22,14 @@ module MetadataPresenter
       end
     end
 
+    def update_count_matching_filenames(original_filename, user_data)
+      extname = File.extname(original_filename)
+      basename = File.basename(original_filename, extname)
+      filename_regex = /^#{Regexp.quote(basename)}(?>-\((\d)\))?#{Regexp.quote(extname)}/
+
+      user_data.select { |_k, v| v.instance_of?(Hash) && v['original_filename'] =~ filename_regex }.count
+    end
+
     private
 
     def page
@@ -72,6 +80,12 @@ module MetadataPresenter
       @page_answers.page.upload_components.each do |component|
         answer = user_data[component.id]
 
+        original_filename = answer.nil? ? @page_answers.send(component.id)['original_filename'] : answer['original_filename']
+
+        if original_filename.present?
+          @page_answers.count = update_count_matching_filenames(original_filename, user_data)
+        end
+
         @page_answers.uploaded_files.push(uploaded_file(answer, component))
       end
     end

data/app/models/metadata_presenter/offline_upload_adapter.rb

@@ -1,7 +1,7 @@
 module MetadataPresenter
   class OfflineUploadAdapter
     include ActiveModel::Model
-    attr_accessor :session, :file_details, :allowed_file_types
+    attr_accessor :session, :file_details, :allowed_file_types, :count
 
     def call
       {}

data/app/models/metadata_presenter/page_answers.rb

@@ -4,6 +4,7 @@ module MetadataPresenter
     include ActiveModel::Validations
     include ActionView::Helpers
     attr_reader :page, :answers, :uploaded_files, :autocomplete_items
+    attr_accessor :count
 
     def initialize(page, answers, autocomplete_items = nil)
       @page = page
@@ -28,7 +29,7 @@ module MetadataPresenter
       if component && component.type == 'date'
         date_answer(component.id)
       elsif component && component.type == 'upload'
-        upload_answer(component.id)
+        upload_answer(component.id, count)
       elsif component && component.type == 'checkboxes'
         answers[method_name.to_s].to_a
       else
@@ -36,16 +37,16 @@ module MetadataPresenter
       end
     end
 
-    def upload_answer(component_id)
+    def upload_answer(component_id, _count)
       file_details = answers[component_id.to_s]
 
       return {} unless file_details
 
       if file_details.is_a?(Hash) || file_details.is_a?(ActionController::Parameters)
-        file_details.merge('original_filename' => sanitize(file_details['original_filename']))
+        file_details.merge('original_filename' => sanitize(filename(file_details['original_filename'])))
       else
         {
-          'original_filename' => sanitize(file_details.original_filename),
+          'original_filename' => sanitize(filename(file_details.original_filename)),
           'content_type' => file_details.content_type,
           'tempfile' => file_details.tempfile.path.to_s
         }
@@ -67,5 +68,22 @@ module MetadataPresenter
         sanitize(answers["#{component_id}(#{segment})"])
       end
     end
+
+    private
+
+    def filename(path)
+      return sanitize(path) if path.nil?
+
+      filename = sanitize(path).gsub(/&gt;/, '').gsub(/&lt;/, '').delete('>"[]{}*?:|]/<').delete('\\')
+
+      if count.present? && count.positive?
+        extname = File.extname(filename)
+        basename = File.basename(filename, extname)
+
+        filename = "#{basename}-(#{count})#{extname}"
+      end
+
+      filename
+    end
   end
 end

data/app/views/metadata_presenter/component/_upload.html.erb

@@ -3,7 +3,6 @@
   <span class="govuk-hint" id="answers-dog-picture-upload-1-hint" data-fb-default-text="<%= default_text('upload_hint') %>">
     <%= component.hint.present? ? component.hint : default_text('upload_hint') %>
   </span>
-
   <p><%= @page_answers.send(component.id)['original_filename'] %></p>
 
   <p>

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.19.3'.freeze
+  VERSION = '2.19.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.19.3
+  version: 2.19.5
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -216,16 +216,16 @@ dependencies:
   name: site_prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement