dragonfly_pdf 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5dab11367b3cdef13ca762005b3a860557f37f2
-  data.tar.gz: 074c0aebc12f4f39a18f538a1d9e71aff311e396
+  metadata.gz: 5f49e3cad532a597767fe058ac6fd8097baf69ff
+  data.tar.gz: 765bdcc44c3b5ba7a708476e01548d79d485fcae
 SHA512:
-  metadata.gz: 7d20ce89e113cd9023e67b9b48fc72ae93025e25cefe354273ffa68522777840766176ad4a79d799e3deace276c15b9055fd3ec4f9b03a04732c983c479c1a94
-  data.tar.gz: a91341b7bea0267ea9043eb04118a0fbeec0943274c1c0be80ec9d2780831f649bf041fefe0ad4206e7c0394c1594a7a3ca650d8f94f651d6a4496ad52e2fa23
+  metadata.gz: 839040f86f9322c1c190802584eddd8d82ac7ab21d33728f3df8c28290542eb486144bed9ad4f029a5e29412ee5fd85766a8be3657e22725b07b7d475dd9b06e
+  data.tar.gz: c3c5b7294bccb265a948e34ad04f1ee66455a7edf0cc20feae4b459f7a777aaec47316f1c47a39a24d1477534c51255ae259032999d07af6a449b95f7ceba491

data/.travis.yml

@@ -12,7 +12,8 @@ before_install:
   - sudo apt-get update
   - sudo apt-get install -y pdftk
   - sudo apt-get install -y ghostscript
-  - sudo apt-get install -y mupdf-tools
+  - curl -OL https://mupdf.com/downloads/mupdf-1.12.0-source.tar.gz
+  - tar zvxf mupdf-1.12.0-source.tar.gz && cd mupdf-1.12.0-source && sudo make HAVE_X11=no HAVE_GLUT=no prefix=/usr/local install
   - sudo apt-get install -y gobject-introspection libgirepository1.0-dev libglib2.0-dev libpoppler-glib-dev
   - curl -OL https://github.com/jcupitt/libvips/releases/download/v8.5.8/vips-8.5.8.tar.gz
   - tar zvxf vips-8.5.8.tar.gz && cd vips-8.5.8 && ./configure && sudo make && sudo make install

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.0.1
+
+* fixed: a bug in Convert and Page Thumb Processors which caused the url to not include file extension
+* refactored: Page Thumb Processor is now a class
+* added: tests for Convert and Page Thumb Processor
+
 ## 2.0.0
 
 * PDF rendering to use `mupdf` which results in siginificant performance boost

data/lib/dragonfly_pdf/plugin.rb

@@ -4,6 +4,7 @@ require 'dragonfly_pdf/analysers/pdf_properties'
 
 require 'dragonfly_pdf/processors/append'
 require 'dragonfly_pdf/processors/convert'
+require 'dragonfly_pdf/processors/page_thumb'
 require 'dragonfly_pdf/processors/page'
 require 'dragonfly_pdf/processors/remove_password'
 require 'dragonfly_pdf/processors/rotate'
@@ -49,25 +50,8 @@ module DragonflyPdf
       app.add_processor :rotate, DragonflyPdf::Processors::Rotate.new
       app.add_processor :stamp, DragonflyPdf::Processors::Stamp.new
       app.add_processor :subset_fonts, DragonflyPdf::Processors::SubsetFonts.new
-
       app.add_processor :thumb, DragonflyLibvips::Processors::Thumb.new
-
-      app.add_processor :page_thumb do |content, page, geometry = nil, options = {}|
-        options = options.deep_symbolize_keys
-        options[:format] = options.fetch(:format, :jpg)
-
-        convert_options = {}
-        convert_options[:format] = case options[:format]
-                                   when :pdf, :svg then options[:format]
-                                   else :png
-        end
-
-        content.process!(:convert, page, geometry, convert_options)
-
-        unless %i[pdf png svg].include?(options[:format].to_sym)
-          content.process!(:thumb, geometry, options)
-        end
-      end
+      app.add_processor :page_thumb, DragonflyPdf::Processors::PageThumb.new
     end
   end
 end

data/lib/dragonfly_pdf/processors/convert.rb

@@ -50,14 +50,16 @@ module DragonflyPdf
           `mv #{content.path.sub(".#{format}", "1.#{format}")} #{content.path}`
         end
 
+        content.meta['format'] = format.to_s
         content.ext = format
+        content.meta['mime_type'] = nil # don't need it as we have ext now
       end
 
-      def update_url(url_attributes, _, options = {})
+      def update_url(attrs, page, geometry=nil, options = {})
         options = options.deep_symbolize_keys
         format = options.fetch(:format, :png)
 
-        url_attributes.ext = format
+        attrs.ext = format.to_s
       end
 
       private

data/lib/dragonfly_pdf/processors/page_thumb.rb

@@ -0,0 +1,40 @@
+module DragonflyPdf
+  module Processors
+    class PageThumb
+      def call(content, page, geometry = nil, options = {})
+        options = options.deep_symbolize_keys
+        format = options.delete(:format) { :jpg }
+
+        convert(content, page, geometry, format)
+
+        unless %i[pdf png svg].include?(format.to_sym)
+          thumb(content, geometry, format, options)
+        end
+
+        content.meta['format'] = format.to_s
+        content.ext = format
+        content.meta['mime_type'] = nil # don't need it as we have ext now
+      end
+
+      def update_url(attrs, page, geometry=nil, options = {})
+        options = options.deep_symbolize_keys
+        format = options.fetch(:format, :jpg)
+        attrs.ext = format.to_s
+      end
+
+      private # =============================================================
+
+      def convert(content, page, geometry, format)
+        convert_format = case format
+                         when :pdf, :svg then format
+                         else :png
+        end
+        content.process!(:convert, page, geometry, { format: convert_format })
+      end
+
+      def thumb(content, geometry, format, options)
+        content.process!(:thumb, geometry, options.merge(format: format))
+      end
+    end
+  end
+end

