riiif 2.1.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e92c056972609b8cb70468fae8b71b34e1974b2ec4caa691af4422187886fa8
-  data.tar.gz: eae0755c48ed444ebc292b56f30bd13520d1e34988ec6c7c37087483bbfbd8d8
+  metadata.gz: 5c83cf037ced763741c5aa704db17564fd43ee2610866d27629b1de4700c518a
+  data.tar.gz: 447135b1b851c29969cd42a91a51b26facb1084b47dc246422b11a15de0dcbc5
 SHA512:
-  metadata.gz: 5fe8da75c42178b50f8768cdb8f8383043d994865ab917d6b1b74083660b925265f0cd7d08f90f0670e7640c41dcf1b48736926a02855a391c51210ef96256f9
-  data.tar.gz: 11dbed920c6e8bd094cbd2ae01e9e5f29de71670833b3d39d231c5ad0415b39fbc4c3da95b9f79dc46d6e6e12f50a962ed4b425ad3d65fa28d960868655db9e1
+  metadata.gz: 86952c0517dfd44217aee70ae4927209aaa7c4078c9142126a6f0a06fe831774371dffb0191c2719cb868249b98b324cbfbf7853c2518622bb67dc2d1afab182
+  data.tar.gz: f315b4762cf831614a80728ac072678ea4ad9f1fc38cbc836cd7f6e3eaf6c2009b870682e0024d4cebca02c9da919a33dde3b66bcd98ac8da5f2f4d5691b23fd

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ruby.yml

@@ -0,0 +1,39 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ["3.2", "3.3", "3.4"]
+        rails: ["8.1.1", "8.0.4", "7.2.3"]
+    steps:
+      - name: Install ImageMagick
+        run: sudo apt install imagemagick
+      - uses: actions/checkout@v6
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
+      - name: Run tests
+        run: bundle exec rake
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
+          ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test"

data/.rubocop_todo.yml

@@ -1,16 +1,54 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-02-23 11:28:05 -0600 using RuboCop version 0.52.1.
+# on 2022-02-28 10:01:41 -0800 using RuboCop version 0.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/controllers/riiif/images_controller_spec.rb'
+
+# Offense count: 62
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: normal, indented_internal_methods
+Layout/IndentationConsistency:
+  Exclude:
+    - 'app/controllers/riiif/images_controller.rb'
+    - 'app/resolvers/riiif/file_system_file_resolver.rb'
+    - 'app/resolvers/riiif/http_file_resolver.rb'
+    - 'app/services/riiif/crop.rb'
+    - 'app/services/riiif/imagemagick_command_factory.rb'
+    - 'app/services/riiif/kakadu_command_factory.rb'
+    - 'app/services/riiif/resize.rb'
+    - 'app/transformers/riiif/kakadu_transformer.rb'
+
+# Offense count: 62
+# Cop supports --auto-correct.
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'app/controllers/riiif/images_controller.rb'
+    - 'app/resolvers/riiif/file_system_file_resolver.rb'
+    - 'app/resolvers/riiif/http_file_resolver.rb'
+    - 'app/services/riiif/crop.rb'
+    - 'app/services/riiif/imagemagick_command_factory.rb'
+    - 'app/services/riiif/kakadu_command_factory.rb'
+    - 'app/services/riiif/resize.rb'
+    - 'app/transformers/riiif/kakadu_transformer.rb'
+
+# Offense count: 1
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
-    - 'app/models/riiif/file.rb'
     - 'app/resolvers/riiif/http_file_resolver.rb'
 
 # Offense count: 1
@@ -18,27 +56,32 @@ Lint/DuplicateMethods:
   Exclude:
     - 'app/resolvers/riiif/http_file_resolver.rb'
 
-# Offense count: 1
-Lint/HandleExceptions:
+# Offense count: 2
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
   Exclude:
+    - 'app/controllers/riiif/images_controller.rb'
     - 'spec/models/riiif/http_file_resolver_spec.rb'
 
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'app/models/riiif/file.rb'
-
 # Offense count: 21
 # Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 233
+  Max: 237
 
