qa 5.11.0 → 5.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b356b770cbc77b1d67024f2a73be01b579943e75d9bda64e7f7dad04f66342b
-  data.tar.gz: a3f6a66764724811209c8616e00f260cab0d371f340117f335d384c1f84d1bd6
+  metadata.gz: 6c2bc5171a4ed527a81eb174b2e5e7f0e99d86c2df285c2619d415ec4587af84
+  data.tar.gz: 8fd957474f3f185867025fb18e08d4262e207ae051bca57bc43eaac10bc7b097
 SHA512:
-  metadata.gz: 798c03132eac1750d15b0db93e2c6009925b1ebd3773619df77cd11f3f0cd661b6645d5e54122842efdc3e86d221356fb38aca6705943c35a5dc03d0a7010d2d
-  data.tar.gz: f1a3e23f4f3eb3197c3f8e39e2a9663ae7329a7e1e46e100f60d91f3b01b55e46a19ded39ac4b88520ec29189adc1e3d948bbfca7422044a92dc2c26d6eb3367
+  metadata.gz: 54cc9b6d0289157de648f34c040355eb06f206ca0d616664d96e6ae3d3e5e754e950c447127d61cf16f6d3f15f874fd65d23845d1f912ce89c3e1571875a9d8e
+  data.tar.gz: 44e459c8a7424a8116f075979fa7ce2023b5307edb48c2a044cfdea5e5239435b8a85375687a9f2a51b7c63af60e2435bf27769043c9fa8be1de9d0f98c8fe9e

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

@@ -46,7 +46,10 @@ module Qa::Authorities
       index = AssignFast.index_for_authority(subauthority)
       return_data = "#{index}%2Cidroot%2Cauth%2Ctype"
       num_rows = 20 # max allowed by the API
-      "http://fast.oclc.org/searchfast/fastsuggest?&query=#{escaped_query}&queryIndex=#{index}&queryReturn=#{return_data}&suggest=autoSubject&rows=#{num_rows}"
+
+      # sort=usage+desc is not documented by OCLC but seems necessary to get the sort
+      # we formerly got without specifying, that is most useful in our use case.
+      "http://fast.oclc.org/searchfast/fastsuggest?&query=#{escaped_query}&queryIndex=#{index}&queryReturn=#{return_data}&suggest=autoSubject&rows=#{num_rows}&sort=usage+desc"
     end
 
     private

data/lib/qa/authorities/getty/aat.rb

@@ -54,7 +54,7 @@ module Qa::Authorities
         end
       rescue StandardError => e
         cause = response.fetch('error', {}).fetch('cause', 'UNKNOWN')
-        cause = cause.present? ? cause : 'UNKNOWN'
+        cause = cause.presence || 'UNKNOWN'
         Rails.logger.warn "  ERROR fetching Getty response: #{e.message}; cause: #{cause}"
         {}
       end

data/lib/qa/authorities/getty/aat2.rb

@@ -54,7 +54,7 @@ module Qa::Authorities
         end
       rescue StandardError => e
         cause = response.fetch('error', {}).fetch('cause', 'UNKNOWN')
-        cause = cause.present? ? cause : 'UNKNOWN'
+        cause = cause.presence || 'UNKNOWN'
         Rails.logger.warn "  ERROR fetching Getty response: #{e.message}; cause: #{cause}"
         {}
       end

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "5.11.0".freeze
+  VERSION = "5.13.0".freeze
 end

data/spec/controllers/terms_controller_spec.rb

@@ -199,7 +199,7 @@ describe Qa::TermsController, type: :controller do
 
     context "assign_fast" do
       before do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word&queryIndex=suggest50&queryReturn=suggest50,idroot,auth,type&rows=20&suggest=autoSubject")
+        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word&queryIndex=suggest50&queryReturn=suggest50,idroot,auth,type&rows=20&suggest=autoSubject&sort=usage+desc")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("assign-fast-topical-result.json"), status: 200, headers: {})
       end

data/spec/lib/authorities/assign_fast_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Qa::Authorities::AssignFast do
+  let(:query) { "word (ling" }
+  let(:expected_url) { "http://fast.oclc.org/searchfast/fastsuggest?&query=word%20ling&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20&sort=usage+desc" }
+
   # subauthority infrastructure
   describe "#new" do
     context "without a sub-authority" do