data/lib/dragonfly_pdf/version.rb

@@ -1,3 +1,3 @@
 module DragonflyPdf
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/test/dragonfly_pdf/plugin_test.rb

@@ -63,22 +63,9 @@ module DragonflyPdf
       end
     end
 
-    describe 'DragonflyLibvips proxy' do
-      describe 'page_thumb' do
-        it 'converts PDF to JPG format' do
-          pdf.page_thumb!(1, '600x')
-          `file --mime-type #{pdf.path}`.must_include 'image/jpeg'
-        end
-
-        # it 'converts PDF page to SVG format' do
-        #   pdf.page_thumb!(1, nil, format: :svg)
-        #   `file --mime-type #{pdf.path}`.must_include 'image/svg+xml'
-        # end
-        #
-        # it 'converts PDF page to PDF format' do
-        #   pdf.page_thumb!(1, nil, format: :pdf)
-        #   `file --mime-type #{pdf.path}`.must_include 'application/pdf'
-        # end
+    describe '#convert' do
+      it 'adds the correct extension to resulting url' do
+        pdf.convert(1, '600x').url.must_match /\.png/
       end
     end
   end

data/test/dragonfly_pdf/processors/convert_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+describe DragonflyPdf::Processors::Convert do
+  let(:app) { test_app.configure_with(:pdf) }
+  let(:sample) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
+
+  let(:processor) { DragonflyPdf::Processors::Convert.new }
+
+  describe 'formats' do
+    let (:url_attributes) { OpenStruct.new }
+
+    describe 'default' do
+      before { processor.call(sample, 1, '600x') }
+
+      it 'converts the PDF to a PNG by default' do
+        sample.ext.must_equal 'png'
+      end
+
+      it 'updates the file meta format to PNG by default' do
+        sample.meta['format'].must_equal 'png'
+      end
+
+      it 'updates the url extension to PNG by default' do
+        processor.update_url(url_attributes, 1)
+        url_attributes.ext.must_equal 'png'
+      end
+    end
+
+    describe 'svg' do
+      before { processor.call(sample, 1, '600x', format: :svg) }
+
+      it 'converts the PDF to an SVG' do
+        sample.ext.must_equal 'svg'
+      end
+
+      it 'updates the file meta format to SVG' do
+        sample.meta['format'].must_equal 'svg'
+      end
+
+      it 'updates the url extension to SVG' do
+        processor.update_url(url_attributes, 1, '', format: :svg)
+        url_attributes.ext.must_equal 'svg'
+      end
+    end
+  end
+end

data/test/dragonfly_pdf/processors/page_thumb_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+describe DragonflyPdf::Processors::PageThumb do
+  let(:app) { test_app.configure_with(:pdf) }
+  let(:sample) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
+
+  let(:processor) { DragonflyPdf::Processors::PageThumb.new }
+
+  describe 'formats' do
+    let (:url_attributes) { OpenStruct.new }
+
+    describe 'default' do
+      before { processor.call(sample, 1, '600x') }
+
+      it 'converts the PDF to a JPG by default' do
+        sample.ext.must_equal 'jpg'
+      end
+
+      it 'updates the file meta format to JPG by default' do
+        sample.meta['format'].must_equal 'jpg'
+      end
+
+      it 'updates the url extension to JPG by default' do
+        processor.update_url(url_attributes, 1)
+        url_attributes.ext.must_equal 'jpg'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -159,6 +159,7 @@ files:
 - lib/dragonfly_pdf/processors/append.rb
 - lib/dragonfly_pdf/processors/convert.rb
 - lib/dragonfly_pdf/processors/page.rb
+- lib/dragonfly_pdf/processors/page_thumb.rb
 - lib/dragonfly_pdf/processors/remove_password.rb
 - lib/dragonfly_pdf/processors/rotate.rb
 - lib/dragonfly_pdf/processors/stamp.rb
@@ -172,7 +173,9 @@ files:
 - test/dragonfly_pdf/analysers/pdf_properties_test.rb
 - test/dragonfly_pdf/plugin_test.rb
 - test/dragonfly_pdf/processors/append_test.rb
+- test/dragonfly_pdf/processors/convert_test.rb
 - test/dragonfly_pdf/processors/page_test.rb
+- test/dragonfly_pdf/processors/page_thumb_test.rb
 - test/dragonfly_pdf/processors/remove_password_test.rb
 - test/dragonfly_pdf/processors/rotate_test.rb
 - test/dragonfly_pdf/processors/stamp_test.rb
@@ -206,7 +209,9 @@ test_files:
 - test/dragonfly_pdf/analysers/pdf_properties_test.rb
 - test/dragonfly_pdf/plugin_test.rb
 - test/dragonfly_pdf/processors/append_test.rb
+- test/dragonfly_pdf/processors/convert_test.rb
 - test/dragonfly_pdf/processors/page_test.rb
+- test/dragonfly_pdf/processors/page_thumb_test.rb
 - test/dragonfly_pdf/processors/remove_password_test.rb
 - test/dragonfly_pdf/processors/rotate_test.rb
 - test/dragonfly_pdf/processors/stamp_test.rb