qa 5.5.1 → 5.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7205f6d228b7548f6dc39ce9781dd4b591d2f4c5e56d5b2bcc4189b3c9005f7e
-  data.tar.gz: 5cdce31ba635c298e5da88cfc01cc86237426a45a1b8ccf3095c316c1eb7b8f4
+  metadata.gz: 427d2d24aab8a8c5a9453dd96aa0f677143ec993f98efb098fdb772c5b5ba429
+  data.tar.gz: 7d71a7cfa524b2d12a7b657e11fc0144db1795b48c65690391fc81a5ec2f93af
 SHA512:
-  metadata.gz: 39259b1eb80bcaab90653152302e38b853d24ecf1ff9bb46ca16afe637a35fe53b7d4abcf85ee2cc7ee7550b57bb6e7505f558adb10792056ea5573d7607b025
-  data.tar.gz: 3a748c62a1aa1b05d0f0b768af0a03ea2d2c6918c892c40cfc7ab1fdb619866053fb272d16b20a3241b9024c5d1dde8521fde108c36e33b59d55037d5d618e96
+  metadata.gz: c5c375b7b54a7e08f7eff73a473542d36a748ebb0298bad65a91b06177479861d762cdf79d08c72a453fa44df8b94094524bd94a03105bbeb3975873e4a299bc
+  data.tar.gz: 205775aa62254267b41f07f6bb3ec5b7f5d5a5f684a70742182b6edc3e77eb406066d6ce829b61f24780d624b7d609fe75832b844bca7e9bf8d2051cfa00517e

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

@@ -29,7 +29,7 @@ module Qa
           end
 
           def combined_substitutions(action_config, action, action_request, request_header)
-            substitutions = request_header.fetch(:replacements, {})
+            substitutions = request_header.fetch(:replacements, {}).clone
             substitutions[action_request_variable(action_config, action)] = action_request
             substitutions[action_subauth_variable(action_config)] = action_subauth_variable_value(action_config, request_header)
             substitutions[action_language_variable(action_config)] = language_value(action_config, request_header)

data/config/authorities/linked_data/oclc_fast.json

@@ -2,14 +2,13 @@
   "QA_CONFIG_VERSION": "2.1",
   "prefixes": {
     "dcterms": "http://purl.org/dc/terms/",
-    "skos": "http://www.w3.org/2004/02/skos/core#",
-    "schema": "http://schema.org/"
+    "schema":  "http://schema.org/"
   },
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type":    "IriTemplate",
-      "template": "http://id.worldcat.org/fast/{term_id}",
+      "template": "http://id.worldcat.org/fast/{term_id}.rdf.xml",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -35,14 +34,15 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://experimental.worldcat.org/fast/search?query={subauth}+all+%22{query}%22&sortKeys=usage&{?maximumRecords}",
+      "template": "http://experimental.worldcat.org/fast/search?query={subauth}+all+%22{query}%22&sortKeys=usage&maximumRecords={maximumRecords}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
           "@type": "IriTemplateMapping",
           "variable": "query",
           "property": "hydra:freetextQuery",
