riiif 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88fa024e853f81b2c6a4fb9a722357d45537e1e6c235aafb165e1dc5fc0f017
-  data.tar.gz: 775234812041bad9fbf9340540799baf9e6740e9cd11d43eca5c51eead07ef28
+  metadata.gz: ea4afe42b1178e584376a461d2a093dce410e4e7d6ffe7b77b03a65c2e90c787
+  data.tar.gz: 74cff5d88b9cb6e0bb5077b67e81cf104b04c400419728090dcb423051b7382d
 SHA512:
-  metadata.gz: eed458967ef79c6f0458fdb9ca6a07ad9442bd487d5dc29f6b8b828649aa37317410b7bd210de93ebc1438990179b2c33b3af196396ed2eebbdd28249416e29d
-  data.tar.gz: cd607c37c612833ab41b90e5beba46891421f8e44e93d0a1c609542dbe857786871926c1ebb44652a44725df9658517c87ee58a80d3d91c5de43b96376d37b85
+  metadata.gz: e3b19485e9b29e6383995a27540acd3356981e49ee2c62e27c069de234e87cd075b685c98818d947a9e03c073478ff55b4e2d49f8c377b9ea9bf9f563def5daf
+  data.tar.gz: a7f044747b0d275e60e7ef3aac3184d7ab033e88c02b1b0bbf7337e212c428d9c985ed604ab1ef95e8b0deb3101dd608ec9b08a66fad70c99531caac5a2a1879

data/.github/workflows/ruby.yml

@@ -18,29 +18,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.1', '3.2']
-        rails: ['7.0.8']
-        include:
-          - ruby: '2.7'
-            rails: '5.2.3'
-          - ruby: '2.7'
-            rails: '6.0.6.1'
-          - ruby: '3.0'
-            rails: '6.0.6.1'
-          - ruby: '3.1'
-            rails: '6.1.7.6'
+        ruby: ["3.2", "3.3"]
+        rails: ["8.0.0", "7.2.2", "7.1.5"]
     steps:
-    - uses: actions/checkout@v2
-    - 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'
+      - name: Install ImageMagick
+        run: sudo apt install imagemagick
+      - uses: actions/checkout@v2
+      - 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/lib/riiif/engine.rb

@@ -10,5 +10,15 @@ module Riiif
 
     # Set to true to use kdu for jp2000 source images
     config.kakadu_enabled = false
+
+    config.before_configuration do
+      # see https://github.com/fxn/zeitwerk#for_gem
+      # We put a generator into LOCAL APP lib/generators, so tell
+      # zeitwerk to ignore the whole directory? If we're using a recent
+      # enough version of Rails to have zeitwerk config
+      #
+      # See: https://github.com/cbeer/engine_cart/issues/117
+      Rails.autoloaders.main.ignore(Rails.root.join('lib', 'generators')) if Rails.try(:autoloaders).try(:main).respond_to?(:ignore)
+    end
   end
 end

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '2.5.0'.freeze
+  VERSION = '2.7.0'.freeze
 end

data/lib/riiif.rb

@@ -12,7 +12,15 @@ module Riiif
   # This error is raised when Riiif can't convert an image
   class ConversionError < Error; end
 
-  HTTPFileResolver = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Riiif::HTTPFileResolver', 'Riiif::HttpFileResolver')
+  def self.deprecation
+    @deprecation ||= ActiveSupport::Deprecation.new('3.0', 'Riiif')
+  end
+
+  HTTPFileResolver = ActiveSupport::Deprecation::DeprecatedConstantProxy.new(
+    'Riiif::HTTPFileResolver',
+    'Riiif::HttpFileResolver',
+    Riiif.deprecation
+  )
 
   mattr_accessor :not_found_image # the image to use when a lookup fails
   mattr_accessor :unauthorized_image # the image to use when a user doesn't have access

data/riiif.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'railties', '>= 4.2', '<8'
+  spec.add_dependency 'railties', '>= 4.2', '< 9'
   spec.add_dependency 'deprecation', '>= 1.0.0'
   spec.add_dependency 'iiif-image-api', '>= 0.1.0'
 

data/spec/controllers/riiif/images_controller_spec.rb

@@ -160,7 +160,7 @@ RSpec.describe Riiif::ImagesController do
                            'height' => 4000,
                            'format' => 'JPEG',
                            'channels' => 'rgb',
