qa 5.5.0 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73811a2b2371ead4042bab0a11e4b4b0f496e94eb6e92a2f6ddb550ac90f9d41
-  data.tar.gz: a8888e0db1aa46b562eaab6d45be5fd0de8df52ac9753189416a3ca0fc0d44a3
+  metadata.gz: 3fb01e5ca2c9435b8c22af76ace78a1486d2ad22ee54f0a8e1a40ba24b64e218
+  data.tar.gz: '0825479f37ac4eb299c944981fff9b670e8efd86eb8b05c3341f7d2a9300361c'
 SHA512:
-  metadata.gz: e4aaecb73516d38ddca2ed4dc61571aa1c70fc4fdedee75d4aa1a7763193147303b97124d4e858471508f09ba6adb6158fb63111c5f2ca817d4cf4ec7164690f
-  data.tar.gz: 9446f03eeaad6aa21890f97d4def246a6915f932f83b764a1bea2b6c9a818c8eb43c45f5d3b8b8235cd57d1efc59c4c08caab93fe1ed1ab5bea65d5a690f23cf
+  metadata.gz: 80792bf55b1f8cf6f7401657d7b7844fbeff0dbc4e4597e16869a63a65a6cf1e271d88d631bd0dd9f4f8dbcdda2caadac47974d8d282f21ee1696308022bb201
+  data.tar.gz: 7d700e24566d6047cb061731e941affa72d3c260eb7822c421421986127ddfd819f2d6d4cd1c968cd9e527b3276c392a7403564ebce8e5ee4210fb86863072d0

data/README.md

@@ -1,6 +1,6 @@
 # Questioning Authority
 
