hydra-derivatives 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0320cb9c40c7d32320a33c09092567f69176ef7ba09d0e3eb85a4d8a59e9324d
-  data.tar.gz: 84689d529bc702a13c067cead22b253de5982c185850032186c7d0ba72683b10
+  metadata.gz: d57cbceda9c0d06164a39a9d02c08f87d3595d2c7e4b651c45febd2b1f170304
+  data.tar.gz: 335f28d6f50ca793f9209cc0d178333958fe0900885dd60db887ee1d7967da39
 SHA512:
-  metadata.gz: 2138cc83cfa2bd0db1825831f4d4a70a4112ce0b728d957df5119c4af55163e932653758f06035c0734a6b284e1be6b0428ebaf71289b94e8108328f2ef12bfc
-  data.tar.gz: ff20e72fcd91fda4a9b52aad791af7c467b893a3ae1df79fef818a4606be8c3ec507598ab20f0afc3ec1477b5621f14c2a0538d890ec4ba3125ff38df6972b5c
+  metadata.gz: 6f9a349b34da727f960c055363c6c49d82d1606e2f5679bf75c6c5d476493cc966f6257e74c171736e0ecacf28a8d997e20381b098844380d7a6deed24db54e9
+  data.tar.gz: 54834ba67208b3345c030b068ebe67c6b831e3541d9632973c91930c5b27a6e9025ca009fca5abec3313692062c0928131bcfbf1f924afd0345f20cbec739767

data/.circleci/config.yml

@@ -29,7 +29,7 @@ jobs:
           command: |
             wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
             sudo apt-get update
-            sudo apt-get install ghostscript libpng-dev imagemagick graphicsmagick ffmpeg libreoffice dcraw
+            sudo apt-get install ghostscript libpng-dev imagemagick graphicsmagick libvips libvips-dev libvips-tools ffmpeg libreoffice dcraw
       - restore_cache:
           name: Restore Kakadu Cache
           keys:

data/.rubocop_todo.yml

@@ -8,6 +8,7 @@ Layout/SpaceBeforeBlockBraces:
 Metrics/ClassLength:
   Exclude:
     - lib/hydra/derivatives/processors/jpeg2k_image.rb
+    - lib/hydra/derivatives/processors/image.rb
 
 Metrics/CyclomaticComplexity:
   Exclude:

data/Dockerfile

@@ -7,6 +7,9 @@ RUN apt update && apt -y install \
   zip \
   ghostscript \
   libpng-dev \
+  libvips \
+  libvips-dev \
+  libvips-tools \
   graphicsmagick \
   ffmpeg \
   libreoffice \
@@ -14,10 +17,11 @@ RUN apt update && apt -y install \
   dcraw \
   libyaml-dev
 
