dragonfly_pdf 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5f49e3cad532a597767fe058ac6fd8097baf69ff
-  data.tar.gz: 765bdcc44c3b5ba7a708476e01548d79d485fcae
+SHA256:
+  metadata.gz: 76f9364c0e260943bd144490065c03b31df16566dfc5edfbdfb8a43a201a5bd7
+  data.tar.gz: 9d632fb7d1f1d52bae8f2be9b1aabc850d6f2581fdb0ef3502bb1d408df200f1
 SHA512:
-  metadata.gz: 839040f86f9322c1c190802584eddd8d82ac7ab21d33728f3df8c28290542eb486144bed9ad4f029a5e29412ee5fd85766a8be3657e22725b07b7d475dd9b06e
-  data.tar.gz: c3c5b7294bccb265a948e34ad04f1ee66455a7edf0cc20feae4b459f7a777aaec47316f1c47a39a24d1477534c51255ae259032999d07af6a449b95f7ceba491
+  metadata.gz: 40d25571ea32a0b72e253cfd3db2efed9fa22d4e1d7cfc06a5d53101887f3cb058ecc28d9c2445561842a89c062434b9b632d3d075667b7c2cdeb17d089eab73
+  data.tar.gz: a7c119532f70acbd4b0dad5e329aacc9ab0cfb5ae5750f21742837b98d799225904c33017c03ac81c80fee0f6c3e3fdb0c989c1086ce72af3558bf0495c7fa6c

data/.travis.yml

@@ -12,8 +12,8 @@ before_install:
   - sudo apt-get update
   - sudo apt-get install -y pdftk
   - sudo apt-get install -y ghostscript
-  - 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
+  - curl -OL https://mupdf.com/downloads/mupdf-1.13.0-source.tar.gz
+  - tar zvxf mupdf-1.13.0-source.tar.gz && cd mupdf-1.13.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,10 @@
 # CHANGELOG
 
+## 2.1.0
+
+* add `SUPPORTED_FORMATS` and `SUPPORTED_OUTPUT_FORMATS` and raise errors when formats are not matching
+* add more thorough tests for supported formats
+
 ## 2.0.1
 
 * fixed: a bug in Convert and Page Thumb Processors which caused the url to not include file extension

data/README.md

@@ -41,6 +41,15 @@ Dragonfly.app.configure do
 end
 ```
 
+## Supported Formats
+
+List of supported formats is available as:
+
+```ruby
+DragonflyPdf::SUPPORTED_FORMATS # => ["pdf"]
+DragonflyPdf::SUPPORTED_OUTPUT_FORMATS # => ["pdf", "svg", …]
+```
+
 ## Analysers
 
 ### PDF properties

data/dragonfly_pdf.gemspec

@@ -1,5 +1,5 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dragonfly_pdf/version'
 
@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dragonfly', '~> 1.0'
-  spec.add_dependency 'dragonfly_libvips', '~> 2.1.0'
-  spec.add_dependency 'activesupport', '>= 4.0'
+  spec.add_dependency 'dragonfly_libvips', '~> 2.2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pdf-reader'
 end

data/lib/dragonfly_pdf.rb

@@ -1,3 +1,12 @@
 require 'dragonfly'
+require 'dragonfly_libvips'
 require 'dragonfly_pdf/plugin'
 require 'dragonfly_pdf/version'
+
+module DragonflyPdf
+  class PageNotFound < RuntimeError; end
+  class UnsupportedFormat < RuntimeError; end
+
+  SUPPORTED_FORMATS = %w[pdf].freeze
+  SUPPORTED_OUTPUT_FORMATS = %w[png pam pbm pkm pnm pdf tga svg].uniq.sort
+end

data/lib/dragonfly_pdf/analysers/pdf_properties.rb

@@ -1,7 +1,9 @@
 module DragonflyPdf
   module Analysers
     class PdfProperties
-      def call(content, _options = {})
+      def call(content, options = {})
+        return {} unless SUPPORTED_FORMATS.include?(content.ext)
+
         data = `pdftk #{content.path} dump_data`
 
         page_count = data.scan(/NumberOfPages: (\d+)/).flatten.first.to_i