-          "required": true
+          "required": true,
+          "encode": true
         },
         {
           "@type": "IriTemplateMapping",

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "5.5.1".freeze
+  VERSION = "5.5.2".freeze
 end

data/spec/controllers/linked_data_terms_controller_spec.rb

@@ -357,7 +357,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
     context 'producing internal server error' do
       context 'when server returns 500' do
         before do
-          stub_request(:get, 'http://id.worldcat.org/fast/530369').to_return(status: 500)
+          stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml').to_return(status: 500)
         end
         it 'returns 500' do
           expect(Rails.logger).to receive(:warn).with(graph_load_failure)
@@ -369,7 +369,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
 
       context 'when data normalization error' do
         before do
-          stub_request(:get, 'http://id.worldcat.org/fast/530369')
+          stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml')
             .to_return(status: 200, body: webmock_fixture('lod_oclc_term_bad_id.nt'), headers: { 'Content-Type' => 'application/ntriples' })
         end
         it 'returns 500' do
@@ -381,7 +381,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
 
       context 'when rdf format error' do
         before do
-          stub_request(:get, 'http://id.worldcat.org/fast/530369').to_return(status: 200)
+          stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml').to_return(status: 200)
           allow(RDF::Graph).to receive(:load).and_raise(RDF::FormatError)
         end
         it 'returns 500' do
@@ -395,7 +395,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
 
       context "when error isn't specifically handled" do
         before do
-          stub_request(:get, 'http://id.worldcat.org/fast/530369').to_return(status: 501)
+          stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml').to_return(status: 501)
         end
         it 'returns 500' do
           expect(Rails.logger).to receive(:warn).with(graph_load_failure)
@@ -408,7 +408,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
 
     context 'when service unavailable' do
       before do
-        stub_request(:get, 'http://id.worldcat.org/fast/530369').to_return(status: 503)
+        stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml').to_return(status: 503)
       end
       it 'returns 503' do
         expect(Rails.logger).to receive(:warn).with(graph_load_failure)
@@ -420,7 +420,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
 
     context 'when requested term is not found at the server' do
       before do
-        stub_request(:get, 'http://id.worldcat.org/fast/FAKE_ID').to_return(status: 404, body: '', headers: {})
+        stub_request(:get, 'http://id.worldcat.org/fast/FAKE_ID.rdf.xml').to_return(status: 404, body: '', headers: {})
       end
       it 'returns 404' do
         expect(Rails.logger).to receive(:warn).with(graph_load_failure)
@@ -433,7 +433,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
     context 'in OCLC_FAST authority' do
       context 'term found' do
         before do
-          stub_request(:get, 'http://id.worldcat.org/fast/530369')
+          stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml')
             .to_return(status: 200, body: webmock_fixture('lod_oclc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
         end
         it 'succeeds and defaults to json content type' do
@@ -481,7 +481,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
       context 'when cors headers are enabled' do
         before do
           Qa.config.enable_cors_headers
-          stub_request(:get, 'http://id.worldcat.org/fast/530369')
+          stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml')
             .to_return(status: 200, body: webmock_fixture('lod_oclc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
         end
         it 'Access-Control-Allow-Origin is *' do
@@ -493,7 +493,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
       context 'when cors headers are disabled' do
         before do
           Qa.config.disable_cors_headers
-          stub_request(:get, 'http://id.worldcat.org/fast/530369')
+          stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml')
             .to_return(status: 200, body: webmock_fixture('lod_oclc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
         end
         it 'Access-Control-Allow-Origin is not present' do

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

@@ -8,18 +8,18 @@ RSpec.describe Qa::Authorities::LinkedData::FindTerm do
     context 'basic parameter testing' do
       context 'with bad id' do
         before do
-          stub_request(:get, 'http://id.worldcat.org/fast/FAKE_ID')
+          stub_request(:get, 'http://id.worldcat.org/fast/FAKE_ID.rdf.xml')
             .to_return(status: 404, body: '', headers: {})
         end
         it 'raises a TermNotFound exception' do
-          expect { lod_oclc.find('FAKE_ID') }.to raise_error Qa::TermNotFound, /.*\/FAKE_ID\ Not Found - Term may not exist at LOD Authority./
+          expect { lod_oclc.find('FAKE_ID') }.to raise_error Qa::TermNotFound, /.*\/FAKE_ID.rdf.xml\ Not Found - Term may not exist at LOD Authority./
         end
       end
     end
 
     context 'performance stats' do
       before do
-        stub_request(:get, 'http://id.worldcat.org/fast/530369')
+        stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml')
           .to_return(status: 200, body: webmock_fixture('lod_oclc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
       end
       context 'when set to true' do
@@ -55,7 +55,7 @@ RSpec.describe Qa::Authorities::LinkedData::FindTerm do
 
     context 'response header' do
       before do
-        stub_request(:get, 'http://id.worldcat.org/fast/530369')
+        stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml')
           .to_return(status: 200, body: webmock_fixture('lod_oclc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
       end
       context 'when set to true' do
@@ -91,7 +91,7 @@ RSpec.describe Qa::Authorities::LinkedData::FindTerm do
     context 'in OCLC_FAST authority' do
       context 'term found' do
         let :results do
-          stub_request(:get, 'http://id.worldcat.org/fast/530369')
+          stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml')
             .to_return(status: 200, body: webmock_fixture('lod_oclc_term_found.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
           lod_oclc.find('530369')
         end
@@ -128,7 +128,7 @@ RSpec.describe Qa::Authorities::LinkedData::FindTerm do
 
         context "ID in graph doesn't match ID in request URI" do
           before do
-            stub_request(:get, 'http://id.worldcat.org/fast/530369')
+            stub_request(:get, 'http://id.worldcat.org/fast/530369.rdf.xml')
               .to_return(status: 200, body: webmock_fixture('lod_oclc_term_bad_id.nt'), headers: { 'Content-Type' => 'application/ntriples' })
           end
 

data/spec/services/linked_data/authority_url_service_spec.rb

@@ -83,16 +83,22 @@ RSpec.describe Qa::LinkedData::AuthorityUrlService do
           let(:action_request) { 'mark twain' }
 
           it 'returns template with substitutions' do
-            expected_url = 'http://experimental.worldcat.org/fast/search?query=oclc.personalName+all+%22mark twain%22&sortKeys=usage&maximumRecords=10'
+            expected_url = 'http://experimental.worldcat.org/fast/search?query=oclc.personalName+all+%22mark%20twain%22&sortKeys=usage&maximumRecords=10'
             expect(subject).to eq expected_url
           end
+
+          it 'does not mutate substitutions hash' do
+            before_substitutions = substitutions.clone
+            subject
+            expect(substitutions).to eq before_substitutions
+          end
         end
 
         context 'when no substitutions specified' do
           let(:action_request) { 'mark twain' }
 
           it 'returns template with substitutions' do
-            expected_url = 'http://experimental.worldcat.org/fast/search?query=cql.any+all+%22mark twain%22&sortKeys=usage&maximumRecords=20'
+            expected_url = 'http://experimental.worldcat.org/fast/search?query=cql.any+all+%22mark%20twain%22&sortKeys=usage&maximumRecords=20'
             expect(subject).to eq expected_url
           end
         end
@@ -104,7 +110,7 @@ RSpec.describe Qa::LinkedData::AuthorityUrlService do
         let(:action_request) { 'n79021164' }
 
         it 'returns template with substitutions' do
-          expected_url = 'http://id.worldcat.org/fast/n79021164'
+          expected_url = 'http://id.worldcat.org/fast/n79021164.rdf.xml'
           expect(subject).to eq expected_url
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.5.2
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import