-                           'profile' => ['http://iiif.io/api/image/2/level1.json', 'formats' => %w(jpg png)],
+                           'profile' => ['http://iiif.io/api/image/2/level1.json', 'formats' => %w(webp jpg png)],
                            'protocol' => 'http://iiif.io/api/image'
         expect(response.headers['Link']).to eq '<http://iiif.io/api/image/2/level1.json>;rel="profile"'
         expect(response.headers['Content-Type']).to eq 'application/ld+json; charset=utf-8'

data/spec/models/riiif/image_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Riiif::Image do
 
     it 'renders' do
       expect(Riiif::CommandRunner).to receive(:execute)
-        .with("convert -quality 85 -sampling-factor 4:2:0 -strip #{filename} jpg:-")
+        .with("convert -quality 85 -sampling-factor 4:2:0 -strip \'#{filename}\' jpg:-")
         .and_return('imagedata')
 
       expect(subject.render('size' => 'full', format: 'jpg')).to eq 'imagedata'
@@ -29,7 +29,7 @@ RSpec.describe Riiif::Image do
 
   it 'is able to override the file used for the Image' do
     allow(Riiif::CommandRunner).to receive(:execute)
-      .with("identify -format '%h %w %m %[channels]' #{filename}[0]").and_return('400 800')
+      .with("identify -format '%h %w %m %[channels]' \'#{filename}[0]\'").and_return('400 800')
 
     img = described_class.new('some_id', Riiif::File.new(filename))
     expect(img.id).to eq 'some_id'
@@ -39,7 +39,7 @@ RSpec.describe Riiif::Image do
   describe 'info' do
     it 'returns the data' do
       allow(Riiif::CommandRunner).to receive(:execute)
-        .with("identify -format '%h %w %m %[channels]' #{filename}[0]").and_return('400 800')
+        .with("identify -format '%h %w %m %[channels]' \'#{filename}[0]\'").and_return('400 800')
 
       expect(subject.info).to eq Riiif::ImageInformation.new(width: 800, height: 400)
     end
@@ -77,7 +77,7 @@ RSpec.describe Riiif::Image do
   describe '#render' do
     before do
       allow(Riiif::CommandRunner).to receive(:execute)
-        .with("identify -format '%h %w %m %[channels]' #{filename}[0]").and_return('131 175 JPEG')
+        .with("identify -format '%h %w %m %[channels]' \'#{filename}[0]\'").and_return('131 175 JPEG')
     end
 
     describe 'region' do
@@ -88,7 +88,7 @@ RSpec.describe Riiif::Image do
 
         it 'returns the original' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -strip #{filename} png:-")
