dragonfly_pdf 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3564818b6fdd4b3ef01e4bbcd252d662951cf447
-  data.tar.gz: 55c1cf69673d57a4bc5552a5fcc7b3f788398052
+  metadata.gz: b5dab11367b3cdef13ca762005b3a860557f37f2
+  data.tar.gz: 074c0aebc12f4f39a18f538a1d9e71aff311e396
 SHA512:
-  metadata.gz: fe8978ec5003eacc7922fdef3eb47f1186cae1553c0db804866516f9fa3c8d68fe275518eb97fa575a1733f90216057c5f82c2ef8863f0b18c94d349be8151dd
-  data.tar.gz: e2a2e9cfee824167690afbb6ce98f7da326c5801f06930690698dfccfc0bcdc056641e3337b11a71cf62403ab8c87dc8a1ff64a08a3105c9d0d6924a17a48070
+  metadata.gz: 7d20ce89e113cd9023e67b9b48fc72ae93025e25cefe354273ffa68522777840766176ad4a79d799e3deace276c15b9055fd3ec4f9b03a04732c983c479c1a94
+  data.tar.gz: a91341b7bea0267ea9043eb04118a0fbeec0943274c1c0be80ec9d2780831f649bf041fefe0ad4206e7c0394c1594a7a3ca650d8f94f651d6a4496ad52e2fa23

data/.travis.yml

@@ -8,11 +8,14 @@ rvm:
 
 before_install:
   - gem update bundler
+  - sudo add-apt-repository -y ppa:ubuntuhandbook1/apps
   - sudo apt-get update
   - sudo apt-get install -y pdftk
+  - sudo apt-get install -y ghostscript
+  - sudo apt-get install -y mupdf-tools
   - sudo apt-get install -y gobject-introspection libgirepository1.0-dev libglib2.0-dev libpoppler-glib-dev
-  - curl -O http://www.vips.ecs.soton.ac.uk/supported/8.4/vips-8.4.5.tar.gz
-  - tar zvxf vips-8.4.5.tar.gz && cd vips-8.4.5 && ./configure && sudo make && sudo make install
+  - 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
   - export GI_TYPELIB_PATH=/usr/local/lib/girepository-1.0/
   - sudo ldconfig
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.0
+
+* PDF rendering to use `mupdf` which results in siginificant performance boost
+
 ## 1.1.0
 
 * match `dragonfly_libvips` dependency

data/README.md

