blacklight-gallery 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e818cba7abe5286ac59f4451915533336dbdf8cc
-  data.tar.gz: e6947e5e2c39fdcd8bce1c111a4ec7b3fbd9943b
+  metadata.gz: 7b4fda01380884b93d14ce8d3bbf36132b82b3ec
+  data.tar.gz: e74c17bc14f0723b121095d0f0b706c3f8d4913a
 SHA512:
-  metadata.gz: 877ba9ab192d0dcdea0b9fdf7e0f4ff1552bcf40174583dbab32b2908a5ffa9dcb7d6919e4f11a73026356c77488eb56d8a01808f79f601087f096ec9f584481
-  data.tar.gz: 5c8dc51a286dad2ba5eea8301b4a993b92d2ad20bdbb25763d75d76067861d66e92599db90299f250a4f670b2f6027936ea8774740250e888d3df40de5cac207
+  metadata.gz: 7ec1c482d1b18ddbe9c5058098d8b7c38bb9899e2f000ccbd1c26526c33e5053ea4148501d677b65837b4a2c90a11934c23f061c600cb7cb177f5d7fda86484c
+  data.tar.gz: 4b31cff43f788b527ba4b11c53300588da6a88b711ebb165981c0b9ec3331ab1856c0e5c135f3c146427894c222ca8c9a5b27dcd8fde5bfc3a14e13825eea204

data/app/helpers/blacklight/gallery_helper.rb

@@ -10,6 +10,25 @@ module Blacklight
       end.join().html_safe
     end
 
+    def render_slideshow_tag(document, image_options = {}, url_options = {})
+      if blacklight_config.view_config(document_index_view_type).slideshow_method
+        method_name = blacklight_config.view_config(document_index_view_type).slideshow_method
+        send(method_name, document, image_options)
+      elsif blacklight_config.view_config(document_index_view_type).slideshow_field
+        url = slideshow_image_url(document)
+
+        image_tag url, image_options if url.present?
+      elsif has_thumbnail?(document)
+        render_thumbnail_tag(document, image_options, url_options.reverse_merge(suppress_link: true))
+      end
+    end
+
+    def slideshow_image_url(document)
+      if document.has? blacklight_config.view_config(document_index_view_type).slideshow_field
+        document.first(blacklight_config.view_config(document_index_view_type).slideshow_field)
+      end
+    end
+
     def gallery_wrapper_template(object)
       format = document_partial_name(object, nil)
       ['index_gallery_%{format}_wrapper', 'index_gallery'].each do |str|

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

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

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/spec/helpers/blacklight/gallery_helper_spec.rb

@@ -1,6 +1,9 @@
 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
@@ -25,4 +28,83 @@ describe Blacklight::GalleryHelper, :type => :helper 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(:index => Blacklight::OpenStructWithHashAccess.new(: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(:index => Blacklight::OpenStructWithHashAccess.new(: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(:index => Blacklight::OpenStructWithHashAccess.new(: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(:index => Blacklight::OpenStructWithHashAccess.new(: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(:index => Blacklight::OpenStructWithHashAccess.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(:index => Blacklight::OpenStructWithHashAccess.new(: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(:index => Blacklight::OpenStructWithHashAccess.new(: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(:index => Blacklight::OpenStructWithHashAccess.new(: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(:index => Blacklight::OpenStructWithHashAccess.new(: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(:index => Blacklight::OpenStructWithHashAccess.new(: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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Gallery display for Blacklight