qa 2.0.0 → 2.3.0

data/spec/controllers/terms_controller_spec.rb

@@ -29,7 +29,16 @@ describe Qa::TermsController, type: :controller do
     end
     context "when a sub-authority does not exist" do
       it "returns 404 if a sub-authority does not exist" do
-        expect(Rails.logger).to receive(:warn).with("Unable to initialize sub-authority non-existent-subauthority for Qa::Authorities::Loc. Valid sub-authorities are [\"subjects\", \"names\", \"classification\", \"childrensSubjects\", \"genreForms\", \"performanceMediums\", \"graphicMaterials\", \"organizations\", \"relators\", \"countries\", \"ethnographicTerms\", \"geographicAreas\", \"languages\", \"iso639-1\", \"iso639-2\", \"iso639-5\", \"preservation\", \"actionsGranted\", \"agentType\", \"edtf\", \"contentLocationType\", \"copyrightStatus\", \"cryptographicHashFunctions\", \"environmentCharacteristic\", \"environmentPurpose\", \"eventRelatedAgentRole\", \"eventRelatedObjectRole\", \"eventType\", \"formatRegistryRole\", \"hardwareType\", \"inhibitorTarget\", \"inhibitorType\", \"objectCategory\", \"preservationLevelRole\", \"relationshipSubType\", \"relationshipType\", \"rightsBasis\", \"rightsRelatedAgentRole\", \"signatureEncoding\", \"signatureMethod\", \"softwareType\", \"storageMedium\"]")
+        msg = "Unable to initialize sub-authority non-existent-subauthority for Qa::Authorities::Loc. Valid sub-authorities are " \
+              "[\"subjects\", \"names\", \"classification\", \"childrensSubjects\", \"genreForms\", \"performanceMediums\", " \
+              "\"graphicMaterials\", \"organizations\", \"relators\", \"countries\", \"ethnographicTerms\", \"geographicAreas\", " \
+              "\"languages\", \"iso639-1\", \"iso639-2\", \"iso639-5\", \"preservation\", \"actionsGranted\", \"agentType\", " \
+              "\"edtf\", \"contentLocationType\", \"copyrightStatus\", \"cryptographicHashFunctions\", " \
+              "\"environmentCharacteristic\", \"environmentPurpose\", \"eventRelatedAgentRole\", \"eventRelatedObjectRole\", " \
+              "\"eventType\", \"formatRegistryRole\", \"hardwareType\", \"inhibitorTarget\", \"inhibitorType\", \"objectCategory\", " \
+              "\"preservationLevelRole\", \"relationshipSubType\", \"relationshipType\", \"rightsBasis\", \"rightsRelatedAgentRole\", " \
+              "\"signatureEncoding\", \"signatureMethod\", \"softwareType\", \"storageMedium\"]"
+        expect(Rails.logger).to receive(:warn).with(msg)
         get :search, params: { q: "a query", vocab: "loc", subauthority: "non-existent-subauthority" }
         expect(response.code).to eq("404")
       end
@@ -63,25 +72,51 @@ describe Qa::TermsController, type: :controller do
       end
       it "succeeds" do
         get :search, params: { q: "a query", vocab: "local", subauthority: "two_args" }
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
     context "loc" do
       before do
