dragonfly_pdf 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 095237a6a9622212369e843513a40d2b24ace6f8
-  data.tar.gz: 98e29ab37babf917c59201b240cb8d8ea55ea362
+  metadata.gz: 708b5f991d28126c6c374d503b4573c28879b8a9
+  data.tar.gz: 1d5d198c02b33d47d6318868da45a4cfdf896d51
 SHA512:
-  metadata.gz: d88ef57e725191fb64fe36949160e7119c66bcbde69a1d8b3d4d84083f479e15f3a0b7e53f434da9a5bcf11781ae321566582afa05242384b75673ce24a1685e
-  data.tar.gz: 9b574a0ef3a50dfb4f28f63c61bcf7f22e0111cb41c99f4635fd014eb05ee1ef90042cce7e1d5e35c5551758d5cf3c0e18718eeef3c458f23637a067c0f8c71c
+  metadata.gz: 907ca3ee3cdb14580edea1a20f11ecf7d571a69fa882409625924511434e811e47bb21ad4f3cf4739683377ed9a83cc45a0e81cc57c279b2a94d235d53234ef8
+  data.tar.gz: 26978346b3358fd27bcc0d7eb72bafb5ccbdfeaf5c6e2bdd8fa20c05a0e5f4703f840e368884df08a3c4e0d8b17bda749a5abe2df15a771b1d8204ae96405231

data/.travis.yml

@@ -5,11 +5,13 @@ sudo: required
 dist: trusty
 rvm:
   - 2.2.5
+env:
+  - LIBVIPS_VERSION_MAJOR=8 LIBVIPS_VERSION_MINOR=3 LIBVIPS_VERSION_PATCH=3 LIBVIPS_VERSION=$LIBVIPS_VERSION_MAJOR.$LIBVIPS_VERSION_MINOR.$LIBVIPS_VERSION_PATCH
 before_install:
   - gem update bundler
   - sudo apt-get update
   - sudo apt-get install -y pdftk
-  - pdftk --version
+  - curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | sudo bash -
 notifications:
   email:
     recipients:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0
+
+* refactored: `:page_thumb` now depends on `dragonfly_libvips` for faster processing and ability to specify dimensions (`100x100`) directly
+
 ## 0.2.4
 
 * added: `:remove_password`

data/README.md

@@ -6,25 +6,32 @@
 
 ## Dependencies
 
