blacklight-spotlight 0.32.0 → 0.33.0

data/spec/helpers/spotlight/main_app_helpers_spec.rb

@@ -40,4 +40,49 @@ describe Spotlight::MainAppHelpers, type: :helper do
       its(:show_contact_form?) { should be_truthy }
     end
   end
+
+  describe '#exhibit_stylesheet_link_tag' do
+    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    before do
+      allow(helper).to receive_messages(current_exhibit: exhibit)
+    end
+
+    context 'without an exhibit context' do
+      let(:exhibit) { nil }
+      it 'uses the standard stylesheet' do
+        expect(helper.exhibit_stylesheet_link_tag('application')).to eq helper.stylesheet_link_tag('application')
+      end
+    end
+
+    context 'for an exhibit without a selected theme' do
+      before do
+        exhibit.update(theme: nil)
+      end
+
+      it 'uses the standard stylesheet' do
+        expect(helper.exhibit_stylesheet_link_tag('application')).to eq helper.stylesheet_link_tag('application')
+      end
+    end
+
+    context 'for an exhibit with an invalid theme' do
+      before do
+        exhibit.update(theme: 'garbage')
+      end
+
+      it 'uses the standard stylesheet' do
+        expect(helper.exhibit_stylesheet_link_tag('application')).to eq helper.stylesheet_link_tag('application')
+      end
+    end
+
+    context 'for a themed exhibit' do
+      before do
+        allow(Spotlight::Engine.config).to receive(:exhibit_themes).and_return(%w(default modern))
+        exhibit.update(theme: 'modern')
+      end
+
+      it 'uses a suffixed stylesheet name' do
+        expect(helper.exhibit_stylesheet_link_tag('application')).to eq helper.stylesheet_link_tag('application_modern')
+      end
+    end
+  end
 end

data/spec/helpers/spotlight/meta_helper_spec.rb

@@ -12,8 +12,7 @@ describe Spotlight::MetaHelper, type: :helper do
 
     it 'generates a twitter card for the exhibit' do
       allow(helper).to receive(:exhibit_root_url).and_return('some/url')
-      allow(current_exhibit).to receive(:thumbnail).and_return(double)
-      allow(current_exhibit).to receive_message_chain(:thumbnail, :image, :thumb, url: '/image')
+      allow(current_exhibit).to receive(:thumbnail).and_return(double(iiif_url: 'https://test.host/images/7777/full/400,300/0/default.jpg'))
 
       helper.add_exhibit_meta_content
 
@@ -22,22 +21,10 @@ describe Spotlight::MetaHelper, type: :helper do
       expect(card).to have_css "meta[name='twitter:url'][value='some/url']", visible: false
       expect(card).to have_css "meta[name='twitter:title'][value='#{current_exhibit.title}']", visible: false
       expect(card).to have_css "meta[name='twitter:description'][value='#{current_exhibit.subtitle}']", visible: false
-      expect(card).to have_css "meta[name='twitter:image'][value='http://test.host/image']", visible: false
+      expect(card).to have_css "meta[name='twitter:image'][value='https://test.host/images/7777/full/400,300/0/default.jpg']", visible: false
 
       graph = helper.opengraph
       expect(graph).to have_css "meta[property='og:site_name'][content='some title']", visible: false
     end
   end
-
-  describe '#carrierwave_url' do
-    it 'turns a application-relative URI into a path' do
-      upload = double(url: '/x/y/z')
-      expect(helper.send(:carrierwave_url, upload)).to eq 'http://test.host/x/y/z'
-    end
-
-    it 'passes a full URI through' do
-      upload = double(url: 'http://some.host/x/y/z')
-      expect(helper.send(:carrierwave_url, upload)).to eq 'http://some.host/x/y/z'
-    end
-  end
 end

data/spec/lib/migration/iiif_spec.rb

