From e0f72067d81b7b002eb20e6869dd363d61234bc6 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Tue, 16 Jan 2024 12:33:38 -0600 Subject: [PATCH 1/2] Update bixby to 5.0 --- app/controllers/riiif/images_controller.rb | 2 +- app/resolvers/riiif/akubra_system_file_resolver.rb | 1 + riiif.gemspec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/riiif/images_controller.rb b/app/controllers/riiif/images_controller.rb index 93ab8f3..0336573 100644 --- a/app/controllers/riiif/images_controller.rb +++ b/app/controllers/riiif/images_controller.rb @@ -3,7 +3,7 @@ class ImagesController < ::ApplicationController before_action :link_header, only: [:show, :info] rescue_from IIIF::Image::InvalidAttributeError do - head 400 + head :bad_request end def show diff --git a/app/resolvers/riiif/akubra_system_file_resolver.rb b/app/resolvers/riiif/akubra_system_file_resolver.rb index 27ce573..700df5d 100644 --- a/app/resolvers/riiif/akubra_system_file_resolver.rb +++ b/app/resolvers/riiif/akubra_system_file_resolver.rb @@ -5,6 +5,7 @@ class AkubraSystemFileResolver < AbstractFileSystemResolver 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 diff --git a/riiif.gemspec b/riiif.gemspec index f33cc56..56e500f 100644 --- a/riiif.gemspec +++ b/riiif.gemspec @@ -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', '~> 3.0' + spec.add_development_dependency 'bixby', '~> 5.0' spec.add_development_dependency 'coveralls' end From c5495f6704c7bac07eaa4a8e415dabc66b370338 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Tue, 16 Jan 2024 12:36:54 -0600 Subject: [PATCH 2/2] Stop using coveralls The coveralls gem is no longer supported and causes TLS errors which break the build --- README.md | 2 -- riiif.gemspec | 2 +- spec/spec_helper.rb | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 74dd6aa..265b87b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # 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. diff --git a/riiif.gemspec b/riiif.gemspec index 56e500f..73afbe8 100644 --- a/riiif.gemspec +++ b/riiif.gemspec @@ -28,5 +28,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rspec-rails' spec.add_development_dependency 'sqlite3' spec.add_development_dependency 'bixby', '~> 5.0' - spec.add_development_dependency 'coveralls' + spec.add_development_dependency 'simplecov' end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 364ced8..6e056c4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,11 +1,5 @@ -require 'coveralls' require 'simplecov' -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ - SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter - ]) - SimpleCov.start('rails') require 'engine_cart'