blacklight-gallery 1.6.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14925720da8a37bde4f1e05a13ff9063898600c81887dd30ef6294a46762b8bf
-  data.tar.gz: 5e9ccf945bf9e2c495d5babfa85144d60a5ec5f58a068e7e987631e43f5176e6
+  metadata.gz: d4078c05e9420ccca75758be7fac8ccb01a4a512d8931f629c683bce2572b739
+  data.tar.gz: a68b999ad88d7f80760a70acfd86f897cebe7d1c48744b893cb78fe85f567458
 SHA512:
-  metadata.gz: af850e569c98cc5b4797262b01be871d3b9136173be1281618e09d6f3ffb3b35bd537002df36911718e3671f79d4bd434f4a33e190e757544c701b92ee9460bd
-  data.tar.gz: 571fe4f304a47dfda6f58b720d7878ee192f94b0d0cf1ab1ae24d2b9d4da0b15b241165ae175e22530e5ef628b535ba839693e17bd6fabef36d334eb7203ba8f
+  metadata.gz: '08669e46871077bba5222f7531675089ad2ad947a1a8ca366c041f220d01a960c5932475e250bcb43b5b9c04c83d8ffd08bb5a82a8db888533c6b13f21b31d73'
+  data.tar.gz: 2dab16fdf85d599cf8a5cd05ff6c8b81e77436c59123d3b392bbc4dc01a04195d35c21f22728ba82a0ec5841f16b6e991b31b726e01239441ddb62493c6e8de0

data/.travis.yml

@@ -1,13 +1,16 @@
 language: ruby
 sudo: false
+dist: bionic
+
+addons:
+  chrome: stable
+
+before_install:
+  - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
 
 notifications:
   email: false
 
-rvm:
-  - 2.5.3
-  - 2.6.0
-
 notifications:
   irc: "irc.freenode.org#blacklight"
   email:
@@ -16,6 +19,20 @@ notifications:
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-    - RAILS_VERSION='5.2.3'
+    - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+
+matrix:
+  include:
+    - rvm: 2.7.1
+      env: "RAILS_VERSION=6.0.3.1"
+    - rvm: 2.6.6
+      env: "RAILS_VERSION=6.0.3.1"
+    - rvm: 2.6.6
+      env: "RAILS_VERSION=5.2.4.3"
+    - rvm: 2.5.8
+      env: "RAILS_VERSION=5.2.4.3"
+    - rvm: 2.4.9
+      env: "RAILS_VERSION=5.2.4.3"
+fast_finish: true
 
 jdk: openjdk11

data/README.md

@@ -1,5 +1,5 @@
 # Blacklight::Gallery
