qa 5.9.0 → 5.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f4e4d8c917617e8cba95cd8bc8e0f06ebb60c9b580672b3736c717ef1ce3746
-  data.tar.gz: bd9624a47e0c513d8b7fdf7a278d2c904867b3331217faaf7951321326f7549d
+  metadata.gz: 0b356b770cbc77b1d67024f2a73be01b579943e75d9bda64e7f7dad04f66342b
+  data.tar.gz: a3f6a66764724811209c8616e00f260cab0d371f340117f335d384c1f84d1bd6
 SHA512:
-  metadata.gz: a6f568c19f5aad67ca850bf0d666afd63f971b7bbab83e51b4299791b52c94e93fcae9e49a9ff6aec4d2e8329cf1b41ab39131fa8dc3e0eb0baec5725934499b
-  data.tar.gz: 69d1bed451753f68ae20551aa1ac2a77e8acbfffeb2600e42d50726d113f28300c01faaf74af9b65dcfc5a168410019fb99bc84b09928b9846b466fd20fc9e63
+  metadata.gz: 798c03132eac1750d15b0db93e2c6009925b1ebd3773619df77cd11f3f0cd661b6645d5e54122842efdc3e86d221356fb38aca6705943c35a5dc03d0a7010d2d
+  data.tar.gz: f1a3e23f4f3eb3197c3f8e39e2a9663ae7329a7e1e46e100f60d91f3b01b55e46a19ded39ac4b88520ec29189adc1e3d948bbfca7422044a92dc2c26d6eb3367

data/README.md

@@ -1,10 +1,15 @@
 # Questioning Authority
 
