From 3a8ccfe31ce337e4111a8610aaf01b09b1d94d2f Mon Sep 17 00:00:00 2001 From: Michael Holloway Date: Tue, 7 Jan 2025 21:22:15 -0500 Subject: [PATCH] cops --- lib/digital_scriptorium/claim_transformer.rb | 10 +++++----- spec/digital_scriptorium/claim_transformer_spec.rb | 8 ++++---- .../digital_scriptorium/name_claim_transformer_spec.rb | 5 +++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/digital_scriptorium/claim_transformer.rb b/lib/digital_scriptorium/claim_transformer.rb index 1c8f9ab..5c9e0da 100644 --- a/lib/digital_scriptorium/claim_transformer.rb +++ b/lib/digital_scriptorium/claim_transformer.rb @@ -24,10 +24,10 @@ def self.transform(claim, export_hash, config) solr_props["#{prefix}_display"] = [{ 'PV' => value }.to_json] if requested_fields.include? 'display' solr_props["#{prefix}_search"] = [value] if requested_fields.include? 'search' solr_props["#{prefix}_facet"] = [value] if requested_fields.include? 'facet' - + solr_props['images_facet'] = ['Yes'] if value && claim.property_id == IIIF_MANIFEST solr_props["#{prefix}_link"] = [value] if requested_fields.include? 'link' - + return solr_props end @@ -40,18 +40,18 @@ def self.transform(claim, export_hash, config) authority_id = qualifier.entity_id_value authority = export_hash[authority_id] - + if authority label = authority.label('en') display_props['QL'] = label search_entries << label facets << label - + external_uri = authority.claim_by_property_id(EXTERNAL_URI)&.data_value wikidata_id = authority.claim_by_property_id(WIKIDATA_QID)&.data_value wikidata_uri = wikidata_id && "https://www.wikidata.org/wiki/#{wikidata_id}" - + # Only one or the other of these seem to exist for a given item in practice. display_props['QU'] = external_uri if external_uri display_props['QU'] = wikidata_uri if wikidata_uri diff --git a/spec/digital_scriptorium/claim_transformer_spec.rb b/spec/digital_scriptorium/claim_transformer_spec.rb index 891e2de..c5ddd2d 100644 --- a/spec/digital_scriptorium/claim_transformer_spec.rb +++ b/spec/digital_scriptorium/claim_transformer_spec.rb @@ -161,10 +161,10 @@ module DigitalScriptorium 'Provence', 'Spain' ], - 'place_facet' => [ - 'Provence', - 'Spain' - ], + 'place_facet' => %w[ + Provence + Spain + ] } expect(solr_item).to eq(expected) end diff --git a/spec/digital_scriptorium/name_claim_transformer_spec.rb b/spec/digital_scriptorium/name_claim_transformer_spec.rb index 4376003..424c6e2 100644 --- a/spec/digital_scriptorium/name_claim_transformer_spec.rb +++ b/spec/digital_scriptorium/name_claim_transformer_spec.rb @@ -12,7 +12,7 @@ module DigitalScriptorium let(:schoenberg_json) { File.read(File.expand_path('../fixtures/items/schoenberg.json', __dir__)) } let(:name_multiple_qualifier_values_json) { File.read(File.expand_path('../fixtures/claims/qualified/name_multiple_qualifier_values.json', __dir__)) } - let(:name_multiple_qualifier_values_claim) { StatementRepresenter.new(Statement.new).from_json(name_multiple_qualifier_values_json) } + let(:name_multiple_qualifier_values_claim) { StatementRepresenter.new(Statement.new).from_json(name_multiple_qualifier_values_json) } let(:deste_json) { File.read(File.expand_path('../fixtures/items/deste.json', __dir__)) } let(:llangattock_json) { File.read(File.expand_path('../fixtures/items/llangattock.json', __dir__)) } @@ -40,7 +40,8 @@ module DigitalScriptorium expected = { 'owner_display' => [ '{"PV":"From the codex made for Leonello d\'Este. Brought to Wales as war booty by 1813, already in a damaged state, by the Rolls family, later enobled as Barons Llangattock, of The Hendre, Monmouth (Llangattock sale, London, Christie\'s, 8 December 1958, lot 190);","QL":"Leonello d\'Este, Marquis of Ferrara","QU":"https://www.wikidata.org/wiki/Q1379797"}', - '{"PV":"From the codex made for Leonello d\'Este. Brought to Wales as war booty by 1813, already in a damaged state, by the Rolls family, later enobled as Barons Llangattock, of The Hendre, Monmouth (Llangattock sale, London, Christie\'s, 8 December 1958, lot 190);","QL":"Baron Llangattock","QU":"https://www.wikidata.org/wiki/Q4862572"}'], + '{"PV":"From the codex made for Leonello d\'Este. Brought to Wales as war booty by 1813, already in a damaged state, by the Rolls family, later enobled as Barons Llangattock, of The Hendre, Monmouth (Llangattock sale, London, Christie\'s, 8 December 1958, lot 190);","QL":"Baron Llangattock","QU":"https://www.wikidata.org/wiki/Q4862572"}' + ], 'owner_search' => [ 'From the codex made for Leonello d\'Este. Brought to Wales as war booty by 1813, already in a damaged state, by the Rolls family, later enobled as Barons Llangattock, of The Hendre, Monmouth (Llangattock sale, London, Christie\'s, 8 December 1958, lot 190);', 'Leonello d\'Este, Marquis of Ferrara',