qa 5.10.0 → 5.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ab17e283e9e6cf2e8234ef90d32bbbebe83ecdb7f52e7b07ccccf853eebd2c
-  data.tar.gz: 83abfe73a222b69a782c54ed9120ec08c07db796656c9e942b5494c3cd32f847
+  metadata.gz: 0b356b770cbc77b1d67024f2a73be01b579943e75d9bda64e7f7dad04f66342b
+  data.tar.gz: a3f6a66764724811209c8616e00f260cab0d371f340117f335d384c1f84d1bd6
 SHA512:
-  metadata.gz: e8e0c392d5c1c54c29e53281e2903722de989e6ce2eea8e50edef227604f4de74855f9d029123e76ce42948951603bbe56be8f32d7af5d4709c82e8dd7d35e97
-  data.tar.gz: 28c4963e4852df3ce295c8df16cf074bb00ea123a18e62011c6f020cfaaa81c2da2da05134956d0a6a5dac921471c0bc4ea9764e81c50d810ff64d145c96f8b6
+  metadata.gz: 798c03132eac1750d15b0db93e2c6009925b1ebd3773619df77cd11f3f0cd661b6645d5e54122842efdc3e86d221356fb38aca6705943c35a5dc03d0a7010d2d
+  data.tar.gz: f1a3e23f4f3eb3197c3f8e39e2a9663ae7329a7e1e46e100f60d91f3b01b55e46a19ded39ac4b88520ec29189adc1e3d948bbfca7422044a92dc2c26d6eb3367

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

@@ -0,0 +1,62 @@
+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.present? ? cause : 'UNKNOWN'
+        Rails.logger.warn "  ERROR fetching Getty response: #{e.message}; cause: #{cause}"
+        {}
+      end
+  end
+end

data/lib/qa/data/TGN_LANGUAGES.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <Vocabulary xmlns="http://localhost/namespace" xmlns:vp="http://localhost/namespace" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://localhost/namespace Getty_Vocab_Export_Languages.xsd" Title="Thesaurus of Geographic Names" Part="Languages" Date="2011-04-11">
 <Language>
 <Language_Code>70115</Language_Code>

data/lib/qa/engine.rb

@@ -4,5 +4,18 @@ require 'qa/linked_data/authority_service'
 module Qa
   class Engine < ::Rails::Engine
     isolate_namespace Qa
+
+    config.before_configuration do
+      # rubocop:disable Style/IfUnlessModifier
+
+      # see https://github.com/fxn/zeitwerk#for_gem
+      # Blacklight puts a generator into LOCAL APP lib/generators, so tell
+      # zeitwerk to ignore the whole directory? If we're using zeitwerk
+      #
+      # See: https://github.com/cbeer/engine_cart/issues/117
+      if Rails.try(:autoloaders).try(:main).respond_to?(:ignore)
+        Rails.autoloaders.main.ignore(Rails.root.join('lib', 'generators'))
+      end
+    end
   end
 end

data/lib/qa/version.rb

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

data/spec/lib/services/rdf_authority_parser_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Qa::Services::RDFAuthorityParser do
-  let(:source) { [File.join(fixture_path, 'lexvo_snippet.rdf.xml')] }
+  let(:source) { [Qa::Engine.root.join('spec', 'fixtures', 'lexvo_snippet.rdf.xml')] }
   let(:format) { 'rdfxml' }
   let(:predicate) { RDF::URI("http://www.w3.org/2008/05/skos#prefLabel") }
   let(:name) { 'language' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 5.11.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-11-09 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.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -475,6 +475,7 @@ 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
@@ -660,7 +661,8 @@ files:
 homepage: https://github.com/projecthydra/questioning_authority
 licenses:
 - APACHE-2
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -676,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: You should question your authorities.