-        stub_request(:get, "http://id.loc.gov/search/?format=json&q=Berry&q=cs:http://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
 
       it "returns a set of terms for a tgnlang query" do
         get :search, params: { q: "Tibetan", vocab: "tgnlang" }
-        expect(response).to be_success
+        expect(response).to be_successful
       end
 
       it "does not return 404 if subauthority is valid" do
         get :search, params: { q: "Berry", vocab: "loc", subauthority: "names" }
-        expect(response).to be_success
+        expect(response).to be_successful
+      end
+
+      context 'when cors headers are enabled' do
+        before do
+          Qa.config.enable_cors_headers
+          stub_request(:get, "http://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
+        it 'Access-Control-Allow-Origin is *' do
+          get :search, params: { q: "Tibetan", vocab: "tgnlang" }
+          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
+          stub_request(:get, "http://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
+        it 'Access-Control-Allow-Origin is not present' do
+          get :search, params: { q: "Tibetan", vocab: "tgnlang" }
+          expect(response.headers.key?('Access-Control-Allow-Origin')).to be false
+        end
       end
     end
 
@@ -93,7 +128,7 @@ describe Qa::TermsController, type: :controller do
       end
       it "succeeds if authority class is camelcase" do
         get :search, params: { q: "word", vocab: "assign_fast", subauthority: "topical" }
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
   end
@@ -102,11 +137,31 @@ describe Qa::TermsController, type: :controller do
     context "with supported authorities" do
       it "returns all local authority state terms" do
         get :index, params: { vocab: "local", subauthority: "states" }
-        expect(response).to be_success
+        expect(response).to be_successful
       end
       it "returns all MeSH terms" do
         get :index, params: { vocab: "mesh" }
-        expect(response).to be_success
+        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 :index, params: { vocab: "local", subauthority: "states" }
+          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 :index, params: { vocab: "local", subauthority: "states" }
+          expect(response.headers.key?('Access-Control-Allow-Origin')).to be false
+        end
       end
     end
 
@@ -129,24 +184,44 @@ describe Qa::TermsController, type: :controller do
   describe "#show" do
     context "with supported authorities" do
       before do
-        stub_request(:get, "http://id.loc.gov/authorities/subjects/sh85077565.json")
+        stub_request(:get, "https://id.loc.gov/authorities/subjects/sh85077565.json")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(status: 200, body: webmock_fixture("loc-names-response.txt"), headers: {})
       end
 
       it "returns an individual state term" do
         get :show, params: { vocab: "local", subauthority: "states", id: "OH" }
-        expect(response).to be_success
+        expect(response).to be_successful
       end
 
       it "returns an individual MeSH term" do
         get :show, params: { vocab: "mesh", id: "D000001" }
-        expect(response).to be_success
+        expect(response).to be_successful
       end
 
       it "returns an individual subject term" do
         get :show, params: { vocab: "loc", subauthority: "subjects", id: "sh85077565" }
-        expect(response).to be_success
+        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 :show, params: { vocab: "mesh", id: "D000001" }
+          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 :show, params: { vocab: "mesh", id: "D000001" }
+          expect(response.headers.key?('Access-Control-Allow-Origin')).to be false
+        end
       end
     end
   end

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

@@ -0,0 +1,91 @@
+{
+  "term": {
+    "url": {
+      "@context": "http://www.w3.org/ns/hydra/context.jsonld",
+      "@type":    "IriTemplate",
+      "template": "http://localhost/test_default/term?uri={?term_uri}&{?encode_true}&{?encode_false}&{?encode_not_specified}",
+      "variableRepresentation": "BasicRepresentation",
+      "mapping": [
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "term_uri",
+          "property": "hydra:freetextQuery",
+          "required": true,
+          "encode":   true
+        },
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "encode_true",
+          "property": "hydra:freetextQuery",
+          "required": true,
+          "encode":   true
+        },
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "encode_false",
+          "property": "hydra:freetextQuery",
+          "required": true,
+          "encode":   false
+        },
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "encode_not_specified",
+          "property": "hydra:freetextQuery",
+          "required": true
+        }
+      ]
+    },
+    "qa_replacement_patterns": {
+      "term_id": "term_uri"
+    },
+    "term_id": "URI",
+    "results": {
+      "id_predicate":       "http://id.loc.gov/vocabulary/identifiers/lccn",
+      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel"
+    }
+  },
+  "search": {
+    "url": {
+      "@context": "http://www.w3.org/ns/hydra/context.jsonld",
+      "@type":    "IriTemplate",
+      "template": "http://localhost/test_default/search?query={?query}&{?encode_true}&{?encode_false}&{?encode_not_specified}",
+      "variableRepresentation": "BasicRepresentation",
+      "mapping": [
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "query",
+          "property": "hydra:freetextQuery",
+          "required": true,
+          "encode":   true
+        },
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "encode_true",
+          "property": "hydra:freetextQuery",
+          "required": true,
+          "encode":   true
+        },
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "encode_false",
+          "property": "hydra:freetextQuery",
+          "required": true,
+          "encode":   false
+        },
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "encode_not_specified",
+          "property": "hydra:freetextQuery",
+          "required": true
+        }
+      ]
+    },
+    "qa_replacement_patterns": {
+      "query": "query"
+    },
+    "results": {
+      "id_predicate":       "http://purl.org/dc/terms/identifier",
+      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel"
+    }
+  }
+}

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

