dragonfly_libvips 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d406440d81b35a36ff76d957aec2605e79caf29faac9df5225d91eb0a29ae9a
-  data.tar.gz: e33e09b0c99cdc864b082c32f0c459fd7a6c5775b0eeff9534e6ff33a0e91650
+  metadata.gz: 507faa296ab3057e5b71b9fd85b0c9314ba77b748c2e23983dfb5bfbb46203f2
+  data.tar.gz: 47eec77cb209df469e4caf83a6102a4d0af6dc3452799bb441c305c8fe5f5faf
 SHA512:
-  metadata.gz: d43526ee56067f3d44f9f5af1a83b2be59e1e48b3dabca86d96503710b83483c8a7369d5f928978ca358c7610e890ae62501853d5f889451717ff0f390bb9702
-  data.tar.gz: 04daf214847dc14d7686d85fbeaaa0eefea256cd429ac1a9912e16cfcc5c87d384b5b065b9f0e208ca740bfed5cd07c673f89ecb36ed3a71d7f4dda9343d3b96
+  metadata.gz: d13cd15073052fcbd5f7de59f5a6462662c98a083c1e348ebb4747a72fece6266261c9bac8ed2af97f693f930a2f3861c9a07d403dad49ec2cf1fa407fa6288b
+  data.tar.gz: ed631f529a74d9dbe21ae4810f24e9d237da89fa5495a400c81f7e2b2875f765be3370e10b541f459e5776fafac475f49614eb4d8edbf9712c4fddbb5cd76545

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+on:
+  pull_request:
+    branches: ["master"]
+  push:
+    branches: ["master"]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.7', '3.2']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt-get clean
+          sudo apt-get update
+          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.13.3/vips-8.13.3.tar.gz
+          tar zxvf vips-8.13.3.tar.gz && cd vips-8.13.3 && ./configure $1 && sudo make && sudo make install
+          export GI_TYPELIB_PATH=/usr/local/lib/girepository-1.0/
+          sudo ldconfig
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake

data/.rubocop.yml

@@ -0,0 +1,6 @@
+inherit_gem:
+  rubocop-rails_config:
+    - config/rails.yml
+
+AllCops:
+  TargetRubyVersion: 3.1

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+3.4.5

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.3
+ruby 3.4.5

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 2.6.0
+
+* Add auto_profile configuration option by @asgerb
+* Fix output not having the ICC profile embedded by @asgerb
+
+## 2.5.1
+
+* Update all DragonflyLibvips.symbolize_keys to new syntax by @Bartuz
+* Remove `raw` from supported output formats by @asgerb
+* Add `j2c`, `j2k`, `jp2`, `jpc`, `jpt`, `jxl`, and `szi` to formats without profile support by @asgerb
+* Don't pass `format` output option to `gif` by @asgerb
+* Fix missing parameters in `Dimensions` by @asgerb
+
 ## 2.5.0
 
 * Fix ruby 3.0+ compatibility by @Bartuz

data/Gemfile

@@ -1,4 +1,6 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in dragonfly_libvips.gemspec
 gemspec

data/Guardfile

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
 guard :minitest do
   watch(%r{^lib/(.+)\.rb$})                               { |m| "test/#{m[1]}_test.rb" }
   watch(%r{^test/.+_test\.rb$})
-  watch(%r{^test/test_helper\.rb$})                       { 'test' }
+  watch(%r{^test/test_helper\.rb$})                       { "test" }
 end

data/Rakefile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/dragonfly_libvips.gemspec

@@ -1,31 +1,35 @@
+# frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dragonfly_libvips/version'
+require "dragonfly_libvips/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dragonfly_libvips'
+  spec.name          = "dragonfly_libvips"
   spec.version       = DragonflyLibvips::VERSION
-  spec.authors       = ['Tomas Celizna']
-  spec.email         = ['tomas.celizna@gmail.com']
+  spec.authors       = ["Tomas Celizna"]
+  spec.email         = ["tomas.celizna@gmail.com"]
 
