From 3afb15be672c09011e267ec7f823dacec1e7e16c Mon Sep 17 00:00:00 2001 From: Michael Holloway Date: Sat, 11 Jan 2025 10:51:28 -0500 Subject: [PATCH] Prefix fixture filenames with item and property IDs --- spec/digital_scriptorium/ds_item_spec.rb | 6 +- spec/digital_scriptorium/ds_meta_spec.rb | 6 +- .../export_representer_spec.rb | 8 +-- spec/digital_scriptorium/export_spec.rb | 8 +-- .../link_claim_transformer_spec.rb | 8 +-- .../name_claim_transformer_spec.rb | 12 ++-- .../qualified_claim_transformer_spec.rb | 60 +++++++++---------- .../unqualified_claim_transformer_spec.rb | 6 +- .../qualified/{title.json => P10_title.json} | 0 .../qualified/{name.json => P14_name.json} | 0 ...> P14_name_multiple_qualifier_values.json} | 0 ...ipt.json => P14_name_original_script.json} | 0 .../qualified/{genre.json => P18_genre.json} | 0 .../{language.json => P21_language.json} | 0 .../qualified/{date.json => P23_date.json} | 0 .../qualified/{place.json => P27_place.json} | 0 .../{material.json => P30_material.json} | 0 .../{institution.json => P5_institution.json} | 0 ...ion.json => P29_physical_description.json} | 0 ...f_manifest.json => P41_iiif_manifest.json} | 0 .../{status.json => P6_status.json} | 0 .../{shelfmark.json => P8_shelfmark.json} | 0 ...cord.json => P9_institutional_record.json} | 0 .../items/{deste.json => Q1105_deste.json} | 0 ...langattock.json => Q1106_llangattock.json} | 0 .../items/{latin.json => Q113_latin.json} | 0 .../{provence.json => Q128_provence.json} | 0 .../items/{spain.json => Q129_spain.json} | 0 .../items/{author.json => Q18_author.json} | 0 ...ormer_owner.json => Q21_former_owner.json} | 0 .../items/{deeds.json => Q283_deeds.json} | 0 .../{parchment.json => Q33_parchment.json} | 0 .../{almagest.json => Q354_almagest.json} | 0 .../items/{penn.json => Q374_upenn.json} | 0 .../{schoenberg.json => Q383_schoenberg.json} | 0 ...dioscorides.json => Q394_dioscorides.json} | 0 ...nt.json => Q4_holding_status_current.json} | 0 ...holding.json => Q542_holding_example.json} | 0 ...ript.json => Q543_manuscript_example.json} | 0 .../{record.json => Q544_record_example.json} | 0 ...ajisti.json => Q649_kitab_al_majisti.json} | 0 .../items/{14c.json => Q96_14th_century.json} | 0 ...{instance_of.json => P16_instance_of.json} | 0 spec/spec_helper.rb | 32 +++++----- 44 files changed, 73 insertions(+), 73 deletions(-) rename spec/fixtures/claims/qualified/{title.json => P10_title.json} (100%) rename spec/fixtures/claims/qualified/{name.json => P14_name.json} (100%) rename spec/fixtures/claims/qualified/{name_multiple_qualifier_values.json => P14_name_multiple_qualifier_values.json} (100%) rename spec/fixtures/claims/qualified/{name_original_script.json => P14_name_original_script.json} (100%) rename spec/fixtures/claims/qualified/{genre.json => P18_genre.json} (100%) rename spec/fixtures/claims/qualified/{language.json => P21_language.json} (100%) rename spec/fixtures/claims/qualified/{date.json => P23_date.json} (100%) rename spec/fixtures/claims/qualified/{place.json => P27_place.json} (100%) rename spec/fixtures/claims/qualified/{material.json => P30_material.json} (100%) rename spec/fixtures/claims/qualified/{institution.json => P5_institution.json} (100%) rename spec/fixtures/claims/unqualified/{physical_description.json => P29_physical_description.json} (100%) rename spec/fixtures/claims/unqualified/{iiif_manifest.json => P41_iiif_manifest.json} (100%) rename spec/fixtures/claims/unqualified/{status.json => P6_status.json} (100%) rename spec/fixtures/claims/unqualified/{shelfmark.json => P8_shelfmark.json} (100%) rename spec/fixtures/claims/unqualified/{institutional_record.json => P9_institutional_record.json} (100%) rename spec/fixtures/items/{deste.json => Q1105_deste.json} (100%) rename spec/fixtures/items/{llangattock.json => Q1106_llangattock.json} (100%) rename spec/fixtures/items/{latin.json => Q113_latin.json} (100%) rename spec/fixtures/items/{provence.json => Q128_provence.json} (100%) rename spec/fixtures/items/{spain.json => Q129_spain.json} (100%) rename spec/fixtures/items/{author.json => Q18_author.json} (100%) rename spec/fixtures/items/{former_owner.json => Q21_former_owner.json} (100%) rename spec/fixtures/items/{deeds.json => Q283_deeds.json} (100%) rename spec/fixtures/items/{parchment.json => Q33_parchment.json} (100%) rename spec/fixtures/items/{almagest.json => Q354_almagest.json} (100%) rename spec/fixtures/items/{penn.json => Q374_upenn.json} (100%) rename spec/fixtures/items/{schoenberg.json => Q383_schoenberg.json} (100%) rename spec/fixtures/items/{dioscorides.json => Q394_dioscorides.json} (100%) rename spec/fixtures/items/{current.json => Q4_holding_status_current.json} (100%) rename spec/fixtures/items/{holding.json => Q542_holding_example.json} (100%) rename spec/fixtures/items/{manuscript.json => Q543_manuscript_example.json} (100%) rename spec/fixtures/items/{record.json => Q544_record_example.json} (100%) rename spec/fixtures/items/{al_majisti.json => Q649_kitab_al_majisti.json} (100%) rename spec/fixtures/items/{14c.json => Q96_14th_century.json} (100%) rename spec/fixtures/properties/{instance_of.json => P16_instance_of.json} (100%) diff --git a/spec/digital_scriptorium/ds_item_spec.rb b/spec/digital_scriptorium/ds_item_spec.rb index 68ee0c2..2247b3f 100644 --- a/spec/digital_scriptorium/ds_item_spec.rb +++ b/spec/digital_scriptorium/ds_item_spec.rb @@ -6,9 +6,9 @@ module DigitalScriptorium include WikibaseRepresentable::Representers RSpec.describe DsItem do - let(:holding_json) { read_fixture('items/holding.json') } - let(:manuscript_json) { read_fixture('items/manuscript.json') } - let(:record_json) { read_fixture('items/record.json') } + let(:holding_json) { read_fixture('items/Q542_holding_example.json') } + let(:manuscript_json) { read_fixture('items/Q543_manuscript_example.json') } + let(:record_json) { read_fixture('items/Q544_record_example.json') } it 'correctly reports if it is a holding' do item = ItemRepresenter.new(described_class.new).from_json(holding_json) diff --git a/spec/digital_scriptorium/ds_meta_spec.rb b/spec/digital_scriptorium/ds_meta_spec.rb index dbbf9c5..25a18d4 100644 --- a/spec/digital_scriptorium/ds_meta_spec.rb +++ b/spec/digital_scriptorium/ds_meta_spec.rb @@ -6,9 +6,9 @@ module DigitalScriptorium include WikibaseRepresentable::Representers RSpec.describe DsMeta do - let(:holding) { ItemRepresenter.new(DsItem.new).from_json(read_fixture('items/holding.json')) } - let(:manuscript) { ItemRepresenter.new(DsItem.new).from_json(read_fixture('items/manuscript.json')) } - let(:record) { ItemRepresenter.new(DsItem.new).from_json(read_fixture('items/record.json')) } + let(:holding) { item_from_fixture('items/Q542_holding_example.json') } + let(:manuscript) { item_from_fixture('items/Q543_manuscript_example.json') } + let(:record) { item_from_fixture('items/Q544_record_example.json') } let(:meta) do described_class.new(record, { record.id => record, holding.id => holding, manuscript.id => manuscript }) end diff --git a/spec/digital_scriptorium/export_representer_spec.rb b/spec/digital_scriptorium/export_representer_spec.rb index eeb8964..e33bb60 100644 --- a/spec/digital_scriptorium/export_representer_spec.rb +++ b/spec/digital_scriptorium/export_representer_spec.rb @@ -7,10 +7,10 @@ module DigitalScriptorium include WikibaseRepresentable::Representers RSpec.describe ExportRepresenter do - let(:holding_json) { read_fixture('items/holding.json') } - let(:manuscript_json) { read_fixture('items/manuscript.json') } - let(:record_json) { read_fixture('items/record.json') } - let(:property_json) { read_fixture('properties/instance_of.json') } + let(:holding_json) { read_fixture('items/Q542_holding_example.json') } + let(:manuscript_json) { read_fixture('items/Q543_manuscript_example.json') } + let(:record_json) { read_fixture('items/Q544_record_example.json') } + let(:property_json) { read_fixture('properties/P16_instance_of.json') } let(:export) do described_class.new(Export.new).from_json("[#{holding_json},#{manuscript_json},#{record_json},#{property_json}]") end diff --git a/spec/digital_scriptorium/export_spec.rb b/spec/digital_scriptorium/export_spec.rb index da807e1..0d8e14c 100644 --- a/spec/digital_scriptorium/export_spec.rb +++ b/spec/digital_scriptorium/export_spec.rb @@ -7,10 +7,10 @@ module DigitalScriptorium include WikibaseRepresentable::Representers RSpec.describe Export do - let(:holding) { item_from_fixture('items/holding.json') } - let(:manuscript) { item_from_fixture('items/manuscript.json') } - let(:record) { item_from_fixture('items/record.json') } - let(:property) { property_from_fixture('properties/instance_of.json') } + let(:holding) { item_from_fixture('items/Q542_holding_example.json') } + let(:manuscript) { item_from_fixture('items/Q543_manuscript_example.json') } + let(:record) { item_from_fixture('items/Q544_record_example.json') } + let(:property) { property_from_fixture('properties/P16_instance_of.json') } it 'transforms a Wikibase export to a Hash' do export = described_class.new diff --git a/spec/digital_scriptorium/link_claim_transformer_spec.rb b/spec/digital_scriptorium/link_claim_transformer_spec.rb index 369e005..073c6b1 100644 --- a/spec/digital_scriptorium/link_claim_transformer_spec.rb +++ b/spec/digital_scriptorium/link_claim_transformer_spec.rb @@ -8,8 +8,8 @@ module DigitalScriptorium include WikibaseRepresentable::Representers RSpec.describe LinkClaimTransformer do - context 'with an institutional record claim' do - json = read_fixture('claims/unqualified/institutional_record.json') + context 'with an institutional record (P9) claim' do + json = read_fixture('claims/unqualified/P9_institutional_record.json') claim = StatementRepresenter.new(Statement.new).from_json(json) expected = { 'institutional_record_link' => ['https://franklin.library.upenn.edu/catalog/FRANKLIN_9949945603503681'] @@ -21,8 +21,8 @@ module DigitalScriptorium end end - context 'with an IIIF manifest claim' do - json = read_fixture('claims/unqualified/iiif_manifest.json') + context 'with an IIIF manifest (P41) claim' do + json = read_fixture('claims/unqualified/P41_iiif_manifest.json') claim = StatementRepresenter.new(Statement.new).from_json(json) expected = { 'iiif_manifest_link' => ['https://colenda.library.upenn.edu/phalt/iiif/2/81431-p33p8v/manifest'], diff --git a/spec/digital_scriptorium/name_claim_transformer_spec.rb b/spec/digital_scriptorium/name_claim_transformer_spec.rb index 6b84b15..4fd8861 100644 --- a/spec/digital_scriptorium/name_claim_transformer_spec.rb +++ b/spec/digital_scriptorium/name_claim_transformer_spec.rb @@ -5,8 +5,8 @@ module DigitalScriptorium RSpec.describe NameClaimTransformer do - context 'with a single qualifier' do - json = read_fixture('claims/qualified/name.json') + context 'with a single name in authority file (P17) qualifier' do + json = read_fixture('claims/qualified/P14_name.json') claim = StatementRepresenter.new(Statement.new).from_json(json) expected = { 'owner_display' => ['{"recorded_value":"Schoenberg, Lawrence J","linked_terms":[{"label":"Lawrence J. Schoenberg","source_url":"https://www.wikidata.org/wiki/Q107542788"}]}'], @@ -20,8 +20,8 @@ module DigitalScriptorium end end - context 'with multiple qualifiers' do - json = read_fixture('claims/qualified/name_multiple_qualifier_values.json') + context 'with multiple name in authority file (P17) qualifiers' do + json = read_fixture('claims/qualified/P14_name_multiple_qualifier_values.json') claim = StatementRepresenter.new(Statement.new).from_json(json) expected = { 'owner_display' => [ @@ -44,8 +44,8 @@ module DigitalScriptorium end end - context 'with an original script qualifier' do - json = read_fixture('claims/qualified/name_original_script.json') + context 'with an original script (P13) qualifier' do + json = read_fixture('claims/qualified/P14_name_original_script.json') claim = StatementRepresenter.new(Statement.new).from_json(json) expected = { 'author_display' => ['{"recorded_value":"Dioscorides Pedanius, of Anazarbos","original_script":"ديسقوريدس. of Anazarbos","linked_terms":[{"label":"Pedanius Dioscorides","source_url":"https://www.wikidata.org/wiki/Q297776"}]}'], diff --git a/spec/digital_scriptorium/qualified_claim_transformer_spec.rb b/spec/digital_scriptorium/qualified_claim_transformer_spec.rb index dbe2faf..682cb11 100644 --- a/spec/digital_scriptorium/qualified_claim_transformer_spec.rb +++ b/spec/digital_scriptorium/qualified_claim_transformer_spec.rb @@ -12,8 +12,8 @@ def build_claim(json) StatementRepresenter.new(Statement.new).from_json(json) end - context 'with an institution claim' do - json = read_fixture('claims/qualified/institution.json') + context 'with an institution (P5) claim' do + json = read_fixture('claims/qualified/P5_institution.json') expected = { 'institution_display' => ['{"recorded_value":"University of Pennsylvania","linked_terms":[{"label":"University of Pennsylvania","source_url":"https://www.wikidata.org/wiki/Q49117"}]}'], 'institution_search' => ['University of Pennsylvania'], @@ -26,8 +26,8 @@ def build_claim(json) end end - context 'with a title claim with standard title and original script qualifiers' do - json = read_fixture('claims/qualified/title.json') + context 'with a title (P10) claim with standard title (P11) and original script (P13) qualifiers' do + json = read_fixture('claims/qualified/P10_title.json') expected = { 'title_display' => ['{"recorded_value":"Kitāb al-Majisṭī","original_script":"كتاب المجسطي.","linked_terms":[{"label":"Almagest"}]}'], 'title_search' => ['Kitāb al-Majisṭī', 'كتاب المجسطي.', 'Almagest'], @@ -40,8 +40,8 @@ def build_claim(json) end end - context 'with a qualified genre claim' do - json = read_fixture('claims/qualified/genre.json') + context 'with a qualified genre (P18) claim' do + json = read_fixture('claims/qualified/P18_genre.json') expected = { 'term_display' => ['{"recorded_value":"Deeds","linked_terms":[{"label":"deeds","source_url":"http://vocab.getty.edu/aat/300027249"}]}'], 'term_search' => %w[Deeds deeds], @@ -54,8 +54,8 @@ def build_claim(json) end end - context 'with a qualified language claim' do - json = read_fixture('claims/qualified/language.json') + context 'with a qualified language (P21) claim' do + json = read_fixture('claims/qualified/P21_language.json') expected = { 'language_display' => ['{"recorded_value":"In Latin","linked_terms":[{"label":"Latin","source_url":"https://www.wikidata.org/wiki/Q397"}]}'], 'language_search' => ['In Latin', 'Latin'], @@ -68,8 +68,26 @@ def build_claim(json) end end - context 'with a place claim with multi-valued qualifier' do - json = read_fixture('claims/qualified/place.json') + context 'with a date (P23) claim' do + json = read_fixture('claims/qualified/P23_date.json') + expected = { + 'date_meta' => ['1358.'], + 'date_display' => ['{"recorded_value":"1358.","linked_terms":[{"label":"fourteenth century (dates CE)","source_url":"http://vocab.getty.edu/aat/300404506"}]}'], + 'date_search' => ['1358.', 'fourteenth century (dates CE)'], + 'date_facet' => ['fourteenth century (dates CE)'], + 'century_int' => [1301], + 'earliest_int' => [1358], + 'latest_int' => [1358] + } + + it 'extracts display, search, facet and extra date fields' do + solr_item = described_class.transform(build_claim(json), export_hash, config[PropertyId::PRODUCTION_DATE_AS_RECORDED]) + expect(solr_item).to eq(expected) + end + end + + context 'with a place (P27) claim with multi-valued qualifier' do + json = read_fixture('claims/qualified/P27_place.json') expected = { 'place_display' => ['{"recorded_value":"[Provence or Spain],","linked_terms":[{"label":"Provence","source_url":"http://vocab.getty.edu/tgn/7012209"},{"label":"Spain","source_url":"http://vocab.getty.edu/tgn/1000095"}]}'], 'place_search' => ['[Provence or Spain],', 'Provence', 'Spain'], @@ -82,8 +100,8 @@ def build_claim(json) end end - context 'with a qualified material claim' do - json = read_fixture('claims/qualified/material.json') + context 'with a qualified material (P30) claim' do + json = read_fixture('claims/qualified/P30_material.json') expected = { 'material_display' => ['{"recorded_value":"parchment","linked_terms":[{"label":"Parchment","source_url":"http://vocab.getty.edu/aat/300011851"}]}'], 'material_search' => %w[parchment Parchment], @@ -95,23 +113,5 @@ def build_claim(json) expect(solr_item).to eq(expected) end end - - context 'with a date claim' do - json = read_fixture('claims/qualified/date.json') - expected = { - 'date_meta' => ['1358.'], - 'date_display' => ['{"recorded_value":"1358.","linked_terms":[{"label":"fourteenth century (dates CE)","source_url":"http://vocab.getty.edu/aat/300404506"}]}'], - 'date_search' => ['1358.', 'fourteenth century (dates CE)'], - 'date_facet' => ['fourteenth century (dates CE)'], - 'century_int' => [1301], - 'earliest_int' => [1358], - 'latest_int' => [1358] - } - - it 'extracts display, search, facet and extra date fields' do - solr_item = described_class.transform(build_claim(json), export_hash, config[PropertyId::PRODUCTION_DATE_AS_RECORDED]) - expect(solr_item).to eq(expected) - end - end end end diff --git a/spec/digital_scriptorium/unqualified_claim_transformer_spec.rb b/spec/digital_scriptorium/unqualified_claim_transformer_spec.rb index a8788dc..c47b0c1 100644 --- a/spec/digital_scriptorium/unqualified_claim_transformer_spec.rb +++ b/spec/digital_scriptorium/unqualified_claim_transformer_spec.rb @@ -10,7 +10,7 @@ module DigitalScriptorium RSpec.describe UnqualifiedClaimTransformer do context 'with a holding status claim' do - json = read_fixture('claims/unqualified/status.json') + json = read_fixture('claims/unqualified/P6_status.json') claim = StatementRepresenter.new(Statement.new).from_json(json) expected = { 'holding_status_display' => ['{"recorded_value":"Current","linked_terms":[]}'], @@ -24,7 +24,7 @@ module DigitalScriptorium end context 'with a shelfmark claim' do - json = read_fixture('claims/unqualified/shelfmark.json') + json = read_fixture('claims/unqualified/P8_shelfmark.json') claim = StatementRepresenter.new(Statement.new).from_json(json) expected = { 'shelfmark_display' => ['{"recorded_value":"Oversize LJS 110","linked_terms":[]}'], @@ -38,7 +38,7 @@ module DigitalScriptorium end context 'with a physical description claim' do - json = read_fixture('claims/unqualified/physical_description.json') + json = read_fixture('claims/unqualified/P29_physical_description.json') claim = StatementRepresenter.new(Statement.new).from_json(json) expected = { 'physical_description_display' => ['{"recorded_value":"Extent: 1 parchment ; 170 x 245 mm.","linked_terms":[]}'], diff --git a/spec/fixtures/claims/qualified/title.json b/spec/fixtures/claims/qualified/P10_title.json similarity index 100% rename from spec/fixtures/claims/qualified/title.json rename to spec/fixtures/claims/qualified/P10_title.json diff --git a/spec/fixtures/claims/qualified/name.json b/spec/fixtures/claims/qualified/P14_name.json similarity index 100% rename from spec/fixtures/claims/qualified/name.json rename to spec/fixtures/claims/qualified/P14_name.json diff --git a/spec/fixtures/claims/qualified/name_multiple_qualifier_values.json b/spec/fixtures/claims/qualified/P14_name_multiple_qualifier_values.json similarity index 100% rename from spec/fixtures/claims/qualified/name_multiple_qualifier_values.json rename to spec/fixtures/claims/qualified/P14_name_multiple_qualifier_values.json diff --git a/spec/fixtures/claims/qualified/name_original_script.json b/spec/fixtures/claims/qualified/P14_name_original_script.json similarity index 100% rename from spec/fixtures/claims/qualified/name_original_script.json rename to spec/fixtures/claims/qualified/P14_name_original_script.json diff --git a/spec/fixtures/claims/qualified/genre.json b/spec/fixtures/claims/qualified/P18_genre.json similarity index 100% rename from spec/fixtures/claims/qualified/genre.json rename to spec/fixtures/claims/qualified/P18_genre.json diff --git a/spec/fixtures/claims/qualified/language.json b/spec/fixtures/claims/qualified/P21_language.json similarity index 100% rename from spec/fixtures/claims/qualified/language.json rename to spec/fixtures/claims/qualified/P21_language.json diff --git a/spec/fixtures/claims/qualified/date.json b/spec/fixtures/claims/qualified/P23_date.json similarity index 100% rename from spec/fixtures/claims/qualified/date.json rename to spec/fixtures/claims/qualified/P23_date.json diff --git a/spec/fixtures/claims/qualified/place.json b/spec/fixtures/claims/qualified/P27_place.json similarity index 100% rename from spec/fixtures/claims/qualified/place.json rename to spec/fixtures/claims/qualified/P27_place.json diff --git a/spec/fixtures/claims/qualified/material.json b/spec/fixtures/claims/qualified/P30_material.json similarity index 100% rename from spec/fixtures/claims/qualified/material.json rename to spec/fixtures/claims/qualified/P30_material.json diff --git a/spec/fixtures/claims/qualified/institution.json b/spec/fixtures/claims/qualified/P5_institution.json similarity index 100% rename from spec/fixtures/claims/qualified/institution.json rename to spec/fixtures/claims/qualified/P5_institution.json diff --git a/spec/fixtures/claims/unqualified/physical_description.json b/spec/fixtures/claims/unqualified/P29_physical_description.json similarity index 100% rename from spec/fixtures/claims/unqualified/physical_description.json rename to spec/fixtures/claims/unqualified/P29_physical_description.json diff --git a/spec/fixtures/claims/unqualified/iiif_manifest.json b/spec/fixtures/claims/unqualified/P41_iiif_manifest.json similarity index 100% rename from spec/fixtures/claims/unqualified/iiif_manifest.json rename to spec/fixtures/claims/unqualified/P41_iiif_manifest.json diff --git a/spec/fixtures/claims/unqualified/status.json b/spec/fixtures/claims/unqualified/P6_status.json similarity index 100% rename from spec/fixtures/claims/unqualified/status.json rename to spec/fixtures/claims/unqualified/P6_status.json diff --git a/spec/fixtures/claims/unqualified/shelfmark.json b/spec/fixtures/claims/unqualified/P8_shelfmark.json similarity index 100% rename from spec/fixtures/claims/unqualified/shelfmark.json rename to spec/fixtures/claims/unqualified/P8_shelfmark.json diff --git a/spec/fixtures/claims/unqualified/institutional_record.json b/spec/fixtures/claims/unqualified/P9_institutional_record.json similarity index 100% rename from spec/fixtures/claims/unqualified/institutional_record.json rename to spec/fixtures/claims/unqualified/P9_institutional_record.json diff --git a/spec/fixtures/items/deste.json b/spec/fixtures/items/Q1105_deste.json similarity index 100% rename from spec/fixtures/items/deste.json rename to spec/fixtures/items/Q1105_deste.json diff --git a/spec/fixtures/items/llangattock.json b/spec/fixtures/items/Q1106_llangattock.json similarity index 100% rename from spec/fixtures/items/llangattock.json rename to spec/fixtures/items/Q1106_llangattock.json diff --git a/spec/fixtures/items/latin.json b/spec/fixtures/items/Q113_latin.json similarity index 100% rename from spec/fixtures/items/latin.json rename to spec/fixtures/items/Q113_latin.json diff --git a/spec/fixtures/items/provence.json b/spec/fixtures/items/Q128_provence.json similarity index 100% rename from spec/fixtures/items/provence.json rename to spec/fixtures/items/Q128_provence.json diff --git a/spec/fixtures/items/spain.json b/spec/fixtures/items/Q129_spain.json similarity index 100% rename from spec/fixtures/items/spain.json rename to spec/fixtures/items/Q129_spain.json diff --git a/spec/fixtures/items/author.json b/spec/fixtures/items/Q18_author.json similarity index 100% rename from spec/fixtures/items/author.json rename to spec/fixtures/items/Q18_author.json diff --git a/spec/fixtures/items/former_owner.json b/spec/fixtures/items/Q21_former_owner.json similarity index 100% rename from spec/fixtures/items/former_owner.json rename to spec/fixtures/items/Q21_former_owner.json diff --git a/spec/fixtures/items/deeds.json b/spec/fixtures/items/Q283_deeds.json similarity index 100% rename from spec/fixtures/items/deeds.json rename to spec/fixtures/items/Q283_deeds.json diff --git a/spec/fixtures/items/parchment.json b/spec/fixtures/items/Q33_parchment.json similarity index 100% rename from spec/fixtures/items/parchment.json rename to spec/fixtures/items/Q33_parchment.json diff --git a/spec/fixtures/items/almagest.json b/spec/fixtures/items/Q354_almagest.json similarity index 100% rename from spec/fixtures/items/almagest.json rename to spec/fixtures/items/Q354_almagest.json diff --git a/spec/fixtures/items/penn.json b/spec/fixtures/items/Q374_upenn.json similarity index 100% rename from spec/fixtures/items/penn.json rename to spec/fixtures/items/Q374_upenn.json diff --git a/spec/fixtures/items/schoenberg.json b/spec/fixtures/items/Q383_schoenberg.json similarity index 100% rename from spec/fixtures/items/schoenberg.json rename to spec/fixtures/items/Q383_schoenberg.json diff --git a/spec/fixtures/items/dioscorides.json b/spec/fixtures/items/Q394_dioscorides.json similarity index 100% rename from spec/fixtures/items/dioscorides.json rename to spec/fixtures/items/Q394_dioscorides.json diff --git a/spec/fixtures/items/current.json b/spec/fixtures/items/Q4_holding_status_current.json similarity index 100% rename from spec/fixtures/items/current.json rename to spec/fixtures/items/Q4_holding_status_current.json diff --git a/spec/fixtures/items/holding.json b/spec/fixtures/items/Q542_holding_example.json similarity index 100% rename from spec/fixtures/items/holding.json rename to spec/fixtures/items/Q542_holding_example.json diff --git a/spec/fixtures/items/manuscript.json b/spec/fixtures/items/Q543_manuscript_example.json similarity index 100% rename from spec/fixtures/items/manuscript.json rename to spec/fixtures/items/Q543_manuscript_example.json diff --git a/spec/fixtures/items/record.json b/spec/fixtures/items/Q544_record_example.json similarity index 100% rename from spec/fixtures/items/record.json rename to spec/fixtures/items/Q544_record_example.json diff --git a/spec/fixtures/items/al_majisti.json b/spec/fixtures/items/Q649_kitab_al_majisti.json similarity index 100% rename from spec/fixtures/items/al_majisti.json rename to spec/fixtures/items/Q649_kitab_al_majisti.json diff --git a/spec/fixtures/items/14c.json b/spec/fixtures/items/Q96_14th_century.json similarity index 100% rename from spec/fixtures/items/14c.json rename to spec/fixtures/items/Q96_14th_century.json diff --git a/spec/fixtures/properties/instance_of.json b/spec/fixtures/properties/P16_instance_of.json similarity index 100% rename from spec/fixtures/properties/instance_of.json rename to spec/fixtures/properties/P16_instance_of.json diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 88e6c0d..18cbfe3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -29,7 +29,7 @@ def read_fixture(file) end def item_from_fixture(file) - item = WikibaseRepresentable::Model::Item.new + item = DigitalScriptorium::DsItem.new WikibaseRepresentable::Representers::ItemRepresenter.new(item).from_json(read_fixture(file)) end @@ -39,21 +39,21 @@ def property_from_fixture(file) end EXPORT_HASH = { - 'Q4' => item_from_fixture('items/current.json'), - 'Q18' => item_from_fixture('items/author.json'), - 'Q21' => item_from_fixture('items/former_owner.json'), - 'Q33' => item_from_fixture('items/parchment.json'), - 'Q96' => item_from_fixture('items/14c.json'), - 'Q113' => item_from_fixture('items/latin.json'), - 'Q128' => item_from_fixture('items/provence.json'), - 'Q129' => item_from_fixture('items/spain.json'), - 'Q283' => item_from_fixture('items/deeds.json'), - 'Q354' => item_from_fixture('items/almagest.json'), - 'Q374' => item_from_fixture('items/penn.json'), - 'Q383' => item_from_fixture('items/schoenberg.json'), - 'Q394' => item_from_fixture('items/dioscorides.json'), - 'Q1105' => item_from_fixture('items/deste.json'), - 'Q1106' => item_from_fixture('items/llangattock.json') + 'Q4' => item_from_fixture('items/Q4_holding_status_current.json'), + 'Q18' => item_from_fixture('items/Q18_author.json'), + 'Q21' => item_from_fixture('items/Q21_former_owner.json'), + 'Q33' => item_from_fixture('items/Q33_parchment.json'), + 'Q96' => item_from_fixture('items/Q96_14th_century.json'), + 'Q113' => item_from_fixture('items/Q113_latin.json'), + 'Q128' => item_from_fixture('items/Q128_provence.json'), + 'Q129' => item_from_fixture('items/Q129_spain.json'), + 'Q283' => item_from_fixture('items/Q283_deeds.json'), + 'Q354' => item_from_fixture('items/Q354_almagest.json'), + 'Q374' => item_from_fixture('items/Q374_upenn.json'), + 'Q383' => item_from_fixture('items/Q383_schoenberg.json'), + 'Q394' => item_from_fixture('items/Q394_dioscorides.json'), + 'Q1105' => item_from_fixture('items/Q1105_deste.json'), + 'Q1106' => item_from_fixture('items/Q1106_llangattock.json') }.freeze def export_hash