@@ -0,0 +1,27 @@
+{
+  "term": {
+    "url": {
+      "@context": "http://www.w3.org/ns/hydra/context.jsonld",
+      "@type":    "IriTemplate",
+      "template": "http://localhost/test_default/term/{?term_id}",
+      "variableRepresentation": "BasicRepresentation",
+      "mapping": [
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "term_id",
+          "property": "hydra:freetextQuery",
+          "required": true
+        }
+      ]
+    },
+    "qa_replacement_patterns": {
+      "term_id": "term_id"
+    },
+    "term_id": "ID",
+    "results": {
+      "id_predicate":       "http://id.loc.gov/vocabulary/identifiers/lccn",
+      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel"
+    }
+  },
+  "search": {}
+}

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

@@ -0,0 +1,27 @@
+{
+  "term": {
+    "url": {
+      "@context": "http://www.w3.org/ns/hydra/context.jsonld",
+      "@type":    "IriTemplate",
+      "template": "http://localhost/test_default/term?uri={?term_uri}",
+      "variableRepresentation": "BasicRepresentation",
+      "mapping": [
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "term_uri",
+          "property": "hydra:freetextQuery",
+          "required": true
+        }
+      ]
+    },
+    "qa_replacement_patterns": {
+      "term_id": "term_uri"
+    },
+    "term_id": "URI",
+    "results": {
+      "id_predicate":       "http://id.loc.gov/vocabulary/identifiers/lccn",
+      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel"
+    }
+  },
+  "search": {}
+}

data/spec/fixtures/{lexvo_snippet.rdf → lexvo_snippet.rdf.xml}

@@ -89,3 +89,4 @@ Niger–Congo family.</rdfs:comment>
   <lvont:label rdf:resource="http://lexvo.org/id/term/pms/Lenga%20Ari" /> <!-- Lenga Ari -->
   <skos:prefLabel xml:lang="en">Ari</skos:prefLabel>
 </rdf:Description>
+</rdf:RDF>

data/spec/lib/authorities/assign_fast_spec.rb

@@ -48,7 +48,9 @@ describe Qa::Authorities::AssignFast do
           .to_return(status: 200, body: "", headers: {})
       end
       it "logs an info and returns an empty array" do
-        expect(Rails.logger).to receive(:info).with("Could not parse response as JSON. Request url: http://fast.oclc.org/searchfast/fastsuggest?&query=word%20ling&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20")
+        msg = "Could not parse response as JSON. Request url: " \
+              "http://fast.oclc.org/searchfast/fastsuggest?&query=word%20ling&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20"
+        expect(Rails.logger).to receive(:info).with(msg)
         results = authority.search("word (ling")
         expect(results).to eq([])
       end

data/spec/lib/authorities/file_based_authority_spec.rb

@@ -7,24 +7,30 @@ describe Qa::Authorities::Local::FileBasedAuthority do
   let(:authority_d) { Qa::Authorities::Local.subauthority_for("authority_D") }
 
   describe "#all" do