-# Offense count: 1
+# Offense count: 2
+Metrics/ClassLength:
+  Exclude:
+    - 'app/services/riiif/crop.rb'
+    - 'app/services/riiif/resize.rb'
+
+      # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 7
 
 # Offense count: 3
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 18
 
@@ -47,12 +90,20 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 6
 
+# Offense count: 3
+# Cop supports --auto-correct.
+Performance/RegexpMatch:
+  Exclude:
+    - 'app/resolvers/riiif/file_system_file_resolver.rb'
+    - 'app/services/riiif/imagemagick_command_factory.rb'
+
 # Offense count: 1
 RSpec/DescribeClass:
   Exclude:
     - 'spec/routing/resize_routes_spec.rb'
 
 # Offense count: 2
+# Cop supports --auto-correct.
 # Configuration parameters: SkipBlocks, EnforcedStyle.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
@@ -67,9 +118,11 @@ RSpec/ExampleLength:
     - 'spec/models/riiif/http_file_resolver_spec.rb'
     - 'spec/transformers/riiif/kakadu_transformer_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
+# Cop supports --auto-correct.
 RSpec/LeadingSubject:
   Exclude:
+    - 'spec/controllers/riiif/images_controller_spec.rb'
     - 'spec/transformers/riiif/kakadu_transformer_spec.rb'
 
 # Offense count: 43
@@ -78,7 +131,8 @@ RSpec/LeadingSubject:
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 23
+# Offense count: 24
+# Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Exclude:
     - 'spec/controllers/riiif/images_controller_spec.rb'
@@ -93,18 +147,51 @@ RSpec/RepeatedExample:
     - 'spec/controllers/riiif/images_controller_spec.rb'
 
 # Offense count: 7
-# Configuration parameters: IgnoreSymbolicNames.
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/controllers/riiif/images_controller_spec.rb'
     - 'spec/services/riiif/imagemagick_command_factory_spec.rb'
     - 'spec/services/riiif/kakadu_command_factory_spec.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
+Rails/Blank:
+  Exclude:
+    - 'spec/controllers/riiif/images_controller_spec.rb'
+
 # Offense count: 1
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: slashes, arguments
 Rails/FilePath:
   Exclude:
     - 'spec/models/riiif/akubra_system_file_resolver_spec.rb'
 
+# Offense count: 37
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/riiif/routes.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/services/riiif/imagemagick_command_factory.rb'
+
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
@@ -114,3 +201,15 @@ Style/PercentLiteralDelimiters:
     - 'app/resolvers/riiif/file_system_file_resolver.rb'
     - 'spec/controllers/riiif/images_controller_spec.rb'
     - 'spec/models/riiif/http_file_resolver_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'app/resolvers/riiif/http_file_resolver.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantFreeze:
+  Exclude:
+    - 'app/services/riiif/imagemagick_command_factory.rb'

data/Gemfile