@@ -0,0 +1,70 @@
+require 'migration/iiif'
+
+RSpec.describe Migration::IIIF do
+  let(:instance) { described_class.new('http://test.host') }
+
+  before do
+    expect(File).to receive(:new).and_return(double)
+  end
+
+  context '#migrate_featured_images' do
+    let!(:old_exhibit_thumbnail) { FactoryGirl.create(:featured_image, type: nil, iiif_tilesource: nil) }
+    let!(:exhibit) { FactoryGirl.create(:exhibit, thumbnail_id: old_exhibit_thumbnail.id) }
+    let(:updated_thumb) { Spotlight::FeaturedImage.find(old_exhibit_thumbnail.id) }
+
+    context "when it's an exhibit thumbnail" do
+      it 'migrates to an ExhibitThumbnail class and stores the image in the correct directory' do
+        instance.run
+        expect(updated_thumb.class).to eq Spotlight::ExhibitThumbnail
+        expect(Spotlight::Exhibit.find(exhibit.id).thumbnail).to eq updated_thumb
+      end
+
+      it 'stores the image in the correct directory for the ExhibitThumbnail class' do
+        instance.run
+        expect(updated_thumb.image.file.file).to match(%r{/spotlight/exhibit_thumbnail/image/#{old_exhibit_thumbnail.id}})
+      end
+    end
+
+    context "when it's any FeaturedImage" do
+      it 'updates the iiif_tilesource attribute based on the given host and image resource' do
+        instance.run
+        expect(updated_thumb.iiif_tilesource).to eq "http://test.host/images/#{updated_thumb.id}/info.json"
+      end
+
+      it 'returns a nil region if one was not set' do
+        instance.run
+        expect(updated_thumb.iiif_region).to be_nil
+      end
+
+      it 'updates the iiif_region attribute based on the legacy crop coordinates' do
+        old_exhibit_thumbnail.image_crop_x = '1'
+        old_exhibit_thumbnail.image_crop_y = '1'
+        old_exhibit_thumbnail.image_crop_w = '400'
+        old_exhibit_thumbnail.image_crop_h = '400'
+        old_exhibit_thumbnail.save
+
+        instance.run
+        expect(updated_thumb.iiif_region).to eq '1,1,400,400'
+      end
+    end
+  end
+
+  describe '#migrate_contact_avatars' do
+    let(:file) { double }
+    let(:contact1) { Spotlight::Contact.create }
+    let(:contact2) { Spotlight::Contact.create }
+    before do
+      allow(File).to receive(:new).and_return(file)
+      allow(contact1).to receive('read_attribute_before_type_cast').and_call_original
+      allow(contact2).to receive('read_attribute_before_type_cast').and_call_original
+      allow(contact1).to receive('read_attribute_before_type_cast').with('avatar').and_return('file1.jpg')
+      allow(contact2).to receive('read_attribute_before_type_cast').with('avatar').and_return('file2.jpg')
+    end
+    it 'migrates' do
+      expect do
+        instance.send :migrate_contact_avatars
+      end.to change { Spotlight::FeaturedImage.count }.by(2)
+      expect(Spotlight::Contact.all.pluck(:avatar_id)).to eq Spotlight::FeaturedImage.all.pluck(:id)
+    end
+  end
+end

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -89,9 +89,16 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       end
 
       it 'defaults to not showing a custom field in the facets' do
-        allow(subject).to receive_messages(custom_facet_fields: { 'a' => Blacklight::Configuration::IndexField.new(field: 'a') })
+        field = double('field', field: 'a', solr_field: 'a', configuration: {})
+        custom_fields = double('custom_fields', vocab: [field])
+        allow(custom_fields).to receive(:map) do |&block|
+          block.call(field)
+        end
+        allow(subject.exhibit).to receive(:custom_fields).and_return(custom_fields)
         expect(subject.blacklight_config.facet_fields).to include('a')
         expect(subject.blacklight_config.facet_fields['a'].show).to be_falsey
+        expect(subject.blacklight_config.facet_fields['a'].if).to eq :field_enabled?
+        expect(subject.blacklight_config.facet_fields['a'].enabled).to eq false
       end
     end
 
@@ -176,10 +183,17 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       expect(subject.blacklight_config.index_fields['a'].list).to be_truthy
     end
 
+    it 'applies immutable values from the configuration' do
+      blacklight_config.add_index_field 'a', immutable: { something: 'set_in_configuration', another: 'immutable' }
+      subject.index_fields['a'] = { something: 'set_in_db' }
+      expect(subject.blacklight_config.index_fields['a'].something).to eq 'set_in_configuration'
+      expect(subject.blacklight_config.index_fields['a'].another).to eq 'immutable'
+    end
+
     context 'custom fields' do
       it 'includes any custom fields' do
         subject.index_fields['a'] = { enabled: true, list: true }
-        allow(subject).to receive_messages(custom_index_fields: { 'a' => double(if: nil, :if= => true, merge!: true, validate!: true, normalize!: true) })
+        allow(subject).to receive_messages(custom_index_fields: { 'a' => Blacklight::Configuration::IndexField.new(field: 'a') })
         expect(subject.blacklight_config.index_fields).to include('a')
       end
 
@@ -242,7 +256,7 @@ describe Spotlight::BlacklightConfiguration, type: :model do
     it 'includes any custom fields' do
       subject.index_fields['a'] = { enabled: true, show: true }
 
-      allow(subject).to receive_messages(custom_index_fields: { 'a' => double(if: nil, :if= => true, merge!: true, validate!: true, normalize!: true) })
+      allow(subject).to receive_messages(custom_index_fields: { 'a' => Blacklight::Configuration::IndexField.new(field: 'a') })
 
       expect(subject.blacklight_config.show_fields).to include('a')
     end
@@ -511,9 +525,7 @@ describe Spotlight::BlacklightConfiguration, type: :model do
         expect(search_field.solr_parameters).to have_key :fl
         expect(search_field.solr_parameters[:fl]).to include 'id'
         expect(search_field.solr_parameters[:fl]).to include 'some_field'
-        expect(search_field.solr_parameters[:fl]).to include 'full_image_url_ssm'
         expect(search_field.solr_parameters[:fl]).to include 'thumbnail_url_ssm'
-        expect(search_field.solr_parameters[:fl]).to include 'thumbnail_square_url_ssm'
       end
     end
   end

data/spec/models/spotlight/contact_image_spec.rb

@@ -0,0 +1,9 @@
+describe Spotlight::ContactImage do
+  subject(:contact_image) do
+    described_class.new(iiif_tilesource: 'http://example.com/iiif/abc123/info.json')
+  end
+
+  it 'has the appropriate contact image size' do
+    expect(contact_image.iiif_url).to match(%r{/full/70,70/})
+  end
+end

data/spec/models/spotlight/exhibit_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::Exhibit, type: :model do
-  subject { FactoryGirl.build(:exhibit, title: 'Sample') }
+  subject(:exhibit) { FactoryGirl.build(:exhibit, title: 'Sample') }
 
   it 'has a title' do
     subject.title = 'Test title'
@@ -45,23 +45,6 @@ describe Spotlight::Exhibit, type: :model do
     end
   end
 
-  context 'thumbnail' do
-    it 'calls DefaultThumbnailJob to fetch a default feature image' do
-      expect(Spotlight::DefaultThumbnailJob).to receive(:perform_later).with(subject.searches.first)
-      expect(Spotlight::DefaultThumbnailJob).to receive(:perform_later).with(subject)
-      subject.save!
-    end
-
-    context '#set_default_thumbnail' do
-      before { subject.save! }
-      it 'uses the thubmnail from the first search' do
-        subject.set_default_thumbnail
-        expect(subject.thumbnail).not_to be_nil
-        expect(subject.thumbnail).to eq subject.searches.first.thumbnail
-      end
-    end
-  end
-
   describe '#main_navigations' do
     subject { FactoryGirl.create(:exhibit, title: 'Sample') }
     it 'has main navigations' do
@@ -302,10 +285,24 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#reindex_progress' do
-    it 'returns a Spotlight::ReindexProgress' do
+    let!(:reindexing_log_entries) do
+      [
+        FactoryGirl.create(:unstarted_reindexing_log_entry, exhibit: exhibit),
+        FactoryGirl.create(:reindexing_log_entry, exhibit: exhibit),
+        in_progress_entry,
+        FactoryGirl.create(:failed_reindexing_log_entry, exhibit: exhibit),
+        FactoryGirl.create(:unstarted_reindexing_log_entry, exhibit: exhibit)
+      ]
+    end
+
+    let(:in_progress_entry) do
+      FactoryGirl.create(:in_progress_reindexing_log_entry, exhibit: exhibit)
+    end
+
+    it 'returns the latest log entry that is not unstarted' do
       reindex_progress = subject.reindex_progress
       expect(reindex_progress).to be_a Spotlight::ReindexProgress
-      expect(reindex_progress.exhibit).to eq subject
+      expect(reindex_progress.current_log_entry).to eq in_progress_entry
     end
   end
 end

data/spec/models/spotlight/exhibit_thumbnail_spec.rb

@@ -0,0 +1,8 @@
+describe Spotlight::ExhibitThumbnail do
+  subject(:exhibit_thumbnail) { described_class.new }
+
+  it 'includes the appropriate size in the iiif_url' do
+    exhibit_thumbnail.iiif_tilesource = 'http://example.com/iiif/abc123/info.json'
+    expect(exhibit_thumbnail.iiif_url).to match(%r{/full/400,400/})
+  end
+end

data/spec/models/spotlight/featured_image_spec.rb

@@ -1,18 +1,67 @@
 describe Spotlight::FeaturedImage do
-  context 'with an uploaded resource' do
-    subject { described_class.new }
-    let(:document) { double(uploaded_resource?: true) }
+  subject(:featured_image) { described_class.new }
 
-    it 'replaces the remote_image_url fragment with the local path to the file' do
-      allow(document).to receive_message_chain(:uploaded_resource, :url, file: File.open(File.join(FIXTURES_PATH, 'avatar.png')))
-      allow(subject).to receive(:document).and_return(document)
+  describe '#iiif_url' do
+    let(:iiif_tilesource) { 'http://example.com/iiif/abc123/info.json' }
+    let(:iiif_region) { '0,0,400,300' }
 
-      subject.remote_image_url = '/some/path'
-      expect(subject.remote_image_url).to be_nil
+    describe 'tilesource' do
+      it 'is nil when not present' do
+        expect(subject.iiif_url).to be_nil
+      end
 
-      subject.validate
+      it 'is included when present (without "/info.json")' do
+        subject.iiif_tilesource = iiif_tilesource
+        expect(subject.iiif_url).to match(%r{^http://example.com/iiif/abc123/})
+        expect(subject.iiif_url).not_to include('info.json')
+      end
+    end
+
+    describe 'region' do
+      before { subject.iiif_tilesource = iiif_tilesource }
+      it 'is included when present' do
+        subject.iiif_region = iiif_region
+        expect(subject.iiif_url).to match(%r{/abc123/#{iiif_region}/})
+      end
+
+      it 'is "full" when not present' do
+        expect(subject.iiif_url).to match(%r{/abc123/full/})
+      end
+    end
+  end
+
+  describe '#document' do
+    before { subject.source = 'exhibit' }
+    it 'fetches the document given the stored GlobalID' do
+      subject.document_global_id = 'gid://internal/SolrDocument/yn959jw9550'
+
+      expect(subject.document).to be_a SolrDocument
+      expect(subject.document[:id]).to eq 'yn959jw9550'
+    end
+
+    it 'busts memoization if the GlobalID is updated' do
+      subject.document_global_id = 'gid://internal/SolrDocument/yn959jw9550'
+      expect(subject.document[:id]).to eq 'yn959jw9550'
+
+      subject.document_global_id = 'gid://internal/SolrDocument/gk446cj2442'
+      expect(subject.document[:id]).to eq 'gk446cj2442'
+    end
+
+    it 'returns nil if the document cannot be found via GlobalID' do
+      subject.document_global_id = 'gid://internal/SolrDocument/NotARealDoc'
+
+      expect(subject.document).to be_nil
+    end
+  end
+
+  describe '#file_present?' do
+    it 'is false when the image file is not present' do
+      expect(subject.file_present?).to be false
+    end
 
-      expect(subject.image.filename).to eq 'avatar.png'
+    it 'is true when the image file is present' do
+      expect(subject).to receive(:image).and_return(double('CarrierWaveUpload', file: 'uploaded file content'))
+      expect(subject.file_present?).to be true
     end
   end
 end

data/spec/models/spotlight/masthead_spec.rb

@@ -1,24 +1,40 @@
 describe Spotlight::Masthead, type: :model do
-  describe '#masthead_exists?' do
-    let(:masthead) { stub_model(described_class) }
-    let(:image) { OpenStruct.new }
-    it 'returns false when the masthead is set to not display' do
-      expect(masthead.display?).to be_falsey
+  let(:masthead) { stub_model(described_class) }
+
+  describe '#iiif_url' do
+    it 'inlcudes the appropriate size' do
+      masthead.iiif_tilesource = 'http://example.com/iiif/abc123/info.json'
+      expect(masthead.iiif_url).to match(%r{/full/1800,180/})
     end
-    it 'returns false when the cropped image is not present' do
-      masthead.display = true
-      expect(masthead.display?).to be_falsey
+  end
+
+  describe '#display?' do
+    let(:image) { OpenStruct.new }
+    subject { masthead.display? }
+
+    context 'when the masthead is set to not display' do
+      it { is_expected.to be_falsey }
     end
-    it 'returns false when the cropped image is present but the masthead is set to not display' do
-      allow(masthead).to receive(:image).and_return(image)
-      allow(image).to receive(:cropped).and_return([0])
-      expect(masthead.display?).to be_falsey
+
+    context 'when the cropped image is not present' do
+      before { masthead.display = true }
+      it { is_expected.to be_falsey }
     end
-    it 'returns true when the cropped image is present and the masthead is set to display' do
-      masthead.display = true
-      expect(masthead).to receive(:image).and_return(image)
-      expect(image).to receive(:cropped).and_return([0])
-      expect(masthead.display?).to be_truthy
+
+    context 'when the cropped image is present' do
+      before do
+        masthead.iiif_tilesource = 'http://test.host/images/1'
+        masthead.iiif_region = '100,0,200,300'
+      end
+
+      context 'but the masthead is set to not display' do
+        it { is_expected.to be_falsey }
+      end
+
+      context 'and the masthead is set to display' do
+        before { masthead.display = true }
+        it { is_expected.to be_truthy }
+      end
     end
   end
 end

data/spec/models/spotlight/page_spec.rb

@@ -93,4 +93,18 @@ describe Spotlight::Page, type: :model do
       end
     end
   end
+
+  describe 'thumbnail_image_url' do
+    subject(:thumbnail) { FactoryGirl.create(:featured_image) }
+    subject(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
+
+    it 'is nil when there is no thumbnail' do
+      expect(page.thumbnail_image_url).to be_nil
+    end
+
+    it "is returns the thumbnail's IIIF url" do
+      page.thumbnail = thumbnail
+      expect(page.thumbnail_image_url).to eq thumbnail.iiif_url
+    end
+  end
 end