@@ -8,6 +8,7 @@
 
 - [libvips](https://github.com/jcupitt/libvips)
 - [GhostScript](http://www.ghostscript.com)
+- [mupdf](https://mupdf.com)
 - [pdftk](https://www.pdflabs.com/tools/pdftk-server)
 
 ## Installation

data/dragonfly_pdf.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dragonfly', '~> 1.0'
-  spec.add_dependency 'dragonfly_libvips', '>= 1.0.2'
+  spec.add_dependency 'dragonfly_libvips', '~> 2.1.0'
   spec.add_dependency 'activesupport', '>= 4.0'
 
   spec.add_development_dependency 'bundler', '~> 1.12'

data/lib/dragonfly_pdf/analysers/pdf_properties.rb

@@ -21,7 +21,7 @@ module DragonflyPdf
         }
       end
 
-      private # =============================================================
+      private
 
       def pt2mm(pt)
         (pt / 72.0) * 25.4

data/lib/dragonfly_pdf/plugin.rb

@@ -1,7 +1,9 @@
 require 'active_support/core_ext/hash'
 
 require 'dragonfly_pdf/analysers/pdf_properties'
+
 require 'dragonfly_pdf/processors/append'
+require 'dragonfly_pdf/processors/convert'
 require 'dragonfly_pdf/processors/page'
 require 'dragonfly_pdf/processors/remove_password'
 require 'dragonfly_pdf/processors/rotate'
@@ -41,6 +43,7 @@ module DragonflyPdf
       # ---------------------------------------------------------------------
 
       app.add_processor :append, DragonflyPdf::Processors::Append.new
+      app.add_processor :convert, DragonflyPdf::Processors::Convert.new
       app.add_processor :page, DragonflyPdf::Processors::Page.new
       app.add_processor :remove_password, DragonflyPdf::Processors::RemovePassword.new
       app.add_processor :rotate, DragonflyPdf::Processors::Rotate.new
@@ -48,11 +51,22 @@ module DragonflyPdf
       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_number, geometry, options = {}|
-        options = options.deep_stringify_keys
-        options.fetch('input_options', {})['page'] = page_number-1
-        options['format'] ||= 'jpg'
-        content.process!(:thumb, geometry, options)
+
+      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
     end
   end

data/lib/dragonfly_pdf/processors/append.rb

@@ -7,7 +7,7 @@ module DragonflyPdf
         end
       end
 
-      private # =============================================================
+      private
 
       def pdftk_command
         'pdftk'

data/lib/dragonfly_pdf/processors/convert.rb

@@ -0,0 +1,70 @@
+require 'dragonfly_libvips/dimensions'
+require 'vips'
+
+module DragonflyPdf
+  module Processors
+    class Convert
+      DPI = 600
+
+      def call(content, page, geometry=nil, options = {})
+        options = options.deep_symbolize_keys
+        format = options.fetch(:format, :png)
+
+        case format.to_sym
+        when :pdf
+          pdf_options = options.fetch(:pdf_options, "compress,compress-fonts,compress-images,linearize,sanitize,garbage=deduplicate")
+
+          content.shell_update(ext: format) do |old_path, new_path|
+            "#{convert_command} -o #{new_path} -F #{format} -O #{pdf_options} #{old_path} #{page}"
+          end
+
+        when :svg
+          text = options.fetch(:text, :path)
+
+          content.shell_update(ext: format) do |old_path, new_path|
+            "#{convert_command} -o #{new_path} -F #{format} -O text=#{text} #{old_path} #{page}"
+          end
+
+          # MuPDF appends 1 at the end of the filename, we need to rename it back
+          `mv #{content.path.sub(".#{format}", "1.#{format}")} #{content.path}`
+
+        else
+          input_options = options.fetch(:input_options, {})
+          input_options[:access] = input_options.fetch(:access, 'sequential')
+          input_options[:dpi] = input_options.fetch(:dpi, DPI)
+
+          img = ::Vips::Image.new_from_file(content.path, input_options)
+
+          dimensions = case geometry
+          when DragonflyLibvips::Processors::Thumb::RESIZE_GEOMETRY then DragonflyLibvips::Dimensions.call(geometry, img.width, img.height)
+          else raise ArgumentError, "Didn't recognise the geometry string: #{geometry}"
+          end
+
+          width = dimensions.width.ceil
+
+          content.shell_update(ext: format) do |old_path, new_path|
+            "#{convert_command} -o #{new_path} -F #{format} -O width=#{width},colorspace=rgb #{old_path} #{page}"
+          end
+
+          # MuPDF appends 1 at the end of the filename, we need to rename it back
+          `mv #{content.path.sub(".#{format}", "1.#{format}")} #{content.path}`
+        end
+
+        content.ext = format
+      end
+
+      def update_url(url_attributes, _, options = {})
+        options = options.deep_symbolize_keys
+        format = options.fetch(:format, :png)
+
+        url_attributes.ext = format
+      end
+
+      private
+
+      def convert_command
+        'mutool convert'
+      end
+    end
+  end
+end

data/lib/dragonfly_pdf/processors/page.rb

@@ -13,7 +13,7 @@ module DragonflyPdf
         end
       end
 
-      private # =============================================================
+      private
 
       def gs_command
         'gs -sDEVICE=pdfwrite -dNOPAUSE -dBATCH'

data/lib/dragonfly_pdf/processors/remove_password.rb

@@ -7,7 +7,7 @@ module DragonflyPdf
         end
       end
 
-      private # =============================================================
+      private
 
       def gs_command
         'gs -dNOPAUSE -dBATCH -sDEVICE=pdfwrite'

data/lib/dragonfly_pdf/processors/rotate.rb

@@ -16,7 +16,7 @@ module DragonflyPdf
         end
       end
 
-      private # =============================================================
+      private
 
       def pdftk_command
         'pdftk'

data/lib/dragonfly_pdf/processors/stamp.rb

@@ -7,7 +7,7 @@ module DragonflyPdf
         end
       end
 
-      private # =============================================================
+      private
 
       def pdftk_command
         'pdftk'

data/lib/dragonfly_pdf/processors/subset_fonts.rb

@@ -7,7 +7,7 @@ module DragonflyPdf
         end
       end
 
-      private # =============================================================
+      private
 
       def gs_command
         'gs -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -dSubsetFonts=true'

data/lib/dragonfly_pdf/version.rb

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

data/test/dragonfly_pdf/plugin_test.rb

@@ -65,10 +65,20 @@ module DragonflyPdf
 
     describe 'DragonflyLibvips proxy' do
       describe 'page_thumb' do
-        it 'encodes the image to the correct format' 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
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_pdf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -28,16 +28,16 @@ dependencies:
   name: dragonfly_libvips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ files:
 - lib/dragonfly_pdf/errors.rb
 - lib/dragonfly_pdf/plugin.rb
 - lib/dragonfly_pdf/processors/append.rb
+- lib/dragonfly_pdf/processors/convert.rb
 - lib/dragonfly_pdf/processors/page.rb
 - lib/dragonfly_pdf/processors/remove_password.rb
 - lib/dragonfly_pdf/processors/rotate.rb