From 3803671a816232395f538c61046b00c875c1444b Mon Sep 17 00:00:00 2001 From: Vincent Robert Date: Wed, 16 Sep 2020 16:18:53 +0200 Subject: [PATCH] Generate a preview without print margins When a PDF is used for both printing and displaying. It will most likely contain a crop box in order to hide print margins when displaying the PDF. Use Poppler's parameter to automatically use the crop box (visible box) rather than the media box (printable box) in order to remove those margins when drawing the PDF. See https://manpages.debian.org/testing/poppler-utils/pdftoppm.1.en.html --- activestorage/CHANGELOG.md | 6 +++++ .../previewer/poppler_pdf_previewer.rb | 2 +- activestorage/test/fixtures/files/cropped.pdf | Bin 0 -> 14127 bytes activestorage/test/models/preview_test.rb | 13 +++++++++++ .../test/previewer/mupdf_previewer_test.rb | 21 +++++++++++++----- .../previewer/poppler_pdf_previewer_test.rb | 21 +++++++++++++----- 6 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 activestorage/test/fixtures/files/cropped.pdf diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index 4a91a8e070..51fe89c829 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -1,3 +1,9 @@ +* The Poppler PDF previewer renders a preview image using the original + document's crop box rather than its media box, hiding print margins. This + matches the behavior of the MuPDF previewer. + + *Vincent Robert* + * Touch parent model when an attachment is purged. *Víctor Pérez Rodríguez* diff --git a/activestorage/lib/active_storage/previewer/poppler_pdf_previewer.rb b/activestorage/lib/active_storage/previewer/poppler_pdf_previewer.rb index c7f9136983..8eaffc6491 100644 --- a/activestorage/lib/active_storage/previewer/poppler_pdf_previewer.rb +++ b/activestorage/lib/active_storage/previewer/poppler_pdf_previewer.rb @@ -29,7 +29,7 @@ def preview(**options) private def draw_first_page_from(file, &block) # use 72 dpi to match thumbnail dimensions of the PDF - draw self.class.pdftoppm_path, "-singlefile", "-r", "72", "-png", file.path, &block + draw self.class.pdftoppm_path, "-singlefile", "-cropbox", "-r", "72", "-png", file.path, &block end end end diff --git a/activestorage/test/fixtures/files/cropped.pdf b/activestorage/test/fixtures/files/cropped.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8a54a1008df20ac78bcc95ad9fd68f1e87c35a87 GIT binary patch literal 14127 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 X?jP`m6=}iho&H25gqM%+7b5=`Zb+nG literal 0 HcmV?d00001 diff --git a/activestorage/test/models/preview_test.rb b/activestorage/test/models/preview_test.rb index 87d2b6b0ec..90e5b092fa 100644 --- a/activestorage/test/models/preview_test.rb +++ b/activestorage/test/models/preview_test.rb @@ -17,6 +17,19 @@ class ActiveStorage::PreviewTest < ActiveSupport::TestCase assert_equal 792, image.height end + test "previewing a cropped PDF" do + blob = create_file_blob(filename: "cropped.pdf", content_type: "application/pdf") + preview = blob.preview(resize: "640x280").processed + + assert_predicate preview.image, :attached? + assert_equal "cropped.png", preview.image.filename.to_s + assert_equal "image/png", preview.image.content_type + + image = read_image(preview.image) + assert_equal 430, image.width + assert_equal 145, image.height + end + test "previewing an MP4 video" do blob = create_file_blob(filename: "video.mp4", content_type: "video/mp4") preview = blob.preview(resize: "640x280").processed diff --git a/activestorage/test/previewer/mupdf_previewer_test.rb b/activestorage/test/previewer/mupdf_previewer_test.rb index 6c2db6fcbf..65869dfe37 100644 --- a/activestorage/test/previewer/mupdf_previewer_test.rb +++ b/activestorage/test/previewer/mupdf_previewer_test.rb @@ -6,12 +6,10 @@ require "active_storage/previewer/mupdf_previewer" class ActiveStorage::Previewer::MuPDFPreviewerTest < ActiveSupport::TestCase - setup do - @blob = create_file_blob(filename: "report.pdf", content_type: "application/pdf") - end - test "previewing a PDF document" do - ActiveStorage::Previewer::MuPDFPreviewer.new(@blob).preview do |attachable| + blob = create_file_blob(filename: "report.pdf", content_type: "application/pdf") + + ActiveStorage::Previewer::MuPDFPreviewer.new(blob).preview do |attachable| assert_equal "image/png", attachable[:content_type] assert_equal "report.png", attachable[:filename] @@ -20,4 +18,17 @@ class ActiveStorage::Previewer::MuPDFPreviewerTest < ActiveSupport::TestCase assert_equal 792, image.height end end + + test "previewing a cropped PDF document" do + blob = create_file_blob(filename: "cropped.pdf", content_type: "application/pdf") + + ActiveStorage::Previewer::MuPDFPreviewer.new(blob).preview do |attachable| + assert_equal "image/png", attachable[:content_type] + assert_equal "cropped.png", attachable[:filename] + + image = MiniMagick::Image.read(attachable[:io]) + assert_equal 430, image.width + assert_equal 145, image.height + end + end end diff --git a/activestorage/test/previewer/poppler_pdf_previewer_test.rb b/activestorage/test/previewer/poppler_pdf_previewer_test.rb index 2b41c8b642..5809b5a058 100644 --- a/activestorage/test/previewer/poppler_pdf_previewer_test.rb +++ b/activestorage/test/previewer/poppler_pdf_previewer_test.rb @@ -6,12 +6,10 @@ require "active_storage/previewer/poppler_pdf_previewer" class ActiveStorage::Previewer::PopplerPDFPreviewerTest < ActiveSupport::TestCase - setup do - @blob = create_file_blob(filename: "report.pdf", content_type: "application/pdf") - end - test "previewing a PDF document" do - ActiveStorage::Previewer::PopplerPDFPreviewer.new(@blob).preview do |attachable| + blob = create_file_blob(filename: "report.pdf", content_type: "application/pdf") + + ActiveStorage::Previewer::PopplerPDFPreviewer.new(blob).preview do |attachable| assert_equal "image/png", attachable[:content_type] assert_equal "report.png", attachable[:filename] @@ -20,4 +18,17 @@ class ActiveStorage::Previewer::PopplerPDFPreviewerTest < ActiveSupport::TestCas assert_equal 792, image.height end end + + test "previewing a cropped PDF document" do + blob = create_file_blob(filename: "cropped.pdf", content_type: "application/pdf") + + ActiveStorage::Previewer::PopplerPDFPreviewer.new(blob).preview do |attachable| + assert_equal "image/png", attachable[:content_type] + assert_equal "cropped.png", attachable[:filename] + + image = MiniMagick::Image.read(attachable[:io]) + assert_equal 430, image.width + assert_equal 145, image.height + end + end end -- GitLab