qa 5.16.0 → 5.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72045748a59fdac5d424b0f6f0703e55282b3971380bc8c8288ccc66677d38d8
-  data.tar.gz: b03d37809c9d45a4c20b2b3dce9ce3a650fbb187580b21f6fdc956f549fef710
+  metadata.gz: 16eaf3a1b00dfb3b3063af78f2065ebd16b254fe5d97c55bc27c6255e41c5946
+  data.tar.gz: 50dc8f8818c16b2ccfcfa0dfb79b74ebb1d7032ca1cd389ac4d181e885ca0db1
 SHA512:
-  metadata.gz: be2bdd94bae283c15a285c3213be0d780053948da33da5e933cc790cdf3ba2fac4c343380b68b80853d2c0fd83aee7c15ed059372fe314af3094376df855b8d7
-  data.tar.gz: 85500cf3c3b1d1a86b002ec6ef748d70b91a0f021caec6ef6ba94861766b67035bfb926fcd59c9e6a6d67abf107c99bf5d0a475b64f122604a006d1386753b29
+  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/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.16.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/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/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.16.0
+  version: 5.17.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-10 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
@@ -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