metadata_presenter 2.19.4 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287793ad62c89ad266e3c05508365cf24bcd5269d4c08e28f9a631aa50f5762a
-  data.tar.gz: 885cc9f6bc43d4d1bd86ba1fb376d1994905000e4f14bfe7173076db7d531633
+  metadata.gz: 4d37f521b151efebea9c3e73254a6ca349499a19e5bf0428c64e8a76f612dff9
+  data.tar.gz: 6cfdaa83747659decd5e3d2f9819845bb986a5e8717f0477429e89ab6222144b
 SHA512:
-  metadata.gz: c3ab0c526f54ea3d22925baa1da1b4260deceb51bbd720695635b55ff3629116f0a93479fc8118e83bef39cc8ccd52bb718a1128fa573ad851247597e1c04821
-  data.tar.gz: '024489fcbd77662977c8684f2949fcd1b4bc5126e7933feba40a6acd689f12a63de3ad112a8eb92a00113c77979c0fcba90f6c65f05e6e6a1eda9d607f02546b'
+  metadata.gz: 847ffda48c7f1c52419f47b8a37154d53f3b4ec977f3abaf4a3c2d6ae1c193eac558b9225220f9281959518921d6da8e41a122e6fb16501c8e35f2ad2a38a035
+  data.tar.gz: 42abc6cde28dc7ea3256e03caba1fcb5ba1f38799fd2be44a1477db6f93bc3eb02288fe0bd61ea3ae48aa9a6d9f6faddd7a9550ae78442628918f2621d47a17b

data/README.md

@@ -97,6 +97,9 @@ The `autocomplete_items` takes the components on a page and retrieves any items
 
 `save_and_return_enabled?` method checks whether save and return is enabled in the Runner or Editor app. In the Runner save and return is enabled when the `ENV['SAVE_AND_RETURN']` environment variable is present. In the Editor, save and return enabled can be ascertained by checking the `ServiceConfiguration` table.
 
+`service_slug_config` method checks whether the user has configured their own service URL. In the Editor this will be a `SERVICE_SLUG` row in the `ServiceConfiguration` table. In the Runner, it will be the `ENV['SERVICE_SLUG']` config.
+If it does not exist, we use the current method of parameterizing the `service_name`.
+
 ## Generate documentation
 
 Run `rake doc` and open the doc/index.html

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,15 +37,13 @@ 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(filename(file_details['original_filename'])))
-
       else
         {
           'original_filename' => sanitize(filename(file_details.original_filename)),
@@ -75,7 +74,16 @@ module MetadataPresenter
     def filename(path)
       return sanitize(path) if path.nil?
 
-      sanitize(path).gsub(/&gt;/, '').gsub(/&lt;/, '').delete('>"[]{}*?:|]/<').delete('\\')
+      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/models/metadata_presenter/service.rb

@@ -38,6 +38,8 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
   end
 
   def service_slug
+    return service_slug_config if service_slug_config.present?
+
     service_name.gsub(/['’]/, '').parameterize
   end
 

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.19.4'.freeze
+  VERSION = '2.20.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.19.4
+  version: 2.20.0
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-18 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