-  spec.summary       = 'Dragonfly analysers and processors for libvips image processing library.'
-  spec.homepage      = 'https://github.com/tomasc/dragonfly_libvips'
-  spec.license       = 'MIT'
+  spec.summary       = "Dragonfly analysers and processors for libvips image processing library."
+  spec.homepage      = "https://github.com/tomasc/dragonfly_libvips"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'dragonfly', '~> 1.0'
-  spec.add_dependency 'ruby-vips', '~> 2.0', '>= 2.0.16'
+  spec.add_dependency "dragonfly", "~> 1.0"
+  spec.add_dependency "ruby-vips", "~> 2.0", ">= 2.0.16"
+  spec.add_dependency "base64"
 
-  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'
-  spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  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"
+  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "lefthook"
+  spec.add_development_dependency "rubocop-rails_config"
 end

data/lefthook.yml

@@ -0,0 +1,5 @@
+pre-commit:
+  parallel: true
+  commands:
+    rubocop:
+      run: bundle exec rubocop {staged_files} -A --display-cop-names --extra-details --force-exclusion

data/lib/dragonfly_libvips/analysers/image_properties.rb

@@ -1,4 +1,6 @@
-require 'vips'
+# frozen_string_literal: true
+
+require "vips"
 
 module DragonflyLibvips
   module Analysers
@@ -10,9 +12,9 @@ module DragonflyLibvips
         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'
+        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, **DragonflyLibvips.symbolize_keys(input_options))
 
@@ -22,12 +24,13 @@ module DragonflyLibvips
         yres = img.yres
 
         {
-          'format' => content.ext.to_s,
-          'width' => width,
-          'height' => height,
-          'xres' => xres,
-          'yres' => yres,
-          'progressive' => (content.mime_type == 'image/jpeg' && img.get('jpeg-multiscan') != 0)
+          "format" => content.ext.to_s,
+          "width" => width,
+          "height" => height,
+          "xres" => xres,
+          "yres" => yres,
+          "has_alpha" => img.has_alpha?,
+          "progressive" => (content.mime_type == "image/jpeg" && img.get("jpeg-multiscan") != 0)
         }
       end
     end

data/lib/dragonfly_libvips/dimensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DragonflyLibvips
   class Dimensions < Struct.new(:geometry, :orig_w, :orig_h)
     def self.call(*args)
@@ -10,60 +12,59 @@ module DragonflyLibvips
     end
 
     private
-
-    def width
-      if landscape?
-        dimensions_specified_by_width? ? dimensions.width : dimensions.height / aspect_ratio
-      else
-        dimensions_specified_by_height? ? dimensions.height / aspect_ratio : dimensions.width
+      def width
+        if landscape?
+          dimensions_specified_by_width? ? dimensions.width : dimensions.height / aspect_ratio
+        else
+          dimensions_specified_by_height? ? dimensions.height / aspect_ratio : dimensions.width
+        end
       end
-    end
 
-    def height
-      if landscape?
-        dimensions_specified_by_width? ? dimensions.width * aspect_ratio : dimensions.height
-      else
-        dimensions_specified_by_height? ? dimensions.height : dimensions.width * aspect_ratio
+      def height
+        if landscape?
+          dimensions_specified_by_width? ? dimensions.width * aspect_ratio : dimensions.height
+        else
+          dimensions_specified_by_height? ? dimensions.height : dimensions.width * aspect_ratio
+        end
       end
-    end
 
-    def scale
-      width.to_f / orig_w.to_f
-    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)
-    end
+      def dimensions
+        w, h = geometry.scan(/\A(\d*)x(\d*)/).flatten.map(&:to_f)
+        OpenStruct.new(width: w, height: h)
+      end
 
-    def aspect_ratio
-      orig_h.to_f / orig_w
-    end
+      def aspect_ratio
+        orig_h.to_f / orig_w
+      end
 