@@ -1,12 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'byebug'
 # Specify your gem's dependencies in riiif.gemspec
 gemspec
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 2.0.1
-# engine_cart stanza: 0.10.0
+# engine_cart: 2.6.0
+# engine_cart stanza: 2.5.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
@@ -27,14 +26,5 @@ else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
-
-  case ENV['RAILS_VERSION']
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
-  end
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -1,13 +1,13 @@
 # Riiif
 [![Gem Version](https://badge.fury.io/rb/riiif.png)](http://badge.fury.io/rb/riiif)
-[![Coverage Status](https://coveralls.io/repos/github/curationexperts/riiif/badge.svg?branch=master)](https://coveralls.io/github/curationexperts/riiif?branch=master)
 
-
-A Ruby IIIF image server as a rails engine
+A Ruby IIIF image server as a rails engine. 
 
 ## Installation
 
-RIIIF depends on Imagemagick so you must install that first. On a mac using Homebrew you can follow these instructions:
+To use RIIIF, you need to install at least one of Imagemagick, Graphicsmagick, or Vips (libvips) (see [comparison](docs/vips_comparison.md)). By default, RIIIF will use Imagemagick.
+
+To install Imagemagick on a Mac using Homebrew you can follow these instructions:
 
 ImageMagick (7.0.4) may be installed with a few options:
 * `--with-ghostscript` Compile with Ghostscript for Postscript/PDF support
@@ -33,6 +33,16 @@ Or install it yourself as:
 
 ## Configure
 
+Any of the following code examples should be included in a `config/initializers/riiif.rb` file in your application (or somewhere else loaded in your app environment) like so:
+
+```ruby
+Rails.application.config.to_prepare do
+  # code goes here
+end
+```
+
+For test applications generated by engine cart (see [Running the tests](#running-the-tests)), this would be `<cloned repo folder>/.internal_test_app/config/initializers/riiif.rb`.
+
 ### Images on the servers file system.
 
 By default Riiif is set to load images from the filesystem using the Riiif::FileSystemFileResolver.
@@ -48,7 +58,7 @@ When the Id passed in is "foo_image", then it will look for an image file using
 ### Images retrieved over HTTP
 It's preferable to use files on the filesystem, because this avoids the overhead of downloading the file.  If this is unavoidable, Riiif can be configured to fetch files from the network.  To enable this behavior, configure Riiif to use an alternative resolver:
 ```
-      Riiif::Image.file_resolver = Riiif::HTTPFileResolver.new
+      Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
 ```
 Then we configure the resolver with a mechanism for mapping the provided id to a url:
 ```
@@ -77,15 +87,25 @@ See [benchmark](docs/benchmark.md) for details
 
 To use [GraphicsMagick](http://www.graphicsmagick.org/) instead of ImageMagick
 
-    Riiif::ImagemagickCommandFactory.external_command = "gm convert"
-    Riiif::ImageMagickInfoExtractor.external_command  = "gm identify"
+```ruby
+Riiif::ImagemagickCommandFactory.external_command = "gm convert"
+Riiif::ImageMagickInfoExtractor.external_command  = "gm identify"
+```
 
 You will of course need to install GraphicsMagick on your system.
 
+### Libvips (aka Vips)
+
+To use [libvips](https://www.libvips.org/) instead of ImageMagick
+
+```ruby
+Riiif::Engine.config.use_vips = true
+```
+
 ## Usage
 
 Add the routes to your application by inserting the following line into `config/routes.rb`
-```
+```ruby
   mount Riiif::Engine => '/image-service', as: 'riiif'
 ```
 
@@ -154,7 +174,7 @@ Create an initializer like this in `config/initializers/riiif_initializer.rb`
 
 ```ruby
 # Tell RIIIF to get files via HTTP (not from the local disk)
-Riiif::Image.file_resolver = Riiif::HTTPFileResolver.new
+Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
 
 # This tells RIIIF how to resolve the identifier to a URI in Fedora
 Riiif::Image.file_resolver.id_to_uri = lambda do |id|

data/app/controllers/riiif/images_controller.rb

@@ -3,7 +3,7 @@ module Riiif
     before_action :link_header, only: [:show, :info]
 
     rescue_from IIIF::Image::InvalidAttributeError do
-      head 400
+      head :bad_request
     end
 
     def show

data/app/extractors/riiif/abstract_info_extractor.rb

@@ -0,0 +1,12 @@
+module Riiif
+  class AbstractInfoExtractor
+    # A basic image info extractor class from which ImageMagickInfoExtractor and
+    # VipsInfoExtractor inherit
+
+    class_attribute :external_command
+
+    def initialize(path)
+      @path = path
+    end
+  end
+end

data/app/{services → extractors}/riiif/image_magick_info_extractor.rb

@@ -1,17 +1,12 @@
 module Riiif
   # Get information using imagemagick to interrogate the file
-  class ImageMagickInfoExtractor
+  class ImageMagickInfoExtractor < AbstractInfoExtractor
     # perhaps you want to use GraphicsMagick instead, set to "gm identify"
-    class_attribute :external_command
     self.external_command = 'identify'
 
-    def initialize(path)
-      @path = path
-    end
-
     def extract
       height, width, format, channels = Riiif::CommandRunner.execute(
-        "#{external_command} -format '%h %w %m %[channels]' #{@path}[0]"
+        "#{external_command} -format '%h %w %m %[channels]' '#{@path}[0]'"
       ).split(' ')
 
       {

data/app/extractors/riiif/vips_info_extractor.rb

@@ -0,0 +1,22 @@
+require 'ruby-vips' if Riiif::Engine.config.use_vips
+
+module Riiif
+  # Get information using (lib)vips to interrogate the file
+  class VipsInfoExtractor < AbstractInfoExtractor
+    self.external_command = 'vipsheader'
+
+    def extract
+      attributes = Riiif::CommandRunner.execute("#{external_command} '#{@path}' -a")
+                                       .split(/\n/)
+                                       .map { |str| str.strip.split(': ', 2) }.to_h
+      width, height = attributes.values_at("width", "height")
+
+      {
+        height: Integer(height),
+        width: Integer(width),
+        format: attributes["vips-loader"].match?("pngload") ? "PNG" : "JPEG",
+        channels: ::Vips::Image.new_from_file(@path.to_s).has_alpha? ? "srgba" : "srgb"
+      }
+    end
+  end
+end

data/app/models/riiif/file.rb

@@ -4,7 +4,14 @@ module Riiif
 
     class_attribute :info_extractor_class
     # TODO: add alternative that uses kdu_jp2info
-    self.info_extractor_class = ImageMagickInfoExtractor
+
+    def self.info_extractor_class
+      if Riiif.use_vips?
+        VipsInfoExtractor
+      else
+        ImageMagickInfoExtractor
+      end
+    end
 
     # @param input_path [String] The location of an image file
     def initialize(input_path, tempfile = nil)
@@ -12,28 +19,6 @@ module Riiif
       @tempfile = tempfile # ensures that the tempfile will stick around until this file is garbage collected.
     end
 
-    def self.read(stream, ext)
-      create(ext) do |f|
-        while chunk = stream.read(8192)
-          f.write(chunk)
-        end
-      end
-    end
-    deprecation_deprecate read: 'Riiif::File.read is deprecated and will be removed in version 2.0'
-
-    # Yields a tempfile to the provided block
-    # @return [Riiif::File] a file backed by the Tempfile
-    def self.create(ext = nil, _validate = true, &block)
-      tempfile = Tempfile.new(['mini_magick', ext.to_s.downcase])
-      tempfile.binmode
-      block.call(tempfile)
-      tempfile.close
-      image = new(tempfile.path, tempfile)
-    ensure
-      tempfile.close if tempfile
-    end
-    deprecation_deprecate create: 'Riiif::File.create is deprecated and will be removed in version 2.0'
-
     # @param [Transformation] transformation
     # @param [ImageInformation] image_info
     # @return [String] the processed image data
@@ -42,7 +27,9 @@ module Riiif
     end
 
     def transformer
-      if Riiif.kakadu_enabled? && path.ends_with?('.jp2')
+      if Riiif.use_vips?
+        VipsTransformer
+      elsif Riiif.kakadu_enabled? && path.ends_with?('.jp2')
         KakaduTransformer
       else
         ImagemagickTransformer

data/app/models/riiif/image.rb

@@ -33,9 +33,6 @@ module Riiif
       @file ||= file_resolver.find(id)
     end
 
-    alias image file
-    deprecation_deprecate image: 'Use Image#file instead. This will be removed in riiif 2.0'
-
     ##
     # @param [ActiveSupport::HashWithIndifferentAccess] args
     # @return [String] the image data

data/app/resolvers/riiif/abstract_file_system_resolver.rb

@@ -4,19 +4,9 @@ module Riiif
     attr_accessor :base_path
 
     def initialize(base_path: nil)
-      @base_path = base_path || default_base_path
+      @base_path = base_path
     end
 
-    def default_base_path
-      Deprecation.warn(self, 'Initializing a file resolver without setting the base path ' \
-      'is deprecated and will be removed in Riiif 2.0', caller(2))
-      @root ||= ::File.expand_path(::File.join(::File.dirname(__FILE__), '../..'))
-      ::File.join(@root, 'spec/samples')
-    end
-
-    attr_reader :root
-    deprecation_deprecate :root
-
     def find(id)
       Riiif::File.new(path(id))
     end

data/app/resolvers/riiif/akubra_system_file_resolver.rb

@@ -5,6 +5,7 @@ module Riiif
     attr_accessor :pathroot, :imagetype, :akubraconfig
 
     def initialize(pr = '/yourfedora/data/datastreamStore/', ir = 'jp2', ac = [[0, 2], [2, 2], [4, 1]])
+      super()
       @pathroot = pr
       @imagetype = ir
       @akubraconfig = ac

data/app/resolvers/riiif/file_system_file_resolver.rb

@@ -14,7 +14,7 @@ module Riiif
 
       # @return [Boolean] true if the id matches the regex
       def validate_identifier(id:, regex: identifier_regex)
-        return true if id =~ regex
+        return true if id.to_s =~ regex
         Rails.logger.warn "Invalid characters in id `#{id}`"
         false
       end

data/app/resolvers/riiif/http_file_resolver.rb

@@ -2,11 +2,11 @@ require 'open-uri'
 require 'active_support/core_ext/file/atomic'
 
 module Riiif
-  class HTTPFileResolver
+  class HttpFileResolver
     # Set a lambda that maps the first parameter (id) to a URL
     # Example:
     #
-    # resolver = Riiif::HTTPFileResolver.new
+    # resolver = Riiif::HttpFileResolver.new
     # resolver.id_to_uri = lambda do |id|
     #  "http://upload.wikimedia.org/wikipedia/commons/thumb/a/a4/#{id}.jpg/600px-#{id}.jpg"
     # end
@@ -63,7 +63,7 @@ module Riiif
           benchmark("Riiif downloaded #{url}") do
             ::File.atomic_write(file_name, cache_path) do |local|
               begin
-                Kernel.open(url, download_opts) do |remote|
+                handler.open(url, **download_opts) do |remote|
                   while chunk = remote.read(8192)
                     local.write(chunk)
                   end
@@ -85,6 +85,14 @@ module Riiif
         def ensure_cache_path(path)
           FileUtils.makedirs(path) unless ::File.exist?(path)
         end
+
+        def handler
+          if url.match?(URI.regexp)
+            URI
+          else
+            Kernel
+          end
+        end
     end
 
     protected

data/app/services/riiif/crop.rb

@@ -45,8 +45,35 @@ module Riiif
       end
     end
 
+    def to_vips
+      case region
+      when IIIF::Image::Region::Full
+        nil
+      when IIIF::Image::Region::Absolute
+        [region.offset_x, region.offset_y, region.width, region.height]
+      when IIIF::Image::Region::Square
+        vips_square
+      when IIIF::Image::Region::Percent
+        vips_percent
+      end
+    end
+
     private
 
+      def vips_percent
+        # Calculate x values
+        offset_x, width = [region.x_pct, region.width_pct].map do |percent|
+          (image_info.width * percentage_to_fraction(percent)).round
+        end
+
+        # Calculate y values
+        offset_y, height = [region.y_pct, region.height_pct].map do |percent|
+          (image_info.height * percentage_to_fraction(percent)).round
+        end
+
+        [offset_x, offset_y, width, height]
+      end
+
       def imagemagick_percent
         offset_x = (image_info.width * percentage_to_fraction(region.x_pct)).round
         offset_y = (image_info.height * percentage_to_fraction(region.y_pct)).round
@@ -60,6 +87,19 @@ module Riiif
         "\{#{percentage_to_fraction(region.height_pct)},#{percentage_to_fraction(region.width_pct)}\}"
       end
 
+      def vips_square
+        min, max = [image_info.width, image_info.height].minmax
+        offset = (max - min) / 2
+
+        if image_info.height >= image_info.width
+          # Portrait: left, offset, width, height
+          [0, offset, min, min]
+        else
+          # Landscape: left, offset, width, height
+          [offset, 0, min, min]
+        end
+      end
+
       def kakadu_square
         min, max = [image_info.width, image_info.height].minmax
         offset = (max - min) / 2

data/app/services/riiif/imagemagick_command_factory.rb

@@ -65,7 +65,7 @@ module Riiif
       end
 
       def input
-        " #{path}#{layer_spec}"
+        " '#{path}#{layer_spec}'"
       end
 
       # In cases where the input file has an alpha_channel but the transformation