-[![Gem Version](https://badge.fury.io/rb/blacklight-gallery.svg)](http://badge.fury.io/rb/blacklight-gallery)
+[![Gem Version](https://badge.fury.io/rb/blacklight-gallery.svg)](http://badge.fury.io/rb/blacklight-gallery)  [![Build Status](https://travis-ci.org/projectblacklight/blacklight-gallery.svg?branch=master)](https://travis-ci.org/projectblacklight/blacklight-gallery)
 
 Gallery views for Blacklight search results
 

data/app/assets/images/blacklight/pause_slideshow.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1 14H9V8h2v8zm4 0h-2V8h2v8z"></path></svg

data/app/assets/images/blacklight/start_slideshow.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 14.5v-9l6 4.5-6 4.5z"></path></svg>

data/app/assets/javascripts/blacklight_gallery/slideshow.js

@@ -72,12 +72,16 @@
       var $img = this.$element.find('.frame img'),
           _this = this;
 
-      // pause slideshow on image mouseenter event
-      $img.on('mouseenter', function() {  _this.pause(); });
+      $(document).on('click', '[data-behavior="pause-slideshow"]', function(e) {
+        e.preventDefault();
+
+        _this.pause();
+      });
+
+      $(document).on('click', '[data-behavior="start-slideshow"]', function(e) {
+        e.preventDefault();
 
-      // play slideshow on image mouseleave event
-      $img.on('mouseleave', function() {
-        if (_this.options.autoPlay) _this.play();
+        _this.play();
       });
 
       $(document).on('click', '[data-slide], [data-slide-to]', function(e) {
@@ -99,7 +103,7 @@
 
 
   Slideshow.DEFAULTS = {
-    autoPlay: true,
+    autoPlay: false,
     interval: 5000 // in milliseconds
   }
 

data/app/assets/stylesheets/blacklight_gallery/_gallery.scss

@@ -1,23 +1,7 @@
 .gallery {
-
-  display: -webkit-box;
-  display: -moz-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  flex-flow: row wrap;
-  -webkit-flex-wrap: wrap;
-
-
   .document {
     border-bottom: none;
 
-    -webkit-box-flex: 1;
-    -moz-box-flex: 1;
-    -ms-flex: 1;
-    flex: 1;
-
-    min-width: 250px;
     min-height: 250px;
     -webkit-flex: 1 0 250px;
   }
@@ -45,8 +29,11 @@
       clear: none;
       text-align: left;
       margin: 0;
-      padding: 0;
     }
 
   }
 }
+
+#documents .gallery, .masonry-gallery, .slideshow-documents {
+  border-bottom: $pagination-border-width solid $pagination-border-color
+}

data/app/assets/stylesheets/blacklight_gallery/_masonry.scss

@@ -6,11 +6,11 @@
     background-color: $gray-300;
     min-height: 70px;
 
-    .thumbnail {
-      border: 0;
+    .img-thumbnail {
+      border-radius: 0;
       padding: 0;
-      margin-bottom: 0;
     }
+
     .caption {
       &:first-child { display: block; } // To display captions when there is no image
       a {

data/app/assets/stylesheets/blacklight_gallery/_osd_viewer.scss

@@ -1,4 +1,4 @@
-#document {
+.openseadragon-container {
 
   .osd-toolbar {
     padding: 5px 0;
@@ -26,4 +26,4 @@
     height: 400px;
 
   }
-}
+}

data/app/assets/stylesheets/blacklight_gallery/_slideshow.scss

@@ -93,6 +93,12 @@ $gray-dark: #343a40 !default;
     padding: 4px 10px;
     text-align: center;
   }
+
+  .controls {
+    svg {
+      fill: $gray-light;
+    }
+  }
 }
 
 .slideshow-documents {

data/app/views/catalog/_document_gallery.html.erb

@@ -1,4 +1,4 @@
 <% # container for all documents in index view -%>
-<div id="documents" class="row gallery">
+<div id="documents" class="gallery row <%= blacklight_config.view_config(:gallery).classes || 'row-cols-2 row-cols-md-3' %>">
   <%= render_gallery_collection documents %>
 </div>

data/app/views/catalog/_document_masonry.html.erb

@@ -1,4 +1,4 @@
 <% # container for all documents in index view -%>
-<div id="documents" class="row" data-behavior="masonry-gallery">
+<div id="documents" class="row masonry-gallery" data-behavior="masonry-gallery">
   <%= render collection: documents, as: :document, partial: 'index_masonry', locals: {count: documents.count} %>
 </div>

data/app/views/catalog/_document_slideshow.html.erb

@@ -1,9 +1,5 @@
 <% # container for all documents in slideshow view -%>
 <div id="documents" class="row slideshow-documents">
-  <div class="info w-100">
-    <h3><%= t(:'blacklight_gallery.catalog.document_slideshow.header') %></h3>
-  </div>
-
   <div class="grid">
     <%= render collection: documents, as: :document, partial: 'grid_slideshow' %>
   </div>

data/app/views/catalog/_grid_slideshow.html.erb

@@ -2,7 +2,7 @@
   <div class="thumbnail">
     <%= link_to '#', data: { :'slide-to' => document_counter, toggle: "modal", target: "#slideshow-modal" } do %>
       <% if thumbnail_url(document) %>
-          <%= image_tag thumbnail_url(document), class: 'img-thumbnail' %>
+          <%= image_tag thumbnail_url(document), class: 'img-thumbnail', alt: index_presenter(document).heading %>
         <% else %>
           <%= t('.missing_image', scope: [:blacklight_gallery]) %>
         <% end %>

data/app/views/catalog/_index_gallery.html.erb

@@ -1,6 +1,12 @@
-<div class="document col-6 col-md-4">
+<div class="document col">
   <div class="thumbnail">
-    <%= render_thumbnail_tag(document, { class: 'img-thumbnail' }, :counter => document_counter_with_offset(document_counter)) %>
+    <%= render_thumbnail_tag(
+          document,
+          { class: 'img-thumbnail', alt: '' },
+          counter: document_counter_with_offset(document_counter),
+          'aria-hidden': true,
+          tabindex: -1
+        ) %>
     <div class="caption">
       <%= render_document_partials document, blacklight_config.view_config(:gallery).partials, :document_counter => document_counter %>
     </div>

data/app/views/catalog/_index_masonry.html.erb

@@ -1,6 +1,6 @@
 <div class="masonry document col-6 col-md-3">
   <div class="thumbnail">
-    <%= render_thumbnail_tag(document, { class: 'img-thumbnail' }, counter: document_counter_with_offset(document_counter)) %>
+    <%= render_thumbnail_tag(document, { class: 'img-thumbnail', alt: index_presenter(document).heading }, counter: document_counter_with_offset(document_counter)) %>
     <div class="caption">
       <%= render_document_partials document, blacklight_config.view_config(:masonry).partials, :document_counter => document_counter %>
     </div>

data/app/views/catalog/_index_slideshow.html.erb

@@ -1,6 +1,6 @@
 <div class="item<%= ' active' if document_counter == 0 %>">
   <div class="frame">
-      <%= render_slideshow_tag(document) %>
+      <%= render_slideshow_tag(document, { alt: '' }) %>
       <div class="caption">
         <%= index_presenter(document).label(document_show_link_field(document)) %>
       </div>

data/app/views/catalog/_openseadragon_default.html.erb

@@ -23,21 +23,20 @@
   <% count = Array(image).length %>
   <div class="openseadragon-container <%= osd_container_class %>">
     <div class="osd-toolbar row">
-      <% if count > 1 %>
-        <% osd_config = osd_config_referencestrip.merge(osd_config) %>
-
-        <div class="col-md-6 pagination">
-          <a id="osd-previous"><%= blacklight_icon('chevron_left') %></a>
-          <span id="osd-page">1</span>  of <%= count %>
-          <a id="osd-next"><%= blacklight_icon('chevron_right') %></a>
-        </div>
-      <% end %>
-        <div class="col-md-6 controls">
-          <a id="osd-zoom-in"><%= blacklight_icon('add_circle') %></a>
-          <a id="osd-zoom-out"><%= blacklight_icon('remove_circle') %></a>
-          <a id="osd-home"><%= blacklight_icon('resize_small') %></a>
-          <a id="osd-full-page"><%= blacklight_icon('custom_fullscreen') %></a>
-        </div>
+      <div class="col-md-6 pagination">
+        <% if count > 1 %>
+          <% osd_config = osd_config_referencestrip.merge(osd_config) %>
+            <a id="osd-previous"><%= blacklight_icon('chevron_left') %></a>
+            <span id="osd-page">1</span>  of <%= count %>
+            <a id="osd-next"><%= blacklight_icon('chevron_right') %></a>
+        <% end %>
+      </div>
+      <div class="col-md-6 controls">
+        <a id="osd-zoom-in"><%= blacklight_icon('add_circle') %></a>
+        <a id="osd-zoom-out"><%= blacklight_icon('remove_circle') %></a>
+        <a id="osd-home"><%= blacklight_icon('resize_small') %></a>
+        <a id="osd-full-page"><%= blacklight_icon('custom_fullscreen') %></a>
+      </div>
     </div>
     <%= openseadragon_picture_tag image, class: 'osd-image row', data: { openseadragon: osd_config } %>
   </div>

data/app/views/catalog/_slideshow.html.erb

@@ -6,10 +6,18 @@
 
     <!-- Controls -->
     <a class="left carousel-control prev" href="#slideshow" data-slide="prev">
-      <%= blacklight_icon 'chevron_left' %>
+      <%= blacklight_icon 'chevron_left', { additional_options: { label_context: 'previous_image' }} %>
     </a>
     <a class="right carousel-control next" href="#slideshow" data-slide="next">
-      <%= blacklight_icon 'chevron_right' %>
+      <%= blacklight_icon 'chevron_right', { additional_options: { label_context: 'next_image' }} %>
     </a>
 
+    <div class="controls text-center">
+      <button class="btn btn-sm btn-link" data-behavior="pause-slideshow" aria-label="<%= t('blacklight_gallery.catalog.slideshow.pause') %>">
+        <%= blacklight_icon 'pause_slideshow' %>
+      </button>
+      <button class="btn btn-sm btn-link" data-behavior="start-slideshow" aria-label="<%= t('blacklight_gallery.catalog.slideshow.start') %>">
+        <%= blacklight_icon 'start_slideshow' %>
+      </button>
+    </div>
   </div>

data/app/views/catalog/_slideshow_modal.html.erb

@@ -4,7 +4,8 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-            ×
+            <span class="sr-only">close</span>
+            <span aria-hidden="true">×</span>
           </button>
         </div>
         <div class="modal-body">

data/blacklight-gallery.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", '~> 5.1'
-  spec.add_dependency 'blacklight', '~> 7.0'
+  spec.add_dependency "rails", '>= 5.1', '< 7'
+  spec.add_dependency 'blacklight', '~> 7.7'
   spec.add_dependency "bootstrap", "~> 4.0"
   spec.add_dependency "openseadragon", ">= 0.2.0"
 

data/config/locales/blacklight-gallery.ar.yml

@@ -1,15 +1,19 @@
 ar:
   blacklight:
+    icon:
+      chevron_left_previous_image: 'الصورة السابقة' 
+      chevron_right_next_image: 'الصورة التالية' 
     search:
       view:
         gallery: "معرض الصور"
-        slideshow: "عرض متتابع"
+        slideshow: "عرض الصور"
         masonry: "عرض الصور كمجموعة"
   blacklight_gallery:
     catalog:
       grid_slideshow:
-        missing_image: "صورة غير موجودة"
-      document_slideshow:
-        header: "حدد صورة لبدء العرض المتتابع"
+        missing_image: 'غير موجود'
       modal_slideshow:
         counter: "%{counter} من %{count}"
+      slideshow:
+        pause: وقف عرض الصور
+        start: بدء عرض الصور

data/config/locales/blacklight-gallery.en.yml

@@ -1,5 +1,8 @@
 en:
   blacklight:
+    icon:
+      chevron_left_previous_image: 'previous image' 
+      chevron_right_next_image: 'next image' 
     search:
       view:
         gallery: "Gallery"
@@ -9,7 +12,8 @@ en:
     catalog:
       grid_slideshow:
         missing_image: 'Missing'
-      document_slideshow:
-        header: "Select an image to start the slideshow"
       modal_slideshow:
         counter: "%{counter} of %{count}"
+      slideshow:
+        pause: Pause slideshow
+        start: Start slideshow

data/config/locales/blacklight-gallery.es.yml

@@ -9,7 +9,8 @@ es:
     catalog:
       grid_slideshow:
         missing_image: No hay nada
-      document_slideshow:
-        header: Selecione una imagen para empezar
       modal_slideshow:
         counter: "%{counter} de %{count}"
+      slideshow:
+        pause: Pausa la Diapositivas
+        start: Empezar la Diapositivas

data/config/locales/blacklight-gallery.fr.yml

@@ -9,7 +9,8 @@ fr:
     catalog:
       grid_slideshow:
         missing_image: 'Image manquante'
-      document_slideshow:
-        header: "Sélectionnez une image pour lancer le diaporama"
       modal_slideshow:
         counter: "%{counter} de %{count}"
+      slideshow:
+        pause: Suspendre le diaporama
+        start: Lancer le diaporama

data/config/locales/blacklight-gallery.it.yml

@@ -9,7 +9,8 @@ it:
     catalog:
       grid_slideshow:
         missing_image: 'Mancante'
-      document_slideshow:
-        header: "Seleziona un immagine per l'avvio del slideshow"
       modal_slideshow:
         counter: "%{counter} di %{count}"
+      slideshow:
+        pause: Pausa del slideshow
+        start: Avvia del slideshow

data/config/locales/blacklight-gallery.pt-BR.yml

@@ -13,3 +13,6 @@ pt-BR:
         header: "Selecione uma imagem para iniciar a apresentação de slides"
       modal_slideshow:
         counter: "%{counter} de %{count}"
+      slideshow:
+        pause: Pausar a apresentação de slides
+        start: Iniciar a apresentação de slides

data/config/locales/blacklight-gallery.zh.yml

@@ -9,7 +9,8 @@ zh:
     catalog:
       grid_slideshow:
         missing_image: '图片缺失'
-      document_slideshow:
-        header: '选择图片启动幻灯展示'
       modal_slideshow:
         counter: "%{counter} of %{count}"
+      slideshow:
+        pause: 暂停幻灯片展示
+        start: 启动幻灯片展示

data/lib/blacklight/gallery/engine.rb

@@ -4,7 +4,6 @@ module Blacklight
   module Gallery
     class Engine < Rails::Engine
       require 'openseadragon'
-    
     end
   end
 end

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "1.6.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/generators/blacklight_gallery/install_generator.rb

@@ -13,6 +13,7 @@ module BlacklightGallery
     def configuration
       inject_into_file 'app/controllers/catalog_controller.rb', after: "configure_blacklight do |config|" do
         "\n    config.view.gallery.partials = [:index_header, :index]" \
+        "\n    # config.view.gallery.classes = 'row-cols-2 row-cols-md-3'" \
         "\n    config.view.masonry.partials = [:index]" \
         "\n    config.view.slideshow.partials = [:index]\n\n" \
         "\n    config.show.tile_source_field = :content_metadata_image_iiif_info_ssm" \

data/spec/views/catalog/_index_gallery.html.erb_spec.rb

@@ -13,7 +13,7 @@ describe "catalog/_index_gallery.html.erb", :type => :view do
   end
 
   it "should have thumbnail and caption" do
-    expect(view).to receive(:render_thumbnail_tag).with(document, { class: 'img-thumbnail' }, hash_including(:counter)).and_return('Thumbnail')
+    expect(view).to receive(:render_thumbnail_tag).with(document, { class: 'img-thumbnail', alt: '' }, hash_including(:counter)).and_return('Thumbnail')
     expect(view).to receive(:render_document_partials).with(document, ['a', 'b'], document_counter: 3).and_return('Z')
     render
     expect(rendered).to have_selector '.thumbnail', text: 'Thumbnail'

data/spec/views/catalog/_index_masonry.html.erb_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe "catalog/_document_masonry.html.erb", :type => :view do
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:documents) { [stub_model(::SolrDocument), stub_model(::SolrDocument)] }
+  let(:presenter) { instance_double(Blacklight::IndexPresenter, heading: 'xyz')}
   before do
     allow(view).to receive_messages(blacklight_config: blacklight_config)
+    allow(view).to receive_messages(index_presenter: presenter)
     allow(view).to receive_messages(documents: documents)
     allow(view).to receive_messages(document_counter: 1)
     allow(view).to receive_messages(document_counter_with_offset: 1)
@@ -23,6 +25,7 @@ describe "catalog/_document_masonry.html.erb", :type => :view do
 
   it 'should render the thumbnail' do
     expect(rendered).to have_css('.thumbnail', text: 'Thumbnail')
+    expect(view).to have_received(:render_thumbnail_tag).with(documents.first, { class: 'img-thumbnail', alt: 'xyz' }, counter: 1)
   end
 
   it 'should render the caption' do

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.7'
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -240,9 +246,11 @@ files:
 - app/assets/images/blacklight/custom_fullscreen.svg
 - app/assets/images/blacklight/gallery.svg
 - app/assets/images/blacklight/masonry.svg
+- app/assets/images/blacklight/pause_slideshow.svg
 - app/assets/images/blacklight/remove_circle.svg
 - app/assets/images/blacklight/resize_small.svg
 - app/assets/images/blacklight/slideshow.svg
+- app/assets/images/blacklight/start_slideshow.svg
 - app/assets/javascripts/blacklight_gallery/default.js
 - app/assets/javascripts/blacklight_gallery/masonry.js
 - app/assets/javascripts/blacklight_gallery/osd_viewer.js
@@ -330,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Gallery display for Blacklight