-    def dimensions_specified_by_width?
-      dimensions.width > 0
-    end
+      def dimensions_specified_by_width?
+        dimensions.width > 0
+      end
 
-    def dimensions_specified_by_height?
-      dimensions.height > 0
-    end
+      def dimensions_specified_by_height?
+        dimensions.height > 0
+      end
 
-    def landscape?
-      aspect_ratio <= 1.0
-    end
+      def landscape?
+        aspect_ratio <= 1.0
+      end
 
-    def portrait?
-      !landscape?
-    end
+      def portrait?
+        !landscape?
+      end
 
-    def do_not_resize_if_image_smaller_than_requested?
-      return false unless geometry.include? '>'
-      orig_w < width && orig_h < height
-    end
+      def do_not_resize_if_image_smaller_than_requested?
+        return false unless geometry.include? ">"
+        orig_w < width && orig_h < height
+      end
 
-    def do_not_resize_if_image_larger_than_requested?
-      return false unless geometry.include? '<'
-      orig_w > width && orig_h > height
-    end
+      def do_not_resize_if_image_larger_than_requested?
+        return false unless geometry.include? "<"
+        orig_w > width && orig_h > height
+      end
   end
 end

data/lib/dragonfly_libvips/plugin.rb

@@ -1,8 +1,10 @@
-require 'dragonfly_libvips/analysers/image_properties'
-require 'dragonfly_libvips/processors/encode'
-require 'dragonfly_libvips/processors/extract_area'
-require 'dragonfly_libvips/processors/rotate'
-require 'dragonfly_libvips/processors/thumb'
+# frozen_string_literal: true
+
+require "dragonfly_libvips/analysers/image_properties"
+require "dragonfly_libvips/processors/encode"
+require "dragonfly_libvips/processors/extract_area"
+require "dragonfly_libvips/processors/rotate"
+require "dragonfly_libvips/processors/thumb"
 
 module DragonflyLibvips
   class Plugin
@@ -24,11 +26,9 @@ module DragonflyLibvips
       app.add_analyser(:landscape) { |c| !c.analyse(:portrait) }
 
       app.add_analyser(:image) do |c|
-        begin
-          c.analyse(:image_properties).key?('format')
-        rescue ::Vips::Error
-          false
-        end
+        c.analyse(:image_properties).key?("format")
+      rescue ::Vips::Error
+        false
       end
 
       # Aliases

data/lib/dragonfly_libvips/processors/encode.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'vips'
+require "vips"
 
 module DragonflyLibvips
   module Processors
@@ -10,40 +10,49 @@ module DragonflyLibvips
         raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
         format = format.to_s
-        format = 'tif' if format == 'tiff'
-        format = 'jpg' if format == 'jpeg'
+        format = "tif" if format == "tiff"
+        format = "jpg" if format == "jpeg"
 
         raise UnsupportedOutputFormat unless SUPPORTED_OUTPUT_FORMATS.include?(format.downcase)
 
         if content.mime_type == Rack::Mime.mime_type(".#{format}")
           content.ext ||= format
-          content.meta['format'] = format
+          content.meta["format"] = format
           return
         end
 
         options = DragonflyLibvips.stringify_keys(options)
 
-        input_options = options.fetch('input_options', {})
-        input_options['access'] ||= 'sequential'
-        if content.mime_type == 'image/jpeg'
-          input_options['autorotate'] = true unless input_options.key?('autorotate')
+        input_options = options.fetch("input_options", {})
+        input_options["access"] ||= "sequential"
+        if content.mime_type == "image/jpeg"
+          input_options["autorotate"] = true unless input_options.key?("autorotate")
         end
 
-        output_options = options.fetch('output_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)
+          output_options.delete("profile")
+        elsif DragonflyLibvips.auto_profile
+          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
+        output_options.delete("Q") unless /jpg|jpeg/i.match?(format.to_s)
+        output_options["format"] ||= format.to_s if /bmp/i.match?(format.to_s)
 
-        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
+        img = ::Vips::Image.new_from_file(content.path, **DragonflyLibvips.symbolize_keys(input_options))
+
+        if output_options.include?("profile")
+          img = img.icc_transform(
+            output_options["profile"],
+            embedded: true,
+            intent: :relative,
+            black_point_compensation: true
+          )
+        end
 
         content.update(
-          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
-          'name' => "temp.#{format}",
-          'format' => format
+          img.write_to_buffer(".#{format}", **DragonflyLibvips.symbolize_keys(output_options)),
+          "name" => "temp.#{format}",
+          "format" => format
         )
         content.ext = format
       end

data/lib/dragonfly_libvips/processors/extract_area.rb

@@ -1,4 +1,6 @@
-require 'vips'
+# frozen_string_literal: true
+
+require "vips"
 
 module DragonflyLibvips
   module Processors
@@ -8,38 +10,47 @@ module DragonflyLibvips
         raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
         options = DragonflyLibvips.stringify_keys(options)
-        format = options.fetch('format', content.ext)
+        format = options.fetch("format", content.ext)
 
-        input_options = options.fetch('input_options', {})
+        input_options = options.fetch("input_options", {})
 
         # input_options['access'] ||= 'sequential'
-        if content.mime_type == 'image/jpeg'
-          input_options['autorotate'] = true unless input_options.has_key?('autorotate')
+        if content.mime_type == "image/jpeg"
+          input_options["autorotate"] = true unless input_options.has_key?("autorotate")
         end
 
-        output_options = options.fetch('output_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)
+          output_options.delete("profile")
+        elsif DragonflyLibvips.auto_profile
+          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
+        output_options.delete("Q") unless /jpg|jpeg/i.match?(format.to_s)
+        output_options["format"] ||= format.to_s if /gif|bmp/i.match?(format.to_s)
 
-        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
+        img = ::Vips::Image.new_from_file(content.path, **DragonflyLibvips.symbolize_keys(input_options))
         img = img.extract_area(x, y, width, height)
 
+        if output_options.include?("profile")
+          img = img.icc_transform(
+            output_options["profile"],
+            embedded: true,
+            intent: :relative,
+            black_point_compensation: true
+          )
+        end
+
         content.update(
-          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
-          'name' => "temp.#{format}",
-          'format' => format
+          img.write_to_buffer(".#{format}", **DragonflyLibvips.symbolize_keys(output_options)),
+          "name" => "temp.#{format}",
+          "format" => format
         )
         content.ext = format
       end
 
       def update_url(url_attributes, _, _, _, _, options = {})
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
-        return unless format = options.fetch('format', nil)
+        options = options.transform_keys { |k| k.to_s } # stringify keys
+        return unless format = options.fetch("format", nil)
         url_attributes.ext = format
       end
     end

data/lib/dragonfly_libvips/processors/rotate.rb

@@ -1,4 +1,6 @@
-require 'vips'
+# frozen_string_literal: true
+
+require "vips"
 
 module DragonflyLibvips
   module Processors
@@ -8,38 +10,47 @@ module DragonflyLibvips
         raise UnsupportedFormat unless SUPPORTED_FORMATS.include?(content.ext.downcase)
 
         options = DragonflyLibvips.stringify_keys(options)
-        format = options.fetch('format', content.ext)
+        format = options.fetch("format", content.ext)
 
-        input_options = options.fetch('input_options', {})
+        input_options = options.fetch("input_options", {})
 
         # input_options['access'] ||= 'sequential'
-        if content.mime_type == 'image/jpeg'
-          input_options['autorotate'] = true unless input_options.has_key?('autorotate')
+        if content.mime_type == "image/jpeg"
+          input_options["autorotate"] = true unless input_options.has_key?("autorotate")
         end
 
-        output_options = options.fetch('output_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)
+          output_options.delete("profile")
+        elsif DragonflyLibvips.auto_profile
+          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
+        output_options.delete("Q") unless /jpg|jpeg/i.match?(format.to_s)
+        output_options["format"] ||= format.to_s if /gif|bmp/i.match?(format.to_s)
 
-        img = ::Vips::Image.new_from_file(content.path, DragonflyLibvips.symbolize_keys(input_options))
+        img = ::Vips::Image.new_from_file(content.path, **DragonflyLibvips.symbolize_keys(input_options))
         img = img.rot("d#{rotate}")
 
+        if output_options.include?("profile")
+          img = img.icc_transform(
+            output_options["profile"],
+            embedded: true,
+            intent: :relative,
+            black_point_compensation: true
+          )
+        end
+
         content.update(
-          img.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
-          'name' => "temp.#{format}",
-          'format' => format
+          img.write_to_buffer(".#{format}", **DragonflyLibvips.symbolize_keys(output_options)),
+          "name" => "temp.#{format}",
+          "format" => format
         )
         content.ext = format
       end
 
       def update_url(url_attributes, _, options = {})
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
-        return unless format = options.fetch('format', nil)
+        options = options.transform_keys { |k| k.to_s } # stringify keys
+        return unless format = options.fetch("format", nil)
         url_attributes.ext = format
       end
     end

data/lib/dragonfly_libvips/processors/thumb.rb

@@ -1,10 +1,12 @@
-require 'dragonfly_libvips/dimensions'
-require 'vips'
+# frozen_string_literal: true
+
+require "dragonfly_libvips/dimensions"
+require "vips"
 
 module DragonflyLibvips
   module Processors
     class Thumb
-      OPERATORS = '><'.freeze
+      OPERATORS = "><"
       RESIZE_GEOMETRY = /\A\d*x\d*[#{OPERATORS}]?\z/ # e.g. '300x200>'
       DPI = 300
 
@@ -15,67 +17,76 @@ module DragonflyLibvips
         options = DragonflyLibvips.stringify_keys(options)
 
         filename = content.path
-        format = options.fetch('format', content.ext).to_s
+        format = options.fetch("format", content.ext).to_s
 
-        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 = 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"
 
-        if content.mime_type == 'application/pdf'
-          input_options['dpi'] = input_options.fetch('dpi', DPI)
-          input_options['page'] = input_options.fetch('page', 0)
-        else
-          input_options.delete('page')
-          input_options.delete('dpi')
+        if content.mime_type == "application/pdf"
+          input_options["dpi"] = input_options.fetch("dpi", DPI)
+          input_options["page"] = input_options.fetch("page", 0)
+        elsif DragonflyLibvips.auto_profile
+          input_options.delete("page")
+          input_options.delete("dpi")
         end
 
-        output_options = options.fetch('output_options', {})
+        output_options = options.fetch("output_options", {})
         if FORMATS_WITHOUT_PROFILE_SUPPORT.include?(format)
-          output_options.delete('profile')
+          output_options.delete("profile")
         else
-          output_options['profile'] ||= input_options.fetch('profile', EPROFILE_PATH)
+          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
+        output_options.delete("Q") unless /jpg|jpeg/i.match?(format.to_s)
+        output_options["format"] ||= format.to_s if /bmp/i.match?(format.to_s)
 
-        input_options = input_options.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v } # symbolize
-        img = ::Vips::Image.new_from_file(filename, DragonflyLibvips.symbolize_keys(input_options))
+        input_options = input_options.transform_keys { |k| k.to_sym } # symbolize
+        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)
                      else raise ArgumentError, "Didn't recognise the geometry string: #{geometry}"
         end
 
-        thumbnail_options = options.fetch('thumbnail_options', {})
+        thumbnail_options = options.fetch("thumbnail_options", {})
         if Vips.at_least_libvips?(8, 8)
-          thumbnail_options['no_rotate'] = input_options.fetch('no_rotate', false) if content.mime_type == 'image/jpeg'
+          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'
+          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
-                                     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
+        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
+                                      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
 
-        filename += "[page=#{input_options[:page]}]" if content.mime_type == 'application/pdf'
+        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, DragonflyLibvips.symbolize_keys(thumbnail_options))
+        thumbnail_options = thumbnail_options.transform_keys { |k| k.to_sym } # symbolize
+        thumb = ::Vips::Image.thumbnail(filename, dimensions.width.ceil, **DragonflyLibvips.symbolize_keys(thumbnail_options))
+
+        if output_options.include?("profile")
+          thumb = thumb.icc_transform(
+            output_options["profile"],
+            embedded: true,
+            intent: :relative,
+            black_point_compensation: true
+          )
+        end
 
         content.update(
-          thumb.write_to_buffer(".#{format}", DragonflyLibvips.symbolize_keys(output_options)),
-          'name' => "temp.#{format}",
-          'format' => format
+          thumb.write_to_buffer(".#{format}", **DragonflyLibvips.symbolize_keys(output_options)),
+          "name" => "temp.#{format}",
+          "format" => format
         )
         content.ext = format
       end
 
       def update_url(url_attributes, _, options = {})
-        options = options.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v } # stringify keys
-        return unless format = options.fetch('format', nil)
+        options = options.transform_keys { |k| k.to_s } # stringify keys
+        return unless format = options.fetch("format", nil)
         url_attributes.ext = format
       end
     end

data/lib/dragonfly_libvips/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DragonflyLibvips
-  VERSION = '2.5.0'.freeze
+  VERSION = "2.6.0"
 end

data/lib/dragonfly_libvips.rb

@@ -1,15 +1,17 @@
-require 'dragonfly'
-require 'dragonfly_libvips/dimensions'
-require 'dragonfly_libvips/plugin'
-require 'dragonfly_libvips/version'
-require 'vips'
+# frozen_string_literal: true
+
+require "dragonfly"
+require "dragonfly_libvips/dimensions"
+require "dragonfly_libvips/plugin"
+require "dragonfly_libvips/version"
+require "vips"
 
 module DragonflyLibvips
   class UnsupportedFormat < 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__)
+  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`
@@ -29,19 +31,42 @@ module DragonflyLibvips
     pfm
     pgm
     ppm
+    raw
     v
     vips
   ]
 
-  FORMATS_WITHOUT_PROFILE_SUPPORT = %w[avif bmp dz gif hdr webp heic heif]
-
-  private
+  FORMATS_WITHOUT_PROFILE_SUPPORT = %w[
+    avif
+    bmp
+    dz
+    gif
+    hdr
+    heic
+    heif
+    j2c
+    j2k
+    jp2
+    jpc
+    jpt
+    jxl
+    szi
+    webp
+  ]
 
-  def self.stringify_keys(hash = {})
-    hash.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v }
+  class << self
+    # Controls whether output images automatically get an ICC profile attached
+    attr_accessor :auto_profile
   end
 
-  def self.symbolize_keys(hash = {})
-    hash.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v }
-  end
+  self.auto_profile ||= true
+
+  private
+    def self.stringify_keys(hash = {})
+      hash.transform_keys { |k| k.to_s }
+    end
+
+    def self.symbolize_keys(hash = {})
+      hash.transform_keys { |k| k.to_sym }
+    end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_libvips
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Tomas Celizna
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -44,6 +43,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.16
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,24 +145,53 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: 
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: lefthook
+  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: rubocop-rails_config
+  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'
 email:
 - tomas.celizna@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".tool-versions"
 - ".travis.yml"
@@ -162,6 +204,7 @@ files:
 - bin/console
 - bin/setup
 - dragonfly_libvips.gemspec
+- lefthook.yml
 - lib/dragonfly_libvips.rb
 - lib/dragonfly_libvips/analysers/image_properties.rb
 - lib/dragonfly_libvips/dimensions.rb
@@ -187,7 +230,6 @@ homepage: https://github.com/tomasc/dragonfly_libvips
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -202,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Dragonfly analysers and processors for libvips image processing library.
 test_files: []