[WIP] update loc_full_config fixture to only use ldpath #290

elrayle · 2019-11-21T20:29:03Z

[WIP] Part of the process to remove deprecated predicate support

No prerequisites for this PR. It will be a prerequisite for other PRs related to removal of deprecated code.

Partially addresses #289

changes loc_full_config fixture to only use ldpath
updates config specs to check for ldpath
temporarily update predicate tests in config specs to test against hardcoded predicate hash (This will be removed when the config processing code no longer supports predicates.)

elrayle · 2019-11-21T20:31:33Z

lib/qa/authorities/linked_data/config/search_config.rb

@@ -105,7 +105,7 @@ def results_altlabel_predicate
      # Does this authority configuration support sorting of search results?
      # @return [True|False] true if sorting of search results is supported; otherwise, false
      def supports_sort?
-        return true unless results_sort_ldpath.present? || !results_sort_predicate.present?
+        return true if results_sort_ldpath.present? || results_sort_predicate.present?


Shifting lod_full_config fixture to specify ldpath for sort instead of a predicate revealed the logic on this was incorrect. The test now verifies that if sort ldpath is present, then sorting is supported.

elrayle · 2019-11-21T20:32:46Z

spec/fixtures/authorities/linked_data/lod_full_config.json

@@ -150,7 +149,7 @@
          "group_id": "dates",
          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.birth_date",
          "property_label_default": "Birth",
-          "ldpath": "madsrdf:identifiesRWO/madsrdf:birthDate/schema:label",
+          "ldpath": "madsrdf:identifiesRWO/madsrdf:birthDate/rdfs:label",


ldpath predefine RDF Schema using rdfs as the namespace. Updated the config to follow this precedence.

elrayle · 2019-11-21T20:33:37Z

spec/lib/authorities/linked_data/config_spec.rb

+            altlabel_ldpath: 'skos:altLabel',
+            broader_ldpath: 'skos:broader',
+            narrower_ldpath: 'skos:narrower',
+            sameas_ldpath: 'skos:exactMatch'


This is the primary change for the PR. The config specified results as ldpaths instead of predicates.

elrayle · 2019-11-21T20:33:43Z

spec/lib/authorities/linked_data/config_spec.rb

+            id_ldpath: 'dcterms:identifier',
+            label_ldpath: 'skos:prefLabel',
+            altlabel_ldpath: 'skos:altLabel',
+            sort_ldpath: 'skos:prefLabel'


This is the primary change for the PR. The config now specifies results as ldpaths instead of predicates.

elrayle · 2019-11-21T20:34:56Z

spec/lib/authorities/linked_data/config_spec.rb

