dragonfly_libvips 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 835350b6d18b031b00f0071279b84694ef940e58
-  data.tar.gz: b306a0a01d08232767091e703772360526030795
+  metadata.gz: 06644e1c4dec0b4e785390a7414522c662018bcc
+  data.tar.gz: aaf43c2978f8a87992d0ccc13bf689a1f3b3a02f
 SHA512:
-  metadata.gz: 4c54e214ddf782d3dbc3d09877de7f679c94c54df30ea510eb4b07bec5d02fcffa5481f34b987f79359f80a74c2de92b4abc09dc6c704fe71a3a2c38a54ddcde
-  data.tar.gz: a0955d32cfd0e2d0eee0e1ec66e1dafab85bed3f963d06b2572f6ee5a8f13d9347bf26d09badff09ec6d5918a34545a4caa2556b7e9f1c5881178c2e08bfe248
+  metadata.gz: 670f2d8d7b42eaa5246496000cfafa31fb44e761fe1e643d883dbbaef5a723fc35ad522a864657e17a80ef1978601fae96570af0cb693543cd1a0d962de3bdbc
+  data.tar.gz: c84c9cf19b33c3b4b4c2cfa07670f51587b51e6e28cdd700792d48b6df704f0cad51473ec0bea240d356c6f4d7b4c51b197c34be21e42349c275db4ca7043403

data/.travis.yml

@@ -11,8 +11,8 @@ before_install:
   - gem install bundler -v 1.12.5
   - sudo apt-get update
   - 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.1.0
+
+* `thumb` process refactored for `Vips::Image.thumbnail`, with faster performance
+
 ## 2.0.1
 
 * `ruby-vips` updated to `>= 2.0.1`

data/dragonfly_libvips.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dragonfly', '~> 1.0'
-  spec.add_dependency 'ruby-vips', '~> 2.0', '>= 2.0.1'
+  spec.add_dependency 'ruby-vips', '~> 2.0', '>= 2.0.6'
   spec.add_dependency 'activesupport', '>= 4.0'
 
   spec.add_development_dependency 'bundler', '~> 1.12'

data/lib/dragonfly_libvips/analysers/image_properties.rb

@@ -1,12 +1,15 @@
+require 'vips'
+
 module DragonflyLibvips
   module Analysers
     class ImageProperties
-      def call(content)
-        require 'vips'
+      DPI = 300
 
+      def call(content)
         input_options = {}
         input_options[:access] = :sequential
         input_options[:autorotate] = true if content.mime_type == 'image/jpeg'
+        input_options[:dpi] = DPI if content.mime_type == 'application/pdf'
 
         img = ::Vips::Image.new_from_file(content.path, input_options)
 

data/lib/dragonfly_libvips/processors/thumb.rb

@@ -7,42 +7,56 @@ module DragonflyLibvips
     class Thumb
       OPERATORS = '><'.freeze
       RESIZE_GEOMETRY = /\A\d*x\d*[#{OPERATORS}]?\z/ # e.g. '300x200>'
-      RESIZE_KEYS = %w(kernel).freeze
+      DPI = 300
 
       def call(content, geometry, options = {})
-        options = options.deep_stringify_keys
+        options = options.deep_symbolize_keys
 
-        format = options.fetch('format', content.ext)
+        filename = content.path
+        format = options.fetch(:format, content.ext)
 
-        input_options = options.fetch('input_options', {})
-        resize_options = options.fetch('resize_options', {})
-        output_options = options.fetch('output_options', {})
+        input_options = options.fetch(:input_options, {})
+        input_options[:access] = input_options.fetch(:access, 'sequential')
+        input_options[:autorotate] = input_options.fetch(:autorotate, true) if content.mime_type == 'image/jpeg'
 
-        input_options['access'] ||= 'sequential'
-        if content.mime_type == 'image/jpeg'
-          input_options['autorotate'] = true unless input_options.has_key?('autorotate')
+        if content.mime_type == 'application/pdf'
+          input_options[:dpi] = input_options.fetch(:dpi, DPI) if content.mime_type == 'application/pdf'
+          input_options[:page] = input_options.fetch(:page, 0) if content.mime_type == 'application/pdf'
+        else
+          input_options.delete(:page)
+          input_options.delete(:dpi)
         end
-        output_options['profile'] ||= DragonflyLibvips::EPROFILE_PATH
 
-        img = ::Vips::Image.new_from_file(content.path, input_options)
+        output_options = options.fetch(:output_options, {})
+        output_options[:profile] = input_options.fetch(:profile, DragonflyLibvips::EPROFILE_PATH)
+
+        img = ::Vips::Image.new_from_file(filename, input_options)
 
         dimensions = case geometry
-        when RESIZE_GEOMETRY then DragonflyLibvips::Dimensions.call(geometry, img.width, img.height)
-                     else raise ArgumentError, "Didn't recognise the geometry string #{geometry}"
+                     when RESIZE_GEOMETRY then DragonflyLibvips::Dimensions.call(geometry, img.width, img.height)
+                     else raise ArgumentError, "Didn't recognise the geometry string: #{geometry}"
         end
 
-        if dimensions.scale != 1
-          img = img.resize(dimensions.scale, resize_options)
+        thumbnail_options = options.fetch(:thumbnail_options, {})
+        thumbnail_options[:auto_rotate] = input_options.fetch(:autorotate, true) if content.mime_type == 'image/jpeg'
+        thumbnail_options[:height] = thumbnail_options.fetch(:height, dimensions.height.ceil)
+        thumbnail_options[:size] ||= case geometry
+                                     when />\z/ then :down # do_not_resize_if_image_smaller_than_requested
+                                     when /<\z/ then :up # do_not_resize_if_image_larger_than_requested
+                                     else :both
         end
 
-        content.update(img.write_to_buffer(".#{format}", output_options), 'format' => format)
+        filename += "[page=#{input_options[:page]}]" if content.mime_type == 'application/pdf'
+        thumb = ::Vips::Image.thumbnail(filename, dimensions.width.ceil, thumbnail_options)
+
+        content.update(thumb.write_to_buffer(".#{format}", output_options), 'format' => format)
         content.ext = format
       end
 
       def update_url(url_attributes, _, options = {})
-        options = options.deep_stringify_keys
+        options = options.deep_symbolize_keys
 
-        if format = options.fetch('format', nil)
+        if format = options.fetch(:format, nil)
           url_attributes.ext = format
         end
       end

data/lib/dragonfly_libvips/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_libvips
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -33,7 +33,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement