qa 5.2.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 69b198054c52dafc00d9cf83f2f61b5fdc3e55cb
-  data.tar.gz: 00aa3d111681efe0a1c068846190e41531155e21
+SHA256:
+  metadata.gz: 7205f6d228b7548f6dc39ce9781dd4b591d2f4c5e56d5b2bcc4189b3c9005f7e
+  data.tar.gz: 5cdce31ba635c298e5da88cfc01cc86237426a45a1b8ccf3095c316c1eb7b8f4
 SHA512:
-  metadata.gz: c75338fdecba820602eb3c669065679a87387e80bf65e350fdc42d6224dc5eb152439198257b6da3eb38812a9e44e6764472fa3a8fff3f554e782b13da0e4c38
-  data.tar.gz: bcf795d36f8fc600dbc672d9884b4b37efd084ad9e12a7e53583b491cf122b1247f8335fdcfe216cfda6b2c3c326628ac27f2b6a375aa44feb783daf8ce0f2b5
+  metadata.gz: 39259b1eb80bcaab90653152302e38b853d24ecf1ff9bb46ca16afe637a35fe53b7d4abcf85ee2cc7ee7550b57bb6e7505f558adb10792056ea5573d7607b025
+  data.tar.gz: 3a748c62a1aa1b05d0f0b768af0a03ea2d2c6918c892c40cfc7ab1fdb619866053fb272d16b20a3241b9024c5d1dde8521fde108c36e33b59d55037d5d618e96

data/README.md

@@ -1,77 +1,83 @@
 # 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=master)](https://coveralls.io/github/samvera/questioning_authority?branch=master)
 
-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/)
 
 You should question your authorities.
 
-----
+--------------------------------------------------------------------------------
+
 ## Table of Contents
 
-  * [What does this do?](#what-does-this-do)
-  * [How does it work?](#how-does-it-work)
-    * [Sub-Authorities](#sub-authorities)
-  * [How do I use this?](#how-do-i-use-this)
-    * [Basic QA Requests](#basic-qa-requests)
-    * [Typical JSON Results](#typical-json-results)
-  * [Authority Sources information](#authority-sources-information)
-  * [Developer Notes](#developer-notes)
-    * [Compatibility](#compatibility)
-    * [Product Owner & Maintenance](#product-owner--maintenance)
-      * [Product Owner](#product-owner)
-  * [Help](#help)
-  * [Acknowledgments](#acknowledgments)
-
-## Not seeing documentation you used to find in the README?  
-
-Much of the documentation has moved to the [Questioning Authority wiki](https://github.com/samvera/questioning_authority/wiki) to allow for better organization.  We hope that you will find this easier to use.
-
-----
+- [What does this do?](#what-does-this-do)
+- [How does it work?](#how-does-it-work)
+
+  - [Sub-Authorities](#sub-authorities)
+
+- [How do I use this?](#how-do-i-use-this)
+
+  - [Basic QA Requests](#basic-qa-requests)
+  - [Typical JSON Results](#typical-json-results)
+
+- [Authority Sources information](#authority-sources-information)
+
+- [Developer Notes](#developer-notes)
+
+  - [Compatibility](#compatibility)
+  - [Product Owner & Maintenance](#product-owner--maintenance)
+
+    - [Product Owner](#product-owner)
+
+- [Help](#help)
+
+- [Acknowledgments](#acknowledgments)
+
+## Not seeing documentation you used to find in the README?
+
+Much of the documentation has moved to the [Questioning Authority wiki](https://github.com/samvera/questioning_authority/wiki) to allow for better organization. We hope that you will find this easier to use.
+
+--------------------------------------------------------------------------------
+
 ## What does this do?
 
-Provides a set of uniform RESTful routes to query any controlled vocabulary or set of authority terms.
-Results are returned in JSON and can be used within the context of a Rails application or any other
-Ruby environment. Primary examples would include providing auto-complete functionality via Javascript
-or populating a dropdown menu with a set of terms.
+Provides a set of uniform RESTful routes to query any controlled vocabulary or set of authority terms. Results are returned in JSON and can be used within the context of a Rails application or any other Ruby environment. Primary examples would include providing auto-complete functionality via Javascript or populating a dropdown menu with a set of terms.
 
 ## How does it work?
 
-Authorities are defined as classes, each implementing a set of methods allowing a controller to return
-results from a given vocabulary in the JSON format.  The controller does three things:
+Authorities are defined as classes, each implementing a set of methods allowing a controller to return results from a given vocabulary in the JSON format. The controller does three things:
 
-* provide a list of all terms (if allowed by the class)
-* return a set of terms matching a given query
-* return the complete information for a specific term given its identifier
+- provide a list of all terms (if allowed by the class)
+- return a set of terms matching a given query
+- return the complete information for a specific term given its identifier
 
-Depending on the kind of authority or its API, the controller may not do all of these things such
-as return a complete list of terms.
+Depending on the kind of authority or its API, the controller may not do all of these things such as return a complete list of terms.
 
 ### Sub-Authorities
 
-Some authorities, such as Library of Congress, allow sub-authorities which is an additional parameter that
-further defines the kind of authority to use with the context of a larger one.
+Some authorities, such as Library of Congress, allow sub-authorities which is an additional parameter that further defines the kind of authority to use with the context of a larger one.
 
 ## How do I use this?
 
 Add the gem to your Gemfile
 
-    gem 'qa'
+```
+gem 'qa'
+```
 
 Run bundler
 
-    bundle install
+```
+bundle install
+```
 
 Install the gem to your application
 
-    rails generate qa:install
+```
+rails generate qa:install
+```
 
 This will copy over some additional config files and add the engine's routes to your `config/route.rb`.
 
@@ -79,84 +85,104 @@ Start questioning your authorities!
 
 ### Basic QA Requests
 
-These show the basic routing patterns for connecting to authorities.  See the [Questioning Authority wiki](https://github.com/samvera/questioning_authority/wiki) documentation for detailed documentation and examples for each authority and local authorities.
+These show the basic routing patterns for connecting to authorities. See the [Questioning Authority wiki](https://github.com/samvera/questioning_authority/wiki) documentation for detailed documentation and examples for each authority and local authorities.
 
 Return a complete list of terms:
 
-    /qa/terms/:vocab
-    /qa/terms/:vocab/:subauthority
+```
+/qa/terms/:vocab
+/qa/terms/:vocab/:subauthority
+```
 
 Return a set of terms matching a given query
 
-    /qa/search/:vocab?q=search_term
-    /qa/search/:vocab/:subauthority?q=search_term
+```
+/qa/search/:vocab?q=search_term
+/qa/search/:vocab/:subauthority?q=search_term
+```
 
 Return the complete information for a specific term given its identifier
 
-    /qa/show/:vocab/:id
-    /qa/show/:vocab/:subauthority/:id
-
-
+```
+/qa/show/:vocab/:id
+/qa/show/:vocab/:subauthority/:id
+```
 
 ### Typical JSON Results
 
 Results are returned in JSON in this format:
 
-    [
-        {"id" : "subject_id_1", "label" : "First labels"},
-        {"id" : "subject_id_2", "label" : "Printing labels"},
-        {"id" : "", "label" : "This term has no id number"},
-        {"id" : "", "label" : "Neither does this"}
-    ]
-
+```
+[
+    {"id" : "subject_id_1", "label" : "First labels"},
+    {"id" : "subject_id_2", "label" : "Printing labels"},
+    {"id" : "", "label" : "This term has no id number"},
+    {"id" : "", "label" : "Neither does this"}
+]
+```
 
 # Authority Sources information
 
 See the [Questioning Authority wiki](https://github.com/samvera/questioning_authority/wiki) for documentation on how to connect to the supported authorities, documentation on how to create new authorities, and other useful tips.
 
-
 # Developer Notes
 
 [How to Contribute](./CONTRIBUTING.md)
 
 To develop this gem, clone the repository, then run:
 
-    bundle install
-    rake ci
+```
+bundle install
+rake ci
+```
 
-This will install the gems, create a dummy application under spec/internal and run the tests.  After you've made changes,
-make sure you've included tests and run the test suite with a new sample application:
+This will install the gems, create a dummy application under spec/internal and run the tests. After you've made changes, make sure you've included tests and run the test suite with a new sample application:
 
-    rake engine_cart:clean
-    rake ci
+```
+rake engine_cart:clean
+rake ci
+```
 
 Commit your features into a new branch and submit a pull request.
 
 ## 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.
+- 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.
 
 ## 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).
+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).
 
 ### Product Owner
 
 [elrayle](https://github.com/elrayle)
 
+## Releasing
+
+1. `bundle install`
+2. Increase the version number in `lib/qa/version.rb`
+3. Increase the same version number in `.github_changelog_generator`
+4. Update `CHANGELOG.md` by running this command:
+
+  ```
+  github_changelog_generator --user samvera --project questioning_authority --token YOUR_GITHUB_TOKEN_HERE
+  ```
+
+5. Commit these changes to the master branch
+
+6. Run `rake release`
+
 # Help
 
 The Samvera community is here to help. Please see our [support guide](./SUPPORT.md).
 
 # Acknowledgments
 
-This software has been developed by and is brought to you by the Samvera community.  Learn more at the
-[Samvera website](http://samvera.org/).
+This software has been developed by and is brought to you by the Samvera community. Learn more at the [Samvera website](http://samvera.org/).
 
 ![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)
 
-### Special thanks to...
+## Special thanks to...
 
 [Jeremy Friesen](https://github.com/jeremyf) who gave us the name for our gem.

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

@@ -91,6 +91,7 @@ module Qa
           end
 
           def process_error(e, url)
+            Rails.logger.warn("******** RDF::Graph#load failure: exception=#{e.inspect}, url=#{url}")
             uri = URI(url)
             raise RDF::FormatError, "Unknown RDF format of results returned by #{uri}. (RDF::FormatError)  You may need to include gem 'linkeddata'." if e.is_a? RDF::FormatError
             response_code = ioerror_code(e)

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

@@ -1,8 +1,9 @@
 # Service to construct a request header that includes optional attributes for search and fetch requests.
+require 'geocoder'
 module Qa
   module LinkedData
     class RequestHeaderService
-      attr_reader :request, :params
+      attr_reader :request, :params, :request_id
 
       # @param request [HttpRequest] request from controller
       # @param params [Hash] attribute-value pairs holding the request parameters
@@ -16,6 +17,8 @@ module Qa
       def initialize(request:, params:)
         @request = request
         @params = params
+        @request_id = request.request_id
+        log_request
       end
 
       # Construct request parameters to pass to search_query (linked data module).
@@ -23,6 +26,8 @@ module Qa
       # @see Qa::Authorities::LinkedData::SearchQuery
       def search_header
         header = {}
+        header[:request] = request
+        header[:request_id] = request_id
         header[:subauthority] = params.fetch(:subauthority, nil)
         header[:user_language] = user_language
         header[:performance_data] = performance_data?
@@ -37,6 +42,8 @@ module Qa
       # @see Qa::Authorities::LinkedData::FindTerm
       def fetch_header
         header = {}
+        header[:request] = request
+        header[:request_id] = request_id
         header[:subauthority] = params.fetch(:subauthority, nil)
         header[:user_language] = user_language
         header[:performance_data] = performance_data?
@@ -62,6 +69,18 @@ module Qa
 
       private
 
+        def log_request
+          msg = "******** #{request.path_parameters[:action].upcase}"
+          unless Qa.config.suppress_ip_data_from_log
+            gc = request.respond_to?(:location) ? request.location : nil
+            city = gc.nil? ? "UNKNOWN" : gc.city
+            state = gc.nil? ? "UNKNOWN" : gc.state
+            country = gc.nil? ? "UNKNOWN" : gc.country
+            msg += " from IP #{request.ip} in {city: #{city}, state: #{state}, country: #{country}}"
+          end
+          Rails.logger.info(msg)
+        end
+
         # filter literals in results to this language
         def user_language
           request_language = request.env['HTTP_ACCEPT_LANGUAGE']

data/lib/generators/qa/install/templates/config/initializers/qa.rb

@@ -23,4 +23,9 @@ Qa.config do |config|
   # When false, properties that do not override default optional behavior will be shown whether or not the property has a value in the graph.
   # When true, properties that do not override default optional behavior will not be shown whn the property does not have a value in the graph.
   # config.property_map_default_for_optional = false
+
+  # IP data including IP address, city, state, and country will be logged with each request.
+  # When false, IP data is logged
+  # When true, IP data will not be logged (default for backward compatibility)
+  # config.suppress_ip_data_from_log = true
 end

data/lib/qa/authorities/geonames.rb

@@ -2,7 +2,33 @@ module Qa::Authorities
   class Geonames < Base
     include WebServiceBase
 
-    class_attribute :username, :label
+    class_attribute :username, :label, :query_url_host, :find_url_host
+
+    # You may need to change your query_url_host in your implementation. To do
+    # so, in the installed application's config/initializers/qa.rb add the
+    # following:
+    #
+    # @example
+    #   Qa::Authorities::Geonames.query_url_host = "http://ws.geonames.net"
+    #
+    # @note This is not exposed as part of the configuration block, but is
+    #       something you can add after the configuration block.
+    # @todo Expose this magic value as a configuration option; Which likely
+    #       requires consideration about how to do this for the general case
+    self.query_url_host = "http://api.geonames.org"
+
+    # You may need to change your query_url_host in your implementation. To do
+    # so, in the installed application's config/initializers/qa.rb add the
+    # following:
+    #
+    # @example
+    #   Qa::Authorities::Geonames.find_url_host = "http://ws.geonames.net"
+    #
+    # @note This is not exposed as part of the configuration block, but is
+    #       something you can add after the configuration block.
+    # @todo Expose this magic value as a configuration option; Which likely
+    #       requires consideration about how to do this for the general case
+    self.find_url_host = "http://www.geonames.org"
 
     self.label = lambda do |item|
       [item['name'], item['adminName1'], item['countryName']].compact.join(', ')
@@ -18,7 +44,7 @@ module Qa::Authorities
 
     def build_query_url(q)
       query = ERB::Util.url_encode(untaint(q))
-      "http://api.geonames.org/searchJSON?q=#{query}&username=#{username}&maxRows=10"
+      File.join(query_url_host, "searchJSON?q=#{query}&username=#{username}&maxRows=10")
     end
 
     def untaint(q)
@@ -30,7 +56,7 @@ module Qa::Authorities
     end
 
     def find_url(id)
-      "http://www.geonames.org/getJSON?geonameId=#{id}&username=#{username}"
+      File.join(find_url_host, "getJSON?geonameId=#{id}&username=#{username}")
     end
 
     private
@@ -39,7 +65,7 @@ module Qa::Authorities
       def parse_authority_response(response)
         response['geonames'].map do |result|
           # Note: the trailing slash is meaningful.
-          { 'id' => "http://sws.geonames.org/#{result['geonameId']}/",
+          { 'id' => "https://sws.geonames.org/#{result['geonameId']}/",
             'label' => label.call(result) }
         end
       end

data/lib/qa/authorities/linked_data/find_term.rb

@@ -15,8 +15,8 @@ module Qa::Authorities
         @term_config = term_config
       end
 
-      attr_reader :term_config, :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :subauthority, :request_header
-      private :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :subauthority, :request_header
+      attr_reader :term_config, :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :subauthority, :request_header, :request_id, :request
+      private :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :subauthority, :request_header, :request_id, :request
 
       delegate :term_subauthority?, :prefixes, :authority_name, to: :term_config
 
@@ -92,6 +92,8 @@ module Qa::Authorities
 
         def unpack_request_header(request_header)
           @request_header = request_header
+          @request = request_header.fetch(:request, nil)
+          @request_id = request_header.fetch(:request_id, 'UNASSIGNED')
           @subauthority = request_header.fetch(:subauthority, nil)
           @format = request_header.fetch(:format, 'json')
           @performance_data = request_header.fetch(:performance_data, false)
@@ -110,8 +112,8 @@ module Qa::Authorities
           predicate_map = preds_for_term
           ldpath_map = ldpaths_for_term
 
-          raise Qa::InvalidConfiguration, "do not specify results using both predicates and ldpath in term configuration for linked data authority #{authority_name} (ldpath is preferred)" if predicate_map.present? && ldpath_map.present? # rubocop:disable Metrics/LineLength
-          raise Qa::InvalidConfiguration, "must specify label_ldpath or label_predicate in term configuration for linked data authority #{authority_name} (label_ldpath is preferred)" unless ldpath_map.key?(:label) || predicate_map.key?(:label) # rubocop:disable Metrics/LineLength
+          raise Qa::InvalidConfiguration, "do not specify results using both predicates and ldpath in term configuration for linked data authority #{authority_name} (ldpath is preferred)" if predicate_map.present? && ldpath_map.present? # rubocop:disable Layout/LineLength
+          raise Qa::InvalidConfiguration, "must specify label_ldpath or label_predicate in term configuration for linked data authority #{authority_name} (label_ldpath is preferred)" unless ldpath_map.key?(:label) || predicate_map.key?(:label) # rubocop:disable Layout/LineLength
 
           if predicate_map.present?
             Qa.deprecation_warning(

data/lib/qa/authorities/linked_data/search_query.rb

@@ -15,8 +15,8 @@ module Qa::Authorities
         @search_config = search_config
       end
 
-      attr_reader :search_config, :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :subauthority, :request_header
-      private :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :subauthority, :request_header
+      attr_reader :search_config, :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :subauthority, :request_header, :request_id, :request
+      private :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :subauthority, :request_header, :request_id, :request
 
       delegate :subauthority?, :supports_sort?, :prefixes, :authority_name, to: :search_config
 
@@ -74,8 +74,8 @@ module Qa::Authorities
           predicate_map = preds_for_search
           ldpath_map = ldpaths_for_search
 
-          raise Qa::InvalidConfiguration, "do not specify results using both predicates and ldpath in search configuration for linked data authority #{authority_name} (ldpath is preferred)" if predicate_map.present? && ldpath_map.present? # rubocop:disable Metrics/LineLength
-          raise Qa::InvalidConfiguration, "must specify label_ldpath or label_predicate in search configuration for linked data authority #{authority_name} (label_ldpath is preferred)" unless ldpath_map.key?(:label) || predicate_map.key?(:label) # rubocop:disable Metrics/LineLength
+          raise Qa::InvalidConfiguration, "do not specify results using both predicates and ldpath in search configuration for linked data authority #{authority_name} (ldpath is preferred)" if predicate_map.present? && ldpath_map.present? # rubocop:disable Layout/LineLength
+          raise Qa::InvalidConfiguration, "must specify label_ldpath or label_predicate in search configuration for linked data authority #{authority_name} (label_ldpath is preferred)" unless ldpath_map.key?(:label) || predicate_map.key?(:label) # rubocop:disable Layout/LineLength
 
           if predicate_map.present?
             Qa.deprecation_warning(
@@ -91,6 +91,8 @@ module Qa::Authorities
 
         def unpack_request_header(request_header)
           @request_header = request_header
+          @request = request_header.fetch(:request, nil)
+          @request_id = request_header.fetch(:request_id, 'UNASSIGNED')
           @subauthority = request_header.fetch(:subauthority, nil)
           @context = request_header.fetch(:context, false)
           @performance_data = request_header.fetch(:performance_data, false)

data/lib/qa/authorities/loc/generic_authority.rb

@@ -26,7 +26,7 @@ module Qa::Authorities
     def build_query_url(q)
       escaped_query = ERB::Util.url_encode(q)
       authority_fragment = Loc.get_url_for_authority(subauthority) + ERB::Util.url_encode(subauthority)
-      "http://id.loc.gov/search/?q=#{escaped_query}&q=#{authority_fragment}&format=json"
+      "https://id.loc.gov/search/?q=#{escaped_query}&q=#{authority_fragment}&format=json"
     end
 
     def find(id)
@@ -34,7 +34,7 @@ module Qa::Authorities
     end
 
     def find_url(id)
-      "http://id.loc.gov/authorities/#{@subauthority}/#{id}.json"
+      "https://id.loc.gov/authorities/#{@subauthority}/#{id}.json"
     end
 
     private

data/lib/qa/configuration.rb

@@ -54,5 +54,14 @@ module Qa
       @property_map_default_for_optional = false if @property_map_default_for_optional.nil?
       @property_map_default_for_optional
     end
+
+    # IP data including IP address, city, state, and country will be logged with each request.
+    # When false, IP data is logged
+    # When true, IP data will not be logged (default for backward compatibility)
+    attr_writer :suppress_ip_data_from_log
+    def suppress_ip_data_from_log
+      @suppress_ip_data_from_log = true if @suppress_ip_data_from_log.nil?
+      @suppress_ip_data_from_log
+    end
   end
 end

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "5.2.0".freeze
+  VERSION = "5.5.1".freeze
 end

data/spec/controllers/linked_data_terms_controller_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'json'
 
 describe Qa::LinkedDataTermsController, type: :controller do
+  let(:graph_load_failure) { /^\*\*\*\*\*\*\*\* RDF\:\:Graph\#load failure/ }
   before do
     @routes = Qa::Engine.routes
   end
@@ -140,6 +141,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
             .to_return(status: 500)
         end
         it 'returns 500' do
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with("Internal Server Error - Search query my_query unsuccessful for authority OCLC_FAST")
           get :search, params: { q: 'my_query', vocab: 'OCLC_FAST', maximumRecords: '3' }
           expect(response.code).to eq('500')
@@ -154,6 +156,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
         end
         it 'returns 500' do
           msg = "RDF Format Error - Results from search query my_query for authority OCLC_FAST was not identified as a valid RDF format.  You may need to include the linkeddata gem."
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with(msg)
           get :search, params: { q: 'my_query', vocab: 'OCLC_FAST', maximumRecords: '3' }
           expect(response.code).to eq('500')
@@ -166,6 +169,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
             .to_return(status: 501)
         end
         it 'returns 500' do
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with("Internal Server Error - Search query my_query unsuccessful for authority OCLC_FAST")
           get :search, params: { q: 'my_query', vocab: 'OCLC_FAST', maximumRecords: '3' }
           expect(response.code).to eq('500')
@@ -179,6 +183,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
           .to_return(status: 503)
       end
       it 'returns 503' do
+        expect(Rails.logger).to receive(:warn).with(graph_load_failure)
         expect(Rails.logger).to receive(:warn).with("Service Unavailable - Search query my_query unsuccessful for authority OCLC_FAST")
         get :search, params: { q: 'my_query', vocab: 'OCLC_FAST', maximumRecords: '3' }
         expect(response.code).to eq('503')
@@ -355,6 +360,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
           stub_request(:get, 'http://id.worldcat.org/fast/530369').to_return(status: 500)
         end
         it 'returns 500' do
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with("Internal Server Error - Fetch term 530369 unsuccessful for authority OCLC_FAST")
           get :show, params: { id: '530369', vocab: 'OCLC_FAST' }
           expect(response.code).to eq('500')
@@ -380,6 +386,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
         end
         it 'returns 500' do
           msg = "RDF Format Error - Results from fetch term 530369 for authority OCLC_FAST was not identified as a valid RDF format.  You may need to include the linkeddata gem."
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with(msg)
           get :show, params: { id: '530369', vocab: 'OCLC_FAST' }
           expect(response.code).to eq('500')
@@ -391,6 +398,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
           stub_request(:get, 'http://id.worldcat.org/fast/530369').to_return(status: 501)
         end
         it 'returns 500' do
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with("Internal Server Error - Fetch term 530369 unsuccessful for authority OCLC_FAST")
           get :show, params: { id: '530369', vocab: 'OCLC_FAST' }
           expect(response.code).to eq('500')
@@ -403,6 +411,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
         stub_request(:get, 'http://id.worldcat.org/fast/530369').to_return(status: 503)
       end
       it 'returns 503' do
+        expect(Rails.logger).to receive(:warn).with(graph_load_failure)
         expect(Rails.logger).to receive(:warn).with("Service Unavailable - Fetch term 530369 unsuccessful for authority OCLC_FAST")
         get :show, params: { id: '530369', vocab: 'OCLC_FAST' }
         expect(response.code).to eq('503')
@@ -414,6 +423,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
         stub_request(:get, 'http://id.worldcat.org/fast/FAKE_ID').to_return(status: 404, body: '', headers: {})
       end
       it 'returns 404' do
+        expect(Rails.logger).to receive(:warn).with(graph_load_failure)
         expect(Rails.logger).to receive(:warn).with('Term Not Found - Fetch term FAKE_ID unsuccessful for authority OCLC_FAST')
         get :show, params: { id: 'FAKE_ID', vocab: 'OCLC_FAST' }
         expect(response.code).to eq('404')
@@ -566,6 +576,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
           stub_request(:get, 'http://localhost/test_default/term?uri=http://id.worldcat.org/fast/530369').to_return(status: 500)
         end
         it 'returns 500' do
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with("Internal Server Error - Fetch term http://id.worldcat.org/fast/530369 unsuccessful for authority LOD_TERM_URI_PARAM_CONFIG")
           get :fetch, params: { vocab: 'LOD_TERM_URI_PARAM_CONFIG', uri: 'http://id.worldcat.org/fast/530369' }
           expect(response.code).to eq('500')
@@ -580,6 +591,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
         it 'returns 500' do
           msg = "RDF Format Error - Results from fetch term http://id.worldcat.org/fast/530369 for authority LOD_TERM_URI_PARAM_CONFIG was not identified as a valid RDF format.  " \
                 "You may need to include the linkeddata gem."
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with(msg)
           get :fetch, params: { uri: 'http://id.worldcat.org/fast/530369', vocab: 'LOD_TERM_URI_PARAM_CONFIG' }
           expect(response.code).to eq('500')
@@ -591,6 +603,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
           stub_request(:get, 'http://localhost/test_default/term?uri=http://id.worldcat.org/fast/530369').to_return(status: 501)
         end
         it 'returns 500' do
+          expect(Rails.logger).to receive(:warn).with(graph_load_failure)
           expect(Rails.logger).to receive(:warn).with("Internal Server Error - Fetch term http://id.worldcat.org/fast/530369 unsuccessful for authority LOD_TERM_URI_PARAM_CONFIG")
           get :fetch, params: { uri: 'http://id.worldcat.org/fast/530369', vocab: 'LOD_TERM_URI_PARAM_CONFIG' }
           expect(response.code).to eq('500')
@@ -603,6 +616,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
         stub_request(:get, 'http://localhost/test_default/term?uri=http://id.worldcat.org/fast/530369').to_return(status: 503)
       end
       it 'returns 503' do
+        expect(Rails.logger).to receive(:warn).with(graph_load_failure)
         expect(Rails.logger).to receive(:warn).with("Service Unavailable - Fetch term http://id.worldcat.org/fast/530369 unsuccessful for authority LOD_TERM_URI_PARAM_CONFIG")
         get :fetch, params: { uri: 'http://id.worldcat.org/fast/530369', vocab: 'LOD_TERM_URI_PARAM_CONFIG' }
         expect(response.code).to eq('503')
@@ -614,6 +628,7 @@ describe Qa::LinkedDataTermsController, type: :controller do
         stub_request(:get, 'http://localhost/test_default/term?uri=http://test.org/FAKE_ID').to_return(status: 404, body: '', headers: {})
       end
       it 'returns 404' do
+        expect(Rails.logger).to receive(:warn).with(graph_load_failure)
         expect(Rails.logger).to receive(:warn).with('Term Not Found - Fetch term http://test.org/FAKE_ID unsuccessful for authority LOD_TERM_URI_PARAM_CONFIG')
         get :fetch, params: { uri: 'http://test.org/FAKE_ID', vocab: 'LOD_TERM_URI_PARAM_CONFIG' }
         expect(response.code).to eq('404')

data/spec/controllers/terms_controller_spec.rb

@@ -82,7 +82,7 @@ describe Qa::TermsController, type: :controller do
 
     context "loc" do
       before do
-        stub_request(:get, "http://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-names-response.txt"), status: 200)
       end
@@ -188,7 +188,7 @@ describe Qa::TermsController, type: :controller do
   describe "#show" do
     context "with supported authorities" do
       before do
-        stub_request(:get, "http://id.loc.gov/authorities/subjects/sh85077565.json")
+        stub_request(:get, "https://id.loc.gov/authorities/subjects/sh85077565.json")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(status: 200, body: webmock_fixture("loc-names-response.txt"), headers: {})
       end

data/spec/lib/authorities/geonames_spec.rb

@@ -7,6 +7,34 @@ describe Qa::Authorities::Geonames do
 
   let(:authority) { described_class.new }
 
+  describe ".query_url_host" do
+    subject { described_class.query_url_host }
+    it { is_expected.to eq "http://api.geonames.org" }
+    it "can be overridden" do
+      begin
+        before_change = described_class.query_url_host
+        described_class.query_url_host = "http://myhost.com"
+        expect(described_class.query_url_host).to eq("http://myhost.com")
+      ensure
+        described_class.query_url_host = before_change
+      end
+    end
+  end
+
+  describe ".find_url_host" do
+    subject { described_class.find_url_host }
+    it { is_expected.to eq "http://www.geonames.org" }
+    it "can be overridden" do
+      begin
+        before_change = described_class.find_url_host
+        described_class.find_url_host = "http://myhost.com"
+        expect(described_class.find_url_host).to eq("http://myhost.com")
+      ensure
+        described_class.find_url_host = before_change
+      end
+    end
+  end
+
   describe "#build_query_url" do
     subject { authority.build_query_url("foo") }
     it { is_expected.to eq 'http://api.geonames.org/searchJSON?q=foo&username=dummy&maxRows=10' }
@@ -28,9 +56,9 @@ describe Qa::Authorities::Geonames do
 
       context "with default label" do
         it "has id and label keys" do
-          expect(subject.first).to eq("id" => 'http://sws.geonames.org/2088122/',
+          expect(subject.first).to eq("id" => 'https://sws.geonames.org/2088122/',
                                       "label" => "Port Moresby, National Capital, Papua New Guinea")
-          expect(subject.last).to eq("id" => 'http://sws.geonames.org/377039/',
+          expect(subject.last).to eq("id" => 'https://sws.geonames.org/377039/',
                                      "label" => "Port Sudan, Red Sea, Sudan")
           expect(subject.size).to eq(10)
         end

data/spec/lib/authorities/getty/aat_spec.rb

@@ -77,7 +77,7 @@ describe Qa::Authorities::Getty::AAT do
     subject { authority.request_options }
     it { is_expected.to eq(accept: "application/sparql-results+json") }
   end
-  # rubocop:disable Metrics/LineLength
+  # rubocop:disable Layout/LineLength
   describe "#sparql" do
     context "using a single subject term" do
       subject { authority.sparql('search_term') }
@@ -92,5 +92,5 @@ describe Qa::Authorities::Getty::AAT do
       }
     end
   end
-  # rubocop:enable Metrics/LineLength
+  # rubocop:enable Layout/LineLength
 end

data/spec/lib/authorities/getty/tgn_spec.rb

@@ -77,7 +77,7 @@ describe Qa::Authorities::Getty::TGN do
     subject { authority.request_options }
     it { is_expected.to eq(accept: "application/sparql-results+json") }
   end
-  # rubocop:disable Metrics/LineLength
+  # rubocop:disable Layout/LineLength
   describe "#sparql" do
     context "using a single subject term" do
       subject { authority.sparql('search_term') }
@@ -92,5 +92,5 @@ describe Qa::Authorities::Getty::TGN do
       }
     end
   end
-  # rubocop:enable Metrics/LineLength
+  # rubocop:enable Layout/LineLength
 end

data/spec/lib/authorities/loc_spec.rb

@@ -28,14 +28,14 @@ describe Qa::Authorities::Loc do
     end
 
     context "for searching" do
-      let(:url) { 'http://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
+      let(:url) { 'https://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
       it "returns a url" do
         expect(authority.build_query_url("foo")).to eq(url)
       end
     end
 
     context "for returning single terms" do
-      let(:url) { "http://id.loc.gov/authorities/subjects/sh2002003586.json" }
+      let(:url) { "https://id.loc.gov/authorities/subjects/sh2002003586.json" }
       it "returns a url with an authority and id" do
         expect(authority.find_url("sh2002003586")).to eq(url)
       end
@@ -49,15 +49,15 @@ describe Qa::Authorities::Loc do
     end
 
     before do
-      stub_request(:get, "http://id.loc.gov/search/?format=json&q=cs:http://id.loc.gov/authorities/subjects")
+      stub_request(:get, "https://id.loc.gov/search/?format=json&q=cs:http://id.loc.gov/authorities/subjects")
         .with(headers: { 'Accept' => 'application/json' })
         .to_return(status: 200, body: "")
     end
 
     context "with flat params encoded" do
-      let(:url) { 'http://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
+      let(:url) { 'https://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
       it "returns a response" do
-        flat_params_url = "http://id.loc.gov/search/?format=json&q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects"
+        flat_params_url = "https://id.loc.gov/search/?format=json&q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects"
         expect(subject.env.url.to_s).to eq(flat_params_url)
       end
     end
@@ -66,7 +66,7 @@ describe Qa::Authorities::Loc do
   describe "#search" do
     context "any LOC authorities" do
       let :authority do
-        stub_request(:get, "http://id.loc.gov/search/?format=json&q=s&q=cs:http://id.loc.gov/vocabulary/geographicAreas")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=s&q=cs:http://id.loc.gov/vocabulary/geographicAreas")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-response.txt"), status: 200)
         described_class.subauthority_for("geographicAreas")
@@ -95,7 +95,7 @@ describe Qa::Authorities::Loc do
 
     context "subject terms" do
       let :results do
-        stub_request(:get, "http://id.loc.gov/search/?format=json&q=History--&q=cs:http://id.loc.gov/authorities/subjects")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=History--&q=cs:http://id.loc.gov/authorities/subjects")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-subjects-response.txt"), status: 200)
         described_class.subauthority_for("subjects").search("History--")
@@ -111,7 +111,7 @@ describe Qa::Authorities::Loc do
 
     context "name terms" do
       let :results do
-        stub_request(:get, "http://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-names-response.txt"), status: 200)
         described_class.subauthority_for("names").search("Berry")
@@ -125,7 +125,7 @@ describe Qa::Authorities::Loc do
   describe "#find" do
     context "using a subject id" do
       let :results do
-        stub_request(:get, "http://id.loc.gov/authorities/subjects/sh2002003586.json")
+        stub_request(:get, "https://id.loc.gov/authorities/subjects/sh2002003586.json")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(status: 200, body: webmock_fixture("loc-subject-find-response.txt"), headers: {})
         described_class.subauthority_for("subjects").find("sh2002003586")

data/spec/lib/mesh_data_parser_spec.rb

@@ -47,7 +47,7 @@ EOS
     expect(records[1]).to eq({})
   end
 
-  # rubocop:disable Metrics/LineLength
+  # rubocop:disable Layout/LineLength
   it 'parses a sample mesh file' do
     mesh = described_class.new(webmock_fixture('mesh.txt'))
     records = mesh.all_records
@@ -117,5 +117,5 @@ EOS
                              "DX" => ["19840101"],
                              "UI" => ["D000001"])
   end
-  # rubocop:enable Metrics/LineLength
+  # rubocop:enable Layout/LineLength
 end

data/spec/services/linked_data/request_header_service_spec.rb

@@ -2,8 +2,44 @@ require 'spec_helper'
 
 RSpec.describe Qa::LinkedData::RequestHeaderService do
   let(:request) { double }
+  let(:request_id) { 'anID' }
+  let(:some_params) { double }
+  let(:location) { double }
+  let(:fake_ip) { '111.22.33.4444' }
+  let(:city) { 'Ithaca' }
+  let(:state) { 'New York' }
+  let(:country) { 'US' }
+  before do
+    allow(request).to receive(:request_id).and_return(request_id)
+    allow(request).to receive_message_chain(:path_parameters, :[]).with(:action).and_return('search') # rubocop:disable RSpec/MessageChain
+    allow(request).to receive(:location).and_return(location)
+    allow(request).to receive(:ip).and_return(fake_ip)
+    allow(location).to receive(:city).and_return(city)
+    allow(location).to receive(:state).and_return(state)
+    allow(location).to receive(:country).and_return(country)
+  end
+
+  describe '#initialize' do
+    context 'when Qa.config.suppress_ip_data_from_log is true' do
+      before { allow(Qa).to receive_message_chain(:config, :suppress_ip_data_from_log).and_return(true) } # rubocop:disable RSpec/MessageChain
+      it 'does not include IP info in log message' do
+        expect(Rails.logger).to receive(:info).with("******** SEARCH")
+        described_class.new(request: request, params: some_params)
+      end
+    end
+
+    context 'when Qa.config.suppress_ip_data_from_log is false' do
+      before { allow(Qa).to receive_message_chain(:config, :suppress_ip_data_from_log).and_return(false) } # rubocop:disable RSpec/MessageChain
+      it 'does include IP info in log message' do
+        expect(Rails.logger).to receive(:info).with("******** SEARCH from IP #{fake_ip} in {city: #{city}, state: #{state}, country: #{country}}")
+        described_class.new(request: request, params: some_params)
+      end
+    end
+  end
 
   describe '#search_header' do
+    let(:request_id) { 's1' }
+
     context 'when optional params are defined' do
       let(:search_params) do
         {
@@ -20,6 +56,8 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
       it 'uses passed in params' do
         expected_results =
           {
+            request: request,
+            request_id: request_id,
             context: true,
             performance_data: true,
             replacements: { 'maxRecords' => '4' },
@@ -37,6 +75,8 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
         it 'returns defaults' do
           expected_results =
             {
+              request: request,
+              request_id: request_id,
               context: false,
               performance_data: false,
               replacements: {},
@@ -53,6 +93,8 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
         it 'returns defaults with language set to request language' do
           expected_results =
             {
+              request: request,
+              request_id: request_id,
               context: false,
               performance_data: false,
               replacements: {},
@@ -67,6 +109,7 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
   end
 
   describe '#fetch_header' do
+    let(:request_id) { 'f1' }
     context 'when optional params are defined' do
       let(:fetch_params) do
         {
@@ -84,6 +127,8 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
       it 'uses passed in params' do
         expected_results =
           {
+            request: request,
+            request_id: request_id,
             format: 'n3',
             performance_data: true,
             replacements: { 'extra' => 'data', 'even' => 'more data' },
@@ -101,6 +146,8 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
         it 'returns defaults' do
           expected_results =
             {
+              request: request,
+              request_id: request_id,
               format: 'json',
               performance_data: false,
               replacements: {},
@@ -117,6 +164,8 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
         it 'returns defaults with language set to request language' do
           expected_results =
             {
+              request: request,
+              request_id: request_id,
               format: 'json',
               performance_data: false,
               replacements: {},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Stephen Anderson
@@ -13,10 +13,10 @@ authors:
 - Mike Stroming
 - Adam Wead
 - E. Lynette Rayle
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -60,6 +60,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: geocoder
+  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: ldpath
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 5.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -577,7 +617,7 @@ homepage: https://github.com/projecthydra/questioning_authority
 licenses:
 - APACHE-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -592,9 +632,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: You should question your authorities.
 test_files: