+ <% document_annots_index[index]&.each do |annot| %>
+ <%= render 'submissions/annotation', annot: %>
+ <% end %>
<% fields_index.dig(document.uuid, index)&.each do |(area, field)| %>
<% value = values[field['uuid']] %>
<% next if value.blank? %>
diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb
index 77c4500b..c998d401 100644
--- a/app/views/submit_form/show.html.erb
+++ b/app/views/submit_form/show.html.erb
@@ -8,11 +8,15 @@
<%= render 'banner' %>
<% (@submitter.submission.template_schema || @submitter.submission.template.schema).each do |item| %>
- <% document = @submitter.submission.template.documents.find { |a| a.uuid == item['attachment_uuid'] } %>
+ <% document = @submitter.submission.template_schema_documents.find { |a| a.uuid == item['attachment_uuid'] } %>
+ <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %>
<% document.preview_images.sort_by { |a| a.filename.base.to_i }.each_with_index do |page, index| %>
+ <% document_annots_index[index]&.each do |annot| %>
+ <%= render 'submissions/annotation', annot: %>
+ <% end %>
<% fields_index.dig(document.uuid, index)&.each do |(area, field)| %>
<% value = values[field['uuid']] %>
<% next if value.blank? %>
diff --git a/app/views/verify_pdf_signature/_result.html.erb b/app/views/verify_pdf_signature/_result.html.erb
index ba29e708..4afa55c1 100644
--- a/app/views/verify_pdf_signature/_result.html.erb
+++ b/app/views/verify_pdf_signature/_result.html.erb
@@ -54,7 +54,7 @@
<%= svg_icon('certificate', class: 'w-5 h-5 inline') %>
- <%= signature.signer_name %>
+ <%= signature.signer_name.force_encoding('UTF-8') %>
<%= svg_icon('lock_access', class: 'w-5 h-5 inline') %>
diff --git a/lib/accounts.rb b/lib/accounts.rb
index 1ae0c702..02934197 100644
--- a/lib/accounts.rb
+++ b/lib/accounts.rb
@@ -51,7 +51,7 @@ module Accounts
end
if (default_cert = cert_data['custom']&.find { |e| e['status'] == 'default' })
- OpenSSL::PKCS12.new(Base64.urlsafe_decode64(default_cert['data']), default_cert['password'])
+ OpenSSL::PKCS12.new(Base64.urlsafe_decode64(default_cert['data']), default_cert['password'].to_s)
else
GenerateCertificate.load_pkcs(cert_data)
end
diff --git a/lib/templates/build_annotations.rb b/lib/templates/build_annotations.rb
new file mode 100644
index 00000000..fff8623f
--- /dev/null
+++ b/lib/templates/build_annotations.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Templates
+ module BuildAnnotations
+ module_function
+
+ def call(data)
+ pdf = PDF::Reader.new(StringIO.new(data))
+
+ pdf.pages.flat_map.with_index do |page, index|
+ annotations = page.objects.deref!(page.attributes[:Annots]) || []
+ annotations.filter_map do |annot|
+ next if annot[:A].blank? || annot[:A][:URI].blank?
+ next unless annot[:Subtype] == :Link
+ next if !annot[:A][:URI].starts_with?('https://') && !annot[:A][:URI].starts_with?('http://')
+
+ build_external_link_hash(page, annot).merge('page' => index)
+ end
+ end
+ end
+
+ def build_external_link_hash(page, annot)
+ left, bottom, right, top = annot[:Rect]
+
+ {
+ 'type' => 'external_link',
+ 'value' => annot[:A][:URI],
+ 'x' => left / page.width,
+ 'y' => (page.height - top) / page.height,
+ 'w' => (right - left) / page.width,
+ 'h' => (top - bottom) / page.height
+ }
+ end
+ end
+end
diff --git a/lib/templates/create_attachments.rb b/lib/templates/create_attachments.rb
new file mode 100644
index 00000000..1364940e
--- /dev/null
+++ b/lib/templates/create_attachments.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Templates
+ module CreateAttachments
+ PDF_CONTENT_TYPE = 'application/pdf'
+
+ module_function
+
+ def call(template, params)
+ find_or_create_blobs(params).map do |blob|
+ document = template.documents.create!(blob:)
+
+ document_data = blob.download
+
+ if blob.content_type == PDF_CONTENT_TYPE && blob.metadata['pdf'].nil?
+ blob.metadata['pdf'] = { 'annotations' => Templates::BuildAnnotations.call(document_data) }
+ end
+
+ blob.save!
+
+ Templates::ProcessDocument.call(document, document_data)
+ end
+ end
+
+ def find_or_create_blobs(params)
+ blobs = params[:blobs]&.map do |attrs|
+ ActiveStorage::Blob.find_signed(attrs[:signed_id])
+ end
+
+ blobs || params[:files].map do |file|
+ data = file.read
+
+ if file.content_type == PDF_CONTENT_TYPE
+ metadata = { 'identified' => true, 'analyzed' => true,
+ 'pdf' => { 'annotations' => Templates::BuildAnnotations.call(data) } }
+ end
+
+ ActiveStorage::Blob.create_and_upload!(
+ io: StringIO.new(data),
+ filename: file.original_filename,
+ metadata:,
+ content_type: file.content_type
+ )
+ end
+ end
+ end
+end
diff --git a/lib/templates/process_document.rb b/lib/templates/process_document.rb
index fd1843b1..41913c20 100644
--- a/lib/templates/process_document.rb
+++ b/lib/templates/process_document.rb
@@ -12,22 +12,20 @@ module Templates
module_function
- def call(attachment)
+ def call(attachment, data)
if attachment.content_type == PDF_CONTENT_TYPE
- generate_pdf_preview_images(attachment)
+ generate_pdf_preview_images(attachment, data)
elsif attachment.image?
- generate_preview_image(attachment)
+ generate_preview_image(attachment, data)
end
attachment
end
- def generate_preview_image(attachment)
- binary = attachment.download
-
+ def generate_preview_image(attachment, data)
ActiveStorage::Attachment.where(name: ATTACHMENT_NAME, record: attachment).destroy_all
- image = Vips::Image.new_from_buffer(binary, '')
+ image = Vips::Image.new_from_buffer(data, '')
image = image.autorot.resize(MAX_WIDTH / image.width.to_f)
io = StringIO.new(image.write_to_buffer(FORMAT, Q: Q, interlace: true))
@@ -42,14 +40,12 @@ module Templates
)
end
- def generate_pdf_preview_images(attachment)
- binary = attachment.download
-
+ def generate_pdf_preview_images(attachment, data)
ActiveStorage::Attachment.where(name: ATTACHMENT_NAME, record: attachment).destroy_all
- number_of_pages = HexaPDF::Document.new(io: StringIO.new(binary)).pages.size - 1
+ number_of_pages = PDF::Reader.new(StringIO.new(data)).pages.size - 1
(0..number_of_pages).each do |page_number|
- page = Vips::Image.new_from_buffer(binary, '', dpi: DPI, page: page_number)
+ page = Vips::Image.new_from_buffer(data, '', dpi: DPI, page: page_number)
page = page.resize(MAX_WIDTH / page.width.to_f)
io = StringIO.new(page.write_to_buffer(FORMAT, Q: Q, interlace: true))
diff --git a/spec/factories/templates.rb b/spec/factories/templates.rb
index 7faa84d3..aba62676 100644
--- a/spec/factories/templates.rb
+++ b/spec/factories/templates.rb
@@ -19,7 +19,7 @@ FactoryBot.define do
record: template
)
- Templates::ProcessDocument.call(attachment)
+ Templates::ProcessDocument.call(attachment, attachment.download)
template.schema = [{ attachment_uuid: attachment.uuid, name: 'sample-document' }]
template.submitters = [