qa 5.14.0 → 5.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790243f02ba25c268235f6247e96f2824bbc1d971463992c17fabc9f6a8109a0
-  data.tar.gz: e5fd83a8fc8aac46cb0c991184c6ceb8d39dd64a9fae10fff0f4edd6d30ae4c2
+  metadata.gz: 72045748a59fdac5d424b0f6f0703e55282b3971380bc8c8288ccc66677d38d8
+  data.tar.gz: b03d37809c9d45a4c20b2b3dce9ce3a650fbb187580b21f6fdc956f549fef710
 SHA512:
-  metadata.gz: a4a2fca9475e5c1b94960b2bcead2fa7d7b504b5a08767797148e59a017178677d3691c92d0a2fc785e4bc53021968850e558bff33fe1739ea344c8abc4a32db
-  data.tar.gz: 6ac6e9ffb528f9dfb7c8a5818793ddb29f83e572a5f61ed3864185407eaab503353ab9c222bc1ea8c0216cd52c00402353652e1e86f535d608ce21505756c27d
+  metadata.gz: be2bdd94bae283c15a285c3213be0d780053948da33da5e933cc790cdf3ba2fac4c343380b68b80853d2c0fd83aee7c15ed059372fe314af3094376df855b8d7
+  data.tar.gz: 85500cf3c3b1d1a86b002ec6ef748d70b91a0f021caec6ef6ba94861766b67035bfb926fcd59c9e6a6d67abf107c99bf5d0a475b64f122604a006d1386753b29

data/config/authorities/assign_fast/oclc_assign_fast.json

@@ -0,0 +1,6 @@
+{
+  "search": {
+    "urls" : { "fastsuggest": "https://fast.oclc.org/searchfast/fastsuggest" },
+    "connection": { "timeout":"5"}
+  }
+}

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

@@ -19,6 +19,7 @@ module Qa::Authorities
       Faraday.get(url) do |req|
         req.options.params_encoder = space_fix_encoder
         req.headers['Accept'] = 'application/json'
+        req.options.timeout = connection_timeout_in_seconds unless connection_timeout_in_seconds.nil?
       end
     end
 
@@ -49,11 +50,25 @@ module Qa::Authorities
 
       # 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"
+      "#{assign_fast_url}?&query=#{escaped_query}&queryIndex=#{index}&queryReturn=#{return_data}&suggest=autoSubject&rows=#{num_rows}&sort=usage+desc"
     end
 
     private
 
+      # See https://github.com/samvera/questioning_authority/wiki/Connecting-to-OCLC-FAST
+      # for more info about config settings for this authority.
+      def assign_fast_config
+        Qa.config.assign_fast_authority_configs
+      end
+
+      def connection_timeout_in_seconds
+        assign_fast_config.dig(:OCLC_ASSIGN_FAST, :search, :connection, :timeout)&.to_i
+      end
+
+      def assign_fast_url
+        assign_fast_config.dig(:OCLC_ASSIGN_FAST, :search, :urls, :fastsuggest) || 'https://fast.oclc.org/searchfast/fastsuggest'
+      end
+
       # Removes characters from the query string that are not tolerated by the API
       #   See oclc sample code at
       #   http://experimental.worldcat.org/fast/assignfast/js/assignFASTComplete.js

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

@@ -1,12 +1,15 @@
 require 'rdf'
 require 'rdf/ntriples'
+require 'net/http'
+require 'json'
+
 module Qa::Authorities
   class Discogs::GenericAuthority < Base
     include WebServiceBase
     include Discogs::DiscogsTranslation
     include Discogs::DiscogsUtils
 
-    class_attribute :discogs_secret, :discogs_key
+    class_attribute :discogs_secret, :discogs_key, :discogs_user_token
     attr_accessor :primary_artists, :selected_format, :work_uri, :instance_uri
 
     # @param [String] subauthority to use
@@ -26,8 +29,8 @@ module Qa::Authorities
       # physical or digital object and a master represents a set of similar releases. Use of a
       # subauthority (e.g., /qa/search/discogs/master) will target a specific type. Using the "all"
       #  subauthority will search for both types.
-      unless discogs_key && discogs_secret
-        Rails.logger.error "Questioning Authority tried to call Discogs, but no secret and/or key were set."
+      unless discogs_user_token.present? || (discogs_key && discogs_secret)
+        Rails.logger.error "Questioning Authority tried to call Discogs, but no user token, secret and/or key were set."
         return []
       end
       response = json(build_query_url(q, tc))
@@ -72,7 +75,9 @@ module Qa::Authorities
         per_page = tc.params["per_page"]
       end
       escaped_q = ERB::Util.url_encode(q)
