Merge pull request #372 from pulibrary/multiple_descriptions

Support multiple descriptions.
pulibrary · Jun 18, 2018 · 8838c2f · 8838c2f
2 parents 177e916 + 63aa15e
commit 8838c2f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -144,3 +144,6 @@ Naming/FileName:
 RSpec/AnyInstance:
   Exclude:
     - 'spec/support/stub_iiif_response.rb'
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/models/iiif_resource_spec.rb'
diff --git a/app/values/manifest_metadata.rb b/app/values/manifest_metadata.rb
@@ -81,6 +81,13 @@ def metadata_hash
     end
   end
 
+  # Do not import manifest's description/etc if there's JSON-LD to pull metadata
+  # from.
+  def manifest_fields
+    return [] if jsonld_metadata
+    super
+  end
+
   private
 
     def range_labels(h)

diff --git a/spec/cassettes/all_collections.yml b/spec/cassettes/all_collections.yml
diff --git a/spec/models/iiif_resource_spec.rb b/spec/models/iiif_resource_spec.rb
@@ -15,6 +15,7 @@
       expect(solr_doc["readonly_range-label_tesim"]).to eq ["Chapter 1", "Chapter 2"]
       expect(Spotlight::CustomField.last.field_type).to eq 'vocab'
       expect(solr_doc["readonly_created_ssim"]).to eq ["1976-01-01T00:00:00Z"]
+      expect(solr_doc["readonly_description_ssim"]).to eq ["First", "Second"]
     end
     it 'indexes collections' do
       exhibit = Spotlight::Exhibit.create title: 'Exhibit A'