qa 5.15.0 → 5.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11cbb13006d50dd1457c8782b84f49a677717302d43a3978e3629670ac9ec433
-  data.tar.gz: 72c2de2f8114cc9df223ef68eeac9f3ff9046a74c87dd93103a3461d24c2c15e
+  metadata.gz: 16eaf3a1b00dfb3b3063af78f2065ebd16b254fe5d97c55bc27c6255e41c5946
+  data.tar.gz: 50dc8f8818c16b2ccfcfa0dfb79b74ebb1d7032ca1cd389ac4d181e885ca0db1
 SHA512:
-  metadata.gz: 30f799610d3d6980f0e33d3b5fcb2364e9c0019c18f8a12f5474dd22a82ccb865f95cc5f4d49da70df2246fda033ab17ea20dd3da554c220b881841d2a64c1bf
-  data.tar.gz: cc3c22f2e7cb940eff5f7f3d398090ae2caaff78840a81eff1ea9e229d1db2c2a17673617e0cd12fd9aef1a6ffa30128accf66cf8eaa1537b0df901e1847ceac
+  metadata.gz: ee41c3074ee5172e3e4455afa5a1a7858e61894140642e45d6c3efddca298cd46749f9eed04a9446bc287965497dbab715167e682821a85e37aba97a0e36e71b
+  data.tar.gz: 6412e3a3843ee1984797299d22cac8c6e8f9ac19f544b8b85c530db4a67c8826811f416fb546d633467736b1070bc86068fde65db7c48e939e9cba12d6956f65

data/app/services/qa/pagination_service.rb

@@ -433,7 +433,7 @@ module Qa
       #       linked_data module pagination).
       def requested_page_offset
         return @requested_page_offset if @requested_page_offset.present?
-        @requested_page_offset = (request_params['page_offset'] || request_params['startRecord'])
+        @requested_page_offset = request_params['page_offset'] || request_params['startRecord']
       end
 
       # @return [Integer] The first record to include in the response data as
@@ -470,7 +470,7 @@ module Qa
       #       linked_data module pagination).
       def requested_page_limit
         return @requested_page_limit if @requested_page_limit.present?
-        @requested_page_limit ||= (request_params['page_limit'] || request_params['maxRecords'])
+        @requested_page_limit ||= request_params['page_limit'] || request_params['maxRecords']
       end
 
       # @return [Integer] The max number of records to include in response data as

data/config/authorities/linked_data/getty_aac.json

@@ -0,0 +1,6 @@
+{
+  "term": { },
+  "search": {
+    "urls" : { "getty_vocab_url": "https://vocab.getty.edu" }
+  }
+}

data/lib/generators/qa/apidoc/apidoc_generator.rb

@@ -11,7 +11,7 @@ This generator makes the following changes to your application:
   def add_to_gemfile
     gem 'swagger-docs'
 
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       run "bundle install"
     end
   end

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

@@ -1,13 +1,11 @@
 module Qa::Authorities
   # for use with Faraday; encode spaces as '%20' not '+'
   class AssignFast::SpaceFixEncoder
+    delegate :decode, to: Faraday::NestedParamsEncoder
+
     def encode(hash)
       encoded = Faraday::NestedParamsEncoder.encode(hash)
       encoded.gsub('+', '%20')
     end
-
-    def decode(str)
-      Faraday::NestedParamsEncoder.decode(str)
-    end
   end
 end

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/authorities/getty/aat.rb

@@ -7,7 +7,7 @@ module Qa::Authorities
     end
 
     def build_query_url(q)
-      "http://vocab.getty.edu/sparql.json?query=#{ERB::Util.url_encode(sparql(q))}&_implicit=false&implicit=true&_equivalent=false&_form=%2Fsparql"
+      "#{getty_vocab_url}/sparql.json?query=#{ERB::Util.url_encode(sparql(q))}&_implicit=false&implicit=true&_equivalent=false&_form=%2Fsparql"
     end
 
     def sparql(q) # rubocop:disable Metrics/MethodLength
