qa 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa5880f67c4587fb44e2740ce97df0cecc2a119
-  data.tar.gz: 50e47d7b72d95bf8a3a93ecc8ab8dcd5f1c442cf
+  metadata.gz: eb0e94ad762c71e5dd0bf2a7b99e03ee71b348e8
+  data.tar.gz: c8d21f4c0379b3035439e39a6b085faa314bf602
 SHA512:
-  metadata.gz: 78b5ce231dc3fdcc74e254c5e578f5024a3ea1abb0c3696655dd4b8619a683e06d1caaa65ba2a87f683b594ecc6b8db79444ac63b6bd441d4a7821e82dc7236a
-  data.tar.gz: 3b02f86177cc7c5f84d232619ff0b1e024cfc1c36eb9847deca5a760632ce2059cc248d15b20539b51be1cf6d98ba7e589879cd6a60873096123ea1cccffd5e6
+  metadata.gz: c1b33787d92489239f1530cc05b4ea3e912e7ae913ed0197a0fb1e58e13e3bf75a701e3ec5d93a15c49288a3cca0f06647ec11380bb48d3eefb0917d3f594390
+  data.tar.gz: 2a6613d06be5b77c2709bc95d0dfe3d78814c3271e3399578726fe1e9bb2ecd533ae9533cf92e30c02345ff09624c705a8f3895f08986f104dd2baf0124e56b1

data/app/controllers/qa/linked_data_terms_controller.rb

@@ -80,6 +80,10 @@ class Qa::LinkedDataTermsController < ::ApplicationController
                 "was not identified as a valid RDF format.  You may need to include the linkeddata gem."
     logger.warn msg
     render json: { errors: msg }, status: :internal_server_error
+  rescue Qa::DataNormalizationError => e
+    msg = "Data Normalization Error - #{e.message}"
+    logger.warn msg
+    render json: { errors: msg }, status: :internal_server_error
   end
 
   # Return all the information for a given term given a URI

data/app/models/qa/linked_data/config/context_property_map.rb

@@ -37,6 +37,7 @@ module Qa
           @ldpath = Qa::LinkedData::Config::Helper.fetch_required(property_map, :ldpath, false)
           @selectable = Qa::LinkedData::Config::Helper.fetch_boolean(property_map, :selectable, false)
           @drillable = Qa::LinkedData::Config::Helper.fetch_boolean(property_map, :drillable, false)
+          @optional = Qa::LinkedData::Config::Helper.fetch_boolean(property_map, :optional, Qa.config.property_map_default_for_optional)
           @expansion_label_ldpath = Qa::LinkedData::Config::Helper.fetch(property_map, :expansion_label_ldpath, nil)
           @expansion_id_ldpath = Qa::LinkedData::Config::Helper.fetch(property_map, :expansion_id_ldpath, nil)
           @prefixes = prefixes
@@ -54,6 +55,12 @@ module Qa
           @drillable
         end
 
+        # Should this property always be included in the extended context or is it optional (i.e. only shown if it has a value)
+        # @return [Boolean] true if this property is optional and will only be included in extended context if it has a value; otherwise, false
+        def optional?
+          @optional
+        end
+
         def group?
           group_id.present?
         end

data/app/services/qa/linked_data/ldpath_service.rb

@@ -6,6 +6,9 @@ module Qa
     class LdpathService
       VALUE_ON_ERROR = [].freeze
 
+      class_attribute :predefined_prefixes
+      self.predefined_prefixes = Ldpath::Transform.default_prefixes.with_indifferent_access
+
       # Create the ldpath program for a given ldpath.
       # @param ldpath [String] ldpath to follow to get a value from a graph (documation: http://marmotta.apache.org/ldpath/language.html)
       # @param prefixes [Hash] shortcut names for URI prefixes with key = part of predicate that is the same for all terms (e.g. { "madsrdf": "http://www.loc.gov/mads/rdf/v1#" })

data/app/services/qa/linked_data/mapper/context_mapper_service.rb

@@ -37,7 +37,11 @@ module Qa
                 values = Qa::LinkedData::Config::ContextPropertyMap::VALUE_ON_ERROR
                 error = e.message
               end
+              return {} if values.blank? && property_map.optional?
+              property_info(values, error, context_map, property_map)
+            end
 
+            def property_info(values, error, context_map, property_map)
               property_info = {}
               property_info["group"] = context_map.group_label(property_map.group_id) if property_map.group?
               property_info["property"] = property_map.label

data/config/authorities/linked_data/loc.json

@@ -1,30 +1,28 @@
 {
   "QA_CONFIG_VERSION": "2.1",
   "prefixes": {
-    "loc": "http://id.loc.gov/vocabulary/identifiers/",
-    "skos": "http://www.w3.org/2004/02/skos/core#",
-    "madsrdf": "http://www.loc.gov/mads/rdf/v1#",
-    "owl": "http://www.w3.org/2002/07/owl#"
+    "loc":     "http://id.loc.gov/vocabulary/identifiers/",
+    "madsrdf": "http://www.loc.gov/mads/rdf/v1#"
   },
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
-      "@type": "IriTemplate",
+      "@type":    "IriTemplate",
       "template": "http://id.loc.gov/authorities/{subauth}/{term_id}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
-          "@type": "IriTemplateMapping",
+          "@type":    "IriTemplateMapping",
           "variable": "term_id",
           "property": "hydra:freetextQuery",
           "required": true
         },
         {
-          "@type": "IriTemplateMapping",
+          "@type":    "IriTemplateMapping",
           "variable": "subauth",
           "property": "hydra:freetextQuery",
           "required": false,
-          "default": "names"
+          "default":  "names"
         }
       ]
     },
@@ -35,20 +33,21 @@
     "term_id": "ID",
     "language": ["en"],
     "results": {
-      "id_ldpath": "loc:lccn",
-      "label_ldpath": "skos:prefLabel :: xsd:string",
+      "id_ldpath":       "loc:lccn | madsrdf:code",
+      "label_ldpath":    "skos:prefLabel :: xsd:string",
       "altlabel_ldpath": "skos:altLabel :: xsd:string",
-      "sameas_ldpath": "skos:exactMatch | owl:sameAs :: xsd:anyURI",
+      "sameas_ldpath":   "skos:exactMatch | owl:sameAs :: xsd:anyURI",
       "narrower_ldpath": "madsrdf:hasNarrowerAuthority :: xsd:anyURI",
-      "broader_ldpath": "madsrdf:hasBroaderAuthority :: xsd:anyURI"
+      "broader_ldpath":  "madsrdf:hasBroaderAuthority :: xsd:anyURI"
     },
     "subauthorities": {
-      "subjects": "subjects",
-      "names": "names",
-      "classification": "classification",
-      "child_subject": "childrensSubjects",
-      "genre": "genreForms",
-      "demographic": "demographicTerms"
+      "subjects":          "subjects",
+      "names":             "names",
+      "classification":    "classification",
+      "child_subject":     "childrensSubjects",
+      "genre":             "genreForms",
+      "demographic":       "demographicTerms",
+      "music_performance": "performanceMediums"
     }
   },
   "search": {}

data/lib/generators/qa/install/templates/config/initializers/qa.rb

@@ -18,4 +18,9 @@ Qa.config do |config|
   # When true, prevents ldpath requests from making additional network calls.  All values will come from the context graph
   # passed to the ldpath request.
   # config.limit_ldpath_to_context = true