@@ -405,8 +404,7 @@
  describe '#prefixes' do
    let(:expected_results) do
      {
-        schema: "http://www.w3.org/2000/01/rdf-schema#",
-        skos: "http://www.w3.org/2004/02/skos/core#"
+        dcterms: "http://purl.org/dc/terms/"


rdfs (previously prefixed as schema) and skos are predefined in the ldpath gem and do not need to be defined here. dcterms is not predefined and needs to be defined here to be used in the config.

elrayle · 2019-11-21T20:36:23Z

spec/lib/authorities/linked_data/search_config_spec.rb

@@ -11,12 +11,12 @@
  let(:term_only_config) { Qa::Authorities::LinkedData::Config.new(:LOD_TERM_ONLY_CONFIG).search }
  let(:encoding_config) { Qa::Authorities::LinkedData::Config.new(:LOD_ENCODING_CONFIG).search }

-  let(:ldpath_results_config) do
+  let(:predicate_results_config) do
    {


ldpath_results_config is no longer needed because lod_full_config fixture now defines them. The predicate definitions were removed from the fixture, so they are defined here for the predicate tests to be able to continue to pass. They will eventually be removed when support for predicates is removed from the config processing classes.

elrayle · 2019-11-21T20:40:36Z

spec/lib/authorities/linked_data/search_config_spec.rb

      it 'returns the ldpath' do
-        expect(full_config.results_id_ldpath).to eq 'schema:identifier ::xsd:string'
+        expect(full_config.results_id_ldpath).to eq 'dcterms:identifier'


Matches the change to the lod_full_config fixture ldpaths.

elrayle · 2019-11-21T20:42:21Z

spec/lib/authorities/linked_data/search_config_spec.rb

      it 'returns the ldpath' do
-        expect(full_config.results_label_ldpath).to eq 'skos:prefLabel ::xsd:string'
+        expect(full_config.results_label_ldpath).to eq 'skos:prefLabel'


The ldpaths in loc_full_config fixture do not have ::xsd:string on the ldpaths. It is optional. The ldpath service already tests paths with and without the type (not in this PR).

elrayle · 2019-11-21T20:43:07Z

spec/lib/authorities/linked_data/term_config_spec.rb

@@ -8,14 +8,14 @@
  let(:encoding_config) { Qa::Authorities::LinkedData::Config.new(:LOD_ENCODING_CONFIG).term }
  let(:loc_config) { Qa::Authorities::LinkedData::Config.new(:LOC).term }

-  let(:ldpath_results_config) do
+  let(:predicate_results_config) do
    {


ldpath_results_config is no longer needed because lod_full_config fixture now defines them. The predicate definitions were removed from the fixture, so they are defined here for the predicate tests to be able to continue to pass. They will eventually be removed when support for predicates is removed from the config processing classes.

elrayle · 2019-11-21T20:44:31Z

spec/lib/authorities/linked_data/term_config_spec.rb

-          narrower_predicate: 'http://www.w3.org/2004/02/skos/core#narrower',
-          sameas_predicate: 'http://www.w3.org/2004/02/skos/core#exactMatch'
+          id_ldpath:       'dcterms:identifier',
+          label_ldpath:    'skos:prefLabel',


This is the primary change for the PR. The config now specifies results as ldpaths instead of predicates.

**[WIP] Step 1 in removing deprecated predicate support** ---- Partially addresses #289 * changes loc_full_config fixture to only use ldpath * updates config specs to check for ldpath * temporarily update predicate tests in config specs to test against hardcoded predicate hash (This will be removed when the config processing code no longer supports predicates.)

elrayle commented Nov 21, 2019

View reviewed changes

elrayle changed the title ~~update loc_full_config fixture to only use ldpath~~ [WIP] update loc_full_config fixture to only use ldpath Nov 21, 2019

elrayle force-pushed the deprecation/lod_full_config branch from 2bbf2fc to 0492e2d Compare November 21, 2019 20:39

elrayle commented Nov 21, 2019

View reviewed changes

elrayle mentioned this pull request Nov 21, 2019

Remove deprecated code #289

Open

5 tasks

elrayle force-pushed the deprecation/lod_full_config branch from 0492e2d to 2574dad Compare November 21, 2019 23:54

elrayle mentioned this pull request Nov 22, 2019

[WIP] remove support for predicate maps from search query #295

Draft

jrgriffiniii marked this pull request as draft May 12, 2022 17:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] update loc_full_config fixture to only use ldpath #290

[WIP] update loc_full_config fixture to only use ldpath #290

elrayle commented Nov 21, 2019 •

edited

Loading

elrayle Nov 21, 2019

elrayle Nov 21, 2019

elrayle Nov 21, 2019

elrayle Nov 21, 2019 •

edited

Loading

elrayle Nov 21, 2019

elrayle Nov 21, 2019

elrayle Nov 21, 2019

elrayle Nov 21, 2019

elrayle Nov 21, 2019 •

edited

Loading

elrayle Nov 21, 2019

[WIP] update loc_full_config fixture to only use ldpath #290

Are you sure you want to change the base?

[WIP] update loc_full_config fixture to only use ldpath #290

Conversation

elrayle commented Nov 21, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elrayle Nov 21, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elrayle Nov 21, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elrayle commented Nov 21, 2019 •

edited

Loading

elrayle Nov 21, 2019 •

edited

Loading

elrayle Nov 21, 2019 •

edited

Loading