qa 5.7.0 → 5.9.0

data/lib/qa/authorities/linked_data/generic_authority.rb

@@ -20,6 +20,7 @@ module Qa::Authorities
       delegate :subauthority?, :subauthorities?, to: :search_config, prefix: 'search'
 
       def initialize(auth_name)
+        super()
         @authority_config = Qa::Authorities::LinkedData::Config.new(auth_name)
       end
 

data/lib/qa/authorities/loc/generic_authority.rb

@@ -2,6 +2,7 @@ module Qa::Authorities
   class Loc::GenericAuthority < Base
     attr_reader :subauthority
     def initialize(subauthority)
+      super()
       @subauthority = subauthority
     end
 

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

@@ -2,6 +2,7 @@ module Qa::Authorities
   class Local::FileBasedAuthority < Base
     attr_reader :subauthority
     def initialize(subauthority)
+      super()
       @subauthority = subauthority
     end
 

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

@@ -19,9 +19,7 @@ module Qa::Authorities
       end
 
       def self.logger
-        @logger ||= begin
-          ::Rails.logger if defined? Rails && Rails.respond_to?(:logger)
-        end
+        @logger ||= ::Rails.logger if defined? Rails && Rails.respond_to?(:logger)
       end
 
       class << self

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

@@ -34,6 +34,7 @@ module Qa::Authorities
     attr_reader :subauthority
 
     def initialize(subauthority)
+      super()
       self.class.check_for_index
       @subauthority = subauthority
     end

data/lib/qa/authorities/local.rb

@@ -36,10 +36,8 @@ module Qa::Authorities
       end
 
       def registry
-        @registry ||= begin
-          Registry.new do |reg|
-            register_defaults(reg)
-          end
+        @registry ||= Registry.new do |reg|
+          register_defaults(reg)
         end
       end
 

data/lib/qa/authorities/mesh_tools/mesh_data_parser.rb

@@ -7,7 +7,9 @@ module Qa::Authorities
         @file = file
       end
 
-      def each_mesh_record # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def each_mesh_record
         current_data = {}
         in_record = false
         file.each_line do |line|

data/lib/qa/authorities/oclcts/generic_oclc_authority.rb

@@ -3,6 +3,7 @@ module Qa::Authorities
     attr_reader :subauthority
 
     def initialize(subauthority)
+      super()
       @subauthority = subauthority
     end
     include WebServiceBase
@@ -34,7 +35,7 @@ module Qa::Authorities
 
       def get_raw_response(query_type, id)
         query_url = Oclcts.url_pattern(query_type).gsub("{query}", id).gsub("{id}", id).gsub("{authority-id}", subauthority)
-        @raw_response = Nokogiri::XML(open(query_url))
+        @raw_response = Nokogiri::XML(URI.open(query_url))
       end
   end
 end

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "5.7.0".freeze
+  VERSION = "5.9.0".freeze
 end

data/spec/controllers/terms_controller_spec.rb

@@ -65,11 +65,12 @@ describe Qa::TermsController, type: :controller do
         class Qa::Authorities::Local::TwoArgs < Qa::Authorities::Base
           attr_reader :subauthority
           def initialize(subauthority)
+            super()
             @subauthority = subauthority
           end
 
           def search(_arg1, _arg2)
-            true
+            []
           end
         end
         Qa::Authorities::Local.register_subauthority('two_args', 'Qa::Authorities::Local::TwoArgs')
@@ -122,6 +123,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

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

@@ -35,7 +35,10 @@ describe Qa::Authorities::Getty::AAT do
         end
 
         it 'logs error and returns empty results' do
-          expect(Rails.logger).to receive(:warn).with("  ERROR fetching Getty response: undefined method `[]' for nil:NilClass; cause: UNKNOWN")
+          # Rails 3.1 actually quotes the failing code in the error message,
+          # so let's match this error message with a multiline regex instead of
+          # a string.
+          expect(Rails.logger).to receive(:warn).with(/ERROR fetching Getty response: .*undefined method.*for nil:NilClass.*; cause: UNKNOWN/m)
           expect(subject).to be {}
         end
       end

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

@@ -35,7 +35,10 @@ describe Qa::Authorities::Getty::TGN do
         end
 
         it 'logs error and returns empty results' do
-          expect(Rails.logger).to receive(:warn).with("  ERROR fetching Getty response: undefined method `[]' for nil:NilClass; cause: UNKNOWN")
+          # Rails 3.1 actually quotes the failing code in the error message,
+          # so let's match this error message with a multiline regex instead of
+          # a string.
+          expect(Rails.logger).to receive(:warn).with(/ERROR fetching Getty response: .*undefined method.*for nil:NilClass.*; cause: UNKNOWN/m)
           expect(subject).to be {}
         end
       end

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

@@ -35,7 +35,10 @@ describe Qa::Authorities::Getty::Ulan do
         end
 
         it 'logs error and returns empty results' do
-          expect(Rails.logger).to receive(:warn).with("  ERROR fetching Getty response: undefined method `[]' for nil:NilClass; cause: UNKNOWN")
+          # Rails 3.1 actually quotes the failing code in the error message,
+          # so let's match this error message with a multiline regex instead of
+          # a string.
+          expect(Rails.logger).to receive(:warn).with(/ERROR fetching Getty response: .*undefined method.*for nil:NilClass.*; cause: UNKNOWN/m)
           expect(subject).to be {}
         end
       end