-Code: [![Gem Version](https://badge.fury.io/rb/qa.png)](http://badge.fury.io/rb/qa) [![Build Status](https://circleci.com/gh/samvera/questioning_authority.svg?style=svg)](https://circleci.com/gh/samvera/questioning_authority) [![Coverage Status](https://coveralls.io/repos/github/samvera/questioning_authority/badge.svg?branch=main)](https://coveralls.io/github/samvera/questioning_authority?branch=main)
+Code:
+[![Gem Version](https://badge.fury.io/rb/qa.png)](http://badge.fury.io/rb/qa)
+[![Build Status](https://circleci.com/gh/samvera/questioning_authority.svg?style=svg)](https://circleci.com/gh/samvera/questioning_authority)
+[![Coverage Status](https://coveralls.io/repos/github/samvera/questioning_authority/badge.svg?branch=main)](https://coveralls.io/github/samvera/questioning_authority?branch=main)
 
-Docs: [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md) [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
+Docs:
+[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
+[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 
-Jump In: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+Community Support: [![Samvera Community Slack](https://img.shields.io/badge/samvera-slack-blueviolet)](http://slack.samvera.org/)
 
 You should question your authorities.
 
@@ -145,14 +150,14 @@ rake ci
 
 Commit your features into a new branch and submit a pull request.
 
-## Contributing 
+## Contributing
 
-If you're working on PR for this project, create a feature branch off of `main`. 
+If you're working on PR for this project, create a feature branch off of `main`.
 
 This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) and [language recommendations](https://github.com/samvera/maintenance/blob/main/templates/CONTRIBUTING.md#language).  Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of this repository.
 
 ## Compatibility
-This gem works with Rails 5.0-6.1 and Ruby 2.5-3.1, provided the version of Rails supports the version of Ruby.
+This gem works with Rails 5.0-7.0 and Ruby 2.5-3.1, provided the version of Rails supports the version of Ruby.
  - Consult `.circleci/config.yml` for a list of supported combinations.
  - The combination of Ruby 3.1 and Rails 6.0 comes with three caveats:
    - your app will not be able to use `psych 4` (which ordinarily comes with 3.1). See https://bugs.ruby-lang.org/issues/17866 and https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias/71192990#71192990 for an explanation. One workaround is to modify your app's `Gemfile` to hold back `psych`: `gem 'psych', '< 4'`.
@@ -163,11 +168,13 @@ See also  `.circleci/config.yml` and `spec/test_app_templates/Gemfile.extra`.
 
 ## Product Owner & Maintenance
 
-Questioning Authority is a Core Component of the Samvera community. The documentation for what this means can be found [here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
+`qa` was a Core Component of the Samvera Community. Given a decline in available labor required for maintenance, this project no longer has a dedicated Product Owner. The documentation for what this means can be found [here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
 
 ### Product Owner
 
-[elrayle](https://github.com/elrayle)
+**Vacant**
+
+_Until a Product Owner has been identified, we ask that you please direct all requests for support, bug reports, and general questions to the [`#dev` Channel on the Samvera Slack](https://samvera.slack.com/app_redirect?channel=dev)._
 
 ## Releasing
 

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

@@ -1,5 +1,21 @@
+# used in initializer where autoload is unavailable, must be required here:
+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.9.0".freeze
+  VERSION = "5.11.0".freeze
 end

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

@@ -212,7 +212,7 @@ describe Qa::Authorities::Discogs::GenericAuthority do
           expect(JSON.parse(results).keys).to match_array ["@context", "@graph"]
           expect(JSON.parse(results)["@context"]["bf2"]).to eq("http://id.loc.gov/ontologies/bibframe/")
           expect(results).to include("You Go To My Head")
-          expect(results).to include("Rodgers & Hart")
+          expect(JSON.parse(results).inspect).to include("Rodgers & Hart")
           expect(results).to include("Ray Brown")
           expect(results).to include("1952")
           expect(results).to include("Single")

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' }

data/spec/spec_helper.rb

@@ -1,4 +1,10 @@
-require 'linkeddata'
+# Not sure why these RDF-related gems are only being used in CI and not general
+# dependencies... maybe meant to be optional dependencies?
+require 'rdf/n3'
+require 'rdf/rdfxml'
+require 'json/ld'
+require 'rdf/vocab'
+
 require 'json'
 require 'engine_cart'
 require 'byebug' unless ENV['TRAVIS']

data/spec/test_app_templates/Gemfile.extra

@@ -1,13 +1,19 @@
 # Use this file to reference specific commits of gems.
 
+
 group :development do
-  gem 'linkeddata'
-  if ENV['RAILS_VERSION'] =~ /^6\.1\./ && ENV['RUBY_VERSION'] =~ /^3\.1\./
-    # Ruby 3.0 comes with Psych 3, while Ruby 3.1 comes with Psych 4,
-    # which has a major breaking change (diff 3.3.2 → 4.0.0).
-    # See: https://bugs.ruby-lang.org/issues/17866
-    # See also: https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias/71192990#71192990
+  # Rails < 6.1 are not compatible with psych 4, although doesn't know it.
+  # Local apps using old Rails will have to lock locally.  Latest versions
+  # of Rails 6.1+ has been updated to work with psych 4.
+  # See also:
+  #
+  # https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias/71192990#71192990
+  #
+  if ENV['RAILS_VERSION'] && Gem::Version.new(ENV['RAILS_VERSION']) < Gem::Version.new("6.1")
     gem 'psych', '< 4'
+  end
+
+  if ENV['RAILS_VERSION'] =~ /^6\.1\./ && ENV['RUBY_VERSION'] =~ /^3\.1\./
     # opt into mail 2.8.0.rc1 so we get extra dependencies
     # Once mail 2.8.0 final is released this will not be required.
     # https://github.com/mikel/mail/pull/1472

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.11.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-27 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: '6.2'
+        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: '6.2'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -217,19 +217,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: linkeddata
+  name: rdf-n3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rdf-rdfxml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: json-ld
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -353,7 +395,6 @@ files:
 - app/models/qa/mesh_tree.rb
 - app/models/qa/subject_mesh_term.rb
 - app/services/qa/iri_template_service.rb
-- app/services/qa/linked_data/authority_service.rb
 - app/services/qa/linked_data/authority_url_service.rb
 - app/services/qa/linked_data/deep_sort_service.rb
 - app/services/qa/linked_data/graph_service.rb
@@ -434,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
@@ -462,6 +504,7 @@ files:
 - lib/qa/configuration.rb
 - lib/qa/data/TGN_LANGUAGES.xml
 - lib/qa/engine.rb
+- lib/qa/linked_data/authority_service.rb
 - lib/qa/services.rb
 - lib/qa/services/rdf_authority_parser.rb
 - lib/qa/version.rb
@@ -618,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:
@@ -634,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: You should question your authorities.