-RUN mkdir -p /opt/kakadu/downloads
-RUN wget http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Linux-x86-64_200602.zip -O /opt/kakadu/downloads/kakadu.zip \
-    && unzip /opt/kakadu/downloads/kakadu.zip \
-    && mv KDU805_Demo_Apps_for_Linux-x86-64_200602 kakadu \
+ARG KAKADU_ZIP
+RUN mkdir -p /opt/kakadu
+COPY $KAKADU_ZIP.zip /opt/kakadu/downloads/kakadu.zip
+RUN unzip /opt/kakadu/downloads/kakadu.zip \
+    && mv $KAKADU_ZIP kakadu \
     && cp kakadu/*.so /usr/lib \
     && cp kakadu/* /usr/bin
 

data/README.md

@@ -257,10 +257,18 @@ If you don't want to run the whole suite all at once like CI, do the following:
 
 First, make sure you have installed [Docker](https://www.docker.com/).
 
-Within your cloned repository, tell Docker to get started installing your development environment:
+Download the most recent version of the Linux Kakadu demo from [the downloads page](https://kakadusoftware.com/documentation-downloads/downloads/)
+and place it in your cloned repository. (This requires signing up with an email address.)
+
+Note the name of the zip file without the .zip extension. We will pass this name as an argument when building 
+the docker container. For example, if the name of the zip file is `KDU841_Demo_Apps_for_Linux-x86-64_231117.zip`, 
+we will pass `KDU841_Demo_Apps_for_Linux-x86-64_231117` to `docker compose build`.
+
+Within your cloned repository, tell Docker to get started installing your development environment, replacing 
+`<name of zip file>` with the name of your downloaded file above.
 
 ```sh
-docker compose build
+docker compose build --build-arg KAKADU_ZIP=<name of zip file>
 docker compose up
 ```
 

data/VERSION

@@ -1 +1 @@
-4.0.0
+4.1.0

data/hydra-derivatives.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rails', '> 5.1', '< 8.0'
+  spec.add_development_dependency 'rails', '> 5.1', '< 9.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency "solr_wrapper"
@@ -26,9 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'active_encode', '~> 1.2'
   spec.add_dependency 'active-fedora', '>= 14.0'
   spec.add_dependency 'active-triples', '>= 1.2'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 8.0'
+  spec.add_dependency 'activesupport', '>= 4.0', '< 9.0'
   spec.add_dependency 'addressable', '~> 2.5'
   spec.add_dependency 'deprecation'
   spec.add_dependency 'mime-types', '> 2.0', '< 4.0'
   spec.add_dependency 'mini_magick', '>= 3.2', '< 5'
+  spec.add_dependency 'ruby-vips'
 end

data/lib/hydra/derivatives/processors/image.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'mini_magick'
+require 'ruby-vips'
 
 module Hydra::Derivatives::Processors
   class Image < Processor
@@ -22,6 +23,8 @@ module Hydra::Derivatives::Processors
       def create_resized_image
         if Hydra::Derivatives::ImageService.processor == :graphicsmagick
           create_resized_image_with_graphicsmagick
+        elsif Hydra::Derivatives::ImageService.processor == :libvips
+          create_resized_image_with_libvips
         else
           create_resized_image_with_imagemagick
         end
@@ -52,12 +55,38 @@ module Hydra::Derivatives::Processors
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
+      def create_resized_image_with_libvips
+        Hydra::Derivatives::Logger.debug('[ImageProcessor] Using libvips resize method')
+        create_image do |temp_file|
+          if size
+            width, height, option = size.match(/(\d+)x(\d+)(.)?/).captures
+            # Translate imagemagick resize syntax into ruby-vips
+            size_option = case option
+                          when '>'
+                            :down
+                          when '<'
+                            :up
+                          when '!'
+                            :force
+                          end
+            temp_file.thumbnail_image(width.to_i, height: height.to_i, size: size_option)
+          end
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+
       def create_image
-        xfrm = selected_layers(load_image_transformer)
-        yield(xfrm) if block_given?
-        xfrm.format(directives.fetch(:format))
-        xfrm.quality(quality.to_s) if quality
-        write_image(xfrm)
+        if Hydra::Derivatives::ImageService.processor == :libvips
+          image = block_given? ? yield(load_image_transformer) : load_image_transformer
+          write_image_with_vips(image, directives)
+        else
+          xfrm = selected_layers(load_image_transformer)
+          yield(xfrm) if block_given?
+          xfrm.format(directives.fetch(:format))
+          xfrm.quality(quality.to_s) if quality
+          write_image(xfrm)
+        end
       end
 
       def write_image(xfrm)
@@ -67,10 +96,24 @@ module Hydra::Derivatives::Processors
         output_file_service.call(output_io, directives)
       end
 
+      def write_image_with_vips(image, directives)
+        output_io = StringIO.new
+        format = directives.fetch(:format, "jpg")
+        format_string = ".#{format}#{"[Q=#{quality}]" if quality}"
+        output_io.write(image.write_to_buffer(format_string))
+        output_io.rewind
+        output_file_service.call(output_io, directives)
+      end
+
       # Override this method if you want a different transformer, or need to load the
       # raw image from a different source (e.g. external file)
       def load_image_transformer
-        MiniMagick::Image.open(source_path)
+        if Hydra::Derivatives::ImageService.processor == :libvips
+          # Vips specifies pdf layers at load time
+          selected_vips_layers(source_path)
+        else
+          MiniMagick::Image.open(source_path)
+        end
       end
 
     private
@@ -92,5 +135,13 @@ module Hydra::Derivatives::Processors
           image
         end
       end
+
+      def selected_vips_layers(source_path)
+        if `vipsheader #{Shellwords.escape(source_path)}` =~ /pdfload/i && directives.fetch(:layer, false)
+          Vips::Image.new_from_file(source_path, page: directives.fetch(:layer))
+        else
+          Vips::Image.new_from_file(source_path)
+        end
+      end
   end
 end

data/lib/hydra/derivatives/services/image_service.rb

@@ -13,8 +13,11 @@ module Hydra::Derivatives
       when 'graphicsmagick'
         Hydra::Derivatives::Logger.debug('[ImageProcessor] Using GraphicsMagick as image processor')
         :graphicsmagick
+      when 'libvips'
+        Hydra::Derivatives::Logger.debug('[ImageProcessor] Using libvips as image processor')
+        :libvips
       else
-        Hydra::Derivatives::Logger.debug("[ImageProcessor] The environment variable IMAGE_PROCESSOR should be set to either 'imagemagick' or 'graphicsmagick'. It is currently set to: #{ENV['IMAGE_PROCESSOR']}. Defaulting to using #{default_processor}")
+        Hydra::Derivatives::Logger.debug("[ImageProcessor] The environment variable IMAGE_PROCESSOR should be set to 'imagemagick','graphicsmagick' or 'libvips'. It is currently set to: #{ENV['IMAGE_PROCESSOR']}. Defaulting to using #{default_processor}")
         default_processor
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,7 +61,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: ruby-vips
+  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'
 description: Derivative generation plugin for hydra
 email:
 - jenlindner@gmail.com
@@ -352,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Derivative generation plugin for hydra