use maintain_literals in ldpath to support language sorting

NOTE: This commit references a branch in ldpath. It needs to be removed when PR #18 is merged into the ldpath gem.
samvera · Nov 22, 2019 · fce0947 · fce0947
1 parent 6986cfa
commit fce0947
Show file tree

Hide file tree

Showing 12 changed files with 204 additions and 98 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,7 +27,7 @@ jobs:
           project: qa
 
       - samvera/engine_cart_generate:
-          cache_key: v7-internal-test-app-{{ checksum "qa.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/qa/install/install_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+          cache_key: v10-internal-test-app-{{ checksum "qa.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/qa/install/install_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
 
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>

diff --git a/Gemfile b/Gemfile
@@ -7,6 +7,8 @@ group :development, :test do
   gem 'simplecov', require: false
 end
 
+gem 'ldpath', github: 'samvera-labs/ldpath', branch: 'maintain_literals'
+
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 0.10.0
 # engine_cart stanza: 0.10.0

diff --git a/app/services/qa/linked_data/ldpath_service.rb b/app/services/qa/linked_data/ldpath_service.rb
@@ -42,10 +42,10 @@ def ldpath_program_code(ldpath:, prefixes: {}, languages: [])
         # @param limit_to_context [Boolean] if true, the evaluation process will not make any outside network calls.
         #        It will limit results to those found in the context graph.
         ## @return [Array<RDF::Literal>] the extracted values based on the ldpath
-        def ldpath_evaluate(program:, graph:, subject_uri:, limit_to_context: Qa.config.limit_ldpath_to_context?)
+        def ldpath_evaluate(program:, graph:, subject_uri:, limit_to_context: Qa.config.limit_ldpath_to_context?, maintain_literals: false)
           raise ArgumentError, "You must specify a program when calling ldpath_evaluate" if program.blank?
-          output = program.evaluate(subject_uri, context: graph, limit_to_context: limit_to_context)
-          property_implode(output)
+          output = program.evaluate(subject_uri, context: graph, limit_to_context: limit_to_context, maintain_literals: maintain_literals)
+          maintain_literals ? property_implode(output) : output.values.flatten.uniq
         rescue ParseError => e
           Rails.logger.warn("WARNING: #{I18n.t('qa.linked_data.ldpath.evaluate_logger_error')} (cause: #{e.message}")
           raise ParseError, I18n.t("qa.linked_data.ldpath.evaluate_error") + "... cause: #{e.message}"

diff --git a/app/services/qa/linked_data/mapper/graph_ldpath_mapper_service.rb b/app/services/qa/linked_data/mapper/graph_ldpath_mapper_service.rb
@@ -38,7 +38,7 @@ def self.map_values(graph:, ldpath_map:, subject_uri:, prefixes: {})
           ldpath_map.each do |key, ldpath|
             next value_map[key] = [subject_uri] if ldpath == :subject_uri
             ldpath_program = ldpath_service.ldpath_program(ldpath: ldpath, prefixes: prefixes)
-            values = ldpath_service.ldpath_evaluate(program: ldpath_program, graph: graph, subject_uri: subject_uri)
+            values = ldpath_service.ldpath_evaluate(program: ldpath_program, graph: graph, subject_uri: subject_uri, maintain_literals: true)
             value_map[key] = values
           end
           value_map = yield value_map if block_given?

diff --git a/qa.gemspec b/qa.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord-import'
   s.add_dependency 'deprecation'
   s.add_dependency 'faraday'
-  s.add_dependency 'ldpath'
+  # s.add_dependency 'ldpath'
   s.add_dependency 'nokogiri', '~> 1.6'
   s.add_dependency 'rails', '~> 5.0'
   s.add_dependency 'rdf'

diff --git a/spec/fixtures/authorities/linked_data/lod_lang_defaults.json b/spec/fixtures/authorities/linked_data/lod_lang_defaults.json
@@ -1,5 +1,8 @@
 {
   "QA_CONFIG_VERSION": "2.0",
+  "prefixes": {
+    "dcterms": "http://purl.org/dc/terms/"
+  },
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
@@ -21,9 +24,9 @@
     "term_id": "URI",
     "language": [ "fr" ],
     "results": {
-      "id_predicate":       "http://id.loc.gov/vocabulary/identifiers/lccn",
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
-      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel"
+      "id_ldpath":       "loc:lccn",
+      "label_ldpath":    "skos:prefLabel",
+      "altlabel_ldpath": "skos:altLabel"
     }
   },
   "search": {
@@ -46,10 +49,10 @@
     },
     "language": [ "fr" ],
     "results": {
-      "id_predicate":       "http://purl.org/dc/terms/identifier",
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
-      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel",
-      "sort_predicate":     "http://www.w3.org/2004/02/skos/core#prefLabel"
+      "id_ldpath":       "dcterms:identifier",
+      "label_ldpath":    "skos:prefLabel",
+      "altlabel_ldpath": "skos:altLabel",
+      "sort_ldpath":     "skos:prefLabel"
     }
   }
 }
diff --git a/spec/fixtures/authorities/linked_data/lod_lang_multi_defaults.json b/spec/fixtures/authorities/linked_data/lod_lang_multi_defaults.json
@@ -1,5 +1,8 @@
 {
   "QA_CONFIG_VERSION": "2.0",
+  "prefixes": {
+    "dcterms": "http://purl.org/dc/terms/"
+  },
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
@@ -21,9 +24,9 @@
     "term_id": "URI",
     "language": [ "en", "fr" ],
     "results": {
-      "id_predicate":       "http://purl.org/dc/terms/identifier",
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
-      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel"
+      "id_ldpath":       "dcterms:identifier",
+      "label_ldpath":    "skos:prefLabel",
+      "altlabel_ldpath": "skos:altLabel"
     }
   },
   "search": {
@@ -46,10 +49,10 @@
     },
     "language": [ "en", "fr" ],
     "results": {
-      "id_predicate":       "http://purl.org/dc/terms/identifier",
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
-      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel",
-      "sort_predicate":     "http://www.w3.org/2004/02/skos/core#prefLabel"
+      "id_ldpath":       "dcterms:identifier",
+      "label_ldpath":    "skos:prefLabel",
+      "altlabel_ldpath": "skos:altLabel",
+      "sort_ldpath":     "skos:prefLabel"
     }
   }
 }
