qa 3.1.0 → 4.0.0.rc1

data/spec/controllers/linked_data_terms_controller_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'json'
 
 describe Qa::LinkedDataTermsController, type: :controller do
   before do
@@ -82,7 +83,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
   describe '#list' do
     let(:expected_results) { ['Auth1', 'Auth2', 'Auth3'] }
     before do
-      allow(Qa::Authorities::LinkedData::AuthorityService).to receive(:authority_names).and_return(expected_results)
+      allow(Qa::LinkedData::AuthorityService).to receive(:authority_names).and_return(expected_results)
     end
     it 'returns list of authorities' do
       get :list
@@ -166,6 +167,21 @@ describe Qa::LinkedDataTermsController, type: :controller do
           expect(response).to be_successful
         end
       end
+
+      context '3 search results with blank nodes removed' do
+        before do
+          stub_request(:get, 'http://experimental.worldcat.org/fast/search?maximumRecords=5&query=cql.any%20all%20%22ezra%22&sortKeys=usage')
+            .to_return(status: 200, body: webmock_fixture('lod_search_with_blanknode_subjects.nt'), headers: { 'Content-Type' => 'application/n-triples' })
+        end
+        it 'succeeds' do
+          get :search, params: { q: 'ezra', vocab: 'OCLC_FAST', maximumRecords: '5' }
+          expect(response).to be_successful
+          results = JSON.parse(response.body)
+          blank_nodes = results.select { |r| r['uri'].start_with?('_:b') }
+          expect(blank_nodes.size).to eq 0
+          expect(results.size).to eq 3
+        end
+      end
     end
 
     context 'in OCLC_FAST authority and personal_name subauthority' do
@@ -215,6 +231,29 @@ describe Qa::LinkedDataTermsController, type: :controller do
         end
       end
     end
+
+    context 'when processing context' do
+      before do
+        Qa.config.disable_cors_headers
+        stub_request(:get, 'http://experimental.worldcat.org/fast/search?maximumRecords=3&query=cql.any%20all%20%22cornell%22&sortKeys=usage')
+          .to_return(status: 200, body: webmock_fixture('lod_oclc_all_query_3_results.rdf.xml'), headers: { 'Content-Type' => 'application/rdf+xml' })
+      end
+      it "returns basic data + context when context='true'" do
+        get :search, params: { q: 'cornell', vocab: 'OCLC_FAST', maximumRecords: '3', context: 'true' }
+        expect(response).to be_successful
+        results = JSON.parse(response.body)
+        expect(results.size).to eq 3
+        expect(results.first.key?('context')).to be true
+      end
+
+      it "returns basic data only when context='false'" do
+        get :search, params: { q: 'cornell', vocab: 'OCLC_FAST', maximumRecords: '3', context: 'false' }
+        expect(response).to be_successful
+        results = JSON.parse(response.body)
+        expect(results.size).to eq 3
+        expect(results.first.key?('context')).to be false
+      end
+    end
   end
 
   describe '#show' do
@@ -437,6 +476,17 @@ describe Qa::LinkedDataTermsController, type: :controller do
             expect(JSON.parse(response.body).keys).to match_array ["@context", "@graph"]
           end
         end
+
+        context 'blank nodes not included in predicates list' do
+          before do
+            stub_request(:get, 'http://localhost/test_default/term?uri=http://test.org/530369wbn')
+              .to_return(status: 200, body: webmock_fixture('lod_term_with_blanknode_objects.nt'), headers: { 'Content-Type' => 'application/n-triples' })
+          end
+          it 'succeeds' do
+            get :fetch, params: { uri: 'http://test.org/530369wbn', vocab: 'LOD_TERM_URI_PARAM_CONFIG' }
+            expect(response).to be_successful
+          end
+        end
       end
 
       context 'when cors headers are enabled' do

data/spec/controllers/terms_controller_spec.rb

@@ -6,29 +6,29 @@ describe Qa::TermsController, type: :controller do
   end
 
   describe "#check_vocab_param" do
-    it "returns 404 if the vocabulary is missing" do
+    it "returns 400 if the vocabulary is missing" do
       get :search, params: { q: "a query", vocab: "" }
-      expect(response.code).to eq("404")
+      expect(response.code).to eq("400")
     end
   end
 
   describe "#check_query_param" do
-    it "returns 404 if the query is missing" do
+    it "returns 400 if the query is missing" do
       get :search, params: { q: "", vocab: "tgnlang" }
-      expect(response.code).to eq("404")
+      expect(response.code).to eq("400")
     end
   end
 
   describe "#init_authority" do
     context "when the authority does not exist" do
-      it "returns 404" do
+      it "returns 400" do
         expect(Rails.logger).to receive(:warn).with("Unable to initialize authority Qa::Authorities::Non-existent-authority")
         get :search, params: { q: "a query", vocab: "non-existent-authority" }
-        expect(response.code).to eq("404")
+        expect(response.code).to eq("400")
       end
     end
     context "when a sub-authority does not exist" do
-      it "returns 404 if a sub-authority does not exist" do
+      it "returns 400 if a sub-authority does not exist" do
         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\", " \
@@ -40,17 +40,17 @@ describe Qa::TermsController, type: :controller do
               "\"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")
+        expect(response.code).to eq("400")
       end
     end
     context "when a sub-authority is absent" do
-      it "returns 404 for LOC" do
+      it "returns 400 for LOC" do
         get :search, params: { q: "a query", vocab: "loc" }
-        expect(response.code).to eq("404")
+        expect(response.code).to eq("400")
       end
-      it "returns 404 for oclcts" do
+      it "returns 400 for oclcts" do
         get :search, params: { q: "a query", vocab: "oclcts" }
-        expect(response.code).to eq("404")
+        expect(response.code).to eq("400")
       end
     end
   end
@@ -78,7 +78,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:http://id.loc.gov/authorities/names")
+        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
@@ -88,7 +88,7 @@ describe Qa::TermsController, type: :controller do
         expect(response).to be_successful
       end
 
-      it "does not return 404 if subauthority is valid" do
+      it "does not return 400 if subauthority is valid" do
         get :search, params: { q: "Berry", vocab: "loc", subauthority: "names" }
         expect(response).to be_successful
       end
@@ -184,7 +184,7 @@ describe Qa::TermsController, type: :controller do
   describe "#show" do
     context "with supported authorities" do
       before do