-      "https://api.discogs.com/database/search?q=#{escaped_q}&type=#{tc.params['subauthority']}&page=#{page}&per_page=#{per_page}&key=#{discogs_key}&secret=#{discogs_secret}"
+      url = "https://api.discogs.com/database/search?q=#{escaped_q}&type=#{tc.params['subauthority']}&page=#{page}&per_page=#{per_page}"
+      url += "&key=#{discogs_key}&secret=#{discogs_secret}" if discogs_user_token.blank?
+      url
     end
 
     # @param [String] the id of the selected item
@@ -82,6 +87,23 @@ module Qa::Authorities
       "https://api.discogs.com/#{subauthority}s/#{id}"
     end
 
+    def json(url)
+      if discogs_user_token.present?
+        uri = URI(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+
+        request = Net::HTTP::Get.new(uri)
+        request['Authorization'] = "Discogs token=#{discogs_user_token}"
+        request['User-Agent'] = 'HykuApp/1.0'
+
+        response = http.request(request)
+        JSON.parse(response.body)
+      else
+        super
+      end
+    end
+
     private
 
       # In the unusual case that we have an id and the subauthority is "all", we don't know which Discogs url to

data/lib/qa/configuration.rb

@@ -28,8 +28,8 @@ module Qa
       token == authorized_reload_token
     end
 
-    # Hold linked data authority configs
-    attr_accessor :linked_data_authority_configs
+    # Hold authority configs
+    attr_accessor :linked_data_authority_configs, :assign_fast_authority_configs
 
     # For linked data access, specify default language for sorting and selection.  The default is only used if a language is not
     # specified in the authority's configuration file and not passed in as a parameter.  (e.g. :en, [:en], or [:en, :fr])

data/lib/qa/linked_data/authority_service.rb

@@ -2,25 +2,45 @@
 module Qa
   module LinkedData
     class AuthorityService
-      # Load or reload the linked data configuration files
       def self.load_authorities
-        auth_cfg = {}
-        # load QA configured linked data authorities
+        load_linked_data_config
+        load_assign_fast_config
+      end
+
+      # Load or reload the linked data configuration files
+      def self.load_linked_data_config
+        ld_auth_cfg = {}
+        # Linked data settings
         Dir[File.join(Qa::Engine.root, 'config', 'authorities', 'linked_data', '*.json')].each do |fn|
-          auth = File.basename(fn, '.json').upcase.to_sym
-          json = File.read(File.expand_path(fn, __FILE__))
-          cfg = JSON.parse(json).deep_symbolize_keys
-          auth_cfg[auth] = cfg
+          process_config_file(file_path: fn, config_hash: ld_auth_cfg)
         end
-
-        # load app configured linked data authorities and overrides
+        # Optional local (app) linked data settings overrides
         Dir[Rails.root.join('config', 'authorities', 'linked_data', '*.json')].each do |fn|
-          auth = File.basename(fn, '.json').upcase.to_sym
-          json = File.read(File.expand_path(fn, __FILE__))
-          cfg = JSON.parse(json).deep_symbolize_keys
-          auth_cfg[auth] = cfg
+          process_config_file(file_path: fn, config_hash: ld_auth_cfg)
         end
-        Qa.config.linked_data_authority_configs = auth_cfg
+        Qa.config.linked_data_authority_configs = ld_auth_cfg
+      end
+
+      # similar to the above; these settings are for getting (non-linked-data) FAST subject headings from OCLC.
+      def self.load_assign_fast_config
+        assign_fast_auth_cfg = {}
+        # assign_fast settings
+        Dir[File.join(Qa::Engine.root, 'config', 'authorities', 'assign_fast', '*.json')].each do |fn|
+          process_config_file(file_path: fn, config_hash: assign_fast_auth_cfg)
+        end
+        # Optional local (app) assign_fast settings overrides
+        Dir[Rails.root.join('config', 'authorities', 'assign_fast', '*.json')].each do |fn|
+          process_config_file(file_path: fn, config_hash: assign_fast_auth_cfg)
+        end
+        Qa.config.assign_fast_authority_configs = assign_fast_auth_cfg
+      end
+
+      # load settings into a configuration hash:
+      def self.process_config_file(file_path:, config_hash:)
+        file_key = File.basename(file_path, '.json').upcase.to_sym
+        json = File.read(File.expand_path(file_path, __FILE__))
+        cfg = JSON.parse(json).deep_symbolize_keys
+        config_hash[file_key] = cfg
       end
 
       # Get the list of names of the loaded authorities

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "5.14.0".freeze
+  VERSION = "5.16.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&sort=usage+desc")
+        stub_request(:get, "https://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

@@ -2,7 +2,7 @@ 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" }
+  let(:expected_url) { "https://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
@@ -60,7 +60,7 @@ describe Qa::Authorities::AssignFast do
 
     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" }
+      let(:expected_url) { "https://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
@@ -104,7 +104,7 @@ describe Qa::Authorities::AssignFast do
 
     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(:expected_url) { "https://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, expected_url)

data/spec/lib/authorities/discogs/generic_authority_spec.rb

@@ -4,6 +4,7 @@ describe Qa::Authorities::Discogs::GenericAuthority do
   before do
     described_class.discogs_key = 'dummy_key'
     described_class.discogs_secret = 'dummy_secret'
+    described_class.discogs_user_token = nil
   end
 
   let(:authority) { described_class.new "all" }
@@ -29,6 +30,18 @@ describe Qa::Authorities::Discogs::GenericAuthority do
 
       it { is_expected.to eq 'https://api.discogs.com/database/search?q=foo&type=master&page=1&per_page=10&key=dummy_key&secret=dummy_secret' }
     end
+
+    context "with a user token" do
+      subject { authority.build_query_url("foo", tc) }
+      let(:tc) { instance_double(Qa::TermsController) }
+      before do
+        described_class.discogs_user_token = 'dummy_token'
+        allow(Qa::TermsController).to receive(:new).and_return(tc)
+        allow(tc).to receive(:params).and_return('page' => "1", 'per_page' => "10", 'subauthority' => "master")
+      end
+
+      it { is_expected.to eq 'https://api.discogs.com/database/search?q=foo&type=master&page=1&per_page=10' }
+    end
   end
 
   describe "#find_url" do
@@ -363,6 +376,33 @@ describe Qa::Authorities::Discogs::GenericAuthority do
         end
       end
 
+      context "with user token authentication" do
+        let(:tc) { instance_double(Qa::TermsController) }
+        let :results do
+          described_class.discogs_user_token = 'dummy_token'
+          described_class.discogs_key = nil
+          described_class.discogs_secret = nil
+          stub_request(:get, "https://api.discogs.com/database/search?q=melody+gardot&type=all&page=&per_page=")
+            .with(
+              headers: {
+                'Authorization' => 'Discogs token=dummy_token',
+                'User-Agent' => 'HykuApp/1.0'
+              }
+            )
+            .to_return(status: 200, body: webmock_fixture("discogs-search-response-no-subauth.json"))
+          authority.search("melody gardot", tc)
+        end
+        before do
+          allow(Qa::TermsController).to receive(:new).and_return(tc)
+          allow(tc).to receive(:params).and_return('subauthority' => "all")
+        end
+
+        it "has id and label keys" do
+          expect(results.first["uri"]).to eq("https://www.discogs.com/Melody-Gardot-Who-Will-Comfort-Me-Over-The-Rainbow/release/1750352")
+          expect(results.first["id"]).to eq "1750352"
+        end
+      end
+
       context "when authentication isn't set" do
         let(:tc) { instance_double(Qa::TermsController) }
         let :results do
@@ -373,12 +413,13 @@ describe Qa::Authorities::Discogs::GenericAuthority do
         before do
           described_class.discogs_secret = nil
           described_class.discogs_key = nil
+          described_class.discogs_user_token = nil
           allow(Qa::TermsController).to receive(:new).and_return(tc)
           allow(tc).to receive(:params).and_return('subauthority' => "master")
         end
 
         it "logs an error" do
-          expect(Rails.logger).to receive(:error).with('Questioning Authority tried to call Discogs, but no secret and/or key were set.')
+          expect(Rails.logger).to receive(:error).with('Questioning Authority tried to call Discogs, but no user token, secret and/or key were set.')
           expect(results).to be_empty
         end
       end

data/spec/spec_helper.rb

@@ -22,7 +22,11 @@ require 'pry'
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
-  config.fixture_path = File.expand_path("../fixtures", __FILE__)
+  if config.respond_to?(:fixture_paths=)
+    config.fixture_paths = [File.expand_path("../fixtures", __FILE__)]
+  else
+    config.fixture_path = File.expand_path("../fixtures", __FILE__)
+  end
 
   config.use_transactional_fixtures = true
 

data/spec/test_app_templates/Gemfile.extra

@@ -21,4 +21,9 @@ group :development do
     # See https://stackoverflow.com/questions/70500220/rails-7-ruby-3-1-loaderror-cannot-load-such-file-net-smtp
     gem 'net-smtp', require: false
   end
+
+  if Gem::Version.new(ENV['RAILS_VERSION']) < Gem::Version.new('7.1')
+    gem 'concurrent-ruby', '1.3.4'
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 5.14.0
+  version: 5.16.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2025-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -114,20 +114,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -413,6 +413,7 @@ files:
 - app/services/qa/pagination_service.rb
 - app/views/layouts/qa/application.html.erb
 - config/authorities.yml
+- config/authorities/assign_fast/oclc_assign_fast.json
 - config/authorities/linked_data/loc.json
 - config/authorities/linked_data/oclc_fast.json
 - config/authorities/states.yml