qa 5.7.0 → 5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb01e5ca2c9435b8c22af76ace78a1486d2ad22ee54f0a8e1a40ba24b64e218
-  data.tar.gz: '0825479f37ac4eb299c944981fff9b670e8efd86eb8b05c3341f7d2a9300361c'
+  metadata.gz: 1f4e4d8c917617e8cba95cd8bc8e0f06ebb60c9b580672b3736c717ef1ce3746
+  data.tar.gz: bd9624a47e0c513d8b7fdf7a278d2c904867b3331217faaf7951321326f7549d
 SHA512:
-  metadata.gz: 80792bf55b1f8cf6f7401657d7b7844fbeff0dbc4e4597e16869a63a65a6cf1e271d88d631bd0dd9f4f8dbcdda2caadac47974d8d282f21ee1696308022bb201
-  data.tar.gz: 7d700e24566d6047cb061731e941affa72d3c260eb7822c421421986127ddfd819f2d6d4cd1c968cd9e527b3276c392a7403564ebce8e5ee4210fb86863072d0
+  metadata.gz: a6f568c19f5aad67ca850bf0d666afd63f971b7bbab83e51b4299791b52c94e93fcae9e49a9ff6aec4d2e8329cf1b41ab39131fa8dc3e0eb0baec5725934499b
+  data.tar.gz: 69d1bed451753f68ae20551aa1ac2a77e8acbfffeb2600e42d50726d113f28300c01faaf74af9b65dcfc5a168410019fb99bc84b09928b9846b466fd20fc9e63

data/README.md

@@ -152,9 +152,14 @@ 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
-
-- Ruby 2.5 or the latest 2.4 version is recommended. Later versions may also work.
-- Rails 5 is required. We recommend the latest Rails 5.2 release.
+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.
+ - 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'`.
+   - likewise, you want to add gem 'net-smtp', require: false to your Gemfile to get around the bug described in https://stackoverflow.com/questions/70500220/rails-7-ruby-3-1-loaderror-cannot-load-such-file-net-smtp .
+   - finally, you may want to opt in to the latest version of "mail". Again, add to your Gemfile the line `gem "mail", ">= 2.8.0.rc1"`.
+
+See also  `.circleci/config.yml` and `spec/test_app_templates/Gemfile.extra`.
 
 ## Product Owner & Maintenance
 

data/app/controllers/qa/terms_controller.rb

@@ -4,6 +4,9 @@
 # same methods.
 
 class Qa::TermsController < ::ApplicationController
+  class_attribute :pagination_service_class
+  self.pagination_service_class = Qa::PaginationService
+
   before_action :check_vocab_param, :init_authority
   before_action :check_query_param, only: :search
 
@@ -23,7 +26,11 @@ class Qa::TermsController < ::ApplicationController
   def search
     terms = @authority.method(:search).arity == 2 ? @authority.search(url_search, self) : @authority.search(url_search)
     cors_allow_origin_header(response)
-    render json: terms
+    respond_to do |wants|
+      wants.json { render json: pagination_service(format: :json, results: terms).build_response }
+      wants.jsonapi { render json: pagination_service(format: :jsonapi, results: terms).build_response }
+      wants.any { render json: pagination_service(format: :json, results: terms).build_response, content_type: json_content_type }
+    end
   end
 
   # If the subauthority supports it, return all the information for a given term
@@ -31,7 +38,13 @@ class Qa::TermsController < ::ApplicationController
   def show
     term = @authority.method(:find).arity == 2 ? @authority.find(params[:id], self) : @authority.find(params[:id])
     cors_allow_origin_header(response)
-    render json: term, content_type: content_type_for_format
+    respond_to do |wants|
+      wants.json { render json: term }
+      wants.n3 { render json: term }
+      wants.jsonld { render json: term }
+      wants.ntriples { render json: term }
+      wants.any { render json: term, content_type: json_content_type }
+    end
   end
 
   # If the subauthority supports it, return all the information for a given term
@@ -39,7 +52,13 @@ class Qa::TermsController < ::ApplicationController
   def fetch
     term = @authority.method(:find).arity == 2 ? @authority.find(params[:uri], self) : @authority.find(params[:uri])
     cors_allow_origin_header(response)
-    render json: term, content_type: content_type_for_format
+    respond_to do |wants|
+      wants.json { render json: term }
+      wants.n3 { render json: term }
+      wants.jsonld { render json: term }
+      wants.ntriples { render json: term }
+      wants.any { render json: term, content_type: json_content_type }
+    end
   end
 
   def check_vocab_param
@@ -90,28 +109,11 @@ class Qa::TermsController < ::ApplicationController
       params[:q].gsub("*", "%2A")
     end
 
-    def format
-      return 'json' unless params.key?(:format)
-      return 'json' if params[:format].blank?
-      params[:format]
-    end
-
-    def jsonld?
-      format.casecmp?('jsonld')
-    end
-
-    def n3?
-      format.casecmp?('n3')
-    end
-
-    def ntriples?
-      format.casecmp?('ntriples')
+    def json_content_type
+      Mime::Type.lookup_by_extension(:json).to_str
     end
 
-    def content_type_for_format
-      return 'application/ld+json' if jsonld?
-      return 'text/n3' if n3?
-      return 'application/n-triples' if ntriples?
-      'application/json'
+    def pagination_service(results:, format:)
+      pagination_service_class.new(request: request, results: results, format: format)
     end
 end

data/app/services/qa/linked_data/graph_service.rb

@@ -57,7 +57,7 @@ module Qa
         def deep_copy(graph:)
           new_graph = RDF::Graph.new
           graph.statements.each do |st|
-            new_graph.insert(st.dup)
+            new_graph << st.dup
           end
           new_graph
         end