-        stub_request(:get, "https://id.loc.gov/authorities/subjects/sh85077565.json")
+        stub_request(:get, "http://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

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

@@ -1,4 +1,5 @@
 {
+  "QA_CONFIG_VERSION": "2.0",
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
@@ -48,7 +49,7 @@
     "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}",
+      "template": "http://localhost/test_default/search?{?query}&{?encode_true}&{?encode_false}&{?encode_not_specified}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {

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

@@ -1,9 +1,14 @@
 {
+  "QA_CONFIG_VERSION": "2.0",
+  "prefixes": {
+    "schema": "http://www.w3.org/2000/01/rdf-schema#",
+    "skos": "http://www.w3.org/2004/02/skos/core#"
+  },
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type":    "IriTemplate",
-      "template": "http://localhost/test_default/term/{?subauth}/{?term_id}?param1={?param1}&param2={?param2}",
+      "template": "http://localhost/test_default/term/{subauth}/{term_id}?{?param1}&{?param2}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -59,7 +64,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type": "IriTemplate",
-      "template": "http://localhost/test_default/search?subauth={?subauth}&query={?query}&param1={?param1}&param2={?param2}",
+      "template": "http://localhost/test_default/search?{?subauth}&{?query}&{?param1}&{?param2}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -102,6 +107,55 @@
       "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel",
       "sort_predicate":     "http://www.w3.org/2004/02/skos/core#prefLabel"
     },
+    "context": {
+      "groups": {
+        "dates": {
+          "group_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.dates",
+          "group_label_default": "Dates"
+        },
+        "hierarchy": {
+          "group_label_i18n": "qa.linked_data.authority.locgenres_ld4l_cache.hierarchy",
+          "group_label_default": "Hierarchy"
+        }
+      },
+      "properties": [
+        {
+          "property_label_i18n": "qa.linked_data.authority.locgenres_ld4l_cache.authoritative_label",
+          "property_label_default": "Authoritative Label",
+          "ldpath": "madsrdf:authoritativeLabel",
+          "selectable": true,
+          "drillable": false
+        },
+        {
+          "group_id": "dates",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.birth_date",
+          "property_label_default": "Birth",
+          "ldpath": "madsrdf:identifiesRWO/madsrdf:birthDate/schema:label",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "group_id": "hierarchy",
+          "property_label_i18n": "qa.linked_data.authority.locgenres_ld4l_cache.narrower",
+          "property_label_default": "Narrower",
+          "ldpath": "skos:narrower :: xsd:string",
+          "selectable": true,
+          "drillable": true,
+          "expansion_label_ldpath": "skos:prefLabel ::xsd:string",
+          "expansion_id_ldpath": "loc:lccn ::xsd:string"
+        },
+        {
+          "group_id": "hierarchy",
+          "property_label_i18n": "qa.linked_data.authority.locgenres_ld4l_cache.broader",
+          "property_label_default": "Broader",
+          "ldpath": "skos:broader :: xsd:string",
+          "selectable": true,
+          "drillable": true,
+          "expansion_label_ldpath": "skos:prefLabel ::xsd:string",
+          "expansion_id_ldpath": "loc:lccn ::xsd:string"
+        }
+      ]
+    },
     "subauthorities": {
       "search_sub1_key": "search_sub1_name",
       "search_sub2_key": "search_sub2_name",

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

@@ -0,0 +1,164 @@
+{
+  "prefixes": {
+    "schema": "http://www.w3.org/2000/01/rdf-schema#",
+    "skos": "http://www.w3.org/2004/02/skos/core#"
+  },
+  "term": {
+    "url": {
+      "@context": "http://www.w3.org/ns/hydra/context.jsonld",
+      "@type":    "IriTemplate",
+      "template": "http://localhost/test_default/term/{?subauth}/{?term_id}?param1={?param1}&param2={?param2}",
+      "variableRepresentation": "BasicRepresentation",
+      "mapping": [
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "term_id",
+          "property": "hydra:freetextQuery",
+          "required": true
+        },
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "subauth",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "term_sub2_name"
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "param1",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "alpha"
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "param2",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "beta"
+        }
+      ]
+    },
+    "qa_replacement_patterns": {
+      "term_id": "term_id",
+      "subauth": "subauth"
+    },
+    "term_id": "ID",
+    "language": [ "en" ],
+    "results": {
+      "id_predicate":       "http://purl.org/dc/terms/identifier",
+      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
+      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel",
+      "broader_predicate":  "http://www.w3.org/2004/02/skos/core#broader",
+      "narrower_predicate": "http://www.w3.org/2004/02/skos/core#narrower",
+      "sameas_predicate":   "http://www.w3.org/2004/02/skos/core#exactMatch"
+    },
+    "subauthorities": {
+      "term_sub1_key": "term_sub1_name",
+      "term_sub2_key": "term_sub2_name",
+      "term_sub3_key": "term_sub3_name"
+    }
+  },
+  "search": {
+    "url": {
+      "@context": "http://www.w3.org/ns/hydra/context.jsonld",
+      "@type": "IriTemplate",
+      "template": "http://localhost/test_default/search?subauth={?subauth}&query={?query}&param1={?param1}&param2={?param2}",
+      "variableRepresentation": "BasicRepresentation",
+      "mapping": [
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "query",
+          "property": "hydra:freetextQuery",
+          "required": true
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "subauth",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "search_sub1_name"
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "param1",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "delta"
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "param2",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "echo"
+        }
+      ]
+    },
+    "qa_replacement_patterns": {
+      "query": "query",
+      "subauth": "subauth"
+    },
+    "language": [ "en", "fr", "de" ],
+    "results": {
+      "id_predicate":       "http://purl.org/dc/terms/identifier",
+      "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
+      "altlabel_predicate": "http://www.w3.org/2004/02/skos/core#altLabel",
+      "sort_predicate":     "http://www.w3.org/2004/02/skos/core#prefLabel"
+    },
+    "context": {
+      "groups": {
+        "dates": {
+          "group_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.dates",
+          "group_label_default": "Dates"
+        },
+        "hierarchy": {
+          "group_label_i18n": "qa.linked_data.authority.locgenres_ld4l_cache.hierarchy",
+          "group_label_default": "Hierarchy"
+        }
+      },
+      "properties": [
+        {
+          "property_label_i18n": "qa.linked_data.authority.locgenres_ld4l_cache.authoritative_label",
+          "property_label_default": "Authoritative Label",
+          "ldpath": "madsrdf:authoritativeLabel",
+          "selectable": true,
+          "drillable": false
+        },
+        {
+          "group_id": "dates",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.birth_date",
+          "property_label_default": "Birth",
+          "ldpath": "madsrdf:identifiesRWO/madsrdf:birthDate/schema:label",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "group_id": "hierarchy",
+          "property_label_i18n": "qa.linked_data.authority.locgenres_ld4l_cache.narrower",
+          "property_label_default": "Narrower",
+          "ldpath": "skos:narrower :: xsd:string",
+          "selectable": true,
+          "drillable": true,
+          "expansion_label_ldpath": "skos:prefLabel ::xsd:string",
+          "expansion_id_ldpath": "loc:lccn ::xsd:string"
+        },
+        {
+          "group_id": "hierarchy",
+          "property_label_i18n": "qa.linked_data.authority.locgenres_ld4l_cache.broader",
+          "property_label_default": "Broader",
+          "ldpath": "skos:broader :: xsd:string",
+          "selectable": true,
+          "drillable": true,
+          "expansion_label_ldpath": "skos:prefLabel ::xsd:string",
+          "expansion_id_ldpath": "loc:lccn ::xsd:string"
+        }
+      ]
+    },
+    "subauthorities": {
+      "search_sub1_key": "search_sub1_name",
+      "search_sub2_key": "search_sub2_name",
+      "search_sub3_key": "search_sub3_name"
+    }
+  }
+}

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

@@ -1,9 +1,10 @@
 {
+  "QA_CONFIG_VERSION": "2.0",
   "term": {
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type":    "IriTemplate",
-      "template": "http://localhost/test_default/term/{?term_id}",
+      "template": "http://localhost/test_default/term/{term_id}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -18,7 +19,7 @@
       "term_id": "term_id"
     },
     "term_id": "ID",
-    "language": [ "en" ],
+    "language": [ "fr" ],
     "results": {
       "id_predicate":       "http://id.loc.gov/vocabulary/identifiers/lccn",
       "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",
@@ -29,7 +30,7 @@
     "url": {
       "@context": "http://www.w3.org/ns/hydra/context.jsonld",
       "@type":    "IriTemplate",
-      "template": "http://localhost/test_default/search?query={?query}",
+      "template": "http://localhost/test_default/search?{?query}",
       "variableRepresentation": "BasicRepresentation",
       "mapping": [
         {
@@ -43,7 +44,7 @@
     "qa_replacement_patterns": {
       "query": "query"
     },
-    "language": [ "en" ],
+    "language": [ "fr" ],
     "results": {
       "id_predicate":       "http://purl.org/dc/terms/identifier",
       "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",