-    let(:expected) { [{ 'id' => "A1", 'label' => "Abc Term A1", 'active' => true },
-                      { 'id' => "A2", 'label' => "Term A2", 'active' => false },
-                      { 'id' => "A3", 'label' => "Abc Term A3", 'active' => true }] }
+    let(:expected) do
+      [{ 'id' => "A1", 'label' => "Abc Term A1", 'active' => true },
+       { 'id' => "A2", 'label' => "Term A2", 'active' => false },
+       { 'id' => "A3", 'label' => "Abc Term A3", 'active' => true }]
+    end
     it "returns all the entries" do
       expect(authority_a.all).to eq(expected)
     end
     context "when terms do not have ids" do
-      let(:expected) { [{ 'id' => "Term B1", 'label' => "Term B1", 'active' => true },
-                        { 'id' => "Term B2", 'label' => "Term B2", 'active' => true },
-                        { 'id' => "Term B3", 'label' => "Term B3", 'active' => true }] }
+      let(:expected) do
+        [{ 'id' => "Term B1", 'label' => "Term B1", 'active' => true },
+         { 'id' => "Term B2", 'label' => "Term B2", 'active' => true },
+         { 'id' => "Term B3", 'label' => "Term B3", 'active' => true }]
+      end
       it "sets the id to be same as the label" do
         expect(authority_b.all).to eq(expected)
       end
     end
     context "authority YAML file is a list of terms" do
-      let(:expected) { [{ 'id' => "Term C1", 'label' => "Term C1", 'active' => true },
-                        { 'id' => "Term C2", 'label' => "Term C2", 'active' => true },
-                        { 'id' => "Term C3", 'label' => "Term C3", 'active' => true }] }
+      let(:expected) do
+        [{ 'id' => "Term C1", 'label' => "Term C1", 'active' => true },
+         { 'id' => "Term C2", 'label' => "Term C2", 'active' => true },
+         { 'id' => "Term C3", 'label' => "Term C3", 'active' => true }]
+      end
       it "uses the terms as labels" do
         expect(authority_c.all).to eq(expected)
       end
@@ -44,8 +50,10 @@ describe Qa::Authorities::Local::FileBasedAuthority do
       end
     end
     context "with at least one matching entry" do
-      let(:expected) { [{ 'id' => "A1", 'label' => "Abc Term A1" },
-                        { 'id' => "A3", 'label' => "Abc Term A3" }] }
+      let(:expected) do
+        [{ 'id' => "A1", 'label' => "Abc Term A1" },
+         { 'id' => "A3", 'label' => "Abc Term A3" }]
+      end
       it "returns only entries matching the query term" do
         expect(authority_a.search("Abc")).to eq(expected)
       end

data/spec/lib/authorities/geonames_spec.rb

@@ -37,12 +37,12 @@ describe Qa::Authorities::Geonames do
       end
 
       context "with custom label" do
+        let!(:original_label) { described_class.label }
         before do
-          @original_label = described_class.label
-          described_class.label = -> (item) { item['name'] }
+          described_class.label = ->(item) { item['name'] }
         end
         after do
-          described_class.label = @original_label
+          described_class.label = original_label
         end
         it "uses the lambda" do
           expect(subject.first['label']).to eq("Port Moresby")

data/spec/lib/authorities/getty/aat_spec.rb

@@ -65,14 +65,20 @@ describe Qa::Authorities::Getty::AAT do
     subject { authority.request_options }
     it { is_expected.to eq(accept: "application/sparql-results+json") }
   end
-
+  # rubocop:disable Metrics/LineLength
   describe "#sparql" do