@@ -13,11 +15,12 @@ module DragonflyPdf
         aspect_ratios = page_dimensions.inject([]) { |res, page| res << (page.first / page.last) }
 
         {
-          aspect_ratios: aspect_ratios,
-          page_count: page_count,
-          page_dimensions: page_dimensions,
-          page_numbers: page_numbers,
-          page_rotations: page_rotations
+          'format' => content.ext.downcase,
+          'aspect_ratios' => aspect_ratios,
+          'page_count' => page_count,
+          'page_dimensions' => page_dimensions,
+          'page_numbers' => page_numbers,
+          'page_rotations' => page_rotations
         }
       end
 

data/lib/dragonfly_pdf/plugin.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash'
-
 require 'dragonfly_pdf/analysers/pdf_properties'
 
 require 'dragonfly_pdf/processors/append'
@@ -11,47 +9,30 @@ require 'dragonfly_pdf/processors/rotate'
 require 'dragonfly_pdf/processors/stamp'
 require 'dragonfly_pdf/processors/subset_fonts'
 
-require 'dragonfly_libvips'
-require 'dragonfly_libvips/analysers/image_properties'
-require 'dragonfly_libvips/processors/thumb'
-
 module DragonflyPdf
   class Plugin
     def call(app, _opts = {})
-      app.add_analyser :image_properties, DragonflyLibvips::Analysers::ImageProperties.new
-      app.add_analyser :pdf_properties, DragonflyPdf::Analysers::PdfProperties.new
-
-      app.add_analyser :page_count do |content|
-        content.analyse(:pdf_properties)[:page_count]
-      end
-
-      app.add_analyser :page_numbers do |content|
-        content.analyse(:pdf_properties)[:page_numbers]
-      end
-
-      app.add_analyser :page_dimensions do |content|
-        content.analyse(:pdf_properties)[:page_dimensions]
-      end
-
-      app.add_analyser :page_rotations do |content|
-        content.analyse(:pdf_properties)[:page_rotations]
-      end
-
-      app.add_analyser :aspect_ratios do |content|
-        content.analyse(:pdf_properties)[:aspect_ratios]
+      app.add_analyser :pdf_properties, Analysers::PdfProperties.new
+
+      %w[ page_count
+          page_numbers
+          page_dimensions
+          page_rotations
+          aspect_ratios
+      ].each do |name|
+        app.add_analyser(name) { |c| c.analyse(:pdf_properties)[name] }
       end
 
-      # ---------------------------------------------------------------------
+      app.add_processor :append, Processors::Append.new
+      app.add_processor :convert, Processors::Convert.new
+      app.add_processor :page, Processors::Page.new
+      app.add_processor :remove_password, Processors::RemovePassword.new
+      app.add_processor :rotate, Processors::Rotate.new
+      app.add_processor :stamp, Processors::Stamp.new
+      app.add_processor :subset_fonts, Processors::SubsetFonts.new
+      app.add_processor :page_thumb, Processors::PageThumb.new
 
-      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
-      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, DragonflyPdf::Processors::PageThumb.new
+      app.define(:encode) { convert }
     end
   end
 end

data/lib/dragonfly_pdf/processors/append.rb

@@ -1,8 +1,10 @@
 module DragonflyPdf
   module Processors
     class Append
-      def call(content, pdfs_to_append, _options = {})
-        content.shell_update(ext: :pdf) do |old_path, new_path|
+      def call(content, pdfs_to_append, options = {})
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
+        content.shell_update(ext: 'pdf') do |old_path, new_path|
           "#{pdftk_command} #{old_path} #{pdfs_to_append.map(&:path).join(' ')} cat output #{new_path}"
         end
       end

data/lib/dragonfly_pdf/processors/convert.rb

@@ -1,4 +1,4 @@
-require 'dragonfly_libvips/dimensions'
+require 'dragonfly_libvips'
 require 'vips'
 
 module DragonflyPdf
@@ -6,20 +6,24 @@ module DragonflyPdf
     class Convert
       DPI = 600
 
-      def call(content, page, geometry=nil, options = {})
-        options = options.deep_symbolize_keys
-        format = options.fetch(:format, :png)
+      def call(content, page, geometry = nil, options = {})
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
 
-        case format.to_sym
-        when :pdf
-          pdf_options = options.fetch(:pdf_options, "compress,compress-fonts,compress-images,linearize,sanitize,garbage=deduplicate")
+        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        format = options.fetch('format', 'png').to_s
+
+        raise UnsupportedOutputFormat unless SUPPORTED_OUTPUT_FORMATS.include?(format)
+
+        case format
+        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)
+        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}"
@@ -29,16 +33,18 @@ module DragonflyPdf
           `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)
+          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
+                       when DragonflyLibvips::Processors::Thumb::RESIZE_GEOMETRY
+                         DragonflyLibvips::Dimensions.call(geometry, img.width, img.height)
+                       else
+                         raise ArgumentError, "Didn't recognise the geometry string: #{geometry}"
+                       end
 
           width = dimensions.width.ceil
 
@@ -50,16 +56,15 @@ module DragonflyPdf
           `mv #{content.path.sub(".#{format}", "1.#{format}")} #{content.path}`
         end
 
-        content.meta['format'] = format.to_s
+        content.meta['format'] = format
         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, :png)
-
-        attrs.ext = format.to_s
+      def update_url(attrs, _page, _geometry = nil, options = {})
+        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        format = options.fetch('format', 'png').to_s
+        attrs.ext = format
       end
 
       private

data/lib/dragonfly_pdf/processors/page.rb

@@ -1,14 +1,15 @@
-require_relative '../errors'
 require_relative '../analysers/pdf_properties'
 
 module DragonflyPdf
   module Processors
     class Page
       def call(content, page_number = 1, _opts = {})
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
         pdf_properties = DragonflyPdf::Analysers::PdfProperties.new.call(content)
-        raise DragonflyPdf::PageNotFound unless pdf_properties[:page_numbers].include?(page_number)
+        raise DragonflyPdf::PageNotFound unless pdf_properties['page_numbers'].include?(page_number)
 
-        content.shell_update(ext: :pdf) do |old_path, new_path|
+        content.shell_update(ext: 'pdf') do |old_path, new_path|
           "#{gs_command} -dFirstPage=#{page_number} -dLastPage=#{page_number} -o #{new_path} -f #{old_path}"
         end
       end

data/lib/dragonfly_pdf/processors/page_thumb.rb

@@ -2,38 +2,41 @@ module DragonflyPdf
   module Processors
     class PageThumb
       def call(content, page, geometry = nil, options = {})
-        options = options.deep_symbolize_keys
-        format = options.delete(:format) { :jpg }
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
+        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        format = options.delete('format') { 'jpg' }.to_s
 
         convert(content, page, geometry, format)
 
-        unless %i[pdf png svg].include?(format.to_sym)
+        unless %w[pdf png svg].include?(format)
           thumb(content, geometry, format, options)
         end
 
-        content.meta['format'] = format.to_s
+        content.meta['format'] = format
         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
+      def update_url(attrs, _page, _geometry = nil, options = {})
+        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        attrs.ext = options.fetch('format', 'jpg').to_s
       end
 
-      private # =============================================================
+      private
 
       def convert(content, page, geometry, format)
-        convert_format = case format
-                         when :pdf, :svg then format
-                         else :png
+        convert_to_format = case format
+                            when 'pdf', 'svg' then format
+                            else 'png'
         end
-        content.process!(:convert, page, geometry, { format: convert_format })
+
+        Convert.new.call(content, page, geometry, 'format' => convert_to_format)
       end
 
       def thumb(content, geometry, format, options)
-        content.process!(:thumb, geometry, options.merge(format: format))
+        options['format'] = format
+        DragonflyLibvips::Processors::Thumb.new.call(content, geometry, options)
       end
     end
   end

data/lib/dragonfly_pdf/processors/remove_password.rb

@@ -2,7 +2,9 @@ module DragonflyPdf
   module Processors
     class RemovePassword
       def call(content, _options = {})
-        content.shell_update(ext: :pdf) do |old_path, new_path|
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
+        content.shell_update(ext: 'pdf') do |old_path, new_path|
           "#{gs_command} -q -sOutputFile=#{new_path} -c .setpdfwrite -f #{old_path}"
         end
       end

data/lib/dragonfly_pdf/processors/rotate.rb

