Merge pull request #126 from pulibrary/display-subguide-images

Display images and fix CI

Author: hackartisan

Gemfile

@@ -76,7 +76,6 @@ group :development, :test do
   gem 'selenium-webdriver'
   gem 'simplecov'
   gem 'simplecov-lcov', '~> 0.8.0'
-  gem 'webdrivers'
 end
 
 group :development do

Gemfile.lock

@@ -66,7 +66,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.4)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     airbrussh (1.4.1)
       sshkit (>= 1.6.1, != 1.7.0)
@@ -92,7 +92,7 @@ GEM
     capistrano-rails-console (2.3.0)
       capistrano (>= 3.5.0, < 4.0.0)
       sshkit-interactive (~> 0.3.0)
-    capybara (3.39.0)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -155,7 +155,7 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     minitest (5.18.0)
     msgpack (1.6.1)
     net-imap (0.3.4)
@@ -171,9 +171,9 @@ GEM
       net-protocol
     net-ssh (7.1.0)
     nio4r (2.5.9)
-    nokogiri (1.14.3-arm64-darwin)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.2.1.1)
@@ -185,11 +185,11 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     puma (5.6.7)
       nio4r (~> 2.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.7.1)
+    rack (2.2.8)
     rack-proxy (0.7.6)
       rack
     rack-test (2.1.0)
@@ -222,10 +222,10 @@ GEM
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.1)
     reline (0.3.2)
       io-console (~> 0.5)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.2)
@@ -261,7 +261,7 @@ GEM
       rubocop (>= 1.33.0, < 2.0)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    selenium-webdriver (4.9.0)
+    selenium-webdriver (4.11.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -312,10 +312,6 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
     websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -359,7 +355,6 @@ DEPENDENCIES
   tzinfo-data
   vite_rails
   web-console
-  webdrivers
 
 RUBY VERSION
    ruby 3.2.0p0

app/controllers/sub_guide_cards_controller.rb

@@ -6,5 +6,6 @@ def index; end
 
   def show
     @sub_guide_card = SubGuideCard.find(params[:id])
+    @card_images = CardImage.where(path: @sub_guide_card.path)
   end
 end

app/models/card_image.rb

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
 
+# Class for CardImage data models
 class CardImage < ApplicationRecord
+  def iiif_url
+    "https://puliiif.princeton.edu/iiif/2/#{image_name.gsub('.tif', '')}/full/,500/0/default.jpg"
+  end
 end

app/views/sub_guide_cards/show.html.erb

@@ -1,3 +1,6 @@
 <h1>SubGuideCards#show</h1>
 <p>Find me in app/views/sub_guide_cards/show.html.erb</p>
 <%= @sub_guide_card.heading %>
+<% @card_images.each do |image| %>
+  <%= image_tag(image.iiif_url) %>
+<% end %>

spec/models/card_image_spec.rb

@@ -9,4 +9,11 @@
     ci.image_name = 'imagecat-disk5-0338-A5977-0000.0001.tif'
     ci.save
   end
+  it 'has a iiif url' do
+    ci = CardImage.new
+    ci.path = '5/0338/A5977'
+    ci.image_name = 'imagecat-disk1-0675-B1764-0000.0219.tif'
+    ci.save
+    expect(ci.iiif_url).to eq 'https://puliiif.princeton.edu/iiif/2/imagecat-disk1-0675-B1764-0000.0219/full/,500/0/default.jpg'
+  end
 end

spec/rails_helper.rb

@@ -9,7 +9,6 @@
 require 'rspec/rails'
 require 'capybara/rails'
 require 'capybara/rspec'
-require 'webdrivers'
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

spec/spec_helper.rb

@@ -14,6 +14,7 @@
 # the additional setup, and require it from the spec files that actually need
 # it.
 require 'simplecov'
+require 'ruby-progressbar/outputs/null'
 
 SimpleCov.start 'rails' do
   if ENV['CI']

spec/support/system_specs.rb

@@ -2,7 +2,6 @@
 
 RSpec.configure do |config|
   config.before(:each, type: :system) do
-    Webdrivers::Chromedriver.required_version = '114.0.5735.90'
     driven_by(:rack_test)
   end
 
@@ -12,14 +11,8 @@
     else
       driven_by(:selenium_headless)
     end
-
-    # Make the screen larger so the save button is alway on screen. This avoids random `Element is not clickable` errors
-    Capybara.page.driver.browser.manage.window.resize_to(2000, 2000)
   end
   config.before(:each, type: :system, js: true, in_browser: true) do
     driven_by(:selenium)
-
-    # Make the screen larger so the save button is alway on screen. This avoids random `Element is not clickable` errors
-    Capybara.page.driver.browser.manage.window.resize_to(2000, 2000)
   end
 end

spec/system/subguide_cards_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'ruby-progressbar/outputs/null'
+
+RSpec.describe 'SubGuideCards', type: :system, js: true do
+  let(:subguide_card_fixture) { Rails.root.join('spec', 'fixtures', 'subguide_card_fixture.csv') }
+  before do
+    SubGuideLoadingService.new(csv_location: subguide_card_fixture,
+                               progressbar: ProgressBar.create(output: ProgressBar::Outputs::Null)).import
+  end
+
+  describe 'show page' do
+    it 'displays card images as links' do
+      ci = CardImage.new
+      ci.path = SubGuideCard.find(2).path
+      ci.image_name = 'imagecat-disk1-0675-B1764-0000.0219.tif'
+      ci.save
+      visit '/sub_guide_cards/2'
+      expect(page).to have_selector('img')
+    end
+  end
+end