dragonfly_libvips 0.1.5 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e30097336afa22dd5d34b9756c4d0d6f0b8c8cd
-  data.tar.gz: 0deda2a95f1ac84b5824b410dbd366e9c4593fff
+  metadata.gz: ac436d551d9ccc732c27161a35c0f80962ca7746
+  data.tar.gz: 53eaccc65db78f1640ad11543e1eefb38b64139a
 SHA512:
-  metadata.gz: ba270433cfe1379aed4440cefa2bac6f283a8050a249583065b4260227cfe2a8d7ca91ad8f67088e155e2376b64fc5a3f71553bbf6b7625f1c25b0e6518a8574
-  data.tar.gz: 4f28259621db0d059df88687c8a86cdfb3797389fed0f0178d4c257b967273b43c36af440e8bd0f5afccccc68830ee32efb3194cca255698256705d822d1f028
+  metadata.gz: ee485134a812e6aba9808283c87bf55c07c31ca14d1d21abf92bc32e88055498c035b5c3e944685f4574fb586f78b3a5e4924a0c8b692f269916f4072a727c1f
+  data.tar.gz: bd2f3aae3d786b8840cc360f63533d7d597089871e4790759d80fe611812e64cb827b5d3ef2aa226ff10f73d3dfc065dc280c6d9b30ae6971e1672c30517ea71

data/.travis.yml

@@ -6,11 +6,16 @@ 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 install bundler -v 1.12.5
-  - curl -s https://raw.githubusercontent.com/lovell/sharp/master/preinstall.sh | sudo bash -
+  - sudo apt-get update
+  - sudo apt-get install -y gobject-introspection libgirepository1.0-dev gtk-doc-tools libglib2.0-dev libpoppler-glib-dev
+  - export GI_TYPELIB_PATH="$VIPS_LIBDIR/girepository-1.0"
+  - curl -O https://poppler.freedesktop.org/poppler-0.51.0.tar.xz
+  - tar xf poppler-0.51.0.tar.xz && cd poppler-0.51.0 && ./configure --prefix=/usr --sysconfdir=/etc --disable-static --enable-build-type=release --enable-cmyk --enable-xpdf-headers --with-testdatadir=$PWD/testfiles && sudo make && sudo make install
+  - 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 $1 --enable-introspection && sudo make && sudo make install
+  - sudo ldconfig
 
 notifications:
   email:

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# CHANGELOG
+
+## 1.0.0
+
+* rewritten to use `ruby-vips` instead of CLI vips utils, which should result in better performance
+* processors `convert`, `vips` and `vipsthumbnail` have been removed

data/README.md

@@ -1,6 +1,6 @@
 # Dragonfly libvips
 