-* [ImageMagick](http://www.imagemagick.org)
-* [GhostScript](http://www.ghostscript.com)
-* [pdftk](https://www.pdflabs.com/tools/pdftk-server)
+- [libvips](https://github.com/jcupitt/libvips)
+- [GhostScript](http://www.ghostscript.com)
+- [pdftk](https://www.pdflabs.com/tools/pdftk-server)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'dragonfly_pdf'
+```
+gem 'dragonfly_pdf'
+```
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install dragonfly_pdf
+```
+$ gem install dragonfly_pdf
+```
 
 ## Usage
+
 The analyser and processors are added by configuring the plugin
 
 ```ruby
@@ -49,14 +56,6 @@ pdf.pdf_properties # => {
 }
 ```
 
-Optionally pass box type (`MediaBox|CropBox|BleedBox|TrimBox`):
-
-```ruby
-pdf.pdf_properties(box_type: 'MediaBox')
-```
-
-By default `TrimBox`, with a fallback to `MediaBox`.
-
 ## Processors
 
 ### Append
@@ -77,21 +76,22 @@ pdf.page(page_number=1)
 
 ### Page Thumb
 
-Generates thumbnail of a specified page, in defined density (dpi) and format, using GhostScript.
+Generates thumbnail of a specified page using the `thumb` processor of [DragonflyLibvips](https://github.com/tomasc/dragonfly_libvips).
 
 ```ruby
-pdf.page_thumb(page_number=1, opts={})
+pdf.page_thumb(page_number=1, '500x', opts={})
 ```
 
-The available options and their default values are:
+The default format is `png`, others can be specified
 
 ```ruby
 {
-    density: 600,
-    format: :png,
+    'format' => 'jpg',
 }
 ```
 
+For more options see the [`thumb` doc](https://github.com/tomasc/dragonfly_libvips#thumb).
+
 ### Remove password
 
 Remove password from password protected PDF.
@@ -109,12 +109,12 @@ pdf.rotate(:left)
 ```
 
 Rotate selected pages.
+
 ```ruby
 pdf.rotate(1 => :left, 3 => :right)
 ```
 
-absolute: `north|south|east|west`
-relative: `left|right|down`
+absolute: `north|south|east|west` relative: `left|right|down`
 
 ### Stamp
 
@@ -134,7 +134,7 @@ pdf.subset_fonts
 
 ## Contributing
 
-1. Fork it ( https://github.com/tomasc/dragonfly_pdf/fork )
+1. Fork it ( <https://github.com/tomasc/dragonfly_pdf/fork> )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/dragonfly_pdf.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dragonfly', '~> 1.0'
+  spec.add_dependency 'dragonfly_libvips', '>= 0.1.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
-  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pdf-reader'
-  spec.add_development_dependency 'rake'
 end

data/lib/dragonfly_pdf/analysers/pdf_properties.rb

@@ -1,31 +1,16 @@
 module DragonflyPdf
   module Analysers
     class PdfProperties
-      def call(content, options = {})
-        box_type = options.fetch :box_type, 'TrimBox'
+      def call(content, _options = {})
+        data = `pdftk #{content.path} dump_data`
 
-        box_data = []
-        rotate_data = []
-        IO.foreach(content.path, "\n\n", encoding: 'ISO-8859-1') do |item|
-          box_data += item.scan(/(MediaBox|CropBox|BleedBox|TrimBox)\s?\[([\d\.]+?)\s([\d\.]+?)\s([\d\.]+?)\s([\d\.]+?)\]/)
-          rotate_data += item.scan(/\/Rotate\s(\d+?)\s/)
+        page_count = data.scan(/NumberOfPages: (\d+)/).flatten.first.to_i
+        page_numbers = data.scan(/PageMediaNumber: (\d+)/).flatten.map(&:to_i)
+        page_dimensions = data.scan(/PageMediaDimensions:\s*(\d+\.?\d+)\s*(\d+\.?\d+)/).map do |width_height|
+          width_height.map(&:to_f).map { |dim| pt2mm(dim) }
         end
-
-        media_box = box_data.select { |d| d.first =~ /mediabox/i }
-        desired_box = box_data.select { |d| d.first =~ /#{box_type}/i }
-
-        # drop last value, since that comes from data about all pages
-        media_box = media_box[0..-2] if media_box.length > 1
-
-        page_dimensions = (!desired_box.empty? ? desired_box : media_box).map do |dim|
-          i = dim[1..-1].map(&:to_f).map { |d| pt2mm(d) }
-          [i[2] - i[0], i[3] - i[1]]
-        end
-
-        page_count = page_dimensions.count
+        page_rotations = data.scan(/PageMediaRotation: (\d+)/).flatten.map(&:to_f)
         aspect_ratios = page_dimensions.inject([]) { |res, page| res << (page.first / page.last) }
-        page_numbers = (1..page_count).to_a
-        page_rotations = rotate_data.flatten.map(&:to_f)
 
         {
           aspect_ratios: aspect_ratios,

data/lib/dragonfly_pdf/plugin.rb

@@ -1,15 +1,19 @@
 require 'dragonfly_pdf/analysers/pdf_properties'
 require 'dragonfly_pdf/processors/append'
 require 'dragonfly_pdf/processors/page'
-require 'dragonfly_pdf/processors/page_thumb'
 require 'dragonfly_pdf/processors/remove_password'
 require 'dragonfly_pdf/processors/rotate'
 require 'dragonfly_pdf/processors/stamp'
 require 'dragonfly_pdf/processors/subset_fonts'
 
+require 'dragonfly_libvips/analysers/image_properties'
+require 'dragonfly_libvips/processors/thumb'
+require 'dragonfly_libvips/processors/vipsthumbnail'
+
 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|
@@ -29,18 +33,26 @@ module DragonflyPdf
       end
 
       app.add_analyser :aspect_ratios do |content|
-        attrs = content.analyse(:pdf_properties)[:aspect_ratios]
+        content.analyse(:pdf_properties)[:aspect_ratios]
       end
 
       # ---------------------------------------------------------------------
 
       app.add_processor :append, DragonflyPdf::Processors::Append.new
       app.add_processor :page, DragonflyPdf::Processors::Page.new
-      app.add_processor :page_thumb, DragonflyPdf::Processors::PageThumb.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 :vipsthumbnail, DragonflyLibvips::Processors::Vipsthumbnail.new
+      app.add_processor :page_thumb do |content, page_number, dimensions, options|
+        options ||= {}
+        options['format'] ||= 'png'
+        options['input_args'] = [options['input_args'], "page=#{page_number - 1}"].compact.join(',')
+        content.process!(:thumb, dimensions, options)
+      end
     end
   end
 end

data/lib/dragonfly_pdf/version.rb

@@ -1,3 +1,3 @@
 module DragonflyPdf
-  VERSION = '0.2.7'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/test/dragonfly_pdf/analysers/pdf_properties_test.rb

@@ -1,53 +1,45 @@
 require 'test_helper'
 
-module DragonflyPdf
-  module Analysers
-    describe PdfProperties do
-      let(:app) { test_app.configure_with(:pdf) }
-      let(:analyser) { DragonflyPdf::Analysers::PdfProperties.new }
-      let(:sample_pages) { app.fetch_file(SAMPLES_DIR.join('sample_pages.pdf')) }
-      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
-          analyser.call(sample_pages_with_bleed)[:page_numbers].must_equal [1]
-        end
-      end
-
-      describe '#page_count' do
-        it 'returns correct page count' do
-          analyser.call(sample_pages)[:page_count].must_equal 10
-          analyser.call(sample_pages_with_bleed)[:page_count].must_equal 1
-        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)
-          analyser.call(sample_pages_with_bleed)[:page_dimensions].map { |p| p.map(&:round) }.must_equal [[210, 297]].cycle.take(1)
-        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)
-          analyser.call(sample_pages_with_bleed)[:aspect_ratios].map { |i| i.round(2) }.must_equal [0.71].cycle.take(1)
-        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
+describe DragonflyPdf::Analysers::PdfProperties do
+  let(:app) { test_app.configure_with(:pdf) }
+  let(:analyser) { DragonflyPdf::Analysers::PdfProperties.new }
+  let(:sample_pages) { app.fetch_file(SAMPLES_DIR.join('sample_pages.pdf')) }
+  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
 end

data/test/dragonfly_pdf/plugin_test.rb

@@ -62,5 +62,14 @@ module DragonflyPdf
         pdf.must_respond_to :subset_fonts
       end
     end
+
+    describe 'DragonflyLibvips proxy' do
+      describe 'page_thumb' do
+        it 'encodes the image to the correct format' do
+          pdf.page_thumb!(1, '600x')
+          `file --mime-type #{pdf.path}`.must_include 'image/png'
+        end
+      end
+    end
   end
 end

data/test/dragonfly_pdf/processors/append_test.rb

@@ -1,34 +1,14 @@
-require 'pdf-reader'
 require 'test_helper'
 
-module DragonflyPdf
-  module Processors
-    describe 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(:result) { PDF::Reader.new(sample_1.path) }
+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')) }
 
-      # =====================================================================
+  before { processor.call(sample_1, [sample_2]) }
 
-      before do
-        processor.call(sample_1, [sample_2])
-      end
-
-      it 'returns PDF by default' do
-        get_mime_type(sample_1.path).must_include 'application/pdf'
-      end
-
-      it 'has total number of pages' do
-        result.pages.count.must_equal 11
-      end
-
-      # ---------------------------------------------------------------------
-
-      def get_mime_type(file_path)
-        `file --mime-type #{file_path}`.delete("\n")
-      end
-    end
+  it 'has total number of pages' do
+    sample_1.analyse(:page_count).must_equal 11
   end
 end

data/test/dragonfly_pdf/processors/page_test.rb

@@ -1,39 +1,19 @@
-require 'pdf-reader'
 require 'test_helper'
 
-module DragonflyPdf
-  module Processors
-    describe Page do
-      let(:app) { test_app.configure_with(:pdf) }
-      let(:processor) { DragonflyPdf::Processors::Page.new }
-      let(:sample_pages) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
-      let(:result) { PDF::Reader.new(sample_pages.path) }
+describe DragonflyPdf::Processors::Page do
+  let(:app) { test_app.configure_with(:pdf) }
+  let(:processor) { DragonflyPdf::Processors::Page.new }
+  let(:sample_pages) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
 
-      # =====================================================================
-
-      it 'returns PDF by default' do
-        processor.call(sample_pages, 1)
-        get_mime_type(sample_pages.path).must_include 'application/pdf'
-      end
-
-      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
-
-      describe 'single pages' do
-        it 'renders page' do
-          processor.call(sample_pages, 1)
-          result.pages.count.must_equal 1
-          result.pages.first.text.must_equal '1'
-        end
-      end
-
-      # ---------------------------------------------------------------------
+  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
 
-      def get_mime_type(file_path)
-        `file --mime-type #{file_path}`.delete("\n")
-      end
+  describe 'single pages' do
+    it 'renders page' do
+      processor.call(sample_pages, 1)
+      sample_pages.analyse(:page_count).must_equal 1
     end
   end
 end

data/test/dragonfly_pdf/processors/remove_password_test.rb

@@ -1,26 +1,12 @@
-require 'pdf-reader'
 require 'test_helper'
 
-module DragonflyPdf
-  module Processors
-    describe RemovePassword do
-      let(:app) { test_app.configure_with(:pdf) }
-      let(:processor) { DragonflyPdf::Processors::RemovePassword.new }
-      let(:sample_pages) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages_with_password.pdf')) }
-      let(:result) { PDF::Reader.new(sample_pages.path) }
+describe DragonflyPdf::Processors::RemovePassword do
+  let(:app) { test_app.configure_with(: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)
-        get_mime_type(sample_pages.path).must_include 'application/pdf'
-      end
-
-      # ---------------------------------------------------------------------
-
-      def get_mime_type(file_path)
-        `file --mime-type #{file_path}`.delete("\n")
-      end
-    end
+  it 'returns PDF by default' do
+    processor.call(sample_pages, 1)
+    `pdftk #{sample_pages.path} dump_data`.wont_include 'OWNER PASSWORD REQUIRED'
   end
 end

data/test/dragonfly_pdf/processors/rotate_test.rb

@@ -1,40 +1,21 @@
-require 'pdf-reader'
 require 'test_helper'
 
-module DragonflyPdf
-  module Processors
-    describe Rotate do
-      let(:app) { test_app.configure_with(:pdf) }
-      let(:processor) { DragonflyPdf::Processors::Rotate.new }
-      let(:sample_1) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
-      let(:result) { PDF::Reader.new(sample_1.path) }
+describe DragonflyPdf::Processors::Rotate do
+  let(:app) { test_app.configure_with(:pdf) }
+  let(:processor) { DragonflyPdf::Processors::Rotate.new }
+  let(:sample_1) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
 
-      # =====================================================================
-
-      it 'returns PDF by default' do
-        processor.call(sample_1, :left)
-        get_mime_type(sample_1.path).must_include 'application/pdf'
-      end
-
-      describe 'arg is String|Symbol' do
-        it 'rotates all pages' do
-          processor.call(sample_1, :left)
-          result.pages.map { |p| p.attributes[:Rotate] }.must_equal [270, 270, 270, 270, 270, 270, 270, 270, 270, 270]
-        end
-      end
-
-      describe 'arg is Hash' do
-        it 'rotates only defined pages' do
-          processor.call(sample_1, 1 => :left, 3 => :right)
-          result.pages.map { |p| p.attributes[:Rotate] }.must_equal [270, nil, 90, nil, nil, nil, nil, nil, nil, nil]
-        end
-      end
-
-      # ---------------------------------------------------------------------
+  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
+  end
 
-      def get_mime_type(file_path)
-        `file --mime-type #{file_path}`.delete("\n")
-      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
   end
 end

data/test/dragonfly_pdf/processors/stamp_test.rb

@@ -1,38 +1,20 @@
 require 'pdf-reader'
 require 'test_helper'
 
-module DragonflyPdf
-  module Processors
-    describe Stamp do
-      let(:app) { test_app.configure_with(: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(:result) { PDF::Reader.new(sample_1.path) }
+describe DragonflyPdf::Processors::Stamp do
+  let(:app) { test_app.configure_with(: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 do
-        processor.call(sample_1, sample_stamp)
-      end
-
-      it 'returns PDF by default' do
-        get_mime_type(sample_1.path).must_include 'application/pdf'
-      end
-
-      it 'has same number of pages' do
-        result.pages.count.must_equal 10
-      end
-
-      it 'has the stamp' do
-        result.pages.map(&:text).must_equal %w(STAMP).cycle(10).to_a
-      end
-
-      # ---------------------------------------------------------------------
+  it 'has same number of pages' do
+    sample_1.analyse(:page_count).must_equal 10
+  end
 
-      def get_mime_type(file_path)
-        `file --mime-type #{file_path}`.delete("\n")
-      end
-    end
+  it 'has the stamp' do
+    text.must_equal %w(STAMP).cycle(10).to_a
   end
 end

data/test/dragonfly_pdf/processors/subset_fonts_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+describe DragonflyPdf::Processors::SubsetFonts do
+  let(:app) { test_app.configure_with(: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)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dragonfly_libvips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -70,32 +84,32 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: pdf-reader
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,7 +144,6 @@ files:
 - lib/dragonfly_pdf/plugin.rb
 - lib/dragonfly_pdf/processors/append.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
@@ -145,11 +158,10 @@ files:
 - test/dragonfly_pdf/plugin_test.rb
 - test/dragonfly_pdf/processors/append_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
-- test/dragonfly_pdf/processors/subset_fonts.rb
+- test/dragonfly_pdf/processors/subset_fonts_test.rb
 - test/test_helper.rb
 homepage: https://github.com/tomasc/dragonfly_pdf
 licenses:
@@ -180,9 +192,8 @@ test_files:
 - test/dragonfly_pdf/plugin_test.rb
 - test/dragonfly_pdf/processors/append_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
-- test/dragonfly_pdf/processors/subset_fonts.rb
+- test/dragonfly_pdf/processors/subset_fonts_test.rb
 - test/test_helper.rb

data/lib/dragonfly_pdf/processors/page_thumb.rb

@@ -1,45 +0,0 @@
-require_relative '../analysers/pdf_properties'
-
-module DragonflyPdf
-  module Processors
-    class PageThumb
-      attr_reader :content, :density, :page_number, :format
-
-      def call(content, page_number = 1, opts = {})
-        @content = content
-        @page_number = page_number
-        @format = opts['format'] || :png
-        @density = opts['density'] || 150
-
-        content.shell_update(ext: @format) do |old_path, new_path|
-          "#{gs_command} -o '#{new_path}' -f '#{old_path}'"
-        end
-
-        @content.meta['format'] = @format.to_s
-        @content.ext = @format
-      end
-
-      def update_url(attrs, page_number, opts = {})
-        format = opts['format']
-        attrs.page_number = page_number
-        attrs.ext = format if format
-      end
-
-      private # =============================================================
-
-      def gs_command
-        "gs -sDEVICE=#{gs_format} -r#{density} -dTextAlphaBits=4 -dUseArtBox -dFirstPage=#{page_number} -dLastPage=#{page_number}"
-      end
-
-
-      def gs_format
-        case @format
-        when :png then :png16m
-        when :jpg, :jpeg then :jpeg
-        when :tif, :tiff then :tiff48nc
-        else :jpeg
-        end
-      end
-    end
-  end
-end

data/test/dragonfly_pdf/processors/page_thumb_test.rb

@@ -1,34 +0,0 @@
-require 'test_helper'
-
-module DragonflyPdf
-  module Processors
-    describe PageThumb do
-      let(:app) { test_app.configure_with(:pdf) }
-      let(:processor) { DragonflyPdf::Processors::PageThumb.new }
-      let(:sample_pages) { Dragonfly::Content.new(app, SAMPLES_DIR.join('sample_pages.pdf')) }
-
-      # =====================================================================
-
-      it 'returns PNG by default' do
-        processor.call(sample_pages, 1, density: 72)
-        get_mime_type(sample_pages.path).must_include 'image/png'
-      end
-
-      it 'raises PageNotFound error' do
-        skip 'calling the page properties slows evrything down'
-        proc { processor.call(sample_pages, 0) }.must_raise DragonflyPdf::PageNotFound
-        proc { processor.call(sample_pages, 11) }.must_raise DragonflyPdf::PageNotFound
-      end
-
-      it 'renders page' do
-        processor.call(sample_pages, 1, density: 72)
-      end
-
-      # ---------------------------------------------------------------------
-
-      def get_mime_type(file_path)
-        `file --mime-type #{file_path}`.delete("\n")
-      end
-    end
-  end
-end

data/test/dragonfly_pdf/processors/subset_fonts.rb

@@ -1,22 +0,0 @@
-module DragonflyPdf
-  module Processors
-    describe SubsetFonts do
-      let(:app) { test_app.configure_with(: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
-        processor.call(sample_pages, 1)
-        get_mime_type(sample_pages.path).must_include 'application/pdf'
-      end
-
-      private # =============================================================
-
-      def get_mime_type(file_path)
-        `file --mime-type #{file_path}`.delete("\n")
-      end
-    end
-  end
-end