+            .with("convert -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -98,7 +98,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -crop 60x75+80+15 -strip #{filename} png:-")
+            .with("convert -crop 60x75+80+15 -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -108,7 +108,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -crop 80.0%x70.0+18+13 -strip #{filename} png:-")
+            .with("convert -crop 80.0%x70.0+18+13 -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -118,7 +118,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -crop 131x131+22+0 -strip #{filename} png:-")
+            .with("convert -crop 131x131+22+0 -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -140,7 +140,7 @@ RSpec.describe Riiif::Image do
 
         it 'returns the original' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -strip #{filename} png:-")
+            .with("convert -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -150,7 +150,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -resize 50.0% -strip #{filename} png:-")
+            .with("convert -resize 50.0% -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -160,7 +160,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -resize 12.5% -strip #{filename} png:-")
+            .with("convert -resize 12.5% -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -170,7 +170,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -resize 50 -strip #{filename} png:-")
+            .with("convert -resize 50 -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -180,7 +180,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -resize x50 -strip #{filename} png:-")
+            .with("convert -resize x50 -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -190,7 +190,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -resize 150x75! -strip #{filename} png:-")
+            .with("convert -resize 150x75! -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -199,7 +199,7 @@ RSpec.describe Riiif::Image do
 
         it 'runs the correct imagemagick command' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -resize 150x75 -strip #{filename} png:-")
+            .with("convert -resize 150x75 -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -221,7 +221,7 @@ RSpec.describe Riiif::Image do
 
         it 'returns the original' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -strip #{filename} png:-")
+            .with("convert -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -231,7 +231,7 @@ RSpec.describe Riiif::Image do
 
         it 'handles floats' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -virtual-pixel white +distort srt 22.5 -strip #{filename} png:-")
+            .with("convert -virtual-pixel white +distort srt 22.5 -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -253,7 +253,7 @@ RSpec.describe Riiif::Image do
 
         it 'returns the original when specifing default' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -strip #{filename} png:-")
+            .with("convert -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -263,7 +263,7 @@ RSpec.describe Riiif::Image do
 
         it 'returns the original when specifing color' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -strip #{filename} png:-")
+            .with("convert -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -273,7 +273,7 @@ RSpec.describe Riiif::Image do
 
         it 'converts to grayscale' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -colorspace Gray -strip #{filename} png:-")
+            .with("convert -colorspace Gray -strip \'#{filename}\' png:-")
           render
         end
       end
@@ -283,7 +283,7 @@ RSpec.describe Riiif::Image do
 
         it 'converts to bitonal' do
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with("convert -colorspace Gray -type Bilevel -strip #{filename} png:-")
+            .with("convert -colorspace Gray -type Bilevel -strip \'#{filename}\' png:-")
           render
         end
       end

data/spec/transformers/riiif/kakadu_transformer_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Riiif::KakaduTransformer do
           .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 ' \
                 '-region "{0.1,0.2},{0.1,0.1}" -reduce 4 -o /tmp/foo.bmp')
         expect(Riiif::CommandRunner).to receive(:execute)
-          .with('convert -resize 38x38! -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+          .with('convert -resize 38x38! -quality 85 -sampling-factor 4:2:0 -strip \'/tmp/foo.bmp\' jpg:-')
         transform
       end
     end
@@ -54,7 +54,7 @@ RSpec.describe Riiif::KakaduTransformer do
           expect(Riiif::CommandRunner).to receive(:execute)
             .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -o /tmp/foo.bmp')
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with('convert -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+            .with('convert -quality 85 -sampling-factor 4:2:0 -strip \'/tmp/foo.bmp\' jpg:-')
           transform
         end
       end
@@ -67,7 +67,7 @@ RSpec.describe Riiif::KakaduTransformer do
           expect(Riiif::CommandRunner).to receive(:execute)
             .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -o /tmp/foo.bmp')
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with('convert -resize 651 -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+            .with('convert -resize 651 -quality 85 -sampling-factor 4:2:0 -strip \'/tmp/foo.bmp\' jpg:-')
           transform
         end
       end
@@ -80,7 +80,7 @@ RSpec.describe Riiif::KakaduTransformer do
           expect(Riiif::CommandRunner).to receive(:execute)
             .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -o /tmp/foo.bmp')
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with('convert -resize x581 -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+            .with('convert -resize x581 -quality 85 -sampling-factor 4:2:0 -strip \'/tmp/foo.bmp\' jpg:-')
           transform
         end
       end
@@ -96,7 +96,7 @@ RSpec.describe Riiif::KakaduTransformer do
           expect(Riiif::CommandRunner).to receive(:execute)
             .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -reduce 1 -o /tmp/foo.bmp')
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with('convert -resize 60.0% -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+            .with('convert -resize 60.0% -quality 85 -sampling-factor 4:2:0 -strip \'/tmp/foo.bmp\' jpg:-')
           transform
         end
       end
@@ -109,7 +109,7 @@ RSpec.describe Riiif::KakaduTransformer do
           expect(Riiif::CommandRunner).to receive(:execute)
             .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -reduce 1 -o /tmp/foo.bmp')
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with('convert -resize 408 -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+            .with('convert -resize 408 -quality 85 -sampling-factor 4:2:0 -strip \'/tmp/foo.bmp\' jpg:-')
           transform
         end
       end
@@ -122,7 +122,7 @@ RSpec.describe Riiif::KakaduTransformer do
           expect(Riiif::CommandRunner).to receive(:execute)
             .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -reduce 1 -o /tmp/foo.bmp')
           expect(Riiif::CommandRunner).to receive(:execute)
-            .with('convert -resize x481 -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+            .with('convert -resize x481 -quality 85 -sampling-factor 4:2:0 -strip \'/tmp/foo.bmp\' jpg:-')
           transform
         end
       end
@@ -135,7 +135,7 @@ RSpec.describe Riiif::KakaduTransformer do
         expect(Riiif::CommandRunner).to receive(:execute)
           .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -reduce 2 -o /tmp/foo.bmp')
         expect(Riiif::CommandRunner).to receive(:execute)
-          .with('convert -resize 80.0% -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+          .with('convert -resize 80.0% -quality 85 -sampling-factor 4:2:0 -strip \'/tmp/foo.bmp\' jpg:-')
         transform
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: A Rails engine that support IIIF requests