-[![Build Status](https://travis-ci.org/tomasc/dragonfly_libvips.svg)](https://travis-ci.org/tomasc/dragonfly_libvips) [![Gem Version](https://badge.fury.io/rb/dragonfly_libvips.svg)](http://badge.fury.io/rb/dragonfly_libvips) [![Coverage Status](https://img.shields.io/coveralls/tomasc/dragonfly_libvips.svg)](https://coveralls.io/r/tomasc/dragonfly_pdf)
+[![Build Status](https://travis-ci.org/tomasc/dragonfly_libvips.svg)](https://travis-ci.org/tomasc/dragonfly_libvips) [![Gem Version](https://badge.fury.io/rb/dragonfly_libvips.svg)](http://badge.fury.io/rb/dragonfly_libvips) [![Coverage Status](https://img.shields.io/coveralls/tomasc/dragonfly_libvips.svg)](https://coveralls.io/r/tomasc/dragonfly_libvips)
 
 Dragonfly analysers and processors for [libvips](https://github.com/jcupitt/libvips) image processing library
 
@@ -73,7 +73,7 @@ image.encode('jpg')
 optionally pass output arguments (specific to format)
 
 ```ruby
-image.encode('jpg', 'Q=50')
+image.encode('jpg')
 ```
 
 #### Rotate
@@ -84,41 +84,22 @@ Rotate a number of degrees with
 image.rotate(90)
 ```
 
-#### Vips
+#### Options
 
-Perform an arbitrary `vips` command
+All processors support `input_options` and `output_options` for passing additional options to vips. For example:
 
 ```ruby
-image.vips('resize', '0.5', { 'input_args' => 'page=2', 'output_args' => 'Q=50', 'format' => 'jpg' })
-```
-
-corresponds to the command-line
-
-```
-vips resize <original_path>[page=2] <new_path>[Q=50] 0.5
+image.encode('jpg', output_options: { Q: 50 })
+pdf.encode('jpg', input_options: { page: 0, dpi: 600 })
 ```
 
-#### Vipsthumbnail
-
-Perform an arbitrary `vipsthumbnail` command
+Defaults:
 
 ```ruby
-image.vipsthumbnail('--size=100x100', { 'input_args' => 'page=2', 'output_args' => 'Q=50', 'format' => 'jpg' })
+input_options: { access: :sequential }
+output_options: { profile: … } # embeds 'sRGB_v4_ICC_preference.icc' profile included with this gem
 ```
 
-corresponds to the command-line
-
-```
-vipsthumbnail  <original_path>[page=2] --size=100x100 -o <new-path>[Q=50]  --eprofile=./vendor/sRGB_v4_ICC_preference.icc
-```
-
-Please note that unless specified a default sRGB profile is added (required for conversion from CMYK, for example). It can be overridden by specifying alternative on in the processors args:
-
-```ruby
-image.vipsthumbnail('--size=100x100 --eprofile=./my_custom_profile.icc')
-```
-
-
 ### Analysers
 
 The following methods are provided
@@ -126,6 +107,8 @@ The following methods are provided
 ```ruby
 image.width # => 280
 image.height # => 355
+image.xres # => 72.0
+image.yres # => 72.0
 image.aspect_ratio # => 0.788732394366197
 image.portrait? # => true
 image.landscape? # => false
@@ -133,21 +116,6 @@ image.format # => 'png'
 image.image? # => true
 ```
 
-### Configuration
-
-```ruby
-Dragonfly.app.configure do
-  plugin :libvips,
-          vips_command: "/opt/local/bin/vips" # defaults to "vips"
-          vipsheader_command: "/opt/local/bin/vipsheader" # defaults to "vipsheader"
-          vipsthumbnail_command: "/opt/local/bin/vipsthumbnail" # defaults to "vipsthumbnail"
-end
-```
-
-## Acknowledgements
-
-This plugin, its structure, sample files, tests as well as this README are based on the original Dragonfly's [ImageMagick plugin](http://markevans.github.io/dragonfly/imagemagick) by Mark Evans.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/dragonfly_libvips.gemspec

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

data/lib/dragonfly_libvips/analysers/image_properties.rb

@@ -1,20 +1,17 @@
+require 'vips'
+
 module DragonflyLibvips
   module Analysers
     class ImageProperties
       def call(content)
-        vipsheader_command = content.env[:vipsheader_command] || 'vipsheader'
-        details = content.shell_eval do |path|
-          "#{vipsheader_command} #{path}"
-        end
-
-        _filename, dimensions, _bands, _interpretation, vips_loader = details.split(/\s*[:,]\s*/)
-        width, height = dimensions.split(/\s+/).first.split('x')
-        format = vips_loader.gsub(/\s*load\s*/, '').downcase
+        img = ::Vips::Image.new_from_file(content.path, access: :sequential)
 
         {
-          'format' => format.downcase,
-          'width' => width.to_i,
-          'height' => height.to_i
+          'format' => content.ext,
+          'width' => img.width,
+          'height' => img.height,
+          'xres' => img.xres,
+          'yres' => img.yres
         }
       end
     end

data/lib/dragonfly_libvips/dimensions.rb

@@ -5,8 +5,8 @@ module DragonflyLibvips
     end
 
     def call
-      return OpenStruct.new(width: orig_w, height: orig_h) if do_not_resize_if_image_smaller_than_requested? || do_not_resize_if_image_larger_than_requested?
-      OpenStruct.new(width: width, height: height)
+      return OpenStruct.new(width: orig_w, height: orig_h, scale: 1) if do_not_resize_if_image_smaller_than_requested? || do_not_resize_if_image_larger_than_requested?
+      OpenStruct.new(width: width, height: height, scale: scale)
     end
 
     private
@@ -27,6 +27,10 @@ module DragonflyLibvips
       end
     end
 
+    def scale
+      width.to_f / orig_w.to_f
+    end
+
     def dimensions
       w, h = geometry.scan(/\A(\d*)x(\d*)/).flatten.map(&:to_f)
       OpenStruct.new(width: w, height: h)

data/lib/dragonfly_libvips/plugin.rb

@@ -1,18 +1,11 @@
-require 'dragonfly/shell'
 require 'dragonfly_libvips/analysers/image_properties'
 require 'dragonfly_libvips/processors/encode'
+require 'dragonfly_libvips/processors/rotate'
 require 'dragonfly_libvips/processors/thumb'
-require 'dragonfly_libvips/processors/vips'
-require 'dragonfly_libvips/processors/vipsthumbnail'
 
 module DragonflyLibvips
   class Plugin
-    def call(app, opts = {})
-      # ENV
-      app.env[:vips_command] = opts[:vips_command] || 'vips'
-      app.env[:vipsheader_command] = opts[:vipsheader_command] || 'vipsheader'
-      app.env[:vipsthumbnail_command] = opts[:vipsthumbnail_command] || 'vipsthumbnail'
-
+    def call(app, _opts = {})
       # Analysers
       app.add_analyser :image_properties, DragonflyLibvips::Analysers::ImageProperties.new
 
@@ -24,6 +17,14 @@ module DragonflyLibvips
         content.analyse(:image_properties)['height']
       end
 
+      app.add_analyser :xres do |content|
+        content.analyse(:image_properties)['xres']
+      end
+
+      app.add_analyser :yres do |content|
+        content.analyse(:image_properties)['yres']
+      end
+
       app.add_analyser :format do |content|
         content.analyse(:image_properties)['format']
       end
@@ -45,7 +46,7 @@ module DragonflyLibvips
       app.add_analyser :image do |content|
         begin
           content.analyse(:image_properties).key?('format')
-        rescue Dragonfly::Shell::CommandFailed
+        rescue ::Vips::Error
           false
         end
       end
@@ -58,19 +59,7 @@ module DragonflyLibvips
       # Processors
       app.add_processor :encode, Processors::Encode.new
       app.add_processor :thumb, Processors::Thumb.new
-      app.add_processor :vips, Processors::Vips.new
-      app.add_processor :vipsthumbnail, Processors::Vipsthumbnail.new
-      app.add_processor :rotate do |content, amount|
-        content.process!(:vips, 'rot', "d#{amount}")
-      end
-
-      # Extra methods
-      app.define :vipsheader do |*args|
-        cli_args = args.first # because ruby 1.8.7 can't deal with default args in blocks
-        shell_eval do |path|
-          "#{app.env[:vipsheader_command]} #{cli_args} #{path}"
-        end
-      end
+      app.add_processor :rotate, Processors::Rotate.new
     end
   end
 end

data/lib/dragonfly_libvips/processors/encode.rb

@@ -1,13 +1,26 @@
+require 'active_support/core_ext/hash'
+require 'vips'
+
 module DragonflyLibvips
   module Processors
     class Encode
-      def call(content, format, output_args = '')
-        opts = { 'format' => format, 'output_args' => output_args }
-        content.process!(:vips, 'copy', '', opts)
+      def call(content, format, options = {})
+        options = options.deep_stringify_keys
+
+        input_options = options.fetch('input_options', {})
+        output_options = options.fetch('output_options', {})
+
+        input_options['access'] ||= 'sequential'
+        output_options['profile'] ||= DragonflyLibvips::EPROFILE_PATH
+
+        img = ::Vips::Image.new_from_file(content.path, input_options)
+
+        content.update(img.write_to_buffer(".#{format}", output_options), 'format' => format)
+        content.ext = format
       end
 
-      def update_url(attrs, format, _args = '')
-        attrs.ext = format.to_s
+      def update_url(url_attributes, format, options = {})
+        url_attributes.ext = format.to_s
       end
     end
   end

data/lib/dragonfly_libvips/processors/rotate.rb

@@ -0,0 +1,35 @@
+require 'active_support/core_ext/hash'
+require 'vips'
+
+module DragonflyLibvips
+  module Processors
+    class Rotate
+      def call(content, rotate, options = {})
+        options = options.deep_stringify_keys
+
+        format = options.fetch('format', content.ext)
+
+        input_options = options.fetch('input_options', {})
+        output_options = options.fetch('output_options', {})
+
+        input_options['access'] ||= 'sequential'
+        output_options['profile'] ||= DragonflyLibvips::EPROFILE_PATH
+
+        img = ::Vips::Image.new_from_file(content.path, input_options)
+
+        img = img.rot("d#{rotate}")
+
+        content.update(img.write_to_buffer(".#{format}", output_options), 'format' => format)
+        content.ext = format
+      end
+
+      def update_url(url_attributes, _, options = {})
+        options = options.deep_stringify_keys
+
+        if format = options.fetch('format', nil)
+          url_attributes.ext = format
+        end
+      end
+    end
+  end
+end

data/lib/dragonfly_libvips/processors/thumb.rb

@@ -1,34 +1,47 @@
+require 'active_support/core_ext/hash'
 require 'dragonfly_libvips/dimensions'
+require 'vips'
 
 module DragonflyLibvips
   module Processors
     class Thumb
       OPERATORS = '><'.freeze
       RESIZE_GEOMETRY = /\A\d*x\d*[#{OPERATORS}]?\z/ # e.g. '300x200>'
+      RESIZE_KEYS = %w(kernel).freeze
 
-      def call(content, geometry, opts = {})
-        image_properties = content.analyse(:image_properties)
-        args = [args_for_geometry(geometry, image_properties), opts['args']].compact.join(' ')
-        content.process!(:vipsthumbnail, args, opts)
-      end
+      def call(content, geometry, options = {})
+        options = options.deep_stringify_keys
 
-      def update_url(url_attributes, _geometry, opts = {})
-        format = opts['format']
-        url_attributes.ext = format if format
-      end
+        format = options.fetch('format', content.ext)
+
+        input_options = options.fetch('input_options', {})
+        resize_options = options.fetch('resize_options', {})
+        output_options = options.fetch('output_options', {})
 
-      private
+        input_options['access'] ||= 'sequential'
+        output_options['profile'] ||= DragonflyLibvips::EPROFILE_PATH
 
-      def args_for_geometry(geometry, image_properties)
-        case geometry
-        when RESIZE_GEOMETRY then resize_args(geometry, image_properties)
-        else raise ArgumentError, "Didn't recognise the geometry string #{geometry}"
+        img = ::Vips::Image.new_from_file(content.path, 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}"
         end
+
+        if dimensions.scale != 1
+          img = img.resize(dimensions.scale, resize_options)
+        end
+
+        content.update(img.write_to_buffer(".#{format}", output_options), 'format' => format)
+        content.ext = format
       end
 
-      def resize_args(geometry, image_properties)
-        res = DragonflyLibvips::Dimensions.call(geometry, image_properties['width'], image_properties['height'])
-        "-s #{res.width.round}x#{res.height.round}"
+      def update_url(url_attributes, _, options = {})
+        options = options.deep_stringify_keys
+
+        if format = options.fetch('format', nil)
+          url_attributes.ext = format
+        end
       end
     end
   end

data/lib/dragonfly_libvips/version.rb

@@ -1,3 +1,3 @@
 module DragonflyLibvips
-  VERSION = '0.1.5'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/lib/dragonfly_libvips.rb

@@ -2,6 +2,7 @@ require 'dragonfly'
 require 'dragonfly_libvips/dimensions'
 require 'dragonfly_libvips/plugin'
 require 'dragonfly_libvips/version'
+require 'vips'
 
 module DragonflyLibvips
   EPROFILE_PATH = File.expand_path('../vendor/sRGB_v4_ICC_preference.icc', __dir__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_libvips
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.2
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-vips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,9 +145,8 @@ files:
 - lib/dragonfly_libvips/dimensions.rb
 - lib/dragonfly_libvips/plugin.rb
 - lib/dragonfly_libvips/processors/encode.rb
+- lib/dragonfly_libvips/processors/rotate.rb
 - lib/dragonfly_libvips/processors/thumb.rb
-- lib/dragonfly_libvips/processors/vips.rb
-- lib/dragonfly_libvips/processors/vipsthumbnail.rb
 - lib/dragonfly_libvips/version.rb
 - samples/beach.png
 - samples/landscape_beach.png

data/lib/dragonfly_libvips/processors/vips.rb

@@ -1,32 +0,0 @@
-module DragonflyLibvips
-  module Processors
-    class Vips
-      def call(content, commands, args = '', opts = {})
-        vips_command = content.env[:vips_command] || 'vips'
-        format = opts['format']
-
-        if input_args = opts['input_args']
-          input_args = "[#{input_args}]"
-        end
-
-        if output_args = opts['output_args']
-          output_args = "[#{output_args}]"
-        end
-
-        content.shell_update ext: format do |old_path, new_path|
-          "#{vips_command} #{commands} #{old_path}#{input_args} #{new_path}#{output_args} #{args}"
-        end
-
-        if format
-          content.meta['format'] = format.to_s
-          content.ext = format
-        end
-      end
-
-      def update_url(attrs, _commands, _args = '', opts = {})
-        format = opts['format']
-        attrs.ext = format if format
-      end
-    end
-  end
-end

data/lib/dragonfly_libvips/processors/vipsthumbnail.rb

@@ -1,36 +0,0 @@
-require 'dragonfly_libvips'
-
-module DragonflyLibvips
-  module Processors
-    class Vipsthumbnail
-      def call(content, args = '', opts = {})
-        vipsthumbnail_command = content.env[:vipsthumbnail_command] || 'vipsthumbnail'
-        format = opts['format']
-
-        if input_args = opts['input_args']
-          input_args = "[#{input_args}]"
-        end
-
-        if output_args = opts['output_args']
-          output_args = "[#{output_args}]"
-        end
-
-        args = [args, "--eprofile=#{EPROFILE_PATH}"].compact.join(' ') unless args.include?('eprofile')
-
-        content.shell_update ext: format do |old_path, new_path|
-          "#{vipsthumbnail_command} #{old_path}#{input_args} -o #{new_path}#{output_args} #{args}"
-        end
-
-        if format
-          content.meta['format'] = format.to_s
-          content.ext = format
-        end
-      end
-
-      def update_url(attrs,  _args = '', opts = {})
-        format = opts['format']
-        attrs.ext = format if format
-      end
-    end
-  end
-end