qa 5.14.0 → 5.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790243f02ba25c268235f6247e96f2824bbc1d971463992c17fabc9f6a8109a0
-  data.tar.gz: e5fd83a8fc8aac46cb0c991184c6ceb8d39dd64a9fae10fff0f4edd6d30ae4c2
+  metadata.gz: 11cbb13006d50dd1457c8782b84f49a677717302d43a3978e3629670ac9ec433
+  data.tar.gz: 72c2de2f8114cc9df223ef68eeac9f3ff9046a74c87dd93103a3461d24c2c15e
 SHA512:
-  metadata.gz: a4a2fca9475e5c1b94960b2bcead2fa7d7b504b5a08767797148e59a017178677d3691c92d0a2fc785e4bc53021968850e558bff33fe1739ea344c8abc4a32db
-  data.tar.gz: 6ac6e9ffb528f9dfb7c8a5818793ddb29f83e572a5f61ed3864185407eaab503353ab9c222bc1ea8c0216cd52c00402353652e1e86f535d608ce21505756c27d
+  metadata.gz: 30f799610d3d6980f0e33d3b5fcb2364e9c0019c18f8a12f5474dd22a82ccb865f95cc5f4d49da70df2246fda033ab17ea20dd3da554c220b881841d2a64c1bf
+  data.tar.gz: cc3c22f2e7cb940eff5f7f3d398090ae2caaff78840a81eff1ea9e229d1db2c2a17673617e0cd12fd9aef1a6ffa30128accf66cf8eaa1537b0df901e1847ceac

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/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.15.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/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.15.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-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -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