qa 5.5.1 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7205f6d228b7548f6dc39ce9781dd4b591d2f4c5e56d5b2bcc4189b3c9005f7e
-  data.tar.gz: 5cdce31ba635c298e5da88cfc01cc86237426a45a1b8ccf3095c316c1eb7b8f4
+  metadata.gz: b4fcd121b5625fc9bddf0250e2bbf75fb1585a5ad2332b0e9b16c8a927085332
+  data.tar.gz: 323903a339a4ef24c3b50db110dfb4e01a93e33dbb3c95e155fbf3577e84b3db
 SHA512:
-  metadata.gz: 39259b1eb80bcaab90653152302e38b853d24ecf1ff9bb46ca16afe637a35fe53b7d4abcf85ee2cc7ee7550b57bb6e7505f558adb10792056ea5573d7607b025
-  data.tar.gz: 3a748c62a1aa1b05d0f0b768af0a03ea2d2c6918c892c40cfc7ab1fdb619866053fb272d16b20a3241b9024c5d1dde8521fde108c36e33b59d55037d5d618e96
+  metadata.gz: c0fc0da7aedbcc2519e0f79d2a6ae403eb26e8a730bb4e1babaf33c6864084b5c624ffe8b2b35cb34dc4057e76f88642a85ebe0b41bcda496d9e6b029a6fad6c
+  data.tar.gz: 564e2b850320b6411462236b2dc0ff88d02ce076c33e2abbe4c5d588b9fb8ae5af0382124cd65686bedf132bf42694d965cf68b233348040c2419d947e0398cd

data/README.md

@@ -1,6 +1,6 @@
 # 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=master)](https://coveralls.io/github/samvera/questioning_authority?branch=master)
+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)
 
@@ -145,6 +145,12 @@ rake ci
 
 Commit your features into a new branch and submit a pull request.
 
+## Contributing 
+
+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.
@@ -169,7 +175,7 @@ Questioning Authority is a Core Component of the Samvera community. The document
   github_changelog_generator --user samvera --project questioning_authority --token YOUR_GITHUB_TOKEN_HERE
   ```
 
-5. Commit these changes to the master branch
+5. Commit these changes to the main branch
 
 6. Run `rake release`
 

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,14 +26,39 @@ 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
+  # Expects id to be part of the request path (e.g. http://my.app/qa/show/auth/subauth/{:id})
   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
+  # Expects uri to be a request parameter (e.g. http://my.app/qa/show/auth/subauth?uri={:uri})
+  def fetch
+    term = @authority.method(:find).arity == 2 ? @authority.find(params[:uri], self) : @authority.find(params[:uri])
+    cors_allow_origin_header(response)
+    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
@@ -81,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/authority_url_service.rb

@@ -29,7 +29,7 @@ module Qa
           end
 
           def combined_substitutions(action_config, action, action_request, request_header)
-            substitutions = request_header.fetch(:replacements, {})
+            substitutions = request_header.fetch(:replacements, {}).clone
             substitutions[action_request_variable(action_config, action)] = action_request
             substitutions[action_subauth_variable(action_config)] = action_subauth_variable_value(action_config, request_header)
             substitutions[action_language_variable(action_config)] = language_value(action_config, request_header)