@@ -38,7 +38,7 @@ module Qa::Authorities
     end
 
     def find_url(id)
-      "http://vocab.getty.edu/download/json?uri=http://vocab.getty.edu/aat/#{id}.json"
+      "#{getty_vocab_url}/download/json?uri=#{getty_vocab_url}/aat/#{id}.json"
     end
 
     def request_options
@@ -58,5 +58,13 @@ module Qa::Authorities
         Rails.logger.warn "  ERROR fetching Getty response: #{e.message}; cause: #{cause}"
         {}
       end
+
+      def linked_data_authority_configs
+        Qa.config.linked_data_authority_configs
+      end
+
+      def getty_vocab_url
+        @getty_vocab_url ||= linked_data_authority_configs.dig(:GETTY_AAC, :search, :urls, :getty_vocab_url) || 'https://vocab.getty.edu'
+      end
   end
 end

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

@@ -179,7 +179,7 @@ module Qa::Authorities
         end
 
         def wrap_labels(labels)
-          lbl = "" if labels.nil? || labels.size.zero?
+          lbl = "" if labels.blank?
           lbl = labels.join(', ') if labels.size.positive?
           lbl = '[' + lbl + ']' if labels.size > 1
           lbl

data/lib/qa/authorities/loc_subauthority.rb

@@ -22,7 +22,7 @@ module Qa::Authorities::LocSubauthority
     return "authorities" if authorities.include?(authority)
     return "vocabulary" if vocabularies.include?(authority)
     return "datatype" if datatypes.include?(authority)
-    return "vocabulary/preservation" if preservation.include?(authority)
+    "vocabulary/preservation" if preservation.include?(authority)
   end
 
   def authorities
@@ -47,6 +47,7 @@ module Qa::Authorities::LocSubauthority
       "languages",
       "iso639-1",
       "iso639-2",
+      "iso639-3",
       "iso639-5",
       "preservation",
       "actionsGranted",

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

@@ -1,23 +1,17 @@
 module Qa::Authorities
   module Local
     class Registry
+      delegate :keys, :fetch, to: :@hash
+
       def initialize
         @hash = {}
         yield self if block_given?
       end
 
-      def keys
-        @hash.keys
-      end
-
       def instance_for(key)
         fetch(key).instance
       end
 
-      def fetch(key)
-        @hash.fetch(key)
-      end
-
       def self.logger
         @logger ||= ::Rails.logger if defined? Rails && Rails.respond_to?(:logger)
       end

data/lib/qa/engine.rb

@@ -17,5 +17,12 @@ module Qa
         Rails.autoloaders.main.ignore(Rails.root.join('lib', 'generators'))
       end
     end
+
+    # Allow main application to configure deprecation behavior
+    if Gem::Version.new(Rails.version) >= Gem::Version.new('7.1.0')
+      initializer "qa.deprecator" do |app|
+        app.deprecators[:qa] = Qa.deprecator
+      end
+    end
   end
 end

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "5.15.0".freeze
+  VERSION = "5.17.0".freeze
 end

data/lib/qa.rb

@@ -25,10 +25,22 @@ module Qa
     @config
   end
 
+  def self.deprecator
+    @deprecator ||= deprecator_instance
+  end
+
+  # TODO: refactor when support for Rails < 7.1.0 is dropped
+  def self.deprecator_instance
+    if Gem::Version.new(Rails.version) >= Gem::Version.new('7.1.0')
+      ActiveSupport::Deprecation.new("6.0.0", "Qa")
+    else
+      Rails.logger
+    end
+  end
+
   def self.deprecation_warning(in_msg: nil, msg:)
-    return if Rails.env == 'test'
     in_msg = in_msg.present? ? "In #{in_msg}, " : ''
-    warn "[DEPRECATED] #{in_msg}#{msg}  It will be removed in the next major release."
+    deprecator.warn "#{in_msg}#{msg}  It will be removed in the next major release."
   end
 
   # Raised when the authority is not valid

