blacklight-gallery 1.7.0 → 3.0.0

data/spec/features/gallery_spec.rb

@@ -4,8 +4,7 @@ describe "Gallery view", :type => :feature do
   before { visit search_catalog_path :q => 'medicine', :view => 'gallery' }
 
   it "should display results in a galley view" do
-    expect(page).to have_selector("#documents.gallery")
-    expect(page).to have_selector(".gallery .document .thumbnail .caption")
-    expect(page).to have_content("Strong Medicine speaks")
+    expect(page).to have_selector("#documents.documents-gallery")
+    expect(page).to have_selector(".caption", text: "Strong Medicine speaks")
   end
-end
+end

data/spec/features/masonry_spec.rb

@@ -4,8 +4,7 @@ describe "Masonry view", :type => :feature do
   before { visit search_catalog_path :q => 'medicine', :view => 'masonry' }
 
   it "should display results in a galley view" do
-    expect(page).to have_selector("#documents[data-behavior='masonry-gallery']")
-    expect(page).to have_selector(".masonry.document .thumbnail")
-    expect(page).to have_selector('.masonry.document .caption', text: "Strong Medicine speaks", visible: false)
+    expect(page).to have_selector("#documents.documents-masonry")
+    expect(page).to have_selector('.document .caption', text: "Strong Medicine speaks", visible: false)
   end
 end

data/spec/features/slideshow_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe "Slideshow", :js, :type => :feature do
 
   it "should open when one of the grid panes are clicked" do
-    pending 'flappy test'
     visit search_catalog_path( :q => 'medicine', :view => 'slideshow' )
     expect(page).to have_content "You searched for:"
     within ".view-type" do
@@ -11,7 +10,6 @@ describe "Slideshow", :js, :type => :feature do
     end
 
     find('.grid [data-slide-to="0"]').click
-    expect(page).to have_selector '#slideshow', visible: true
   end
 
 end

data/spec/models/concerns/openseadragon_solr_document_spec.rb

@@ -13,7 +13,7 @@ describe Blacklight::Gallery::OpenseadragonSolrDocument do
 
   context 'when not configured for the view' do
     let(:fields) { { some_field: 'data' } }
-    let(:view_config) { double('ViewConfig') }
+    let(:view_config) { double('ViewConfig', tile_source_field: nil) }
     it 'returns nil' do
       expect(subject).to be_nil
     end

data/spec/spec_helper.rb

@@ -9,19 +9,11 @@ require 'rspec/rails'
 require 'rspec/active_model/mocks'
 
 require 'selenium-webdriver'
-require 'chromedriver-helper'
+require 'webdrivers'
 
-Capybara.javascript_driver = :headless_chrome
 
-Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu no-sandbox] }
-  )
-
-  Capybara::Selenium::Driver.new(app,
-                                 browser: :chrome,
-                                 desired_capabilities: capabilities)
-end
+Capybara.javascript_driver = :selenium_chrome_headless
+Capybara.disable_animation = true
 
 require 'blacklight'
 require 'blacklight/gallery'
@@ -29,5 +21,6 @@ require 'blacklight/gallery'
 RSpec.configure do |c|
   c.infer_spec_type_from_file_location!
   c.full_backtrace = true
+  c.include ViewComponent::TestHelpers, type: :component
   #onfig.assets.precompile += %w(spotlight/default_thumbnail.jpg spotlight/default_browse_thumbnail.jpg)
 end

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

@@ -1,17 +1,27 @@
 require 'spec_helper'
 
 describe "catalog/_document_slideshow.html.erb", :type => :view do
-  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:blacklight_config) do
+    Blacklight::Configuration.new do |config|
+      config.track_search_session = false
+    end
+  end
 
   let(:document) { stub_model(::SolrDocument) }
 
   before do
-    allow(view).to receive_messages(blacklight_config: blacklight_config)
-    allow(view).to receive_messages(documents: [document])
-    allow(view).to receive(:blacklight_configuration_context).and_return(double(evaluate_if_unless_configuration: true))
+    allow(view).to receive_messages(
+      blacklight_config: blacklight_config,
+      documents: [document],
+      document_index_view_type: 'slideshow',
+      document_counter_with_offset: 1
+    )
+    allow(view).to receive(:current_search_session).and_return(nil)
+    allow(view).to receive(:search_session).and_return({})
+    allow(view).to receive(:search_state).and_return(Blacklight::SearchState.new({}, blacklight_config))
   end
 
-  it "should have a edit tag form" do
+  it 'has a modal' do
     render
     expect(rendered).to have_selector '#slideshow-modal'
     expect(rendered).to have_selector '[data-slide="prev"]'

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Chris Beer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2021-01-14 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.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.12'
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: openseadragon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +185,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -220,16 +226,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.13.1
-description: 
+description:
 email:
 - cabeer@stanford.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".solr_wrapper.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -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