-    subject { authority.sparql('search_term') }
-    it { is_expected.to eq 'SELECT ?s ?name {
-              ?s a skos:Concept; luc:term "search_term";
-                 skos:inScheme <http://vocab.getty.edu/aat/> ;
-                 gvp:prefLabelGVP [skosxl:literalForm ?name].
-              FILTER regex(?name, "search_term", "i") .
-            } ORDER BY ?name' }
+    context "using a single subject term" do
+      subject { authority.sparql('search_term') }
+      it {
+        is_expected.to eq %(SELECT ?s ?name { ?s a skos:Concept; luc:term "search_term"; skos:inScheme <http://vocab.getty.edu/aat/> ; gvp:prefLabelGVP [skosxl:literalForm ?name]. FILTER regex(?name, "search_term", "i") . } ORDER BY ?name)
+      }
+    end
+    context "using a two subject terms" do
+      subject { authority.sparql('search term') }
+      it {
+        is_expected.to eq %(SELECT ?s ?name { ?s a skos:Concept; luc:term "search term"; skos:inScheme <http://vocab.getty.edu/aat/> ; gvp:prefLabelGVP [skosxl:literalForm ?name]. FILTER ((regex(?name, "search", "i")) && (regex(?name, "term", "i"))) . } ORDER BY ?name)
+      }
+    end
   end
+  # rubocop:enable Metrics/LineLength
 end

data/spec/lib/authorities/getty/tgn_spec.rb

@@ -65,27 +65,20 @@ describe Qa::Authorities::Getty::TGN do
     subject { authority.request_options }
     it { is_expected.to eq(accept: "application/sparql-results+json") }
   end
-
+  # rubocop:disable Metrics/LineLength
   describe "#sparql" do
     context "using a single subject term" do
       subject { authority.sparql('search_term') }
-      it { is_expected.to eq 'SELECT DISTINCT ?s ?name ?par {
-              ?s a skos:Concept; luc:term "search_term";
-                 skos:inScheme <http://vocab.getty.edu/tgn/> ;
-                 gvp:prefLabelGVP [skosxl:literalForm ?name] ;
-                  gvp:parentString ?par .
-              FILTER regex(?name, "search_term", "i") .
-            } ORDER BY ?name ASC(?par)' }
+      it {
+        is_expected.to eq %(SELECT DISTINCT ?s ?name ?par { ?s a skos:Concept; luc:term "search_term"; skos:inScheme <http://vocab.getty.edu/ulan/> ; gvp:prefLabelGVP [skosxl:literalForm ?name] ; gvp:parentString ?par . FILTER regex(?name, "search_term", "i") . } ORDER BY ?name ASC(?par))
+      }
     end
     context "using a two subject terms" do
       subject { authority.sparql('search term') }
-      it { is_expected.to eq "SELECT DISTINCT ?s ?name ?par {
-              ?s a skos:Concept; luc:term \"search term\";
-                 skos:inScheme <http://vocab.getty.edu/tgn/> ;
-                 gvp:prefLabelGVP [skosxl:literalForm ?name] ;
-                  gvp:parentString ?par .
-              FILTER ((regex(CONCAT(?name, ', ', REPLACE(str(?par), \",[^,]+,[^,]+$\", \"\")), \"search\",\"i\" ) && regex(CONCAT(?name, ', ', REPLACE(str(?par), \",[^,]+,[^,]+$\", \"\")), \"term\",\"i\" ) ) && (regex(?name, \"search\",\"i\" ) || regex(?name, \"term\",\"i\" ) ) ) .
-            } ORDER BY ?name ASC(?par)" }
+      it {
+        is_expected.to eq %(SELECT DISTINCT ?s ?name ?par { ?s a skos:Concept; luc:term "search term"; skos:inScheme <http://vocab.getty.edu/ulan/> ; gvp:prefLabelGVP [skosxl:literalForm ?name] ; gvp:parentString ?par . FILTER ((regex(?name, "search", "i") || regex(?alt, "search", "i")) && (regex(?name, "term", "i") || regex(?alt, "term", "i"))) . } ORDER BY ?name ASC(?par))
+      }
     end
   end
+  # rubocop:enable Metrics/LineLength
 end