+
+  # Define default behavior for property_map.optional? when it is not defined in the configuration for a property.
+  # When false, properties that do not override default optional behavior will be shown whether or not the property has a value in the graph.
+  # When true, properties that do not override default optional behavior will not be shown whn the property does not have a value in the graph.
+  # config.property_map_default_for_optional = false
 end

data/lib/qa.rb

@@ -64,4 +64,7 @@ module Qa
   module IriTemplate
     class MissingParameter < StandardError; end
   end
+
+  # Raised when data is returned but cannot be normalized
+  class DataNormalizationError < StandardError; end
 end

data/lib/qa/authorities/linked_data/config/term_config.rb

@@ -70,13 +70,30 @@ module Qa::Authorities
         Config.config_value(term_results, :id_ldpath)
       end
 
+      # Return results id_predicates
+      # @return [Array<String>] the configured predicate to use to extract the id from the results
+      def term_results_id_predicates
+        @pred_ids ||=
+          begin
+            pred = Config.predicate_uri(term_results, :id_predicate)
+            pred ? [pred] : id_predicates_from_ldpath
+          end
+      end
+
       # Return results id_predicate
       # @return [String] the configured predicate to use to extract the id from the results
-      def term_results_id_predicate
-        return @pred_id unless @pred_id.blank?
-        @pred_id = Config.predicate_uri(term_results, :id_predicate)
-        return @pred_id unless @pred_id.blank?
-        @pred_id = pred_id_from_ldpath
+      # NOTE: Customizations using this method should be updated to use `term_results_id_predicates` which returns [Array<String>] of
+      #       id predicates.  This method remains for backward compatibility only but may cause issues if used in places expecting an Array
+      def term_results_id_predicate(suppress_deprecation_warning: false)
+        unless suppress_deprecation_warning
+          Qa.deprecation_warning(
+            in_msg: 'Qa::Authorities::LinkedData::TermConfig',
+            msg: "`term_results_id_predicate` is deprecated; use `term_results_id_ldpath` by updating linked data " \
+                 "term config results in authority #{authority_name} to specify as `id_ldpath`"
+          )
+        end
+        id_predicates = term_results_id_predicates
+        id_predicates.first
       end
 
       # Return results label_ldpath
@@ -222,16 +239,30 @@ module Qa::Authorities
 
       private
 
-        def pred_id_from_ldpath
-          # prefix example: { skos: 'http://www.w3.org/2004/02/skos/core#' }
-          # ldpath example: 'skos:id :: xsd:string'
+        # Parse ldpath into an array of predicates.
+        # Gets ldpath (e.g. 'loc:lccn | madsrdf:code :: xsd:string') using config accessor for results id ldpath.
+        # Multiple paths are delineated by | which is used to split the ldpath into an array of paths.
+        # @return [Array<String>] the predicate for each path in the ldpath
+        def id_predicates_from_ldpath
           id_ldpath = term_results_id_ldpath
-          return nil if id_ldpath.blank?
-          tokens = id_ldpath.split(':')
+          return [] if id_ldpath.blank?
+          id_ldpath.split('|').map(&:strip).map do |path|
+            predicate = parse_predicate_from_single_path(path)
+            predicate.present? ? RDF::URI.new(predicate) : nil
+          end.compact
+        end
+
+        # Parse a single path (e.g. 'loc:lccn' where 'loc' is the ontology prefix and 'lccn' is the property name)
+        # Gets prefixes (e.g. { "loc": "http://id.loc.gov/vocabulary/identifiers/", "madsrdf": "http://www.loc.gov/mads/rdf/v1#" }) from authority config
+        # @return [String] the predicate constructed by combining the expanded prefix with the property name
+        def parse_predicate_from_single_path(path)
+          tokens = path.split(':')
           return nil if tokens.size < 2
           prefix = tokens.first.to_sym
           prefix_path = prefixes[prefix]
-          prefix_path + tokens.second.strip
+          prefix_path = Qa::LinkedData::LdpathService.predefined_prefixes[prefix] if prefix_path.blank?
+          raise Qa::InvalidConfiguration, "Prefix '#{prefix}' is not defined in term configuration for authority #{authority_name}" if prefix_path.blank?
+          "#{prefix_path}#{tokens.second.strip}"
         end
 
         def summary_without_subauthority(auth_name, language)

data/lib/qa/authorities/linked_data/find_term.rb

@@ -15,8 +15,8 @@ module Qa::Authorities
         @term_config = term_config
       end
 
-      attr_reader :term_config, :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s
-      private :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s
+      attr_reader :term_config, :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size
+      private :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size
 
       delegate :term_subauthority?, :prefixes, :authority_name, to: :term_config
 
@@ -60,6 +60,7 @@ module Qa::Authorities
 
           access_end_dt = Time.now.utc
           @access_time_s = access_end_dt - access_start_dt
+          @fetched_size = full_graph.triples.to_s.size if performance_data?
           Rails.logger.info("Time to receive data from authority: #{access_time_s}s")
         end
 
@@ -70,8 +71,9 @@ module Qa::Authorities
           json = perform_normalization
 
           @normalize_time_s = normalize_end_dt - normalize_start_dt
+          @normalized_size = json.to_s.size if performance_data?
           Rails.logger.info("Time to convert data to json: #{normalize_time_s}s")
-          json = append_performance_data(json) if performance_data? && !jsonld?
+          json = append_performance_data(json) if performance_data?
           json
         end
 
@@ -108,13 +110,15 @@ module Qa::Authorities
                                             ldpath_map: ldpaths_for_term, predicate_map: preds_for_term)
         end
 
-        # special processing for loc ids for backward compatibility
+        # Special processing for loc ids for backward compatibility.  IDs may be in the form 'n123' or 'n 123'.  URIs do not
+        # have a blank.  This removes the <blank> from the ID.
         def normalize_id
           return id if expects_uri?
           loc? ? id.delete(' ') : id
         end
 
-        # special processing for loc ids for backward compatibility
+        # Special processing for loc ids for backward compatibility.  IDs may be in the form 'n123' or 'n 123'.  This adds
+        # the <blank> into the ID to allow it to be found as the object of a triple in the graph.
         def loc_id
           loc_id = URI.unescape(id)
           digit_idx = loc_id.index(/\d/)
@@ -124,7 +128,7 @@ module Qa::Authorities
 
         # determine if the current authority is LOC which may require special processing of its ids for backward compatibility
         def loc?
-          authority_name.to_s.casecmp('loc').zero?
+          term_config.url_config.template.starts_with? 'http://id.loc.gov/authorities/'
         end
 
         def expects_uri?
@@ -133,16 +137,31 @@ module Qa::Authorities
 
         def extract_uri
           return @uri = RDF::URI.new(id) if expects_uri?
-          @uri = graph_service.subjects_for_object_value(graph: @filtered_graph, predicate: RDF::URI.new(term_config.term_results_id_predicate), object_value: URI.unescape(id)).first
-          return @uri unless loc? && @uri.blank?
-          # for backward compatibility, if an loc id as passed in fails to extract the URI, try to adding a blank to the id
-          @uri = graph_service.subjects_for_object_value(graph: @filtered_graph, predicate: RDF::URI.new(term_config.term_results_id_predicate), object_value: loc_id).first
-          if @uri.present?
-            Qa.deprecation_warning(
-              in_msg: 'Qa::Authorities::LinkedData::FindTerm',
-              msg: 'Special processing of LOC ids is deprecated; id should be an exact match of the id in the graph'
-            )
+          term_config.term_results_id_predicates.each do |id_predicate|
+            extract_uri_by_id(id_predicate)
+            break if @uri.present?
           end