@@ -252,19 +260,19 @@ files:
 - app/assets/stylesheets/blacklight_gallery/_osd_viewer.scss
 - app/assets/stylesheets/blacklight_gallery/_slideshow.scss
 - app/assets/stylesheets/blacklight_gallery/default.scss
+- app/components/blacklight/gallery/document_component.html.erb
+- app/components/blacklight/gallery/document_component.rb
+- app/components/blacklight/gallery/slideshow_component.html.erb
+- app/components/blacklight/gallery/slideshow_component.rb
+- app/components/blacklight/gallery/slideshow_preview_component.html.erb
+- app/components/blacklight/gallery/slideshow_preview_component.rb
 - app/helpers/blacklight/gallery_helper.rb
 - app/helpers/blacklight/openseadragon_helper.rb
 - app/models/concerns/blacklight/gallery/openseadragon_solr_document.rb
 - app/views/catalog/_document_gallery.html.erb
 - app/views/catalog/_document_masonry.html.erb
 - app/views/catalog/_document_slideshow.html.erb
-- app/views/catalog/_grid_slideshow.html.erb
-- app/views/catalog/_index_gallery.html.erb
-- app/views/catalog/_index_masonry.html.erb
-- app/views/catalog/_index_masonry_default.html.erb
-- app/views/catalog/_index_slideshow.html.erb
 - app/views/catalog/_openseadragon_default.html.erb
-- app/views/catalog/_slideshow.html.erb
 - app/views/catalog/_slideshow_modal.html.erb
 - blacklight-gallery.gemspec
 - config/locales/blacklight-gallery.ar.yml
@@ -297,17 +305,16 @@ files:
 - solr/conf/xslt/example_atom.xsl
 - solr/conf/xslt/example_rss.xsl
 - solr/conf/xslt/luke.xsl
+- spec/components/blacklight/gallery/document_component_spec.rb
+- spec/components/blacklight/gallery/slideshow_component_spec.rb
 - spec/features/gallery_spec.rb
 - spec/features/masonry_spec.rb
 - spec/features/slideshow_spec.rb
-- spec/helpers/blacklight/gallery_helper_spec.rb
 - spec/models/concerns/openseadragon_solr_document_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_document_slideshow.html.erb_spec.rb
-- spec/views/catalog/_index_gallery.html.erb_spec.rb
-- spec/views/catalog/_index_masonry.html.erb_spec.rb
 - spec/views/catalog/_openseadragon_default.html.erb_spec.rb
 - vendor/assets/javascripts/imagesloaded.min.js
 - vendor/assets/javascripts/masonry.min.js
@@ -315,7 +322,7 @@ homepage: https://github.com/projectblacklight/blacklight-gallery
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -330,20 +337,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Gallery display for Blacklight
 test_files:
+- spec/components/blacklight/gallery/document_component_spec.rb
+- spec/components/blacklight/gallery/slideshow_component_spec.rb
 - spec/features/gallery_spec.rb
 - spec/features/masonry_spec.rb
 - spec/features/slideshow_spec.rb
-- spec/helpers/blacklight/gallery_helper_spec.rb
 - spec/models/concerns/openseadragon_solr_document_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_document_slideshow.html.erb_spec.rb
-- spec/views/catalog/_index_gallery.html.erb_spec.rb
-- spec/views/catalog/_index_masonry.html.erb_spec.rb
 - spec/views/catalog/_openseadragon_default.html.erb_spec.rb

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-sudo: false
-
-notifications:
-  email: false
-
-rvm:
-  - 2.5.3
-  - 2.6.0
-
-notifications:
-  irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
-
-env:
-  global:
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-    - RAILS_VERSION='5.2.3'
-
-jdk: openjdk11

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

@@ -1,11 +0,0 @@
-<div class="document">
-  <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' %>
-        <% else %>
-          <%= t('.missing_image', scope: [:blacklight_gallery]) %>
-        <% end %>
-    <% end %>
-  </div>
-</div>

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

@@ -1,14 +0,0 @@
-<div class="document col-6 col-md-4">
-  <div class="thumbnail">
-    <%= 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>
-  </div>
-</div>

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

@@ -1,8 +0,0 @@
-<div class="masonry document col-6 col-md-3">
-  <div class="thumbnail">
-    <%= 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>
-  </div>
-</div>

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

@@ -1 +0,0 @@
-<%= link_to_document(document, truncate(index_presenter(document).label(document_show_link_field(document)), length: 89)) %>

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

@@ -1,11 +0,0 @@
-<div class="item<%= ' active' if document_counter == 0 %>">
-  <div class="frame">
-      <%= render_slideshow_tag(document) %>
-      <div class="caption">
-        <%= index_presenter(document).label(document_show_link_field(document)) %>
-      </div>
-      <span class="counter">
-        <%= t :'blacklight_gallery.catalog.modal_slideshow.counter', counter: document_counter + 1, count: count %>
-      </span>
-  </div>
-</div>

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

