qa 5.5.1 → 5.8.0

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

@@ -69,7 +69,7 @@ describe Qa::TermsController, type: :controller do
           end
 
           def search(_arg1, _arg2)
-            true
+            []
           end
         end
         Qa::Authorities::Local.register_subauthority('two_args', 'Qa::Authorities::Local::TwoArgs')
@@ -122,6 +122,78 @@ describe Qa::TermsController, type: :controller do
           expect(response.headers.key?('Access-Control-Allow-Origin')).to be false
         end
       end
+
+      context 'when pagination parameters are set' do
+        context 'and no format is specified' do
+          let(:params) do
+            {
+              q: "Berry", vocab: "loc", subauthority: "names",
+              page_limit: "5", page_offset: "6"
+            }
+          end
+
+          it "returns a subset of results as an Array<Hash>" do
+            # query without pagination is expected to return 20 results
+            get :search, params: params
+            expect(response).to be_successful
+            expect(response.content_type.split(';')).to include 'application/json'
+            results = JSON.parse(response.body)
+            expect(results.count).to eq 5
+          end
+        end
+
+        context 'and format is specified as :jsonapi' do
+          let(:params) do
+            {
+              q: "Berry", vocab: "loc", subauthority: "names",
+              page_limit: "5", page_offset: "6", format: "jsonapi"
+            }
+          end
+          let(:total_num_found) { "20" } # query without pagination is expected to return 20 results
+
+          it "returns a subset of results in the JSON-API format" do
+            get :search, params: params
+            expect(response).to be_successful
+            expect(response.content_type.split(';')).to include 'application/vnd.api+json'
+            json_api_response = JSON.parse(response.body)
+            expect(json_api_response['data'].count).to eq 5
+          end
+
+          it "sets meta['page'] stats" do
+            get :search, params: params
+            json_api_response = JSON.parse(response.body)
+            expect(json_api_response["meta"]["page"]["page_offset"]).to eq "6"
+            expect(json_api_response["meta"]["page"]["page_limit"]).to eq "5"
+            expect(json_api_response["meta"]["page"]["actual_page_size"]).to eq "5"
+            expect(json_api_response["meta"]["page"]["total_num_found"]).to eq total_num_found
+          end
+
+          it 'sets links with prev and next having values' do
+            get :search, params: params
+
+            base_url = request.base_url
+            url_path = request.path
+            first_page = "#{base_url}#{url_path}?q=Berry&page_limit=5&page_offset=1"
+            second_page = "#{base_url}#{url_path}?q=Berry&page_limit=5&page_offset=6"
+            third_page = "#{base_url}#{url_path}?q=Berry&page_limit=5&page_offset=11"
+            fourth_page = "#{base_url}#{url_path}?q=Berry&page_limit=5&page_offset=16"
+            last_page = fourth_page
+
+            json_api_response = JSON.parse(response.body)
+            expect(json_api_response['links']["self"]).to eq second_page
+            expect(json_api_response['links']["first"]).to eq first_page
+            expect(json_api_response['links']["prev"]).to eq first_page
+            expect(json_api_response['links']["next"]).to eq third_page
+            expect(json_api_response['links']["last"]).to eq last_page
+          end
+
+          it 'does not include errors' do
+            get :search, params: params
+            json_api_response = JSON.parse(response.body)
+            expect(json_api_response.key?('errors')).to eq false
+          end
+        end
+      end
     end
 
     context "assign_fast" do
@@ -253,4 +325,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/{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