diff --git a/spec/fixtures/authorities/linked_data/lod_lang_no_defaults.json b/spec/fixtures/authorities/linked_data/lod_lang_no_defaults.json
@@ -1,5 +1,8 @@
 {
   "QA_CONFIG_VERSION": "2.0",
+  "prefixes": {
+    "dcterms": "http://purl.org/dc/terms/"
+  },
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
@@ -20,8 +23,8 @@
     },
     "term_id": "URI",
     "results": {
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
-      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel"
+      "label_ldpath":    "skos:prefLabel",
+      "altlabel_ldpath": "skos:altLabel"
     }
   },
   "search": {
@@ -43,10 +46,10 @@
       "query": "query"
     },
     "results": {
-      "id_predicate":       "http://purl.org/dc/terms/identifier",
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
-      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel",
-      "sort_predicate":     "http://www.w3.org/2004/02/skos/core#prefLabel"
+      "id_ldpath":       "dcterms:identifier",
+      "label_ldpath":    "skos:prefLabel",
+      "altlabel_ldpath": "skos:altLabel",
+      "sort_ldpath":     "skos:prefLabel"
     }
   }
 }
diff --git a/spec/fixtures/authorities/linked_data/lod_lang_param.json b/spec/fixtures/authorities/linked_data/lod_lang_param.json
@@ -1,5 +1,9 @@
 {
   "QA_CONFIG_VERSION": "2.0",
+  "prefixes": {
+    "dcterms": "http://purl.org/dc/terms/",
+    "loc":     "http://id.loc.gov/vocabulary/identifiers/"
+  },
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
@@ -27,9 +31,9 @@
     },
     "term_id": "URI",
     "results": {
-      "id_predicate":       "http://id.loc.gov/vocabulary/identifiers/lccn",
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
-      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel"
+      "id_ldpath":       "loc:lccn",
+      "label_ldpath":    "skos:prefLabel",
+      "altlabel_ldpath": "skos:altLabel"
     }
   },
   "search": {
@@ -58,10 +62,10 @@
       "query": "query"
     },
     "results": {
-      "id_predicate":       "http://purl.org/dc/terms/identifier",
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
-      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel",
-      "sort_predicate":     "http://www.w3.org/2004/02/skos/core#prefLabel"
+      "id_ldpath":       "dcterms:identifier",
+      "label_ldpath":    "skos:prefLabel",
+      "altlabel_ldpath": "skos:altLabel",
+      "sort_ldpath":     "skos:prefLabel"
     }
   }
 }
diff --git a/spec/fixtures/authorities/linked_data/lod_min_config.json b/spec/fixtures/authorities/linked_data/lod_min_config.json
@@ -1,5 +1,8 @@
 {
   "QA_CONFIG_VERSION": "2.0",
+  "prefixes": {
+    "loc": "http://id.loc.gov/vocabulary/identifiers/"
+  },
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
@@ -20,8 +23,8 @@
     },
     "term_id": "URI",
     "results": {
-      "id_predicate":       "http://id.loc.gov/vocabulary/identifiers/lccn",
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel"
+      "id_ldpath":    "loc:lccn",
+      "label_ldpath": "skos:prefLabel"
     }
   },
   "search": {
@@ -43,7 +46,7 @@
       "query": "query"
     },
     "results": {
-      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel"
+      "label_ldpath": "skos:prefLabel"
     }
   }
 }
diff --git a/spec/models/linked_data/config/context_property_map_spec.rb b/spec/models/linked_data/config/context_property_map_spec.rb
@@ -280,9 +280,9 @@
       allow(Ldpath::Program).to receive(:parse).with("property = madsrdf:identifiesRWO/madsrdf:birthDate/schema:label ;\n").and_return(basic_program)
       allow(Ldpath::Program).to receive(:parse).with("property = skos:prefLabel ::xsd:string ;\n").and_return(expanded_label_program)
       allow(Ldpath::Program).to receive(:parse).with("property = loc:lccn ::xsd:string ;\n").and_return(expanded_id_program)
-      allow(basic_program).to receive(:evaluate).with(subject_uri, context: graph, limit_to_context: true).and_return('property' => [expanded_uri])
-      allow(expanded_label_program).to receive(:evaluate).with(RDF::URI.new(subject_uri), context: graph, limit_to_context: true).and_return('property' => [expanded_label])
-      allow(expanded_id_program).to receive(:evaluate).with(RDF::URI.new(subject_uri), context: graph, limit_to_context: true).and_return('property' => [expanded_id])
+      allow(basic_program).to receive(:evaluate).with(subject_uri, context: graph, limit_to_context: true, maintain_literals: false).and_return('property' => [expanded_uri])
+      allow(expanded_label_program).to receive(:evaluate).with(RDF::URI.new(subject_uri), context: graph, limit_to_context: true, maintain_literals: false).and_return('property' => [expanded_label])
+      allow(expanded_id_program).to receive(:evaluate).with(RDF::URI.new(subject_uri), context: graph, limit_to_context: true, maintain_literals: false).and_return('property' => [expanded_id])
     end
     it 'returns the uri, id, label for the expanded uri value' do
       expanded_values = subject.expanded_values(graph, subject_uri).first