data/lib/tasks/mesh.rake

@@ -1,9 +1,9 @@
-require 'benchmark'
-
 namespace :qa do
   namespace :mesh do
     desc "Import MeSH terms from the file $MESH_FILE, it will update any terms which are already in the database"
     task import: :environment do
+      require 'benchmark' # may require you to add benchmark dependency in ruby 4+
+
       fname = ENV['MESH_FILE']
       if fname.nil?
         puts "Need to set $MESH_FILE with path to file to ingest"

data/spec/controllers/terms_controller_spec.rb

@@ -32,7 +32,7 @@ describe Qa::TermsController, type: :controller do
         msg = "Unable to initialize sub-authority non-existent-subauthority for Qa::Authorities::Loc. Valid sub-authorities are " \
               "[\"subjects\", \"names\", \"classification\", \"childrensSubjects\", \"genreForms\", \"performanceMediums\", " \
               "\"graphicMaterials\", \"organizations\", \"relators\", \"countries\", \"ethnographicTerms\", \"geographicAreas\", " \
-              "\"languages\", \"iso639-1\", \"iso639-2\", \"iso639-5\", \"preservation\", \"actionsGranted\", \"agentType\", " \
+              "\"languages\", \"iso639-1\", \"iso639-2\", \"iso639-3\", \"iso639-5\", \"preservation\", \"actionsGranted\", \"agentType\", " \
               "\"edtf\", \"contentLocationType\", \"copyrightStatus\", \"cryptographicHashFunctions\", " \
               "\"environmentCharacteristic\", \"environmentPurpose\", \"eventRelatedAgentRole\", \"eventRelatedObjectRole\", " \
               "\"eventType\", \"formatRegistryRole\", \"hardwareType\", \"inhibitorTarget\", \"inhibitorType\", \"objectCategory\", " \

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/lib/authorities/getty/aat_spec.rb

@@ -5,12 +5,12 @@ describe Qa::Authorities::Getty::AAT do
 
   describe "#build_query_url" do
     subject { authority.build_query_url("foo") }
