riiif 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef3da010f8f0debef74aab318475a9563005c3904544ee159567b904e51c610
-  data.tar.gz: 53c1e7c6ffcd6f9b345fae4f4bb295059e8ff280c449e4e3eec1959e9ae36126
+  metadata.gz: b5d2036dfb026731136b7eba93e3ede1943246aeac921a6db93cc76c6a1cfa8f
+  data.tar.gz: fd36f9c29b4beffb389259f3c1d66650f6f2b9963f0c243cfb6f0140736b72e7
 SHA512:
-  metadata.gz: 3326d9199c7bf9f3e3b51da13d8a1cd9abd4c5b8633f451c92e17c57eea39698c5bdc2d5192d71bfd00ab8d721076377e18bb60241e93bb9d8a6dbb01fb941d9
-  data.tar.gz: 700b1ee4398a39f444593ddc01067784448007df22a4e4a87df06bacc886a466f3d7de5694bccd4d77fda3aab9835e672c66d376b5b6bfca7bb302d41be839d4
+  metadata.gz: 25e4d827a9033f80d3a803c3b47891b703bfc27dbff125b464b3a0096f6900c8f90eeb42e59bd80e7c59c79d2fe75e000adb69932489840899b52cea8aeba1c2
+  data.tar.gz: f226dd80245c3f7aebd8923980ef54d31faa3abf4829fc530ad297991642b1235c346c219dbb2bbbeaf6936d6e4979bca976b977f2271a01b8a6b2369dfccf5e

data/.github/workflows/ruby.yml

@@ -0,0 +1,42 @@
+# 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: ['2.7', '3.0']
+        rails: ['6.1.4.6', '7.0.2.2']
+        include:
+          - ruby: '2.7'
+            rails: '5.2.3'
+          - ruby: '2.7'
+            rails: '6.0.0'
+    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'

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,26 @@ 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
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 7
 
 # Offense count: 3
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 18
 
@@ -47,12 +84,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 +112,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 +125,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 +141,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 +195,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/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

@@ -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/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.4.0'.freeze
 end

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', '<7'
+  spec.add_dependency 'railties', '>= 4.2', '<8'
   spec.add_dependency 'deprecation', '>= 1.0.0'
   spec.add_dependency 'iiif-image-api', '>= 0.1.0'
 
@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'engine_cart', '~> 2.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'bixby', '~> 1.0.0'
+  spec.add_development_dependency 'bixby', '~> 3.0'
   spec.add_development_dependency 'coveralls'
 end

data/spec/controllers/riiif/images_controller_spec.rb

@@ -24,9 +24,9 @@ RSpec.describe Riiif::ImagesController do
     it 'sends images to the service' do
       image = double
       expect(Riiif::Image).to receive(:new).with('abcd1234').and_return(image)
-      expect(image).to receive(:render).with('region' => 'full', 'size' => 'full',
+      expect(image).to receive(:render).with({ 'region' => 'full', 'size' => 'full',
                                              'rotation' => '0', 'quality' => 'default',
-                                             'format' => 'jpg').and_return('IMAGEDATA')
+                                             'format' => 'jpg' }).and_return('IMAGEDATA')
       get :show, params: { id: 'abcd1234', action: 'show', region: 'full', size: 'full',
                            rotation: '0', quality: 'default', format: 'jpg' }
       expect(response).to be_successful
@@ -102,9 +102,9 @@ RSpec.describe Riiif::ImagesController do
             raise Riiif::ImageNotFoundError unless file.present?
             not_found_image
           end.twice
-          expect(not_found_image).to receive(:render).with('region' => 'full', 'size' => 'full',
+          expect(not_found_image).to receive(:render).with({ 'region' => 'full', 'size' => 'full',
                                                            'rotation' => '0', 'quality' => 'default',
-                                                           'format' => 'jpg').and_return('default-image-data')
+                                                           'format' => 'jpg' }).and_return('default-image-data')
 
           get :show, params: { id: 'bad_id', action: 'show', region: 'full', size: 'full',
                                rotation: '0', quality: 'default', format: 'jpg' }
@@ -118,9 +118,9 @@ RSpec.describe Riiif::ImagesController do
             raise Riiif::ImageNotFoundError unless file.present?
             not_found_image
           end.twice
-          expect(not_found_image).to receive(:render).with('region' => 'full', 'size' => 'full',
+          expect(not_found_image).to receive(:render).with({ 'region' => 'full', 'size' => 'full',
                                                            'rotation' => '0', 'quality' => 'default',
-                                                           'format' => 'jpg').and_return('default-image-data')
+                                                           'format' => 'jpg' }).and_return('default-image-data')
 
           get :show, params: { id: 'bad_id', action: 'show', region: 'full', size: 'full',
                                rotation: '0', quality: 'default', format: 'jpg' }
@@ -155,7 +155,7 @@ RSpec.describe Riiif::ImagesController do
         get :info, params: { id: 'abcd1234', format: 'json' }
         expect(response).to be_successful
         expect(json).to eq '@context' => 'http://iiif.io/api/image/2/context.json',
-                           '@id' => 'http://test.host/abcd1234',
+                           '@id' => Rails.version > '6.1' ? 'http://test.host/images/abcd1234' : 'http://test.host/abcd1234',
                            'width' => 6000,
                            'height' => 4000,
                            'format' => 'JPEG',

data/spec/models/riiif/file_system_file_resolver_spec.rb

@@ -78,5 +78,12 @@ describe Riiif::FileSystemFileResolver do
         expect(subject).to be_nil
       end
     end
+
+    context 'as an integer' do
+      let(:id) { 1 }
+      it 'converts it to a string before parsing' do
+        expect { subject }.not_to raise_error
+      end
+    end
   end
 end

data/spec/models/riiif/image_spec.rb

@@ -28,6 +28,9 @@ RSpec.describe Riiif::Image do
   end
 
   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')
+
     img = described_class.new('some_id', Riiif::File.new(filename))
     expect(img.id).to eq 'some_id'
     expect(img.info).to eq Riiif::ImageInformation.new(width: 800, height: 400)
@@ -35,6 +38,9 @@ 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')
+
       expect(subject.info).to eq Riiif::ImageInformation.new(width: 800, height: 400)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2022-02-28 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: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -163,11 +163,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -218,7 +218,7 @@ homepage: https://github.com/curationexperts/riiif
 licenses:
 - APACHE2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -233,8 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: A rails engine that support IIIF requests
 test_files:

data/.travis.yml

@@ -1,16 +0,0 @@
-notifications:
-  email: false
-
-before_install:
-  - gem update --system
-
-rvm:
-  - 2.6.3
-
-env:
- - "RAILS_VERSION=5.2.3"
- - "RAILS_VERSION=6.0.0"
-
-sudo: false
-language: ruby
-dist: trusty