@@ -2,16 +2,18 @@ module DragonflyPdf
   module Processors
     class Rotate
       def call(content, arg)
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
         rotate_args = case arg
                       when String, Symbol
-                        raise ArgumentError unless arg =~ /north|south|east|west|left|right|down/i
+                        raise ArgumentError unless arg.to_s =~ /north|south|east|west|left|right|down/i
                         "1-end#{arg}"
                       when Hash
                         pdf_properties = DragonflyPdf::Analysers::PdfProperties.new.call(content)
-                        pdf_properties[:page_numbers].map { |page| [page, arg[page]].compact.join }.join(' ')
+                        pdf_properties['page_numbers'].map { |page| [page, arg[page]].compact.join }.join(' ')
         end
 
-        content.shell_update(ext: :pdf) do |old_path, new_path|
+        content.shell_update(ext: 'pdf') do |old_path, new_path|
           "#{pdftk_command} #{old_path} cat #{rotate_args} output #{new_path}"
         end
       end

data/lib/dragonfly_pdf/processors/stamp.rb

@@ -2,7 +2,9 @@ module DragonflyPdf
   module Processors
     class Stamp
       def call(content, stamp_pdf, _options = {})
-        content.shell_update(ext: :pdf) do |old_path, new_path|
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
+        content.shell_update(ext: 'pdf') do |old_path, new_path|
           "#{pdftk_command} #{old_path} stamp #{stamp_pdf.path} output #{new_path}"
         end
       end

data/lib/dragonfly_pdf/processors/subset_fonts.rb

@@ -2,7 +2,9 @@ module DragonflyPdf
   module Processors
     class SubsetFonts
       def call(content, _opts = {})
-        content.shell_update(ext: :pdf) do |old_path, new_path|
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+
+        content.shell_update(ext: 'pdf') do |old_path, new_path|
           "#{gs_command} -o #{new_path} -f #{old_path}"
         end
       end

data/lib/dragonfly_pdf/version.rb

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

data/test/dragonfly_pdf/analysers/pdf_properties_test.rb

@@ -7,39 +7,10 @@ describe DragonflyPdf::Analysers::PdfProperties do
   let(:sample_pages_with_bleed) { app.fetch_file(SAMPLES_DIR.join('sample_pages_with_bleed.pdf')) }
   let(:sample_pages_rotated) { app.fetch_file(SAMPLES_DIR.join('sample_pages_rotated.pdf')) }
 
