qa 4.0.0.rc2 → 4.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f973c50da7d6620ac328e37f5cdac7e57f272206
-  data.tar.gz: 94f2320009030be3a989feb19d78e2a5a3cc89b2
+  metadata.gz: de32b8faa17be4ebfa99c1bde6b357cacb1beb3f
+  data.tar.gz: 5b1a2952d54233aedad9d2981113ac99d3279106
 SHA512:
-  metadata.gz: 9b80b00632adfc5514009304394016012954cb7c5e4fe3b2cec4dcdf5b22140f88ff4c52c4c130271fdcfba04f11b6a5c18a941798ee077de99f96899f044bff
-  data.tar.gz: d50bc77a2dbe1368b691349252b5889e80b2a7c04c6c1ead788f1d5f7a8e03d40adb514bacb1cc67baeb100e9b7eb03cd40723d13e36266cf05422b4bfcf868d
+  metadata.gz: 6436875ac41e2da533c468342247b85e2964176779378df25f2a8faab7426538d3ff4975d10bd392952aa68cde811ac7b6defb9564f644a35a889087d5a1a433
+  data.tar.gz: c5e8c5375474db838240a77507e2d08255614c26243eddb8945c70d659b3a219e3859ab312b2c9eaa836fcb133d2c15e5d7fca515ff91b97630e65d28536e004

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

@@ -68,11 +68,15 @@ module Qa::Authorities
           preds = { label: label_pred_uri }
           preds[:uri] = :subject_uri
           preds[:altlabel] = search_config.results_altlabel_predicate unless search_config.results_altlabel_predicate.nil?
-          preds[:id] = search_config.results_id_predicate unless search_config.results_id_predicate.nil?
+          preds[:id] = id_predicate.present? ? id_predicate : :subject_uri
           preds[:sort] = sort_predicate.present? ? sort_predicate : preds[:label]
           preds
         end
 
+        def id_predicate
+          @id_predicate ||= search_config.results_id_predicate
+        end
+
         def sort_predicate
           @sort_predicate ||= search_config.results_sort_predicate
         end
@@ -86,7 +90,7 @@ module Qa::Authorities
         def convert_result_to_json(result)
           json_result = {}
           json_result[:uri] = result[:uri].first.to_s
-          json_result[:id] = result[:id].first.to_s
+          json_result[:id] = result[:id].any? ? result[:id].first.to_s : ""
           json_result[:label] = full_label(result[:label], result[:altlabel])
           json_result[:context] = result[:context] if context?
           json_result

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "4.0.0.rc2".freeze
+  VERSION = "4.0.0.rc3".freeze
 end

data/spec/fixtures/authorities/linked_data/lod_min_config.json

@@ -43,7 +43,6 @@
       "query": "query"
     },
     "results": {
-      "id_predicate":       "http://purl.org/dc/terms/identifier",
       "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel"
     }
   }

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

@@ -58,6 +58,21 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
       end
     end
 
+    context 'when id predicate is not specified' do
+      let(:min_authority) { described_class.new(:LOD_MIN_CONFIG) }
+      let :results do
+        stub_request(:get, 'http://localhost/test_default/search?query=peanuts')
+          .to_return(status: 200, body: webmock_fixture('lod_oclc_personalName_query_3_results.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
+        min_authority.search('peanuts')
+      end
+      it 'uses subject uri for id' do
+        expect(results.count).to eq(3)
+        expect(results.first).to eq(uri: 'http://id.worldcat.org/fast/409667', id: 'http://id.worldcat.org/fast/409667', label: 'Cornell, Ezra, 1807-1874')
+        expect(results.second).to eq(uri: 'http://id.worldcat.org/fast/5140', id: 'http://id.worldcat.org/fast/5140', label: 'Cornell, Joseph')
+        expect(results.third).to eq(uri: 'http://id.worldcat.org/fast/72456', id: 'http://id.worldcat.org/fast/72456', label: 'Cornell, Sarah Maria, 1802-1832')
+      end
+    end
+
     # context 'in LOC authority' do
     #   ###################################
     #   ### SEARCH NOT SUPPORTED BY LOC ###

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0.rc3
 platform: ruby
 authors:
 - Stephen Anderson