@@ -1,15 +0,0 @@
-  <div id="slideshow" class="slideshow-presenter">
-    <!-- Wrapper for slides -->
-    <div class="slideshow-inner">
-      <%= render collection: documents, as: :document, partial: 'index_slideshow', locals: {count: documents.count} %>
-    </div>
-
-    <!-- Controls -->
-    <a class="left carousel-control prev" href="#slideshow" data-slide="prev">
-      <%= blacklight_icon 'chevron_left' %>
-    </a>
-    <a class="right carousel-control next" href="#slideshow" data-slide="next">
-      <%= blacklight_icon 'chevron_right' %>
-    </a>
-
-  </div>

data/spec/helpers/blacklight/gallery_helper_spec.rb

@@ -1,110 +0,0 @@
-require 'spec_helper'
-
-describe Blacklight::GalleryHelper, :type => :helper do
-  before do
-    allow(helper).to receive(:blacklight_configuration_context).and_return(double(evaluate_if_unless_configuration: true))
-  end
-  describe "#render_gallery_collection" do
-    let(:template) { double }
-    before do
-      allow(template).to receive(:render).and_return("hello ")
-      allow(helper).to receive(:gallery_wrapper_template).and_return(template)
-    end
-    let(:documents) { [ double, double] }
-    subject { helper.render_gallery_collection documents}
-
-    it { is_expected.to eq 'hello hello ' }
-  end
-
-  describe "#gallery_wrapper_template" do
-    before do
-      allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
-      helper.lookup_context.prefixes << "catalog"
-    end
-
-    subject { helper.gallery_wrapper_template SolrDocument.new }
-
-    it "should be the default template" do
-       expect(subject.virtual_path).to eq 'catalog/_index_gallery'
-    end
-  end
-
-  describe "render_slideshow_tag" do
-    let(:document) { instance_double(SolrDocument) }
-
-    it "calls the provided slideshow method" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.slideshow_method = :xyz })
-      expect(helper).to receive_messages(:xyz => "some-slideshow")
-      expect(helper.render_slideshow_tag(document)).to eq 'some-slideshow'
-    end
-
-    it "creates an image tag from the given field" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.slideshow_field = :xyz })
-
-      allow(document).to receive(:has?).with(:xyz).and_return(true)
-      allow(document).to receive(:first).with(:xyz).and_return("http://example.com/some.jpg")
-      expect(helper.render_slideshow_tag(document)).to match /img/
-    end
-
-    it "does not link to the document if the url options are false" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.slideshow_method = :xyz })
-      allow(helper).to receive_messages(:xyz => "some-slideshow")
-
-      result = helper.render_slideshow_tag document, {}, false
-      expect(result).to eq "some-slideshow"
-    end
-
-    it "does not link to the document if the url options have :suppress_link" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.slideshow_method = :xyz })
-      allow(helper).to receive_messages(:xyz => "some-slideshow")
-
-      result = helper.render_slideshow_tag document, {}, suppress_link: true
-      expect(result).to eq "some-slideshow"
-    end
-
-
-    it "returns nil if no slideshow is available" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new)
-      expect(helper.render_slideshow_tag document).to be_nil
-    end
-
-    it "returns nil if no slideshow is returned from the slideshow method" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.slideshow_method = :xyz })
-      allow(helper).to receive_messages(:xyz => nil)
-
-      expect(helper.render_slideshow_tag document).to be_nil
-    end
-
-    it "returns nil if no slideshow is in the document" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.slideshow_field = :xyz })
-
-      allow(document).to receive(:has?).with(:xyz).and_return(false)
-
-      expect(helper.render_slideshow_tag document).to be_nil
-    end
-
-    it "falls back to a thumbnail" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.thumbnail_method = :xyz })
-      allow(helper).to receive(:xyz).and_return('thumbnail-image')
-
-      expect(helper.render_slideshow_tag document).to eq 'thumbnail-image'
-    end
-  end
-
-  describe "slideshow_url" do
-    it "pulls the configured slideshow field out of the document" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.slideshow_field = :xyz })
-      document = instance_double(SolrDocument)
-      allow(document).to receive(:has?).with(:xyz).and_return(true)
-      allow(document).to receive(:first).with(:xyz).and_return("asdf")
-      expect(helper.slideshow_image_url document).to eq("asdf")
-    end
-
-    it "returns nil if the slideshow field doesn't exist" do
-      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new.tap { |config| config.index.slideshow_field = :xyz })
-      document = instance_double(SolrDocument)
-      allow(document).to receive(:has?).with(:xyz).and_return(false)
-      expect(helper.slideshow_image_url document).to be_nil
-    end
-  end
-end