-  # =====================================================================
-
-  it 'returns Hash' do
-    analyser.call(sample_pages).must_be_kind_of Hash
-  end
-
-  describe '#page_numbers' do
-    it 'returns one-dimensional array' do
-      analyser.call(sample_pages)[:page_numbers].must_equal (1..10).to_a
-    end
-  end
-
-  describe '#page_count' do
-    it 'returns correct page count' do
-      analyser.call(sample_pages)[:page_count].must_equal 10
-    end
-  end
-
-  describe '#page_dimensions' do
-    it 'returns array of page dimensions' do
-      analyser.call(sample_pages)[:page_dimensions].map { |p| p.map(&:round) }.must_equal [[210, 297]].cycle.take(10)
-    end
-  end
-
-  describe '#aspect_ratios' do
-    it 'returns aspect ratios' do
-      analyser.call(sample_pages)[:aspect_ratios].map { |i| i.round(2) }.must_equal [0.71].cycle.take(10)
-    end
-  end
-
-  describe '#page_rotations' do
-    it 'returns correct page count' do
-      analyser.call(sample_pages_rotated)[:page_rotations].must_equal [0.0, 90.0, 180.0, 270.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
-    end
-  end
+  it { analyser.call(sample_pages).must_be_kind_of Hash }
+  it { analyser.call(sample_pages)['page_numbers'].must_equal (1..10).to_a }
+  it { analyser.call(sample_pages)['page_count'].must_equal 10 }
+  it { analyser.call(sample_pages)['page_dimensions'].map { |p| p.map(&:round) }.must_equal [[210, 297]].cycle.take(10) }
+  it { analyser.call(sample_pages)['aspect_ratios'].map { |i| i.round(2) }.must_equal [0.71].cycle.take(10) }
+  it { analyser.call(sample_pages_rotated)['page_rotations'].must_equal [0.0, 90.0, 180.0, 270.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0] }
 end

data/test/dragonfly_pdf/plugin_test.rb

@@ -3,70 +3,28 @@ require 'test_helper'
 module DragonflyPdf
   describe Plugin do
     let(:app) { test_app.configure_with(:pdf) }
-    let(:pdf) { app.fetch_file(SAMPLES_DIR.join('sample_pages.pdf')) }
-
-    # ---------------------------------------------------------------------
+    let(:content) { app.fetch_file(SAMPLES_DIR.join('sample_pages.pdf')) }
 
     describe 'analysers' do
-      it 'adds #pdf_properties' do
-        pdf.must_respond_to :pdf_properties
-      end
-
-      it 'allows an options parameter on #pdf_properties' do
-        pdf.pdf_properties.must_be_kind_of Hash
-      end
-
-      it 'adds #page_count' do
-        pdf.must_respond_to :page_count
-      end
-
-      it 'adds #page_numbers' do
-        pdf.must_respond_to :page_numbers
-      end
-
-      it 'adds #page_dimensions' do
-        pdf.must_respond_to :page_dimensions
-      end
-
-      it 'adds #aspect_ratios' do
-        pdf.must_respond_to :aspect_ratios
-      end
-
-      it 'adds #page_rotations' do
-        pdf.must_respond_to :page_rotations
-      end
+      it { content.must_respond_to :pdf_properties }
+      it { content.pdf_properties.must_be_kind_of Hash }
+      it { content.must_respond_to :page_count }
+      it { content.must_respond_to :page_numbers }
+      it { content.must_respond_to :page_dimensions }
+      it { content.must_respond_to :aspect_ratios }
+      it { content.must_respond_to :page_rotations }
     end
 
-    # ---------------------------------------------------------------------
-
     describe 'processors' do
-      it 'adds #append' do
-        pdf.must_respond_to :append
-      end
-      it 'adds #page' do
-        pdf.must_respond_to :page
-      end
-      it 'adds #page_thumb' do
-        pdf.must_respond_to :page_thumb
-      end
-      it 'adds #remove_password' do
-        pdf.must_respond_to :remove_password
-      end
-      it 'adds #rotate' do
-        pdf.must_respond_to :rotate
-      end
-      it 'adds #stamp' do
-        pdf.must_respond_to :stamp
-      end
-      it 'adds #subset_fonts' do
-        pdf.must_respond_to :subset_fonts
-      end
-    end
-
-    describe '#convert' do
-      it 'adds the correct extension to resulting url' do
-        pdf.convert(1, '600x').url.must_match /\.png/
-      end
+      it { content.must_respond_to :append }
+      it { content.must_respond_to :convert }
+      it { content.must_respond_to :encode }
+      it { content.must_respond_to :page }
+      it { content.must_respond_to :page_thumb }
+      it { content.must_respond_to :remove_password }
+      it { content.must_respond_to :rotate }
+      it { content.must_respond_to :stamp }
+      it { content.must_respond_to :subset_fonts }
     end
   end
 end

data/test/dragonfly_pdf/processors/append_test.rb

@@ -3,12 +3,14 @@ require 'test_helper'
 describe DragonflyPdf::Processors::Append do
   let(:app) { test_app.configure_with(:pdf) }
   let(:processor) { DragonflyPdf::Processors::Append.new }
-  let(:sample_1) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
-  let(:sample_2) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages_with_bleed.pdf')) }
+  let(:content_1) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
+  let(:content_2) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages_with_bleed.pdf')) }
 
-  before { processor.call(sample_1, [sample_2]) }
+  before { processor.call(content_1, [content_2]) }
 
-  it 'has total number of pages' do
-    sample_1.analyse(:page_count).must_equal 11
+  it { content_1.analyse(:page_count).must_equal 11 }
+
+  describe 'tempfile has extension' do
+    it { content_1.tempfile.path.must_match /\.pdf\z/ }
   end
 end

data/test/dragonfly_pdf/processors/convert_test.rb

@@ -2,45 +2,24 @@ 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'
+  let(:content) { app.fetch_file SAMPLES_DIR.join('sample_pages.pdf') }
+
+  describe 'SUPPORTED_OUTPUT_FORMATS' do
+    DragonflyPdf::SUPPORTED_OUTPUT_FORMATS.each do |format|
+      it(format) do
+        result = content.convert(1, '600x', format: format)
+        result.ext.must_equal format
+        result.mime_type.must_equal Rack::Mime.mime_type(".#{format}")
+        result.size.must_be :>, 0
+        result.tempfile.path.must_match /\.#{format}\z/
       end
     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
+  describe 'url' do
+    let (:url_attributes) { OpenStruct.new }
+    before { processor.update_url(url_attributes, 1) }
+    it { url_attributes.ext.must_equal 'png' }
   end
 end

data/test/dragonfly_pdf/processors/page_test.rb

@@ -2,18 +2,18 @@ require 'test_helper'
 
 describe DragonflyPdf::Processors::Page do
   let(:app) { test_app.configure_with(:pdf) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
   let(:processor) { DragonflyPdf::Processors::Page.new }
-  let(:sample_pages) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
 
-  it 'raises PageNotFound error' do
-    proc { processor.call(sample_pages, 0) }.must_raise DragonflyPdf::PageNotFound
-    proc { processor.call(sample_pages, 11) }.must_raise DragonflyPdf::PageNotFound
-  end
+  it { proc { processor.call(content, 0) }.must_raise DragonflyPdf::PageNotFound }
+  it { proc { processor.call(content, 11) }.must_raise DragonflyPdf::PageNotFound }
 
   describe 'single pages' do
-    it 'renders page' do
-      processor.call(sample_pages, 1)
-      sample_pages.analyse(:page_count).must_equal 1
-    end
+    before { processor.call(content, 1) }
+    it { content.analyse(:page_count).must_equal 1 }
+  end
+
+  describe 'tempfile has extension' do
+    it { processor.call(content, 1).tempfile.path.must_match /\.pdf\z/ }
   end
 end

data/test/dragonfly_pdf/processors/page_thumb_test.rb

@@ -2,28 +2,26 @@ 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(:content) { 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
+      before do
+        processor.call(content, 1, '600x')
         processor.update_url(url_attributes, 1)
-        url_attributes.ext.must_equal 'jpg'
       end
+
+      it { content.ext.must_equal 'jpg' }
+      it { content.meta['format'].must_equal 'jpg' }
+      it { url_attributes.ext.must_equal 'jpg' }
     end
   end
+
+  describe 'tempfile has extension' do
+    before { processor.call(content, 1, '600x') }
+    it { content.tempfile.path.must_match /\.jpg\z/ }
+  end
 end

data/test/dragonfly_pdf/processors/remove_password_test.rb

@@ -2,11 +2,14 @@ require 'test_helper'
 
 describe DragonflyPdf::Processors::RemovePassword do
   let(:app) { test_app.configure_with(:pdf) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages_with_password.pdf')) }
   let(:processor) { DragonflyPdf::Processors::RemovePassword.new }
-  let(:sample_pages) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages_with_password.pdf')) }
 
-  it 'returns PDF by default' do
-    processor.call(sample_pages, 1)
-    `pdftk #{sample_pages.path} dump_data`.wont_include 'OWNER PASSWORD REQUIRED'
+  before { processor.call(content, 1) }
+
+  it { `pdftk #{content.path} dump_data`.wont_include 'OWNER PASSWORD REQUIRED' }
+
+  describe 'tempfile has extension' do
+    it { content.tempfile.path.must_match /\.pdf\z/ }
   end
 end

data/test/dragonfly_pdf/processors/rotate_test.rb

@@ -2,20 +2,21 @@ require 'test_helper'
 
 describe DragonflyPdf::Processors::Rotate do
   let(:app) { test_app.configure_with(:pdf) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
   let(:processor) { DragonflyPdf::Processors::Rotate.new }
-  let(:sample_1) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
 
-  describe 'arg is String|Symbol' do
-    it 'rotates all pages' do
-      processor.call(sample_1, :left)
-      sample_1.analyse(:page_rotations).must_equal [270, 270, 270, 270, 270, 270, 270, 270, 270, 270]
-    end
+  describe 'String|Symbol' do
+    before { processor.call(content, :left) }
+    it { content.analyse(:page_rotations).must_equal [270, 270, 270, 270, 270, 270, 270, 270, 270, 270] }
   end
 
   describe 'arg is Hash' do
-    it 'rotates only defined pages' do
-      processor.call(sample_1, 1 => :left, 3 => :right)
-      sample_1.analyse(:page_rotations).must_equal [270, 0.0, 90, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
-    end
+    before { processor.call(content, 1 => :left, 3 => :right) }
+    it { content.analyse(:page_rotations).must_equal [270, 0.0, 90, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0] }
+  end
+
+  describe 'tempfile has extension' do
+    before { processor.call(content, :left) }
+    it { content.tempfile.path.must_match /\.pdf\z/ }
   end
 end

data/test/dragonfly_pdf/processors/stamp_test.rb

@@ -3,18 +3,16 @@ require 'test_helper'
 
 describe DragonflyPdf::Processors::Stamp do
   let(:app) { test_app.configure_with(:pdf) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
+  let(:content_stamp) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_stamp.pdf')) }
   let(:processor) { DragonflyPdf::Processors::Stamp.new }
-  let(:sample_1) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
-  let(:sample_stamp) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_stamp.pdf')) }
-  let(:text) { PDF::Reader.new(sample_1.path).pages.map(&:text) }
 
-  before { processor.call(sample_1, sample_stamp) }
+  before { processor.call(content, content_stamp) }
 
-  it 'has same number of pages' do
-    sample_1.analyse(:page_count).must_equal 10
-  end
+  it { content.analyse(:page_count).must_equal 10 }
+  it { PDF::Reader.new(content.path).pages.map(&:text).must_equal %w(STAMP).cycle(10).to_a }
 
-  it 'has the stamp' do
-    text.must_equal %w(STAMP).cycle(10).to_a
+  describe 'tempfile has extension' do
+    it { content.tempfile.path.must_match /\.pdf\z/ }
   end
 end

data/test/dragonfly_pdf/processors/subset_fonts_test.rb

@@ -2,11 +2,16 @@ require 'test_helper'
 
 describe DragonflyPdf::Processors::SubsetFonts do
   let(:app) { test_app.configure_with(:pdf) }
+  let(:content) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
   let(:processor) { DragonflyPdf::Processors::SubsetFonts.new }
-  let(:sample_pages) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
 
   it 'returns PDF by default' do
     skip 'not sure how to test this'
-    processor.call(sample_pages, 1)
+    processor.call(content, 1)
+  end
+
+  describe 'tempfile has extension' do
+    before { processor.call(content, 1) }
+    it { content.tempfile.path.must_match /\.pdf\z/ }
   end
 end

data/test/test_helper.rb

@@ -2,20 +2,19 @@ require 'bundler/setup'
 
 require 'minitest'
 require 'minitest/autorun'
+require 'minitest/reporters'
 require 'minitest/spec'
 
 require 'dragonfly'
 require 'dragonfly_pdf'
 
-# ---------------------------------------------------------------------
-
 SAMPLES_DIR = Pathname.new(File.expand_path('../../samples', __FILE__))
 
-# ---------------------------------------------------------------------
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 def test_app(name = nil)
-  app = Dragonfly::App.instance(name)
-  app.datastore = Dragonfly::MemoryDataStore.new
-  app.secret = 'test secret'
-  app
+  app = Dragonfly::App.instance(name).tap do |app|
+    app.datastore = Dragonfly::MemoryDataStore.new
+    app.secret = 'test secret'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -30,28 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,6 @@ files:
 - dragonfly_pdf.gemspec
 - lib/dragonfly_pdf.rb
 - lib/dragonfly_pdf/analysers/pdf_properties.rb
-- lib/dragonfly_pdf/errors.rb
 - lib/dragonfly_pdf/plugin.rb
 - lib/dragonfly_pdf/processors/append.rb
 - lib/dragonfly_pdf/processors/convert.rb
@@ -201,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dragonfly PDF analysers and processors.

data/lib/dragonfly_pdf/errors.rb

@@ -1,3 +0,0 @@
-module DragonflyPdf
-  class PageNotFound < RuntimeError; end
-end