-    it { is_expected.to match(/^http:\/\/vocab\.getty\.edu\//) }
+    it { is_expected.to match(/^https:\/\/vocab\.getty\.edu\//) }
   end
 
   describe "#find_url" do
     subject { authority.find_url("300053264") }
-    it { is_expected.to eq "http://vocab.getty.edu/download/json?uri=http://vocab.getty.edu/aat/300053264.json" }
+    it { is_expected.to eq "https://vocab.getty.edu/download/json?uri=https://vocab.getty.edu/aat/300053264.json" }
   end
 
   describe "#search" do
@@ -62,7 +62,7 @@ describe Qa::Authorities::Getty::AAT do
   describe "#find" do
     context "using a subject id" do
       before do
-        stub_request(:get, "http://vocab.getty.edu/download/json?uri=http://vocab.getty.edu/aat/300265560.json")
+        stub_request(:get, "https://vocab.getty.edu/download/json?uri=https://vocab.getty.edu/aat/300265560.json")
           .to_return(status: 200, body: webmock_fixture("getty-aat-find-response.json"))
       end
       subject { authority.find("300265560") }

data/spec/services/linked_data/authority_service_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe Qa::LinkedData::AuthorityService do
   let(:auth_names) do
-    [:LOC,
+    [:GETTY_AAC,
+     :LOC,
      :LOD_ENCODING_CONFIG,
      :LOD_FULL_CONFIG,
      :LOD_FULL_CONFIG_1_0,

data/spec/services/linked_data/response_header_service_spec.rb

@@ -74,8 +74,7 @@ RSpec.describe Qa::LinkedData::ResponseHeaderService do
 
   describe '#fetch_header' do
     let(:request_header) do
-      {
-      }.with_indifferent_access
+      {}.with_indifferent_access
     end
     let(:term_config) { double }
     let(:graph) { instance_double(RDF::Graph) }

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

@@ -26,4 +26,13 @@ group :development do
     gem 'concurrent-ruby', '1.3.4'
   end
 
+  # multi_json 1.19.x / json 2.19.x interaction causes
+  # RDF::Graph#dump(:jsonld, standard_prefixes: true) to raise:
+  # NoMethodError: undefined method `except' for JSON::Ext::Generator::State
+  # in e.g. lib/qa/authorities/linked_data/find_term.rb and
+  # lib/qa/authorities/discogs/discogs_translation.rb 
+  if RUBY_VERSION =~ /^3\.[01]\./
+    gem "multi_json", ">= 1.17", "< 1.19"
+  end
+
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -4,7 +4,7 @@ class TestAppGenerator < Rails::Generators::Base
   source_root Rails.root
 
   def update_app
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       run "bundle install"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 5.15.0
+  version: 5.17.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-02 00:00:00.000000000 Z
+date: 2026-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -32,20 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: deprecation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -114,20 +100,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
@@ -414,6 +400,7 @@ files:
 - app/views/layouts/qa/application.html.erb
 - config/authorities.yml
 - config/authorities/assign_fast/oclc_assign_fast.json
+- config/authorities/linked_data/getty_aac.json
 - config/authorities/linked_data/loc.json
 - config/authorities/linked_data/oclc_fast.json
 - config/authorities/states.yml
@@ -476,7 +463,6 @@ files:
 - lib/qa/authorities/geonames.rb
 - lib/qa/authorities/getty.rb
 - lib/qa/authorities/getty/aat.rb
-- lib/qa/authorities/getty/aat2.rb
 - lib/qa/authorities/getty/tgn.rb
 - lib/qa/authorities/getty/ulan.rb
 - lib/qa/authorities/linked_data.rb
@@ -681,7 +667,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: You should question your authorities.

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

@@ -1,62 +0,0 @@
-module Qa::Authorities
-  class Getty::AAT2 < Base
-    include WebServiceBase
-
-    def search(q)
-      parse_authority_response(json(build_query_url(q)))
-    end
-
-    def build_query_url(q)
-      "http://vocab.getty.edu/sparql.json?query=#{ERB::Util.url_encode(sparql(q))}&_implicit=false&implicit=true&_equivalent=false&_form=%2Fsparql"
-    end
-
-    def sparql(q) # rubocop:disable Metrics/MethodLength
-      search = untaint(q)
-      if search.include?(' ')
-        clauses = search.split(' ').collect do |i|
-          %((regex(?name, "#{i}", "i")))
-        end
-        ex = "(#{clauses.join(' && ')})"
-      else
-        ex = %(regex(?name, "#{search}", "i"))
-      end
-      # The full text index matches on fields besides the term, so we filter to ensure the match is in the term.
-      %(SELECT ?s ?name {
-              ?s a skos:Concept; luc:term "#{search}";
-                 skos:inScheme <http://vocab.getty.edu/aat/> ;
-                 gvp:prefLabelGVP [skosxl:literalForm ?name].
-              FILTER #{ex} .
-            } ORDER BY ?name).gsub(/[\s\n]+/, " ")
-    end
-
-    def untaint(q)
-      q.gsub(/[^\w\s-]/, '')
-    end
-
-    def find(id)
-      json(find_url(id))
-    end
-
-    def find_url(id)
-      "http://vocab.getty.edu/download/json?uri=http://vocab.getty.edu/aat/#{id}.json"
-    end
-
-    def request_options
-      { accept: 'application/sparql-results+json' }
-    end
-
-    private
-
-      # Reformats the data received from the Getty service
-      def parse_authority_response(response)
-        response['results']['bindings'].map do |result|
-          { 'id' => result['s']['value'], 'label' => result['name']['value'] }
-        end
-      rescue StandardError => e
-        cause = response.fetch('error', {}).fetch('cause', 'UNKNOWN')
-        cause = cause.presence || 'UNKNOWN'
-        Rails.logger.warn "  ERROR fetching Getty response: #{e.message}; cause: #{cause}"
-        {}
-      end
-  end
-end