-Code: [![Gem Version](https://badge.fury.io/rb/qa.png)](http://badge.fury.io/rb/qa) [![Build Status](https://circleci.com/gh/samvera/questioning_authority.svg?style=svg)](https://circleci.com/gh/samvera/questioning_authority) [![Coverage Status](https://coveralls.io/repos/github/samvera/questioning_authority/badge.svg?branch=master)](https://coveralls.io/github/samvera/questioning_authority?branch=master)
+Code: [![Gem Version](https://badge.fury.io/rb/qa.png)](http://badge.fury.io/rb/qa) [![Build Status](https://circleci.com/gh/samvera/questioning_authority.svg?style=svg)](https://circleci.com/gh/samvera/questioning_authority) [![Coverage Status](https://coveralls.io/repos/github/samvera/questioning_authority/badge.svg?branch=main)](https://coveralls.io/github/samvera/questioning_authority?branch=main)
 
 Docs: [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md) [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 
@@ -145,6 +145,12 @@ rake ci
 
 Commit your features into a new branch and submit a pull request.
 
+## Contributing 
+
+If you're working on PR for this project, create a feature branch off of `main`. 
+
+This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) and [language recommendations](https://github.com/samvera/maintenance/blob/main/templates/CONTRIBUTING.md#language).  Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of this repository.
+
 ## Compatibility
 
 - Ruby 2.5 or the latest 2.4 version is recommended. Later versions may also work.
@@ -169,7 +175,7 @@ Questioning Authority is a Core Component of the Samvera community. The document
   github_changelog_generator --user samvera --project questioning_authority --token YOUR_GITHUB_TOKEN_HERE
   ```
 
-5. Commit these changes to the master branch
+5. Commit these changes to the main branch
 
 6. Run `rake release`
 

data/app/controllers/qa/terms_controller.rb

@@ -27,12 +27,21 @@ class Qa::TermsController < ::ApplicationController
   end
 
   # If the subauthority supports it, return all the information for a given term
+  # Expects id to be part of the request path (e.g. http://my.app/qa/show/auth/subauth/{:id})
   def show
     term = @authority.method(:find).arity == 2 ? @authority.find(params[:id], self) : @authority.find(params[:id])
     cors_allow_origin_header(response)
     render json: term, content_type: content_type_for_format
   end
 
+  # If the subauthority supports it, return all the information for a given term
+  # Expects uri to be a request parameter (e.g. http://my.app/qa/show/auth/subauth?uri={:uri})
+  def fetch
+    term = @authority.method(:find).arity == 2 ? @authority.find(params[:uri], self) : @authority.find(params[:uri])
+    cors_allow_origin_header(response)
+    render json: term, content_type: content_type_for_format
+  end
+
   def check_vocab_param
     return if params[:vocab].present?
     msg = "Required param 'vocab' is missing or empty"

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/config/routes.rb

@@ -9,6 +9,8 @@ Qa::Engine.routes.draw do
   get "/search/:vocab(/:subauthority)", controller: :terms, action: :search
   get "/show/:vocab/:id", controller: :terms, action: :show
   get "/show/:vocab/:subauthority/:id", controller: :terms, action: :show
+  get "/fetch/:vocab", controller: :terms, action: :fetch
+  get "/fetch/:vocab/:subauthority", controller: :terms, action: :fetch
 
   match "/search/linked_data/:vocab(/:subauthority)", to: 'application#options', via: [:options]
   match "/show/linked_data/:vocab/:id", to: 'application#options', via: [:options]
@@ -17,4 +19,6 @@ Qa::Engine.routes.draw do
   match "/search/:vocab(/:subauthority)", to: 'application#options', via: [:options]
   match "/show/:vocab/:id", to: 'application#options', via: [:options]
   match "/show/:vocab/:subauthority/:id", to: 'application#options', via: [:options]
+  match "/fetch/:vocab", to: 'application#options', via: [:options]
+  match "/fetch/:vocab/:subauthority", to: 'application#options', via: [:options]
 end

data/lib/qa/authorities/loc_subauthority.rb

@@ -70,18 +70,18 @@ module Qa::Authorities::LocSubauthority
   private
 
     def vocab_base_url
-      "cs%3Ahttps%3A%2F%2Fid.loc.gov%2Fvocabulary%2F"
+      "cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fvocabulary%2F"
     end
 
     def authority_base_url
-      "cs%3Ahttps%3A%2F%2Fid.loc.gov%2Fauthorities%2F"
+      "cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2F"
     end
 
     def datatype_base_url
-      "cs%3Ahttps%3A%2F%2Fid.loc.gov%2Fdatatypes%2F"
+      "cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fdatatypes%2F"
     end
 
     def vocab_preservation_base_url
-      "cs%3Ahttps%3A%2F%2Fid.loc.gov%2Fvocabulary%2Fpreservation%2F"
+      "cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fvocabulary%2Fpreservation%2F"
     end
 end

data/lib/qa/authorities/local/file_based_authority.rb

@@ -8,13 +8,14 @@ module Qa::Authorities
     def search(q)
       r = q.blank? ? [] : terms.select { |term| /\b#{q.downcase}/.match(term[:term].downcase) }
       r.map do |res|
-        { id: res[:id], label: res[:term] }.with_indifferent_access
+        { id: res[:id], label: res[:term], uri: res.fetch(:uri, nil) }.compact.with_indifferent_access
       end
     end
 
     def all
       terms.map do |res|
-        { id: res[:id], label: res[:term], active: res.fetch(:active, true) }.with_indifferent_access
+        { id: res[:id], label: res[:term], active: res.fetch(:active, true), uri: res.fetch(:uri, nil) }
+          .compact.with_indifferent_access
       end
     end
 

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "5.5.0".freeze
+  VERSION = "5.7.0".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/controllers/terms_controller_spec.rb

@@ -82,7 +82,7 @@ describe Qa::TermsController, type: :controller do
 
     context "loc" do
       before do
-        stub_request(:get, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:https://id.loc.gov/authorities/names")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-names-response.txt"), status: 200)
       end
@@ -253,4 +253,33 @@ describe Qa::TermsController, type: :controller do
       end
     end
   end
+
+  describe "#fetch" do
+    context "with supported authorities" do
+      it "returns an individual state term" do
+        get :fetch, params: { vocab: "local", subauthority: "authority_U", uri: "http://my.domain/terms/a2" }
+        expect(response).to be_successful
+      end
+
+      context 'when cors headers are enabled' do
+        before do
+          Qa.config.enable_cors_headers
+        end
+        it 'Access-Control-Allow-Origin is *' do
+          get :fetch, params: { vocab: "local", subauthority: "authority_U", uri: "http://my.domain/terms/a2" }
+          expect(response.headers['Access-Control-Allow-Origin']).to eq '*'
+        end
+      end
+
+      context 'when cors headers are disabled' do
+        before do
+          Qa.config.disable_cors_headers
+        end
+        it 'Access-Control-Allow-Origin is not present' do
+          get :fetch, params: { vocab: "local", subauthority: "authority_U", uri: "http://my.domain/terms/a2" }
+          expect(response.headers.key?('Access-Control-Allow-Origin')).to be false
+        end
+      end
+    end
+  end
 end

data/spec/fixtures/authorities/authority_U.yml

@@ -0,0 +1,13 @@
+:terms:
+    - :id: A1
+      :term: Abc Term A1
+      :uri: http://my.domain/terms/a1
+      :active: true
+    - :id: A2
+      :term: Term A2
+      :uri: http://my.domain/terms/a2
+      :active: false
+    - :id: A3
+      :term: Abc Term A3
+      :uri: http://my.domain/terms/a3
+      :active: true

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/lib/authorities/loc_spec.rb

@@ -28,7 +28,7 @@ describe Qa::Authorities::Loc do
     end
 
     context "for searching" do
-      let(:url) { 'https://id.loc.gov/search/?q=foo&q=cs%3Ahttps%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
+      let(:url) { 'https://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
       it "returns a url" do
         expect(authority.build_query_url("foo")).to eq(url)
       end
@@ -49,15 +49,15 @@ describe Qa::Authorities::Loc do
     end
 
     before do
-      stub_request(:get, "https://id.loc.gov/search/?format=json&q=cs:https://id.loc.gov/authorities/subjects")
+      stub_request(:get, "https://id.loc.gov/search/?format=json&q=cs:http://id.loc.gov/authorities/subjects")
         .with(headers: { 'Accept' => 'application/json' })
         .to_return(status: 200, body: "")
     end
 
     context "with flat params encoded" do
-      let(:url) { 'https://id.loc.gov/search/?q=foo&q=cs%3Ahttps%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
+      let(:url) { 'https://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
       it "returns a response" do
-        flat_params_url = "https://id.loc.gov/search/?format=json&q=foo&q=cs%3Ahttps%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects"
+        flat_params_url = "https://id.loc.gov/search/?format=json&q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects"
         expect(subject.env.url.to_s).to eq(flat_params_url)
       end
     end
@@ -66,7 +66,7 @@ describe Qa::Authorities::Loc do
   describe "#search" do
     context "any LOC authorities" do
       let :authority do
-        stub_request(:get, "https://id.loc.gov/search/?format=json&q=s&q=cs:https://id.loc.gov/vocabulary/geographicAreas")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=s&q=cs:http://id.loc.gov/vocabulary/geographicAreas")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-response.txt"), status: 200)
         described_class.subauthority_for("geographicAreas")
@@ -95,7 +95,7 @@ describe Qa::Authorities::Loc do
 
     context "subject terms" do
       let :results do
-        stub_request(:get, "https://id.loc.gov/search/?format=json&q=History--&q=cs:https://id.loc.gov/authorities/subjects")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=History--&q=cs:http://id.loc.gov/authorities/subjects")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-subjects-response.txt"), status: 200)
         described_class.subauthority_for("subjects").search("History--")
@@ -111,7 +111,7 @@ describe Qa::Authorities::Loc do
 
     context "name terms" do
       let :results do
-        stub_request(:get, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:https://id.loc.gov/authorities/names")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-names-response.txt"), status: 200)
         described_class.subauthority_for("names").search("Berry")

data/spec/lib/authorities/{file_based_authority_spec.rb → local/file_based_authority_spec.rb}

@@ -5,6 +5,7 @@ describe Qa::Authorities::Local::FileBasedAuthority do
   let(:authority_b) { Qa::Authorities::Local.subauthority_for("authority_B") }
   let(:authority_c) { Qa::Authorities::Local.subauthority_for("authority_C") }
   let(:authority_d) { Qa::Authorities::Local.subauthority_for("authority_D") }
+  let(:authority_u) { Qa::Authorities::Local.subauthority_for("authority_U") }
 
   describe "#all" do
     let(:expected) do
@@ -35,6 +36,16 @@ describe Qa::Authorities::Local::FileBasedAuthority do
         expect(authority_c.all).to eq(expected)
       end
     end
+    context "when terms have uris" do
+      let(:expected) do
+        [{ 'id' => "A1", 'label' => "Abc Term A1", 'active' => true, 'uri' => 'http://my.domain/terms/a1' },
+         { 'id' => "A2", 'label' => "Term A2", 'active' => false, 'uri' => 'http://my.domain/terms/a2' },
+         { 'id' => "A3", 'label' => "Abc Term A3", 'active' => true, 'uri' => 'http://my.domain/terms/a3' }]
+      end
+      it "sets the id to be same as the label" do
+        expect(authority_u.all).to eq(expected)
+      end
+    end
     context "YAML file is malformed" do
       it "raises an error" do
         expect { authority_d.all }.to raise_error Psych::SyntaxError

data/spec/lib/authorities/local_spec.rb

@@ -33,7 +33,9 @@ describe Qa::Authorities::Local do
 
   describe "#names" do
     it "returns a list of yaml files" do
-      expect(described_class.names).to include("authority_A", "authority_B", "authority_C", "authority_D", "states")
+      expect(described_class.names)
+        .to include("authority_A", "authority_B", "authority_C",
+                    "authority_D", "authority_U", "states")
     end
 
     context "when the path doesn't exist" do

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.0
+  version: 5.7.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -111,7 +111,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -479,6 +479,7 @@ files:
 - spec/fixtures/authorities/authority_B.yml
 - spec/fixtures/authorities/authority_C.yml
 - spec/fixtures/authorities/authority_D.yml
+- spec/fixtures/authorities/authority_U.yml
 - spec/fixtures/authorities/linked_data/lod_encoding_config.json
 - spec/fixtures/authorities/linked_data/lod_full_config.json
 - spec/fixtures/authorities/linked_data/lod_full_config_1_0.json
@@ -559,7 +560,6 @@ files:
 - spec/lib/authorities/crossref_spec.rb
 - spec/lib/authorities/discogs/generic_authority_spec.rb
 - spec/lib/authorities/discogs_spec.rb
-- spec/lib/authorities/file_based_authority_spec.rb
 - spec/lib/authorities/geonames_spec.rb
 - spec/lib/authorities/getty/aat_spec.rb
 - spec/lib/authorities/getty/tgn_spec.rb
@@ -572,12 +572,13 @@ files:
 - spec/lib/authorities/linked_data/search_query_spec.rb
 - spec/lib/authorities/linked_data/term_config_spec.rb
 - spec/lib/authorities/loc_spec.rb
+- spec/lib/authorities/local/file_based_authority_spec.rb
+- spec/lib/authorities/local/mysql_table_based_authority_spec.rb
+- spec/lib/authorities/local/table_based_authority_spec.rb
 - spec/lib/authorities/local_spec.rb
 - spec/lib/authorities/mesh_spec.rb
-- spec/lib/authorities/mysql_table_based_authority_spec.rb
 - spec/lib/authorities/oclcts_spec.rb
 - spec/lib/authorities/space_fix_encoder.rb
-- spec/lib/authorities/table_based_authority_spec.rb
 - spec/lib/authorities/tgnlang_spec.rb
 - spec/lib/authorities_loc_subauthorities.rb
 - spec/lib/configuration_spec.rb
@@ -662,16 +663,16 @@ test_files:
 - spec/lib/authorities/tgnlang_spec.rb
 - spec/lib/authorities/crossref_spec.rb
 - spec/lib/authorities/oclcts_spec.rb
-- spec/lib/authorities/file_based_authority_spec.rb
+- spec/lib/authorities/local/file_based_authority_spec.rb
+- spec/lib/authorities/local/table_based_authority_spec.rb
+- spec/lib/authorities/local/mysql_table_based_authority_spec.rb
 - spec/lib/authorities/space_fix_encoder.rb
 - spec/lib/authorities/assign_fast_spec.rb
-- spec/lib/authorities/table_based_authority_spec.rb
 - spec/lib/authorities/getty/tgn_spec.rb
 - spec/lib/authorities/getty/ulan_spec.rb
 - spec/lib/authorities/getty/aat_spec.rb
 - spec/lib/authorities/discogs_spec.rb
 - spec/lib/authorities/mesh_spec.rb
-- spec/lib/authorities/mysql_table_based_authority_spec.rb
 - spec/lib/authorities/local_spec.rb
 - spec/lib/authorities/discogs/generic_authority_spec.rb
 - spec/lib/authorities/geonames_spec.rb
@@ -750,6 +751,7 @@ test_files:
 - spec/fixtures/authorities/authority_D.yml
 - spec/fixtures/authorities/authority_A.yml
 - spec/fixtures/authorities/authority_C.yml
+- spec/fixtures/authorities/authority_U.yml
 - spec/fixtures/authorities/authority_B.yml
 - spec/fixtures/geonames-response.json
 - spec/fixtures/tgn-response.txt