blacklight-spotlight 0.33.1 → 0.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78348ea18057199e2df65dd4f77a17565870de28
-  data.tar.gz: e05ebfa153e5d460fc98a5b693b35c58f486de5d
+  metadata.gz: 9929af9368b873e9eb460daed4109a840efbb870
+  data.tar.gz: b29558c9058a0e5632aee6a296072dcca65cadcd
 SHA512:
-  metadata.gz: 99f7d04d673f41e1d635e1d79aa44e5ee13a2012c61c6d9e9119d99ce0c9f78a14ada590d674322c782f47d1b55d3d14fe9dfc6df581e0c0143accb6de4befc5
-  data.tar.gz: c09d5b011c13f56d88093c82dca782f70e970b8b6c45e6b6990666762ec789359c716f9f57c141ef06f496eef605dfbe9ff729a329f2474f1e437b51f3a19f97
+  metadata.gz: 764a628705b402874bd623e4dbccab64d7e6115a4f654c9d733911b3e6fa55982380056661aca11340c861fafc29b237eb107129ca756d3563a389dcea5ee02c
+  data.tar.gz: 4c8de36275779e9702c720fdcbb57801c9e9e9a863229c3fefbcc2f805e9d08ee95613d5d9d6aa5f7c44c6e7bc73708ded9a8156a9a66fbaeaf6f35f6eb7d0f8

data/app/assets/javascripts/spotlight/crop.es6

@@ -30,6 +30,12 @@ export default class Crop {
     this.iiifImageField.val(iiifObject.imageId);
   }
 