+          raise Qa::DataNormalizationError, "Unable to extract URI based on ID: #{id}" if @uri.blank?
+          @uri
+        end
+
+        def extract_uri_by_id(id_predicate)
+          @uri = graph_service.subjects_for_object_value(graph: @filtered_graph,
+                                                         predicate: id_predicate,
+                                                         object_value: URI.unescape(id)).first
+          return if @uri.present? || !loc?
+
+          # NOTE: Second call to try and extract using the loc_id allows for special processing on the id for LOC authorities.
+          #       LOC URIs do not include a blank (e.g. ends with 'n123'), but the ID in the data might (e.g. 'n 123').  If
+          #       the ID is provided without the <blank>, this tries a second time to find it with the <blank>.
+          @uri = graph_service.subjects_for_object_value(graph: @filtered_graph,
+                                                         predicate: id_predicate,
+                                                         object_value: URI.unescape(loc_id)).first
+          return if @uri.blank? # only show the depercation warning if the loc_id was used
+          Qa.deprecation_warning(
+            in_msg: 'Qa::Authorities::LinkedData::FindTerm',
+            msg: 'Special processing of LOC ids is deprecated; id should be an exact match of the id in the graph'
+          )
           @uri
         end
 
@@ -168,7 +187,7 @@ module Qa::Authorities
         end
 
         def performance_data?
-          @performance_data == true
+          @performance_data == true && !jsonld?
         end
 
         def preds_for_term
@@ -181,7 +200,7 @@ module Qa::Authorities
         def optional_preds
           opt_preds = {}
           opt_preds[:altlabel] = term_config.term_results_altlabel_predicate
-          opt_preds[:id] = term_config.term_results_id_predicate
+          opt_preds[:id] = term_config.term_results_id_predicates
           opt_preds[:narrower] = term_config.term_results_narrower_predicate
           opt_preds[:broader] = term_config.term_results_broader_predicate
           opt_preds[:sameas] = term_config.term_results_sameas_predicate
@@ -240,9 +259,14 @@ module Qa::Authorities
         end
 
         def append_performance_data(results)
-          performance = { predicate_count: results['predicates'].size,
+          pred_count = results['predicates'].present? ? results['predicates'].size : 0
+          performance = { predicate_count: pred_count,
                           fetch_time_s: access_time_s,
                           normalization_time_s: normalize_time_s,
+                          fetched_bytes: fetched_size,
+                          normalized_bytes: normalized_size,
+                          fetch_bytes_per_s: fetched_size / access_time_s,
+                          normalization_bytes_per_s: normalized_size / normalize_time_s,
                           total_time_s: (access_time_s + normalize_time_s) }
           { performance: performance, results: results }
         end

data/lib/qa/authorities/linked_data/search_query.rb

@@ -15,8 +15,8 @@ module Qa::Authorities
         @search_config = search_config
       end
 
-      attr_reader :search_config, :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s
-      private :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s
+      attr_reader :search_config, :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size
+      private :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size
 
       delegate :subauthority?, :supports_sort?, :prefixes, :authority_name, to: :search_config
 
@@ -52,6 +52,7 @@ module Qa::Authorities
 
           access_end_dt = Time.now.utc
           @access_time_s = access_end_dt - access_start_dt
+          @fetched_size = full_graph.triples.to_s.size if performance_data?
           Rails.logger.info("Time to receive data from authority: #{access_time_s}s")
         end
 
@@ -64,6 +65,7 @@ module Qa::Authorities
 
           normalize_end_dt = Time.now.utc
           @normalize_time_s = normalize_end_dt - normalize_start_dt
+          @normalized_size = json.to_s.size if performance_data?
           Rails.logger.info("Time to convert data to json: #{normalize_time_s}s")
           json = append_performance_data(json) if performance_data?
           json
@@ -171,6 +173,10 @@ module Qa::Authorities
           performance = { result_count: results.size,
                           fetch_time_s: access_time_s,
                           normalization_time_s: normalize_time_s,
+                          fetched_bytes: fetched_size,
+                          normalized_bytes: normalized_size,
+                          fetch_bytes_per_s: fetched_size / access_time_s,
+                          normalization_bytes_per_s: normalized_size / normalize_time_s,
                           total_time_s: (access_time_s + normalize_time_s) }
           { performance: performance, results: results }
         end

data/lib/qa/configuration.rb

@@ -42,8 +42,17 @@ module Qa
     # passed to the ldpath request.
     attr_writer :limit_ldpath_to_context
     def limit_ldpath_to_context?
-      return true if @limit_ldpath_to_context.nil?
+      @limit_ldpath_to_context = true if @limit_ldpath_to_context.nil?
       @limit_ldpath_to_context
     end
+
+    # Define default behavior for property_map.optional? when it is not defined in the configuration for a property.
+    # When false, properties that do not override default optional behavior will be shown whether or not the property has a value in the graph.
+    # When true, properties that do not override default optional behavior will not be shown whn the property does not have a value in the graph.
+    attr_writer :property_map_default_for_optional
+    def property_map_default_for_optional
+      @property_map_default_for_optional = false if @property_map_default_for_optional.nil?
+      @property_map_default_for_optional
+    end
   end
 end

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "4.1.1".freeze
+  VERSION = "4.2.0".freeze
 end

data/spec/controllers/linked_data_terms_controller_spec.rb

@@ -307,7 +307,9 @@ describe Qa::LinkedDataTermsController, type: :controller do
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Hash
         expect(results.keys).to match_array ['performance', 'results']
-        expect(results['performance'].keys).to match_array ['result_count', 'fetch_time_s', 'normalization_time_s', 'total_time_s']
+        expect(results['performance'].keys).to match_array ['result_count', 'fetch_time_s', 'normalization_time_s',
+                                                            'fetched_bytes', 'normalized_bytes', 'fetch_bytes_per_s',
+                                                            'normalization_bytes_per_s', 'total_time_s']
         expect(results['performance']['total_time_s']).to eq results['performance']['fetch_time_s'] + results['performance']['normalization_time_s']
         expect(results['performance']['result_count']).to eq 3
         expect(results['results'].count).to eq 3
@@ -336,6 +338,18 @@ describe Qa::LinkedDataTermsController, type: :controller do
         end
       end
 
+      context 'when data normalization error' do
+        before do
+          stub_request(:get, 'http://id.worldcat.org/fast/530369')
+            .to_return(status: 200, body: webmock_fixture('lod_oclc_term_bad_id.nt'), headers: { 'Content-Type' => 'application/ntriples' })
+        end
+        it 'returns 500' do
+          expect(Rails.logger).to receive(:warn).with("Data Normalization Error - Unable to extract URI based on ID: 530369")
+          get :show, params: { id: '530369', vocab: 'OCLC_FAST' }
+          expect(response.code).to eq('500')
+        end
+      end
+
       context 'when rdf format error' do
         before do
           stub_request(:get, 'http://id.worldcat.org/fast/530369').to_return(status: 200)
@@ -463,7 +477,9 @@ describe Qa::LinkedDataTermsController, type: :controller do
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Hash
         expect(results.keys).to match_array ['performance', 'results']
-        expect(results['performance'].keys).to match_array ['predicate_count', 'fetch_time_s', 'normalization_time_s', 'total_time_s']
+        expect(results['performance'].keys).to match_array ['predicate_count', 'fetch_time_s', 'normalization_time_s',
+                                                            'fetched_bytes', 'normalized_bytes', 'fetch_bytes_per_s',
+                                                            'normalization_bytes_per_s', 'total_time_s']
         expect(results['performance']['total_time_s']).to eq results['performance']['fetch_time_s'] + results['performance']['normalization_time_s']
         expect(results['performance']['predicate_count']).to eq 15
         expect(results['results']['predicates'].count).to eq 15
@@ -619,7 +635,9 @@ describe Qa::LinkedDataTermsController, type: :controller do
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Hash
         expect(results.keys).to match_array ['performance', 'results']
-        expect(results['performance'].keys).to match_array ['predicate_count', 'fetch_time_s', 'normalization_time_s', 'total_time_s']
+        expect(results['performance'].keys).to match_array ['predicate_count', 'fetch_time_s', 'normalization_time_s',
+                                                            'fetched_bytes', 'normalized_bytes', 'fetch_bytes_per_s',
+                                                            'normalization_bytes_per_s', 'total_time_s']
         expect(results['performance']['total_time_s']).to eq results['performance']['fetch_time_s'] + results['performance']['normalization_time_s']
         expect(results['performance']['predicate_count']).to eq 7
         expect(results['results']['predicates'].count).to eq 7

data/spec/fixtures/lod_loc_term_bad_id.rdf.xml

@@ -0,0 +1,68 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <madsrdf:Topic rdf:about="http://id.loc.gov/authorities/subjects/sh1234" xmlns:madsrdf="http://www.loc.gov/mads/rdf/v1#">
+    <rdf:type rdf:resource="http://www.loc.gov/mads/rdf/v1#Authority"/>
+    <madsrdf:authoritativeLabel xml:lang="en">More Science</madsrdf:authoritativeLabel>
+    <madsrdf:elementList rdf:parseType="Collection">
+      <madsrdf:TopicElement>
+	<madsrdf:elementValue xml:lang="en">More Science</madsrdf:elementValue>
+      </madsrdf:TopicElement>
+    </madsrdf:elementList>
+    <madsrdf:hasVariant>
+      <madsrdf:Topic>
+	<rdf:type rdf:resource="http://www.loc.gov/mads/rdf/v1#Variant"/>
+	<madsrdf:variantLabel xml:lang="en">More Natural science</madsrdf:variantLabel>
+	<madsrdf:elementList rdf:parseType="Collection">
+	  <madsrdf:TopicElement>
+	    <madsrdf:elementValue xml:lang="en">More Natural science</madsrdf:elementValue>
+	  </madsrdf:TopicElement>
+	</madsrdf:elementList>
+      </madsrdf:Topic>
+    </madsrdf:hasVariant>
+    <madsrdf:hasVariant>
+      <madsrdf:Topic>
+	<rdf:type rdf:resource="http://www.loc.gov/mads/rdf/v1#Variant"/>
+	<madsrdf:variantLabel xml:lang="en">More Science of science</madsrdf:variantLabel>
+	<madsrdf:elementList rdf:parseType="Collection">
+	  <madsrdf:TopicElement>
+	    <madsrdf:elementValue xml:lang="en">More Science of science</madsrdf:elementValue>
+	  </madsrdf:TopicElement>
+	</madsrdf:elementList>
+      </madsrdf:Topic>
+    </madsrdf:hasVariant>
+    <madsrdf:hasVariant>
+      <madsrdf:Topic>
+	<rdf:type rdf:resource="http://www.loc.gov/mads/rdf/v1#Variant"/>
+	<madsrdf:variantLabel xml:lang="en">More Sciences</madsrdf:variantLabel>
+	<madsrdf:elementList rdf:parseType="Collection">
+	  <madsrdf:TopicElement>
+	    <madsrdf:elementValue xml:lang="en">More Sciences</madsrdf:elementValue>
+	  </madsrdf:TopicElement>
+	</madsrdf:elementList>
+      </madsrdf:Topic>
+    </madsrdf:hasVariant>
+    <identifiers:lccn xmlns:identifiers="http://id.loc.gov/vocabulary/identifiers/">BAD ID sh 1234</identifiers:lccn>
+    <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
+    <skos:prefLabel xml:lang="en" xmlns:skos="http://www.w3.org/2004/02/skos/core#">More Science</skos:prefLabel>
+    <skosxl:altLabel xmlns:skosxl="http://www.w3.org/2008/05/skos-xl#">
+      <rdf:Description>
+	<rdf:type rdf:resource="http://www.w3.org/2008/05/skos-xl#Label"/>
+	<skosxl:literalForm xml:lang="en">More Natural science</skosxl:literalForm>
+      </rdf:Description>
+    </skosxl:altLabel>
+    <skosxl:altLabel xmlns:skosxl="http://www.w3.org/2008/05/skos-xl#">
+      <rdf:Description>
+	<rdf:type rdf:resource="http://www.w3.org/2008/05/skos-xl#Label"/>
+	<skosxl:literalForm xml:lang="en">More Science of science</skosxl:literalForm>
+      </rdf:Description>
+    </skosxl:altLabel>
+    <skosxl:altLabel xmlns:skosxl="http://www.w3.org/2008/05/skos-xl#">
+      <rdf:Description>
+	<rdf:type rdf:resource="http://www.w3.org/2008/05/skos-xl#Label"/>
+	<skosxl:literalForm xml:lang="en">More Sciences</skosxl:literalForm>
+      </rdf:Description>
+    </skosxl:altLabel>
+    <skos:altLabel xml:lang="en" xmlns:skos="http://www.w3.org/2004/02/skos/core#">More Natural science</skos:altLabel>
+    <skos:altLabel xml:lang="en" xmlns:skos="http://www.w3.org/2004/02/skos/core#">More Science of science</skos:altLabel>
+    <skos:altLabel xml:lang="en" xmlns:skos="http://www.w3.org/2004/02/skos/core#">More Sciences</skos:altLabel>
+  </madsrdf:Topic>
+</rdf:RDF>

data/spec/fixtures/lod_oclc_term_bad_id.nt

@@ -0,0 +1,4 @@
+<http://id.worldcat.org/fast/530369> <http://purl.org/dc/terms/identifier> "BAD_ID 530369" .
+<http://id.worldcat.org/fast/530369> <http://www.w3.org/2004/02/skos/core#prefLabel> "Cornell University" .
+<http://id.worldcat.org/fast/530369> <http://www.w3.org/2004/02/skos/core#altLabel> "Ithaca (N.Y.). Cornell University" .
+<http://id.worldcat.org/fast/530369> <http://www.w3.org/2004/02/skos/core#sameAs> <http://id.loc.gov/authorities/names/n79021621> .

data/spec/lib/authorities/linked_data/find_term_spec.rb

@@ -28,7 +28,9 @@ RSpec.describe Qa::Authorities::LinkedData::FindTerm do
         end
         it 'includes performance in return hash' do
           expect(results.keys).to match_array [:performance, :results]
-          expect(results[:performance].keys).to match_array [:predicate_count, :fetch_time_s, :normalization_time_s, :total_time_s]
+          expect(results[:performance].keys).to match_array [:predicate_count, :fetch_time_s, :normalization_time_s,
+                                                             :fetched_bytes, :normalized_bytes, :fetch_bytes_per_s,
+                                                             :normalization_bytes_per_s, :total_time_s]
           expect(results[:performance][:predicate_count]).to eq 7
           expect(results[:performance][:total_time_s]).to eq results[:performance][:fetch_time_s] + results[:performance][:normalization_time_s]
         end
@@ -90,90 +92,145 @@ RSpec.describe Qa::Authorities::LinkedData::FindTerm do
             .to include('Cornell University', 'Ithaca (N.Y.). Cornell University', "Kornel\\xCA\\xB9skii universitet",
                         "K\\xCA\\xBBang-nai-erh ta hs\\xC3\\xBCeh")
         end
+
+        context "ID in graph doesn't match ID in request URI" do
+          before do
+            stub_request(:get, 'http://id.worldcat.org/fast/530369')
+              .to_return(status: 200, body: webmock_fixture('lod_oclc_term_bad_id.nt'), headers: { 'Content-Type' => 'application/ntriples' })
+          end
+
+          it 'raises DataNormalizationError' do
+            expect { lod_oclc.find('530369') }.to raise_error Qa::DataNormalizationError, "Unable to extract URI based on ID: 530369"
+          end
+        end
       end
     end
 
     context 'in LOC authority' do
       context 'term found' do
-        before do
-          stub_request(:get, 'http://id.loc.gov/authorities/subjects/sh85118553')
-            .to_return(status: 200, body: webmock_fixture('lod_loc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
-          stub_request(:get, 'http://id.loc.gov/authorities/subjects/sh1234')
-            .to_return(status: 200, body: webmock_fixture('lod_loc_second_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
-        end
+        context 'when id requires special processing for <blank> in id' do
+          before do
+            stub_request(:get, 'http://id.loc.gov/authorities/subjects/sh85118553')
+              .to_return(status: 200, body: webmock_fixture('lod_loc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
+          end
 
-        let(:results) { lod_loc.find('sh 85118553', subauth: 'subjects') }
-        let(:second_results) { lod_loc.find('sh 1234', subauth: 'subjects') }
-        let(:results_without_blank) { lod_loc.find('sh85118553', subauth: 'subjects') }
+          let(:results) { lod_loc.find('sh 85118553', subauth: 'subjects') }
 
-        it 'has correct primary predicate values' do
-          expect(results[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh85118553'
-          expect(results[:uri]).to be_kind_of String
-          expect(results[:id]).to eq 'sh 85118553'
-          expect(results[:label]).to eq ['Science']
-          expect(results[:altlabel]).to include('Natural science', 'Science of science', 'Sciences')
-          expect(results[:narrower]).to include('http://id.loc.gov/authorities/subjects/sh92004048')
-          expect(results[:narrower].first).to be_kind_of String
-        end
+          it 'has correct primary predicate values' do
+            expect(results[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh85118553'
+            expect(results[:uri]).to be_kind_of String
+            expect(results[:id]).to eq 'sh 85118553'
+            expect(results[:label]).to eq ['Science']
+            expect(results[:altlabel]).to include('Natural science', 'Science of science', 'Sciences')
+            expect(results[:narrower]).to include('http://id.loc.gov/authorities/subjects/sh92004048')
+            expect(results[:narrower].first).to be_kind_of String
+          end
 
-        it 'has correct number of predicates in pred-obj list' do
-          expect(results['predicates'].count).to eq 15
-        end
+          it 'has correct number of predicates in pred-obj list' do
+            expect(results['predicates'].count).to eq 15
+          end
 
-        it 'has primary predicates in pred-obj list' do
-          expect(results['predicates']['http://id.loc.gov/vocabulary/identifiers/lccn']).to eq ['sh 85118553']
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#authoritativeLabel']).to eq ['Science']
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#prefLabel']).to eq ['Science']
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#altLabel']).to include('Natural science', 'Science of science', 'Sciences')
+          it 'has primary predicates in pred-obj list' do
+            expect(results['predicates']['http://id.loc.gov/vocabulary/identifiers/lccn']).to eq ['sh 85118553']
+            expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#authoritativeLabel']).to eq ['Science']
+            expect(results['predicates']['http://www.w3.org/2004/02/skos/core#prefLabel']).to eq ['Science']
+            expect(results['predicates']['http://www.w3.org/2004/02/skos/core#altLabel']).to include('Natural science', 'Science of science', 'Sciences')
+          end
+
+          it 'has loc mads predicate values' do
+            expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#classification']).to eq ['Q']
+            expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#isMemberOfMADSCollection'])
+              .to include('http://id.loc.gov/authorities/subjects/collection_LCSHAuthorizedHeadings',
+                          'http://id.loc.gov/authorities/subjects/collection_LCSH_General',
+                          'http://id.loc.gov/authorities/subjects/collection_SubdivideGeographically')
+            expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#hasCloseExternalAuthority'])
+              .to include('http://data.bnf.fr/ark:/12148/cb12321484k', 'http://data.bnf.fr/ark:/12148/cb119673416',
+                          'http://data.bnf.fr/ark:/12148/cb119934236', 'http://data.bnf.fr/ark:/12148/cb12062047t',
+                          'http://data.bnf.fr/ark:/12148/cb119469567', 'http://data.bnf.fr/ark:/12148/cb11933232c',
+                          'http://data.bnf.fr/ark:/12148/cb122890536', 'http://data.bnf.fr/ark:/12148/cb121155321',
+                          'http://data.bnf.fr/ark:/12148/cb15556043g', 'http://data.bnf.fr/ark:/12148/cb123662513',
+                          'http://d-nb.info/gnd/4066562-8', 'http://data.bnf.fr/ark:/12148/cb120745812',
+                          'http://data.bnf.fr/ark:/12148/cb11973101n', 'http://data.bnf.fr/ark:/12148/cb13328497r')
+            expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#isMemberOfMADSScheme'])
+              .to eq ['http://id.loc.gov/authorities/subjects']
+            expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#editorialNote'])
+              .to eq ['headings beginning with the word [Scientific;] and subdivision [Science] under ethnic groups and individual wars, e.g. [World War, 1939-1945--Science]']
+          end
+
+          it 'has more unspecified predicate values' do
+            expect(results['predicates']['http://www.w3.org/1999/02/22-rdf-syntax-ns#type']).to include('http://www.loc.gov/mads/rdf/v1#Topic', 'http://www.loc.gov/mads/rdf/v1#Authority', 'http://www.w3.org/2004/02/skos/core#Concept')
+            expect(results['predicates']['http://www.w3.org/2002/07/owl#sameAs']).to include('info:lc/authorities/sh85118553', 'http://id.loc.gov/authorities/sh85118553#concept')
+            expect(results['predicates']['http://www.w3.org/2004/02/skos/core#closeMatch'])
+              .to include('http://data.bnf.fr/ark:/12148/cb12321484k', 'http://data.bnf.fr/ark:/12148/cb119673416',
+                          'http://data.bnf.fr/ark:/12148/cb119934236', 'http://data.bnf.fr/ark:/12148/cb12062047t',
+                          'http://data.bnf.fr/ark:/12148/cb119469567', 'http://data.bnf.fr/ark:/12148/cb11933232c',
+                          'http://data.bnf.fr/ark:/12148/cb122890536', 'http://data.bnf.fr/ark:/12148/cb121155321',
+                          'http://data.bnf.fr/ark:/12148/cb15556043g', 'http://data.bnf.fr/ark:/12148/cb123662513',
+                          'http://d-nb.info/gnd/4066562-8', 'http://data.bnf.fr/ark:/12148/cb120745812',
+                          'http://data.bnf.fr/ark:/12148/cb11973101n', 'http://data.bnf.fr/ark:/12148/cb13328497r')
+            expect(results['predicates']['http://www.w3.org/2004/02/skos/core#editorial'])
+              .to eq ['headings beginning with the word [Scientific;] and subdivision [Science] under ethnic groups and individual wars, e.g. [World War, 1939-1945--Science]']
+            expect(results['predicates']['http://www.w3.org/2004/02/skos/core#inScheme']).to eq ['http://id.loc.gov/authorities/subjects']
+          end
         end
 
-        it 'has loc mads predicate values' do
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#classification']).to eq ['Q']
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#isMemberOfMADSCollection'])
-            .to include('http://id.loc.gov/authorities/subjects/collection_LCSHAuthorizedHeadings',
-                        'http://id.loc.gov/authorities/subjects/collection_LCSH_General',
-                        'http://id.loc.gov/authorities/subjects/collection_SubdivideGeographically')
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#hasCloseExternalAuthority'])
-            .to include('http://data.bnf.fr/ark:/12148/cb12321484k', 'http://data.bnf.fr/ark:/12148/cb119673416',
-                        'http://data.bnf.fr/ark:/12148/cb119934236', 'http://data.bnf.fr/ark:/12148/cb12062047t',
-                        'http://data.bnf.fr/ark:/12148/cb119469567', 'http://data.bnf.fr/ark:/12148/cb11933232c',
-                        'http://data.bnf.fr/ark:/12148/cb122890536', 'http://data.bnf.fr/ark:/12148/cb121155321',
-                        'http://data.bnf.fr/ark:/12148/cb15556043g', 'http://data.bnf.fr/ark:/12148/cb123662513',
-                        'http://d-nb.info/gnd/4066562-8', 'http://data.bnf.fr/ark:/12148/cb120745812',
-                        'http://data.bnf.fr/ark:/12148/cb11973101n', 'http://data.bnf.fr/ark:/12148/cb13328497r')
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#isMemberOfMADSScheme'])
-            .to eq ['http://id.loc.gov/authorities/subjects']
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#editorialNote'])
-            .to eq ['headings beginning with the word [Scientific;] and subdivision [Science] under ethnic groups and individual wars, e.g. [World War, 1939-1945--Science]']
+        context 'when multiple requests are made' do
+          before do
+            stub_request(:get, 'http://id.loc.gov/authorities/subjects/sh85118553')
+              .to_return(status: 200, body: webmock_fixture('lod_loc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
+            stub_request(:get, 'http://id.loc.gov/authorities/subjects/sh1234')
+              .to_return(status: 200, body: webmock_fixture('lod_loc_second_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
+          end
+
+          let(:results) { lod_loc.find('sh 85118553', subauth: 'subjects') }
+          let(:second_results) { lod_loc.find('sh 1234', subauth: 'subjects') }
+
+          it 'has correct primary predicate values for second request' do
+            expect(results[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh85118553'
+            expect(second_results[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh1234'
+            expect(second_results[:uri]).to be_kind_of String
+            expect(second_results[:id]).to eq 'sh 1234'
+            expect(second_results[:label]).to eq ['More Science']
+            expect(second_results[:altlabel]).to include('More Natural science', 'More Science of science', 'More Sciences')
+          end
         end
 
-        it 'has more unspecified predicate values' do
-          expect(results['predicates']['http://www.w3.org/1999/02/22-rdf-syntax-ns#type']).to include('http://www.loc.gov/mads/rdf/v1#Topic', 'http://www.loc.gov/mads/rdf/v1#Authority', 'http://www.w3.org/2004/02/skos/core#Concept')
-          expect(results['predicates']['http://www.w3.org/2002/07/owl#sameAs']).to include('info:lc/authorities/sh85118553', 'http://id.loc.gov/authorities/sh85118553#concept')
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#closeMatch'])
-            .to include('http://data.bnf.fr/ark:/12148/cb12321484k', 'http://data.bnf.fr/ark:/12148/cb119673416',
-                        'http://data.bnf.fr/ark:/12148/cb119934236', 'http://data.bnf.fr/ark:/12148/cb12062047t',
-                        'http://data.bnf.fr/ark:/12148/cb119469567', 'http://data.bnf.fr/ark:/12148/cb11933232c',
-                        'http://data.bnf.fr/ark:/12148/cb122890536', 'http://data.bnf.fr/ark:/12148/cb121155321',
-                        'http://data.bnf.fr/ark:/12148/cb15556043g', 'http://data.bnf.fr/ark:/12148/cb123662513',
-                        'http://d-nb.info/gnd/4066562-8', 'http://data.bnf.fr/ark:/12148/cb120745812',
-                        'http://data.bnf.fr/ark:/12148/cb11973101n', 'http://data.bnf.fr/ark:/12148/cb13328497r')
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#editorial'])
-            .to eq ['headings beginning with the word [Scientific;] and subdivision [Science] under ethnic groups and individual wars, e.g. [World War, 1939-1945--Science]']
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#inScheme']).to eq ['http://id.loc.gov/authorities/subjects']
+        context 'when id does not have a <blank>' do
+          before do
+            stub_request(:get, 'http://id.loc.gov/authorities/subjects/sh85118553')
+              .to_return(status: 200, body: webmock_fixture('lod_loc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
+          end
+
+          let(:results_without_blank) { lod_loc.find('sh85118553', subauth: 'subjects') }
+
+          it 'extracts correct uri' do
+            expect(results_without_blank[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh85118553'
+          end
         end
 
-        it 'has correct primary predicate values for second request' do
-          expect(results[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh85118553'
-          expect(second_results[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh1234'
-          expect(second_results[:uri]).to be_kind_of String
-          expect(second_results[:id]).to eq 'sh 1234'
-          expect(second_results[:label]).to eq ['More Science']
-          expect(second_results[:altlabel]).to include('More Natural science', 'More Science of science', 'More Sciences')
+        context "ID in graph doesn't match ID in request URI" do
+          before do
+            stub_request(:get, 'http://id.loc.gov/authorities/subjects/sh85118553')
+              .to_return(status: 200, body: webmock_fixture('lod_loc_term_bad_id.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
+          end
+
+          it 'raises DataNormalizationError' do
+            expect { lod_loc.find('sh85118553', subauth: 'subjects') }.to raise_error Qa::DataNormalizationError, "Unable to extract URI based on ID: sh85118553"
+          end
         end
 
-        it 'extracts correct uri when loc id does not have blank' do
-          expect(results_without_blank[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh85118553'
+        context 'when alternate authority name is used to access loc' do
+          before do
+            stub_request(:get, 'http://id.loc.gov/authorities/subjects/sh85118553')
+              .to_return(status: 200, body: webmock_fixture('lod_loc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
+            allow(lod_loc.term_config).to receive(:authority_name).and_return('ALT_LOC_AUTHORITY')
+          end
+
+          let(:results) { lod_loc.find('sh 85118553', subauth: 'subjects') }
+
+          it 'does special processing to remove blank from id' do
+            expect(results[:uri]).to eq 'http://id.loc.gov/authorities/subjects/sh85118553'
+          end
         end
       end
     end

data/spec/lib/authorities/linked_data/search_query_spec.rb

@@ -16,7 +16,9 @@ RSpec.describe Qa::Authorities::LinkedData::SearchQuery do
         it 'includes performance in return hash' do
           expect(results).to be_kind_of Hash
           expect(results.keys).to match_array [:performance, :results]
-          expect(results[:performance].keys).to match_array [:result_count, :fetch_time_s, :normalization_time_s, :total_time_s]
+          expect(results[:performance].keys).to match_array [:result_count, :fetch_time_s, :normalization_time_s,
+                                                             :fetched_bytes, :normalized_bytes, :fetch_bytes_per_s,
+                                                             :normalization_bytes_per_s, :total_time_s]
           expect(results[:performance][:total_time_s]).to eq results[:performance][:fetch_time_s] + results[:performance][:normalization_time_s]
           expect(results[:performance][:result_count]).to eq 3
           expect(results[:results].count).to eq 3

data/spec/lib/authorities/linked_data/term_config_spec.rb

@@ -6,6 +6,7 @@ describe Qa::Authorities::LinkedData::TermConfig do
   let(:min_config) { Qa::Authorities::LinkedData::Config.new(:LOD_MIN_CONFIG).term }
   let(:search_only_config) { Qa::Authorities::LinkedData::Config.new(:LOD_SEARCH_ONLY_CONFIG).term }
   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
     {
@@ -201,17 +202,30 @@ describe Qa::Authorities::LinkedData::TermConfig do
     it 'returns nil if only search configuration is defined' do
       expect(search_only_config.term_results).to eq nil
     end
-    it 'returns hash of predicates' do
+    it 'returns hash of predicates or ldpaths' do
       expect(full_config.term_results).to eq results_config
     end
   end
 
-  describe '#term_results_id_predicate' do
+  describe '#term_results_id_predicates' do
     it 'returns nil if only search configuration is defined' do
-      expect(search_only_config.term_results_id_predicate).to eq nil
+      expect(search_only_config.term_results_id_predicates).to eq []
     end
-    it 'returns the predicate that holds the ID in term results' do
-      expect(full_config.term_results_id_predicate).to eq RDF::URI('http://purl.org/dc/terms/identifier')
+    it 'returns array of one predicates when only one defined' do
+      expect(full_config.term_results_id_predicates).to eq [RDF::URI('http://purl.org/dc/terms/identifier')]
+    end
+    it 'returns array of multiple predicates when ldpath specifies more than one path' do
+      expect(loc_config.term_results_id_predicates).to match_array [RDF::URI('http://id.loc.gov/vocabulary/identifiers/lccn'),
+                                                                    RDF::URI('http://www.loc.gov/mads/rdf/v1#code')]
+    end
+    it 'returns array of predicates when prefix is one of the ldpath gem predefined prefixes' do
+      allow(full_config).to receive(:prefixes).and_return({})
+      allow(full_config).to receive(:term_results).and_return(id_ldpath: 'dc:identifier')
+      expect(full_config.term_results_id_predicates).to eq [RDF::URI('http://purl.org/dc/elements/1.1/identifier')]
+    end
+    it 'raises an error if predicate prefix is not defined' do
+      allow(loc_config).to receive(:prefixes).and_return({})
+      expect { loc_config.term_results_id_predicates }.to raise_error Qa::InvalidConfiguration, "Prefix 'loc' is not defined in term configuration for authority LOC"
     end
   end
 
@@ -266,7 +280,7 @@ describe Qa::Authorities::LinkedData::TermConfig do
     it 'returns nil if only search configuration is defined' do
       expect(search_only_config.term_results_altlabel_ldpath).to eq nil
     end
-    it 'return nil if altlabel predicate is not defined' do
+    it 'return nil if altlabel ldpath is not defined' do
       expect(min_config.term_results_altlabel_ldpath).to eq nil
     end
 
@@ -294,7 +308,7 @@ describe Qa::Authorities::LinkedData::TermConfig do
     it 'returns nil if only search configuration is defined' do
       expect(search_only_config.term_results_broader_ldpath).to eq nil
     end
-    it 'return nil if broader predicate is not defined' do
+    it 'return nil if broader ldpath is not defined' do
       expect(min_config.term_results_broader_ldpath).to eq nil
     end
 
@@ -322,7 +336,7 @@ describe Qa::Authorities::LinkedData::TermConfig do
     it 'returns nil if only search configuration is defined' do
       expect(search_only_config.term_results_narrower_ldpath).to eq nil
     end
-    it 'return nil if narrower predicate is not defined' do
+    it 'return nil if narrower ldpath is not defined' do
       expect(min_config.term_results_narrower_ldpath).to eq nil
     end
 
@@ -350,7 +364,7 @@ describe Qa::Authorities::LinkedData::TermConfig do
     it 'returns nil if only search configuration is defined' do
       expect(search_only_config.term_results_sameas_ldpath).to eq nil
     end
-    it 'return nil if sameas predicate is not defined' do
+    it 'return nil if sameas ldpath is not defined' do
       expect(min_config.term_results_sameas_ldpath).to eq nil
     end
 

data/spec/lib/configuration_spec.rb

@@ -76,14 +76,52 @@ RSpec.describe Qa::Configuration do
       end
     end
 
-    context 'when configured' do
+    context 'when configured as true' do
+      before do
+        subject.limit_ldpath_to_context = true
+      end
+
+      it 'returns true' do
+        expect(subject.limit_ldpath_to_context?).to be true
+      end
+    end
+
+    context 'when configured as false' do
       before do
         subject.limit_ldpath_to_context = false
       end
 
-      it 'returns the configured value' do
+      it 'returns false' do
         expect(subject.limit_ldpath_to_context?).to be false
       end
     end
   end
+
+  describe '#property_map_default_for_optional' do
+    context 'when NOT configured' do
+      it 'returns false' do
+        expect(subject.property_map_default_for_optional).to be false
+      end
+    end
+
+    context 'when configured as true' do
+      before do
+        subject.property_map_default_for_optional = true
+      end
+
+      it 'returns the true' do
+        expect(subject.property_map_default_for_optional).to be true
+      end
+    end
+
+    context 'when configured as false' do
+      before do
+        subject.property_map_default_for_optional = false
+      end
+
+      it 'returns false' do
+        expect(subject.property_map_default_for_optional).to be false
+      end
+    end
+  end
 end

data/spec/models/linked_data/config/context_property_map_spec.rb

@@ -109,6 +109,43 @@ RSpec.describe Qa::LinkedData::Config::ContextPropertyMap do
     end
   end
 
+  describe '#optional?' do
+    context 'when map has optional: true' do
+      before { property_map[:optional] = true }
+
+      it 'returns true' do
+        expect(subject.optional?).to be true
+      end
+    end
+
+    context 'when map has optional: false' do
+      before { property_map[:optional] = false }
+
+      it 'returns false' do
+        expect(subject.optional?).to be false
+      end
+    end
+
+    context 'when optional: is not defined in the map' do
+      before { property_map.delete(:optional) }
+
+      context 'and property_map_default_for_optional is true' do
+        before { allow(Qa.config).to receive(:property_map_default_for_optional).and_return(true) }
+        it 'returns true' do
+          Qa.config.property_map_default_for_optional = true
+          expect(subject.optional?).to be true
+        end
+      end
+
+      context 'and property_map_default_for_optional is false' do
+        before { allow(Qa.config).to receive(:property_map_default_for_optional).and_return(false) }
+        it 'returns false' do
+          expect(subject.optional?).to be false
+        end
+      end
+    end
+  end
+
   describe '#label' do
     context 'when map defines property_label_i18n key' do
       context 'and i18n translation is defined in locales' do

data/spec/services/linked_data/ldpath_service_spec.rb

@@ -58,4 +58,13 @@ RSpec.describe Qa::LinkedData::LdpathService do
       end
     end
   end
+
+  describe '.predefined_prefixes' do
+    subject { described_class.predefined_prefixes }
+    it 'includes prefixes defined by ldpath' do
+      # only checking for a few prefixes as opposed to the entire list since the gem may expand the list
+      expect(subject.keys).to include("rdf", "rdfs", "owl", "skos", "dc")
+      expect(subject[:rdf]).to be_present
+    end
+  end
 end

data/spec/services/linked_data/mapper/context_mapper_service_spec.rb

@@ -7,17 +7,19 @@ RSpec.describe Qa::LinkedData::Mapper::ContextMapperService do
   let(:context_map) { instance_double(Qa::LinkedData::Config::ContextMap) }
   let(:subject_uri) { instance_double(RDF::URI) }
 
-  let(:context_properties) { [birth_date_property_map, death_date_property_map, occupation_property_map] }
+  let(:context_properties) { [birth_date_property_map, death_date_property_map, occupation_property_map, missing_property_map] }
 
   let(:birth_date_property_map) { instance_double(Qa::LinkedData::Config::ContextPropertyMap) }
   let(:death_date_property_map) { instance_double(Qa::LinkedData::Config::ContextPropertyMap) }
   let(:occupation_property_map) { instance_double(Qa::LinkedData::Config::ContextPropertyMap) }
+  let(:missing_property_map)    { instance_double(Qa::LinkedData::Config::ContextPropertyMap) }
 
   let(:group_id) { 'dates' }
 
   let(:birth_date_values) { ['10/15/1943'] }
   let(:death_date_values) { ['12/17/2018'] }
   let(:occupation_values) { ['Actress', 'Director', 'Producer'] }
+  let(:missing_values) { [] }
 
   before do
     allow(context_map).to receive(:properties).and_return(context_properties)
@@ -29,6 +31,7 @@ RSpec.describe Qa::LinkedData::Mapper::ContextMapperService do
     allow(birth_date_property_map).to receive(:selectable?).and_return(false)
     allow(birth_date_property_map).to receive(:drillable?).and_return(false)
     allow(birth_date_property_map).to receive(:expand_uri?).and_return(false)
+    allow(birth_date_property_map).to receive(:optional?).and_return(false)
 
     allow(death_date_property_map).to receive(:label).and_return('Death')
     allow(death_date_property_map).to receive(:values).with(graph, subject_uri).and_return(death_date_values)
@@ -36,6 +39,7 @@ RSpec.describe Qa::LinkedData::Mapper::ContextMapperService do
     allow(death_date_property_map).to receive(:selectable?).and_return(false)
     allow(death_date_property_map).to receive(:drillable?).and_return(false)
     allow(death_date_property_map).to receive(:expand_uri?).and_return(false)
+    allow(death_date_property_map).to receive(:optional?).and_return(false)
 
     allow(occupation_property_map).to receive(:label).and_return('Occupation')
     allow(occupation_property_map).to receive(:values).with(graph, subject_uri).and_return(occupation_values)
@@ -43,6 +47,15 @@ RSpec.describe Qa::LinkedData::Mapper::ContextMapperService do
     allow(occupation_property_map).to receive(:selectable?).and_return(false)
     allow(occupation_property_map).to receive(:drillable?).and_return(false)
     allow(occupation_property_map).to receive(:expand_uri?).and_return(false)
+    allow(occupation_property_map).to receive(:optional?).and_return(false)
+
+    allow(missing_property_map).to receive(:label).and_return('Property with NO values')
+    allow(missing_property_map).to receive(:values).with(graph, subject_uri).and_return(missing_values)
+    allow(missing_property_map).to receive(:group?).and_return(false)
+    allow(missing_property_map).to receive(:selectable?).and_return(false)
+    allow(missing_property_map).to receive(:drillable?).and_return(false)
+    allow(missing_property_map).to receive(:expand_uri?).and_return(false)
+    allow(missing_property_map).to receive(:optional?).and_return(true)
   end
 
   describe '.map_context' do
@@ -115,6 +128,21 @@ RSpec.describe Qa::LinkedData::Mapper::ContextMapperService do
       end
     end
 
+    context 'when optional? is false' do
+      before { allow(missing_property_map).to receive(:optional?).and_return(false) }
+      it 'includes property with blank values' do
+        result = find_property_to_test(subject, 'Property with NO values')
+        expect(result['values']).to eq []
+      end
+    end
+
+    context 'when optional? is true' do
+      before { allow(missing_property_map).to receive(:optional?).and_return(true) }
+      it 'property with blank values is not added to results' do
+        expect { find_property_to_test(subject, 'Property with NO values') }.to raise_error StandardError, "property 'Property with NO values' not found"
+      end
+    end
+
     context 'when error occurs' do
       let(:cause) { I18n.t('qa.linked_data.ldpath.parse_error') }
       before { allow(occupation_property_map).to receive(:values).with(graph, subject_uri).and_raise(cause) }
@@ -132,6 +160,6 @@ RSpec.describe Qa::LinkedData::Mapper::ContextMapperService do
       next unless r['property'] == label
       return r
     end
-    raise "property (#{label}) to test not found"
+    raise StandardError, "property '#{label}' not found"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -488,10 +488,12 @@ files:
 - spec/fixtures/lod_lang_term_enfrde.rdf.xml
 - spec/fixtures/lod_lang_term_fr.rdf.xml
 - spec/fixtures/lod_loc_second_term_found.rdf.xml
+- spec/fixtures/lod_loc_term_bad_id.rdf.xml
 - spec/fixtures/lod_loc_term_found.rdf.xml
 - spec/fixtures/lod_oclc_all_query_3_results.rdf.xml
 - spec/fixtures/lod_oclc_personalName_query_3_results.rdf.xml
 - spec/fixtures/lod_oclc_query_no_results.rdf.xml
+- spec/fixtures/lod_oclc_term_bad_id.nt
 - spec/fixtures/lod_oclc_term_found.rdf.xml
 - spec/fixtures/lod_search_with_blanknode_subjects.nt
 - spec/fixtures/lod_term_with_blanknode_objects.nt
@@ -627,6 +629,7 @@ test_files:
 - spec/fixtures/oclcts-response-mesh-3.txt
 - spec/fixtures/loc-names-response.txt
 - spec/fixtures/oclcts-response-mesh-2.txt
+- spec/fixtures/lod_loc_term_bad_id.rdf.xml
 - spec/fixtures/aat-response.txt
 - spec/fixtures/journals-result.json
 - spec/fixtures/discogs-search-response-no-subauth.json
@@ -696,6 +699,7 @@ test_files:
 - spec/fixtures/geonames-response.json
 - spec/fixtures/tgn-response.txt
 - spec/fixtures/lod_oclc_term_found.rdf.xml
+- spec/fixtures/lod_oclc_term_bad_id.nt
 - spec/fixtures/lod_search_with_blanknode_subjects.nt
 - spec/fixtures/assign-fast-noheader.json
 - spec/fixtures/lod_loc_second_term_found.rdf.xml