dragonfly_libvips 2.3.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4b64d88420b228e976b7c0d5792e803ea538862d8b6fa4ad6cd48351f88c7e6
-  data.tar.gz: 827caa0406199bc7ae5911346a378762e3a293c1be3481a69461ea5b5109cd13
+  metadata.gz: 46c101441cc8dcf749651080e1697e2a31eab69dde06a9aae0856bc37df6f0ba
+  data.tar.gz: 2ef729e0df1f12951dc09e5b492165593fd434fb79edce33a5f57bfae143c9c9
 SHA512:
-  metadata.gz: 714d74358f8d176013dc78b7c89fd25e328b3d94816ad0acc82c86ee84110884a4713f8312802de727b9ecc62498976a141751683bf2157e2b0ca27bc7d94367
-  data.tar.gz: 6a2fe288e736019d108262b17fd0bcae88cfc4d7428508042309f0204adef8e157ed7b4dadde3c32aff42f9d99a8337d961e6a697ec280d9986d747aef73478d
+  metadata.gz: f62cdad7d98c0c107acd337883a02356fea0579fb622ca3d4b8c4a98696d3fd2ba5ab83ffac20eaca9d6e44f55fba446bf21d2bba4d9d04f4e444cf9dc71c8ae
+  data.tar.gz: 2c40316d19404f9271c28d88982643c2f94fceffff7c51b4deca294c4194974d87778dfc1dd0a877906d01730d862a86e8f07fd6da409d0673d5908b2178b7b3

data/.ruby-version

@@ -0,0 +1 @@
+2.6.3

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.3

data/.travis.yml

@@ -1,18 +1,19 @@
 # libvips build instructions taken from https://github.com/marcbachmann/dockerfile-libvips
 
 language: ruby
+cache: bundler
 script: 'bundle exec rake'
 sudo: required
 dist: trusty
 rvm:
-  - 2.2.5
+  - 2.6.3
 
 before_install:
-  - gem install bundler -v 1.12.5
+  - gem update bundler
   - sudo apt-get update
-  - 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
+  - sudo apt-get install -y gobject-introspection libgirepository1.0-dev libglib2.0-dev libpoppler-glib-dev libgif-dev
+  - curl -OL https://github.com/libvips/libvips/releases/download/v8.7.4/vips-8.7.4.tar.gz
+  - tar zxvf vips-8.7.4.tar.gz && cd vips-8.7.4 && ./configure $1 && sudo make && sudo make install
   - export GI_TYPELIB_PATH=/usr/local/lib/girepository-1.0/
   - sudo ldconfig
 

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # CHANGELOG
 
+## 2.4.1
+
+* Fix misspelled UnsupportedOutputFormat (#13) by @asgerb
+* Fix broken links in README (#12) by @NARKOZ
+
+## 2.4.0
+
+* symbolize `input_options` and `output_options` to avoid argument errors coming from `ruby-vips`
+
+## 2.3.3
+
+* locks `ruby-vips` to `< 2.0.14`
+* adds support for `libvips` `8.8.0`
+
+## 2.3.2
+
+* FIX: support for .gif
+
+## 2.3.1
+
+* improved `SUPPORTED_FORMATS` matching that ignores case
+
 ## 2.3.0
 
 * add support for progressive JPEGs

data/README.md

@@ -2,11 +2,11 @@
 
 [![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
+Dragonfly analysers and processors for [libvips](https://github.com/libvips/libvips) image processing library
 
 From the libvips README:
 
-> libvips is a 2D image processing library. Compared to similar libraries, [libvips runs quickly and uses little memory](http://www.vips.ecs.soton.ac.uk/index.php?title=Speed_and_Memory_Use). libvips is licensed under the LGPL 2.1+.
+> libvips is a 2D image processing library. Compared to similar libraries, [libvips runs quickly and uses little memory](https://github.com/libvips/libvips/wiki/Speed-and-memory-use). libvips is licensed under the LGPL 2.1+.
 
 ## Installation
 
@@ -34,7 +34,7 @@ If you run into trouble installing `libvips` with Ruby introspection on Linux, f
 
 ## Dependencies
 
-The [vips](http://www.vips.ecs.soton.ac.uk/index.php?title=Supported) library and its [dependencies](https://github.com/jcupitt/libvips#dependencies).
+The [vips](http://www.vips.ecs.soton.ac.uk/index.php?title=Supported) library and its [dependencies](https://github.com/libvips/libvips#dependencies).
 
 ## Usage
 

data/dragonfly_libvips.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dragonfly', '~> 1.0'
-  spec.add_dependency 'ruby-vips', '~> 2.0', '>= 2.0.6'
+  spec.add_dependency 'ruby-vips', '~> 2.0', '>= 2.0.16'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'bundler'#, '~> 2.0'
+  spec.add_development_dependency 'rb-readline'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'minitest', '~> 5.0'

data/lib/dragonfly_libvips.rb

@@ -6,21 +6,24 @@ require 'vips'
 
 module DragonflyLibvips
   class UnsupportedFormat < RuntimeError; end
-  class UnsupportedOutputormat < RuntimeError; end
+  class UnsupportedOutputFormat < RuntimeError; end
 
   CMYK_PROFILE_PATH = File.expand_path('../vendor/cmyk.icm', __dir__)
   EPROFILE_PATH = File.expand_path('../vendor/sRGB_v4_ICC_preference.icc', __dir__)
 
   SUPPORTED_FORMATS = begin
     output = `vips -l | grep -i ForeignLoad`
-    output.scan(/\.(\w{1,4})/).flatten.sort.uniq
+    output.scan(/\.(\w{1,4})/).flatten.compact.sort.map(&:downcase).uniq
   end
 
   SUPPORTED_OUTPUT_FORMATS = begin
     output = `vips -l | grep -i ForeignSave`
-    output.scan(/\.(\w{1,4})/).flatten.sort.uniq
+    output.scan(/\.(\w{1,4})/).flatten.compact.sort.map(&:downcase).uniq
   end - %w[
     csv
+    fit
+    fits
+    fts
     mat
     pbm
     pfm
@@ -30,4 +33,16 @@ module DragonflyLibvips
     vips
     webp
   ]
+
+  FORMATS_WITHOUT_PROFILE_SUPPORT = %w[bmp dz gif hdr webp heic]
+
+  private
+
+  def self.stringify_keys(hash = {})
+    hash.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v }
+  end
+
+  def self.symbolize_keys(hash = {})
+    hash.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v }
+  end
 end

data/lib/dragonfly_libvips/analysers/image_properties.rb

@@ -6,14 +6,15 @@ module DragonflyLibvips
       DPI = 300
 
       def call(content)
-        return {} unless SUPPORTED_FORMATS.include?(content.ext)
+        return {} unless content.ext
+        return {} unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
         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)
+        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
 
         width = img.width
         height = img.height

data/lib/dragonfly_libvips/processors/encode.rb

@@ -1,16 +1,19 @@
+# frozen_string_literal: true
+
+require 'vips'
+
 module DragonflyLibvips
   module Processors
     class Encode
-      FORMATS_WITHOUT_PROFILE_SUPPORT = %w[dz webp hdr]
-
       def call(content, format, options = {})
-        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+        raise UnsupportedFormat unless content.ext
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
         format = format.to_s
         format = 'tif' if format == 'tiff'
         format = 'jpg' if format == 'jpeg'
 
-        raise UnsupportedOutputFormat unless SUPPORTED_OUTPUT_FORMATS.include?(format)
+        raise UnsupportedOutputFormat unless SUPPORTED_OUTPUT_FORMATS.include?(format.downcase)
 
         if content.mime_type == Rack::Mime.mime_type(".#{format}")
           content.ext ||= format
@@ -18,31 +21,34 @@ module DragonflyLibvips
           return
         end
 
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        options = DragonflyLibvips.stringify_keys(options)
 
         input_options = options.fetch('input_options', {})
-        output_options = options.fetch('output_options', {})
-
         input_options['access'] ||= 'sequential'
         if content.mime_type == 'image/jpeg'
-          input_options['autorotate'] = true unless input_options.has_key?('autorotate')
+          input_options['autorotate'] = true unless input_options.key?('autorotate')
         end
 
-        output_options['profile'] ||= EPROFILE_PATH
-        output_options.delete('profile') if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
+        output_options = options.fetch('output_options', {})
+        if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
+          output_options.delete('profile')
+        else
+          output_options['profile'] ||= input_options.fetch('profile', EPROFILE_PATH)
+        end
+        output_options.delete('Q') unless format.to_s =~ /jpg|jpeg/i
+        output_options['format'] ||= format.to_s if format.to_s =~ /gif|bmp/i
 
-        require 'vips'
-        img = ::Vips::Image.new_from_file(content.path, input_options)
+        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
 
         content.update(
-          img.write_to_buffer(".#{format}", output_options),
+          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
           'name' => "temp.#{format}",
           'format' => format
         )
         content.ext = format
       end
 
-      def update_url(url_attributes, format, options = {})
+      def update_url(url_attributes, format, _options = {})
         url_attributes.ext = format.to_s
       end
     end

data/lib/dragonfly_libvips/processors/extract_area.rb

@@ -1,28 +1,36 @@
+require 'vips'
+
 module DragonflyLibvips
   module Processors
     class ExtractArea
       def call(content, x, y, width, height, options = {})
-        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+        raise UnsupportedFormat unless content.ext
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        options = DragonflyLibvips.stringify_keys(options)
         format = options.fetch('format', content.ext)
 
         input_options = options.fetch('input_options', {})
-        output_options = options.fetch('output_options', {})
 
         # input_options['access'] ||= 'sequential'
         if content.mime_type == 'image/jpeg'
           input_options['autorotate'] = true unless input_options.has_key?('autorotate')
         end
-        output_options['profile'] ||= EPROFILE_PATH
 
-        require 'vips'
-        img = ::Vips::Image.new_from_file(content.path, input_options)
+        output_options = options.fetch('output_options', {})
+        if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
+          output_options.delete('profile')
+        else
+          output_options['profile'] ||= input_options.fetch('profile', EPROFILE_PATH)
+        end
+        output_options.delete('Q') unless format.to_s =~ /jpg|jpeg/i
+        output_options['format'] ||= format.to_s if format.to_s =~ /gif|bmp/i
 
+        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
         img = img.extract_area(x, y, width, height)
 
         content.update(
-          img.write_to_buffer(".#{format}", output_options),
+          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
           'name' => "temp.#{format}",
           'format' => format
         )

data/lib/dragonfly_libvips/processors/rotate.rb

@@ -1,28 +1,36 @@
+require 'vips'
+
 module DragonflyLibvips
   module Processors
     class Rotate
       def call(content, rotate, options = {})
-        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+        raise UnsupportedFormat unless content.ext
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        options = DragonflyLibvips.stringify_keys(options)
         format = options.fetch('format', content.ext)
 
         input_options = options.fetch('input_options', {})
-        output_options = options.fetch('output_options', {})
 
         # input_options['access'] ||= 'sequential'
         if content.mime_type == 'image/jpeg'
           input_options['autorotate'] = true unless input_options.has_key?('autorotate')
         end
-        output_options['profile'] ||= EPROFILE_PATH
 
-        require 'vips'
-        img = ::Vips::Image.new_from_file(content.path, input_options)
+        output_options = options.fetch('output_options', {})
+        if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
+          output_options.delete('profile')
+        else
+          output_options['profile'] ||= input_options.fetch('profile', EPROFILE_PATH)
+        end
+        output_options.delete('Q') unless format.to_s =~ /jpg|jpeg/i
+        output_options['format'] ||= format.to_s if format.to_s =~ /gif|bmp/i
 
+        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
         img = img.rot("d#{rotate}")
 
         content.update(
-          img.write_to_buffer(".#{format}", output_options),
+          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
           'name' => "temp.#{format}",
           'format' => format
         )

data/lib/dragonfly_libvips/processors/thumb.rb

@@ -9,9 +9,10 @@ module DragonflyLibvips
       DPI = 300
 
       def call(content, geometry, options = {})
-        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext)
+        raise UnsupportedFormat unless content.ext
+        raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
+        options = DragonflyLibvips.stringify_keys(options)
 
         filename = content.path
         format = options.fetch('format', content.ext).to_s
@@ -29,10 +30,16 @@ module DragonflyLibvips
         end
 
         output_options = options.fetch('output_options', {})
-        output_options['profile'] = input_options.fetch('profile', EPROFILE_PATH)
+        if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
+          output_options.delete('profile')
+        else
+          output_options['profile'] ||= input_options.fetch('profile', EPROFILE_PATH)
+        end
+        output_options.delete('Q') unless format.to_s =~ /jpg|jpeg/i
+        output_options['format'] ||= format.to_s if format.to_s =~ /gif|bmp/i
 
         input_options = input_options.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v } # symbolize
-        img = ::Vips::Image.new_from_file(filename, input_options)
+        img = ::Vips::Image.new_from_file(filename, DragonflyLibvips.symbolize_keys(input_options))
 
         dimensions = case geometry
                      when RESIZE_GEOMETRY then Dimensions.call(geometry, img.width, img.height)
@@ -40,7 +47,11 @@ module DragonflyLibvips
         end
 
         thumbnail_options = options.fetch('thumbnail_options', {})
-        thumbnail_options['auto_rotate'] = input_options.fetch('autorotate', true) if content.mime_type == 'image/jpeg'
+        if Vips.at_least_libvips?(8, 8)
+          thumbnail_options['no_rotate'] = input_options.fetch('no_rotate', false) if content.mime_type == 'image/jpeg'
+        else
+          thumbnail_options['auto_rotate'] = input_options.fetch('autorotate', true) if content.mime_type == 'image/jpeg'
+        end
         thumbnail_options['height'] = thumbnail_options.fetch('height', dimensions.height.ceil)
         thumbnail_options['import_profile'] = CMYK_PROFILE_PATH if img.get('interpretation') == :cmyk
         thumbnail_options['size'] ||= case geometry
@@ -52,10 +63,10 @@ module DragonflyLibvips
         filename += "[page=#{input_options[:page]}]" if content.mime_type == 'application/pdf'
 
         thumbnail_options = thumbnail_options.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v } # symbolize
-        thumb = ::Vips::Image.thumbnail(filename, dimensions.width.ceil, thumbnail_options)
+        thumb = ::Vips::Image.thumbnail(filename, dimensions.width.ceil, DragonflyLibvips.symbolize_keys(thumbnail_options))
 
         content.update(
-          thumb.write_to_buffer(".#{format}", output_options),
+          thumb.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
           'name' => "temp.#{format}",
           'format' => format
         )

data/lib/dragonfly_libvips/version.rb

@@ -1,3 +1,3 @@
 module DragonflyLibvips
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_libvips
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2020-08-08 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.6
+        version: 2.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,21 +43,35 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.16
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  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: guard
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -162,6 +178,7 @@ files:
 - samples/sample.png
 - samples/sample.svg
 - samples/sample.tif
+- samples/sample_anim.gif
 - samples/sample_cmyk.jpg
 - samples/white pixel.png
 - vendor/cmyk.icm
@@ -185,8 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Dragonfly analysers and processors for libvips image processing library.