From c5951c010ef3e8d7e9edafdb328d5a9259814928 Mon Sep 17 00:00:00 2001 From: Dan Olson Date: Wed, 6 Nov 2024 20:22:00 -0500 Subject: [PATCH 1/2] Upgrade to Ruby 3.3.5 --- .github/workflows/validate-pull-request.yaml | 2 +- .ruby-version | 2 +- Gemfile | 5 +++-- Gemfile.lock | 18 ++++++++---------- README.md | 2 +- lib/mdl/archive_generator.rb | 2 +- lib/mdl/process_document_for_search.rb | 2 +- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/validate-pull-request.yaml b/.github/workflows/validate-pull-request.yaml index b645530e..b7db80a1 100644 --- a/.github/workflows/validate-pull-request.yaml +++ b/.github/workflows/validate-pull-request.yaml @@ -37,7 +37,7 @@ jobs: uses: ruby/setup-ruby@v1 with: bundler-cache: true - ruby-version: '3.1.2' + ruby-version: '3.3.5' - name: Install Dependencies Node uses: actions/setup-node@v3 with: diff --git a/.ruby-version b/.ruby-version index ef538c28..fa7adc7a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.3.5 diff --git a/Gemfile b/Gemfile index 0b1812a6..b46992f9 100644 --- a/Gemfile +++ b/Gemfile @@ -64,6 +64,9 @@ gem 'blacklight_advanced_search', '~> 7.0' gem 'blacklight_range_limit', '~> 8.2.0' gem 'blacklight-spotlight', '~> 3.4' gem 'blacklight_oai_provider', '~> 7.0' +gem 'blacklight-gallery', '>= 0.3.0' +gem 'blacklight-oembed', '~> 1.1' + gem 'chosen-rails', '~> 1.9' gem 'leaflet-rails' gem 'rsolr', '~> 2.5' @@ -92,8 +95,6 @@ gem 'redis-rails', '~> 5.0' gem 'friendly_id' gem 'sitemap_generator' -gem 'blacklight-gallery', '>= 0.3.0' -gem 'blacklight-oembed', '~> 1.1' gem 'autoprefixer-rails', '~> 10.4.7' # Constraint to accommodate Node 8 on QA/Prod gem 'kaltura-client' diff --git a/Gemfile.lock b/Gemfile.lock index a3176766..7a81ed6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -403,13 +403,13 @@ GEM meta_request (0.7.3) rack-contrib (>= 1.1, < 3) railties (>= 3.0.0, < 7) - method_source (1.0.0) + method_source (1.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) mini_magick (4.11.0) mini_mime (1.1.5) - mini_portile2 (2.8.4) + mini_portile2 (2.8.7) minitest (5.19.0) multi_json (1.15.0) multi_xml (0.6.0) @@ -431,8 +431,6 @@ GEM nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) - racc (~> 1.4) oai (1.2.1) builder (>= 3.1.0) faraday (< 3) @@ -460,17 +458,17 @@ GEM protocol-http2 (0.14.2) protocol-hpack (~> 1.4) protocol-http (~> 0.18) - pry (0.13.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.10.1) byebug (~> 11.0) - pry (~> 0.13.0) - pry-rails (0.3.9) - pry (>= 0.10.4) + pry (>= 0.13, < 0.15) + pry-rails (0.3.11) + pry (>= 0.13.0) public_suffix (5.0.0) puma (3.12.6) - racc (1.7.1) + racc (1.8.1) rack (2.2.8) rack-contrib (2.3.0) rack (~> 2.0) diff --git a/README.md b/README.md index 335e1784..e050d7d5 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Install Ruby 3.1.2 via [rbenv](https://github.com/rbenv/rbenv) ```bash brew install rbenv ruby-build rbenv init -rbenv install 3.1.2 +rbenv install 3.3.5 ``` Install MySQL and Redis clients, as well as geckodriver for system tests run via Selenium. diff --git a/lib/mdl/archive_generator.rb b/lib/mdl/archive_generator.rb index fbdfac66..abd09cce 100644 --- a/lib/mdl/archive_generator.rb +++ b/lib/mdl/archive_generator.rb @@ -6,7 +6,7 @@ module MDL class ArchiveGenerator - TMP_DIR = File.exists?('/swadm/tmp') ? '/swadm/tmp' : Dir.tmpdir + TMP_DIR = File.exist?('/swadm/tmp') ? '/swadm/tmp' : Dir.tmpdir def self.call(identifier) new(identifier).call diff --git a/lib/mdl/process_document_for_search.rb b/lib/mdl/process_document_for_search.rb index f3c8863d..d0a24f62 100644 --- a/lib/mdl/process_document_for_search.rb +++ b/lib/mdl/process_document_for_search.rb @@ -1,6 +1,6 @@ module MDL class ProcessDocumentForSearch - TMP_DIR = File.exists?('/swadm/tmp') ? '/swadm/tmp' : Dir.tmpdir + TMP_DIR = File.exist?('/swadm/tmp') ? '/swadm/tmp' : Dir.tmpdir ### # Glue that connects an IIIF canvas, the image it represents, # and the OCR process we need to perform. From 2b1a475ca3af7a1f9ccd14b4e76cee80e00788d1 Mon Sep 17 00:00:00 2001 From: Dan Olson Date: Mon, 11 Nov 2024 20:22:01 -0500 Subject: [PATCH 2/2] Remove pinning of strscan version --- Gemfile | 1 - Gemfile.lock | 2 -- 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index b46992f9..23343746 100644 --- a/Gemfile +++ b/Gemfile @@ -102,4 +102,3 @@ gem 'kaltura-client' gem 'sentry-ruby' gem 'sentry-rails' gem 'sentry-sidekiq' -gem 'strscan', '3.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 7a81ed6f..c8becc90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -659,7 +659,6 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) ssrf_filter (1.0.8) - strscan (3.0.1) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) @@ -787,7 +786,6 @@ DEPENDENCIES sitemap_generator spring spring-watcher-listen (~> 2.0.0) - strscan (= 3.0.1) thread-local twitter-typeahead-rails (= 0.11.1.pre.corejavascript) uglifier (>= 1.3.0)