+  emptyIiifFields() {
+    this.iiifManifestField.val('');
+    this.iiifCanvasField.val('');
+    this.iiifImageField.val('');
+  }
+
   // Set the Crop tileSource and setup the cropper
   setTileSource(source) {
     if (source == this.tileSource) {
@@ -95,7 +101,9 @@ export default class Crop {
       crs: L.CRS.Simple,
       zoom: 0
     });
-    this.iiifLayer = L.tileLayer.iiif(this.tileSource).addTo(this.iiifCropper);
+    this.iiifLayer = L.tileLayer.iiif(this.tileSource, {
+      tileSize: 512
+    }).addTo(this.iiifCropper);
 
     this.iiifCropBox = L.areaSelect({
       width: this.cropArea.data('crop-width') / 2,
@@ -155,8 +163,8 @@ export default class Crop {
       self.iiifCropper.panTo(bounds.getCenter());
 
       self.iiifCropBox.setDimensions({
-        width: Math.abs(x),
-        height: Math.abs(y)
+        width: Math.round(Math.abs(x)),
+        height: Math.round(Math.abs(y))
       });
 
       self.existingCropBoxSet = true;
@@ -200,6 +208,7 @@ export default class Crop {
   }
 
   successHandler(data, stat, xhr) {
+    this.emptyIiifFields();
     this.setTileSource(data.tilesource);
   }
 }

data/app/models/spotlight/resources/iiif_manifest.rb

@@ -63,8 +63,11 @@ module Spotlight
       end
 
       def add_label
-        return unless title_field && manifest.try(:label)
-        solr_hash[title_field] = manifest.label
+        return unless title_fields.present? && manifest.try(:label)
+
+        Array.wrap(title_fields).each do |field|
+          solr_hash[field] = json_ld_value(manifest.label)
+        end
       end
 
       def add_image_urls
@@ -87,6 +90,12 @@ module Spotlight
         end
       end
 
+      def json_ld_value(value)
+        return value['@value'] if value.is_a?(Hash)
+        return value.find { |v| v['@language'] == default_json_ld_language }.try(:[], '@value') if value.is_a?(Array)
+        value
+      end
+
       def create_sidecars_for(*keys)
         missing_keys(keys).each do |k|
           exhibit.custom_fields.create! label: k, readonly_field: true
@@ -143,8 +152,12 @@ module Spotlight
         blacklight_config.show.try(:tile_source_field)
       end
 
-      def title_field
-        blacklight_config.index.try(:title_field)
+      def title_fields
+        Spotlight::Engine.config.iiif_title_fields || blacklight_config.index.try(:title_field)
+      end
+
+      def default_json_ld_language
+        Spotlight::Engine.config.default_json_ld_language
       end
 
       def sidecar

data/app/services/spotlight/upload_solr_document_builder.rb

@@ -26,7 +26,7 @@ module Spotlight
     end
 
     def add_file_versions(solr_hash)
-      solr_hash[Spotlight::Engine.config.thumbnail_field] = riiif.image_path(resource.upload_id, size: '400,400')
+      solr_hash[Spotlight::Engine.config.thumbnail_field] = riiif.image_path(resource.upload_id, size: '!400,400')
     end
 
     def add_sidecar_fields(solr_hash)

data/lib/spotlight/engine.rb

@@ -136,6 +136,8 @@ module Spotlight
     config.iiif_manifest_field = :iiif_manifest_url_ssi
     config.iiif_metadata_class = -> { Spotlight::Resources::IiifManifest::Metadata }
     config.iiif_collection_id_field = :collection_id_ssim
+    config.iiif_title_fields = nil
+    config.default_json_ld_language = 'en'
 
     config.masthead_initial_crop_selection = [1200, 120]
     config.thumbnail_initial_crop_selection = [120, 120]

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.33.1'.freeze
+  VERSION = '0.33.2'.freeze
 end

data/spec/fixtures/iiif_responses.rb

@@ -132,7 +132,10 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest2',
       "@type": 'sc:Manifest',
-      "label": 'Test Manifest 2',
+      "label": {
+        "@value": 'Test Manifest 2',
+        "@language": 'en'
+      },
       "attribution": 'Attribution Data',
       "description": 'A test IIIF manifest',
       "license": 'http://www.example.org/license.html',
@@ -186,7 +189,16 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest3',
       "@type": 'sc:Manifest',
-      "label": 'Test Manifest 3',
+      "label": [
+        {
+          "@value": 'Test Manifest 3',
+          "@language": 'en'
+        },
+        {
+          "@value": "Manifeste d'essai 3",
+          "@language": 'fr'
+        }
+      ],
       "attribution": 'Attribution Data',
       "description": 'A test IIIF manifest',
       "license": 'http://www.example.org/license.html',

data/spec/models/spotlight/resources/iiif_manifest_spec.rb

@@ -12,8 +12,9 @@ describe Spotlight::Resources::IiifManifest do
   let(:url) { 'uri://to-manifest' }
   subject { described_class.new(url: url, manifest: manifest, collection: collection) }
   let(:collection) { double(compound_id: '1') }
+  let(:manifest_fixture) { test_manifest1 }
   before do
-    stub_iiif_response_for_url(url, test_manifest1)
+    stub_iiif_response_for_url(url, manifest_fixture)
     subject.with_exhibit(exhibit)
   end
 
@@ -31,6 +32,34 @@ describe Spotlight::Resources::IiifManifest do
       it 'is inlcuded in the solr document when present' do
         expect(subject.to_solr['full_title_tesim']).to eq 'Test Manifest 1'
       end
+
+      it 'indexes to multiple fields when configured' do
+        allow(Spotlight::Engine.config).to receive(:iiif_title_fields).at_least(:once).and_return(%w(title_field1 title_field2))
+
+        expect(subject.to_solr['title_field1']).to eq 'Test Manifest 1'
+        expect(subject.to_solr['title_field2']).to eq 'Test Manifest 1'
+      end
+    end
+
+    context 'JSON-LD style labels' do
+      context 'when it is an array' do
+        let(:manifest_fixture) { test_manifest3 }
+
+        it 'uses the configured language to find a value' do
+          expect(subject.to_solr['full_title_tesim']).to eq 'Test Manifest 3'
+
+          allow(Spotlight::Engine.config).to receive(:default_json_ld_language).and_return('fr')
+          expect(subject.to_solr['full_title_tesim']).to eq "Manifeste d'essai 3"
+        end
+      end
+
+      context 'when it is a hash' do
+        let(:manifest_fixture) { test_manifest2 }
+
+        it 'is parsed correctly' do
+          expect(subject.to_solr['full_title_tesim']).to eq 'Test Manifest 2'
+        end
+      end
     end
 
     describe 'collection id' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.33.1
+  version: 0.33.2
 platform: ruby
 authors:
 - Chris Beer