@@ -30,8 +33,7 @@ describe Qa::Authorities::AssignFast do
     end
 
     it "is correctly formed" do
-      url = 'http://fast.oclc.org/searchfast/fastsuggest?&query=word%20ling&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20'
-      expect(authority.build_query_url("word (ling")).to eq(url)
+      expect(authority.build_query_url(query)).to eq(expected_url)
     end
   end
 
@@ -43,27 +45,29 @@ describe Qa::Authorities::AssignFast do
     context "when we sent a bad character" do
       # server returns 200 with empty response; JSON throws a ParserError
       before do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject")
+        stub_request(:get, expected_url)
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(status: 200, body: "", headers: {})
       end
       it "logs an info and returns an empty array" do
-        expect(Rails.logger).to receive(:info).with('Retrieving json for 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("Retrieving json for url: #{expected_url}")
+        msg = "Could not parse response as JSON. Request url: #{expected_url}"
         expect(Rails.logger).to receive(:info).with(msg)
-        results = authority.search("word (ling")
+        results = authority.search(query)
         expect(results).to eq([])
       end
     end
 
     context "when query is blank" do
+      let(:query) { "" }
+      let(:expected_url) { "http://fast.oclc.org/searchfast/fastsuggest?&query=&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20&sort=usage+desc" }
+
       # server returns results but no results header
       let :results do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?&query=&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20")
+        stub_request(:get, expected_url)
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("assign-fast-noheader.json"), status: 200, headers: {})
-        authority.search("")
+        authority.search(query)
       end
       it "returns an empty array" do
         expect(results).to eq([])
@@ -72,10 +76,10 @@ describe Qa::Authorities::AssignFast do
 
     context "with no results" do
       let :results do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject")
+        stub_request(:get, expected_url)
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("assign-fast-noresults.json"), status: 200, headers: {})
-        authority.search("word (ling")
+        authority.search(query)
       end
       it "returns an empty array" do
         expect(results).to eq([])
@@ -84,10 +88,10 @@ describe Qa::Authorities::AssignFast do
 
     context "with suggestall results" do
       let :results do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject")
+        stub_request(:get, expected_url)
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("assign-fast-oneresult.json"), status: 200, headers: {})
-        authority.search("word (ling")
+        authority.search(query)
       end
       it "is correctly parsed" do
         expect(results.count).to eq(1)
@@ -99,11 +103,14 @@ describe Qa::Authorities::AssignFast do
     end
 
     context "with topical results" do
+      let(:query) { "word" }
+      let(:expected_url) { "http://fast.oclc.org/searchfast/fastsuggest?query=word&queryIndex=suggest50&queryReturn=suggest50,idroot,auth,type&rows=20&suggest=autoSubject&sort=usage+desc" }
+
       let :results do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word&queryIndex=suggest50&queryReturn=suggest50,idroot,auth,type&rows=20&suggest=autoSubject")
+        stub_request(:get, expected_url)
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("assign-fast-topical-result.json"), status: 200, headers: {})
-        described_class.subauthority_for("topical").search("word")
+        described_class.subauthority_for("topical").search(query)
       end
       it "is correctly parsed" do
         expect(results.count).to eq(20)

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

@@ -38,7 +38,7 @@ describe Qa::Authorities::Getty::AAT do
           # 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(Rails.logger).to receive(:warn).with(/ERROR fetching Getty response: .*undefined method.*for nil.*; cause: UNKNOWN/m)
           expect(subject).to be {}
         end
       end

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

@@ -38,7 +38,7 @@ describe Qa::Authorities::Getty::TGN do
           # 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(Rails.logger).to receive(:warn).with(/ERROR fetching Getty response: .*undefined method.*for nil.*; cause: UNKNOWN/m)
           expect(subject).to be {}
         end
       end

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

@@ -38,7 +38,7 @@ describe Qa::Authorities::Getty::Ulan do
           # 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(Rails.logger).to receive(:warn).with(/ERROR fetching Getty response: .*undefined method.*for nil.*; cause: UNKNOWN/m)
           expect(subject).to be {}
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 5.11.0
+  version: 5.13.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -117,7 +117,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement