qa 4.3.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7e4ee1da3b72cee5194380a24b44e96793395d110cbe2234da55541da3f962c9
-  data.tar.gz: 27dffc56d77c9e583000c99823a31fe8c90f3591ea3de04935c4e476bda9d289
+SHA1:
+  metadata.gz: bc29035b13c98a73e85662eaeb115eabd0d12372
+  data.tar.gz: c509732acf8103e7587fcec0f1fd61824b6490ff
 SHA512:
-  metadata.gz: ad1a1bc75bcde5877679a355e7afec3f992e869686f3c3c706d5e1ffee6ecdcc66c4be4a8572c9ca1c27b6b177b12b211debc8a579268037aff006872d3e9b5a
-  data.tar.gz: 789919e7a524d155d69ae2ca0203900cc0509f613d94d3b2b14ed697e2c80134b9d13dd56fb013c9db052069296955f4b948b43ff95ae10f93e4dd2ccbd643d6
+  metadata.gz: 4dbb5d3904901814ad948f8d2f80bda6a1709ba4b84d65cde4746ffae13354255c4617825d88c58322bdb6d6345913ff034b25d658734ef56740d737c75d40b1
+  data.tar.gz: f4d641ec0744de995d7358c304220a39a4d0a37de684a66c1d9e2cdd3561ba5b5bf8d411f92148f09bfb1d756cf1d06f7478dda1ab86c39fc9f88201c480c939

data/app/controllers/qa/linked_data_terms_controller.rb

@@ -154,7 +154,7 @@ class Qa::LinkedDataTermsController < ::ApplicationController
     end
 
     def create_request_header_service
-      @request_header_service = request_header_service_class.new(request, params)
+      @request_header_service = request_header_service_class.new(request: request, params: params)
     end
 
     def init_authority

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

@@ -0,0 +1,26 @@
+# Service to construct a request header that includes optional attributes for search and fetch requests.
+module Qa
+  module LinkedData
+    class PerformanceDataService
+      # Construct performance data structure to include in the returned results (linked data module).
+      # @param access_time_s [Float] time to fetch the data from the external source and populate it in an RDF graph
+      # @param normalization_time_s [Float] time for QA to normalize the data
+      # @param fetched_size [Float] size of data in the RDF graph (in bytes)
+      # @param normalized_size [Float] size of the normalized data string (in bytes)
+      # @returns [Hash] performance data
+      # @see Qa::Authorities::LinkedData::SearchQuery
+      # @see Qa::Authorities::LinkedData::FindTerm
+      def self.performance_data(access_time_s:, normalize_time_s:, fetched_size:, normalized_size:)
+        {
+          fetch_time_s: access_time_s,
+          normalization_time_s: normalize_time_s,
+          fetched_bytes: fetched_size,
+          normalized_bytes: normalized_size,
+          fetch_bytes_per_s: fetched_size / access_time_s,
+          normalization_bytes_per_s: normalized_size / normalize_time_s,
+          total_time_s: (access_time_s + normalize_time_s)
+        }
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Qa
       # @option context [Boolean] true if context should be returned with the results; otherwise, false (default: false) (search only)
       # @option format [String] return data in this format (fetch only)
       # @note params may have additional attribute-value pairs that are passed through via replacements (only configured replacements are used)
-      def initialize(request, params)
+      def initialize(request:, params:)
         @request = request
         @params = params
       end

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

@@ -39,6 +39,10 @@ module Qa::Authorities
         @prefixes ||= authority_config.fetch(:prefixes, {})
       end
 
+      def service_uri
+        @service_uri ||= authority_config.fetch(:service_uri, nil)
+      end
+
       def config_version
         @config_version ||= authority_config.fetch(:QA_CONFIG_VERSION, '1.0')
       end

data/lib/qa/authorities/linked_data/config/search_config.rb

@@ -8,7 +8,7 @@ module Qa::Authorities
       attr_reader :prefixes, :full_config, :search_config
       private :full_config, :search_config
 
-      delegate :authority_name, to: :full_config
+      delegate :authority_name, :service_uri, to: :full_config
 
       # @param [Hash] config the search portion of the config
       # @param [Hash<Symbol><String>] prefixes URL map of prefixes to use with ldpaths
@@ -146,7 +146,7 @@ module Qa::Authorities
         search_config.fetch(:qa_replacement_patterns, {})
       end
 
-      # @return [Boolean] true if supports language parameter; otherwise, false
+      # @return [Boolean] true if supports subauthorities; otherwise, false
       def supports_subauthorities?
         qa_replacement_patterns.key?(:subauth) && subauthorities?
       end
@@ -182,6 +182,22 @@ module Qa::Authorities
         @subauthorities ||= search_config.fetch(:subauthorities)
       end
 
+      # @return [String] name of parameter holding start record number
+      def start_record_parameter
+        qa_replacement_patterns.key?(:start_record) ? qa_replacement_patterns[:start_record] : nil
+      end
+
+      # @return [String] name of parameter holding number of requested records
+      def requested_records_parameter
+        qa_replacement_patterns.key?(:requested_records) ? qa_replacement_patterns[:requested_records] : nil
+      end
+
+      # @return [String] ldpath of the triple that holds the total number of available records for a search
+      # @see #service_subject_uri
+      def total_count_ldpath
+        search_config.key?(:total_count_ldpath) ? search_config[:total_count_ldpath] : nil
+      end
+
       def info
         return [] unless supports_search?
         auth_name = authority_name.downcase.to_s

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, :fetched_size, :normalized_size, :subauthority
-      private :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size, :subauthority
+      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
 
       delegate :term_subauthority?, :prefixes, :authority_name, to: :term_config
 
@@ -63,7 +63,6 @@ module Qa::Authorities
 
           access_end_dt = Time.now.utc
           @access_time_s = access_end_dt - access_start_dt
-          @fetched_size = full_graph.triples.to_s.size if performance_data?
           Rails.logger.info("Time to receive data from authority: #{access_time_s}s")
         end
 
@@ -74,9 +73,8 @@ module Qa::Authorities
 
           normalize_end_dt = Time.now.utc
           @normalize_time_s = normalize_end_dt - normalize_start_dt
-          @normalized_size = results.to_s.size if performance_data?
           Rails.logger.info("Time to normalize data: #{normalize_time_s}s")
-          results = append_performance_data(results) if performance_data?
+          results = append_data_outside_results(results)
           results
         end
 
@@ -93,6 +91,7 @@ module Qa::Authorities
         end
 
         def unpack_request_header(request_header)
+          @request_header = request_header
           @subauthority = request_header.fetch(:subauthority, nil)
           @format = request_header.fetch(:format, 'json')
           @performance_data = request_header.fetch(:performance_data, false)
@@ -282,17 +281,20 @@ module Qa::Authorities
           predicates_hash
         end
 
-        def append_performance_data(results)
-          pred_count = results['predicates'].present? ? results['predicates'].size : 0
-          performance = { predicate_count: pred_count,
-                          fetch_time_s: access_time_s,
-                          normalization_time_s: normalize_time_s,
-                          fetched_bytes: fetched_size,
-                          normalized_bytes: normalized_size,
-                          fetch_bytes_per_s: fetched_size / access_time_s,
-                          normalization_bytes_per_s: normalized_size / normalize_time_s,
-                          total_time_s: (access_time_s + normalize_time_s) }
-          { performance: performance, results: results }
+        def append_data_outside_results(results)
+          return results unless performance_data?
+          full_results = {}
+          full_results[:results] = results
+          full_results[:performance] = performance(results)
+          full_results
+        end
+
+        def performance(results)
+          normalized_size = results.to_s.size
+          fetched_size = full_graph.triples.to_s.size
+          perf_data = Qa::LinkedData::PerformanceDataService.performance_data(access_time_s: access_time_s, normalize_time_s: normalize_time_s,
+                                                                              fetched_size: fetched_size, normalized_size: normalized_size)
+          perf_data
         end
 
         # This is providing support for calling build_url with individual parameters instead of the request_header.

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, :fetched_size, :normalized_size, :subauthority
-      private :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size, :subauthority
+      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
 
       delegate :subauthority?, :supports_sort?, :prefixes, :authority_name, to: :search_config
 
@@ -53,22 +53,20 @@ module Qa::Authorities
 
           access_end_dt = Time.now.utc
           @access_time_s = access_end_dt - access_start_dt
-          @fetched_size = full_graph.triples.to_s.size if performance_data?
           Rails.logger.info("Time to receive data from authority: #{access_time_s}s")
         end
 
         def normalize_results
           normalize_start_dt = Time.now.utc
 
-          @filtered_graph = graph_service.filter(graph: @full_graph, language: language)
+          @filtered_graph = graph_service.filter(graph: full_graph, language: language)
           results = map_results
           json = convert_results_to_json(results)
 
           normalize_end_dt = Time.now.utc
           @normalize_time_s = normalize_end_dt - normalize_start_dt
-          @normalized_size = json.to_s.size if performance_data?
           Rails.logger.info("Time to normalize data: #{normalize_time_s}s")
-          json = append_performance_data(json) if performance_data?
+          json = append_data_outside_results(json)
           json
         end
 
@@ -92,6 +90,7 @@ module Qa::Authorities
         end
 
         def unpack_request_header(request_header)
+          @request_header = request_header
           @subauthority = request_header.fetch(:subauthority, nil)
           @context = request_header.fetch(:context, false)
           @performance_data = request_header.fetch(:performance_data, false)
@@ -179,16 +178,19 @@ module Qa::Authorities
           lbl
         end
 
-        def append_performance_data(results)
-          performance = { result_count: results.size,
-                          fetch_time_s: access_time_s,
-                          normalization_time_s: normalize_time_s,
-                          fetched_bytes: fetched_size,
-                          normalized_bytes: normalized_size,
-                          fetch_bytes_per_s: fetched_size / access_time_s,
-                          normalization_bytes_per_s: normalized_size / normalize_time_s,
-                          total_time_s: (access_time_s + normalize_time_s) }
-          { performance: performance, results: results }
+        def append_data_outside_results(results)
+          return results unless performance_data?
+          full_results = {}
+          full_results[:results] = results
+          full_results[:performance] = performance(results)
+          full_results
+        end
+
+        def performance(results)
+          normalized_size = results.to_s.size
+          fetched_size = full_graph.triples.to_s.size
+          Qa::LinkedData::PerformanceDataService.performance_data(access_time_s: access_time_s, normalize_time_s: normalize_time_s,
+                                                                  fetched_size: fetched_size, normalized_size: normalized_size)
         end
 
         # This is providing support for calling build_url with individual parameters instead of the request_header.

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)
-      "https://id.loc.gov/search/?q=#{escaped_query}&q=#{authority_fragment}&format=json"
+      "http://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)
-      "https://id.loc.gov/authorities/#{@subauthority}/#{id}.json"
+      "http://id.loc.gov/authorities/#{@subauthority}/#{id}.json"
     end
 
     private

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "4.3.0".freeze
+  VERSION = "5.0.0".freeze
 end

data/spec/controllers/linked_data_terms_controller_spec.rb

@@ -307,12 +307,10 @@ describe Qa::LinkedDataTermsController, type: :controller do
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Hash
         expect(results.keys).to match_array ['performance', 'results']
-        expect(results['performance'].keys).to match_array ['result_count', 'fetch_time_s', 'normalization_time_s',
+        expect(results['performance'].keys).to match_array ['fetch_time_s', 'normalization_time_s',
                                                             'fetched_bytes', 'normalized_bytes', 'fetch_bytes_per_s',
                                                             'normalization_bytes_per_s', 'total_time_s']
         expect(results['performance']['total_time_s']).to eq results['performance']['fetch_time_s'] + results['performance']['normalization_time_s']
-        expect(results['performance']['result_count']).to eq 3
-        expect(results['results'].count).to eq 3
       end
 
       it "returns basic data only when performance_data='false'" do
@@ -320,7 +318,6 @@ describe Qa::LinkedDataTermsController, type: :controller do
         expect(response).to be_successful
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Array
-        expect(results.size).to eq 3
       end
     end
   end
@@ -495,12 +492,9 @@ describe Qa::LinkedDataTermsController, type: :controller do
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Hash
         expect(results.keys).to match_array ['performance', 'results']
-        expect(results['performance'].keys).to match_array ['predicate_count', 'fetch_time_s', 'normalization_time_s',
-                                                            'fetched_bytes', 'normalized_bytes', 'fetch_bytes_per_s',
-                                                            'normalization_bytes_per_s', 'total_time_s']
+        expect(results['performance'].keys).to match_array ['fetch_time_s', 'normalization_time_s', 'fetched_bytes', 'normalized_bytes',
+                                                            'fetch_bytes_per_s', 'normalization_bytes_per_s', 'total_time_s']
         expect(results['performance']['total_time_s']).to eq results['performance']['fetch_time_s'] + results['performance']['normalization_time_s']
-        expect(results['performance']['predicate_count']).to eq 15
-        expect(results['results']['predicates'].count).to eq 15
       end
 
       it "returns basic data only when performance_data='false'" do
@@ -509,7 +503,6 @@ describe Qa::LinkedDataTermsController, type: :controller do
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Hash
         expect(results.keys).not_to include('performance')
-        expect(results['predicates'].size).to eq 15
       end
     end
   end
@@ -671,12 +664,10 @@ describe Qa::LinkedDataTermsController, type: :controller do
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Hash
         expect(results.keys).to match_array ['performance', 'results']
-        expect(results['performance'].keys).to match_array ['predicate_count', 'fetch_time_s', 'normalization_time_s',
+        expect(results['performance'].keys).to match_array ['fetch_time_s', 'normalization_time_s',
                                                             'fetched_bytes', 'normalized_bytes', 'fetch_bytes_per_s',
                                                             'normalization_bytes_per_s', 'total_time_s']
         expect(results['performance']['total_time_s']).to eq results['performance']['fetch_time_s'] + results['performance']['normalization_time_s']
-        expect(results['performance']['predicate_count']).to eq 7
-        expect(results['results']['predicates'].count).to eq 7
       end
 
       it "returns basic data only when performance_data='false'" do
@@ -685,7 +676,6 @@ describe Qa::LinkedDataTermsController, type: :controller do
         results = JSON.parse(response.body)
         expect(results).to be_kind_of Hash
         expect(results.keys).not_to include('performance')
-        expect(results['predicates'].size).to eq 7
       end
     end
   end

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, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
+        stub_request(:get, "http://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, "https://id.loc.gov/authorities/subjects/sh85077565.json")
+        stub_request(:get, "http://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/fixtures/authorities/linked_data/lod_full_config.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.0",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "schema": "http://www.w3.org/2000/01/rdf-schema#",
     "skos": "http://www.w3.org/2004/02/skos/core#"
@@ -114,9 +115,12 @@
     "qa_replacement_patterns": {
       "query": "query",
       "subauth": "subauth",
-      "lang": "lang"
+      "lang": "lang",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
     "language": [ "en", "fr", "de" ],
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_predicate":       "http://purl.org/dc/terms/identifier",
       "label_predicate":    "http://www.w3.org/2004/02/skos/core#prefLabel",

data/spec/lib/authorities/linked_data/config_spec.rb

@@ -25,7 +25,8 @@ describe Qa::Authorities::LinkedData::Config do
   describe '#authority_config' do
     let(:full_auth_config) do
       {
-        QA_CONFIG_VERSION: "2.0",
+        QA_CONFIG_VERSION: "2.2",
+        service_uri: "http://ld4l.org/ld4l_services/cache",
         prefixes: {
           schema: "http://www.w3.org/2000/01/rdf-schema#",
           skos: "http://www.w3.org/2004/02/skos/core#"
@@ -140,9 +141,12 @@ describe Qa::Authorities::LinkedData::Config do
           qa_replacement_patterns: {
             query: 'query',
             subauth: 'subauth',
-            lang: 'lang'
+            lang: 'lang',
+            start_record: 'startRecord',
+            requested_records: 'maxRecords'
           },
           language: ['en', 'fr', 'de'],
+          total_count_ldpath: "vivo:count",
           results: {
             id_predicate: 'http://purl.org/dc/terms/identifier',
             label_predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel',
@@ -377,7 +381,7 @@ describe Qa::Authorities::LinkedData::Config do
     let(:authority_config) { full_config.authority_config }
     let(:authority_config_1_0) { full_config_1_0.authority_config }
 
-    it 'returns hash of the full authority 2.0 configuration' do
+    it 'returns hash of the full authority 2.2 configuration' do
       expect(authority_config).to eq full_auth_config
     end
 
@@ -468,18 +472,18 @@ describe Qa::Authorities::LinkedData::Config do
 
     context 'when version is specified in the config file' do
       it 'returns the version from the config file' do
-        expect(full_config.config_version).to eq '2.0'
+        expect(full_config.config_version).to eq '2.2'
       end
     end
   end
 
   describe '#config_version?' do
     it "returns true if the passed in version matches the authority's version" do
-      expect(full_config.config_version?('2.0')).to eq true
+      expect(full_config.config_version?('2.2')).to eq true
     end
 
     it "returns false if the passed in version does NOT match the authority's version" do
-      expect(full_config_1_0.config_version?('2.0')).to eq false
+      expect(full_config_1_0.config_version?('2.2')).to eq false
     end
   end
 end

data/spec/lib/authorities/linked_data/find_term_spec.rb

@@ -28,10 +28,8 @@ RSpec.describe Qa::Authorities::LinkedData::FindTerm do
         end
         it 'includes performance in return hash' do
           expect(results.keys).to match_array [:performance, :results]
-          expect(results[:performance].keys).to match_array [:predicate_count, :fetch_time_s, :normalization_time_s,
-                                                             :fetched_bytes, :normalized_bytes, :fetch_bytes_per_s,
-                                                             :normalization_bytes_per_s, :total_time_s]
-          expect(results[:performance][:predicate_count]).to eq 7
+          expect(results[:performance].keys).to match_array [:fetch_time_s, :normalization_time_s, :fetched_bytes, :normalized_bytes,
+                                                             :fetch_bytes_per_s, :normalization_bytes_per_s, :total_time_s]
           expect(results[:performance][:total_time_s]).to eq results[:performance][:fetch_time_s] + results[:performance][:normalization_time_s]
         end
       end

data/spec/lib/authorities/linked_data/search_config_spec.rb

@@ -68,9 +68,12 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
         qa_replacement_patterns: {
           query: 'query',
           subauth: 'subauth',
-          lang: 'lang'
+          lang: 'lang',
+          start_record: 'startRecord',
+          requested_records: 'maxRecords'
         },
         language: ['en', 'fr', 'de'],
+        total_count_ldpath: "vivo:count",
         results: {
           id_predicate: 'http://purl.org/dc/terms/identifier',
           label_predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel',
@@ -408,6 +411,42 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
     end
   end
 
+  describe '#start_record_parameter' do
+    it 'returns nil if only term configuration is defined' do
+      expect(term_only_config.start_record_parameter).to eq nil
+    end
+    it 'returns nil if not defined' do
+      expect(min_config.start_record_parameter).to eq nil
+    end
+    it 'returns parameter name if defined' do
+      expect(full_config.start_record_parameter).to eq 'startRecord'
+    end
+  end
+
+  describe '#requested_records_parameter' do
+    it 'returns nil if only term configuration is defined' do
+      expect(term_only_config.requested_records_parameter).to eq nil
+    end
+    it 'returns nil if not defined' do
+      expect(min_config.requested_records_parameter).to eq nil
+    end
+    it 'returns parameter name if defined' do
+      expect(full_config.requested_records_parameter).to eq 'maxRecords'
+    end
+  end
+
+  describe '#total_count_ldpath' do
+    it 'returns nil if only term configuration is defined' do
+      expect(term_only_config.total_count_ldpath).to eq nil
+    end
+    it 'returns nil if not defined' do
+      expect(min_config.total_count_ldpath).to eq nil
+    end
+    it 'returns parameter name if defined' do
+      expect(full_config.total_count_ldpath).to eq 'vivo:count'
+    end
+  end
+
   describe '#info' do
     let(:term_details) do
       {

data/spec/lib/authorities/linked_data/search_query_spec.rb

@@ -16,11 +16,10 @@ RSpec.describe Qa::Authorities::LinkedData::SearchQuery do
         it 'includes performance in return hash' do
           expect(results).to be_kind_of Hash
           expect(results.keys).to match_array [:performance, :results]
-          expect(results[:performance].keys).to match_array [:result_count, :fetch_time_s, :normalization_time_s,
+          expect(results[:performance].keys).to match_array [:fetch_time_s, :normalization_time_s,
                                                              :fetched_bytes, :normalized_bytes, :fetch_bytes_per_s,
                                                              :normalization_bytes_per_s, :total_time_s]
           expect(results[:performance][:total_time_s]).to eq results[:performance][:fetch_time_s] + results[:performance][:normalization_time_s]
-          expect(results[:performance][:result_count]).to eq 3
           expect(results[:results].count).to eq 3
         end
       end

data/spec/lib/authorities/loc_spec.rb

@@ -28,14 +28,14 @@ describe Qa::Authorities::Loc do
     end
 
     context "for searching" do
-      let(:url) { 'https://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
+      let(:url) { 'http://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) { "https://id.loc.gov/authorities/subjects/sh2002003586.json" }
+      let(:url) { "http://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, "https://id.loc.gov/search/?format=json&q=cs:http://id.loc.gov/authorities/subjects")
+      stub_request(:get, "http://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) { 'https://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json' }
+      let(:url) { 'http://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 = "https://id.loc.gov/search/?format=json&q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects"
+        flat_params_url = "http://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, "https://id.loc.gov/search/?format=json&q=s&q=cs:http://id.loc.gov/vocabulary/geographicAreas")
+        stub_request(:get, "http://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, "https://id.loc.gov/search/?format=json&q=History--&q=cs:http://id.loc.gov/authorities/subjects")
+        stub_request(:get, "http://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, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
+        stub_request(:get, "http://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, "https://id.loc.gov/authorities/subjects/sh2002003586.json")
+        stub_request(:get, "http://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/services/linked_data/performance_data_service_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+RSpec.describe Qa::LinkedData::PerformanceDataService do
+  let(:request) { double }
+
+  describe '.performance_data' do
+    context 'when all data passed in' do
+      let(:access_time_s) { 0.5 }
+      let(:normalize_time_s) { 0.3 }
+      let(:fetched_size) { 11 }
+      let(:normalized_size) { 8 }
+      it 'uses passed in params' do
+        expected_results =
+          {
+            fetch_time_s: access_time_s,
+            normalization_time_s: normalize_time_s,
+            fetched_bytes: fetched_size,
+            normalized_bytes: normalized_size,
+            fetch_bytes_per_s: (fetched_size / access_time_s),
+            normalization_bytes_per_s: (normalized_size / normalize_time_s),
+            total_time_s: (access_time_s + normalize_time_s)
+          }
+        expect(described_class.performance_data(access_time_s: access_time_s, normalize_time_s: normalize_time_s, fetched_size: fetched_size, normalized_size: normalized_size)).to eq expected_results
+      end
+    end
+  end
+end

data/spec/services/linked_data/request_header_service_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
             subauthority: 'person',
             user_language: ['sp']
           }
-        expect(described_class.new(request, search_params).search_header).to eq expected_results
+        expect(described_class.new(request: request, params: search_params).search_header).to eq expected_results
       end
     end
 
@@ -41,7 +41,7 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
               subauthority: nil,
               user_language: nil
             }
-          expect(described_class.new(request, {}).search_header).to eq expected_results
+          expect(described_class.new(request: request, params: {}).search_header).to eq expected_results
         end
       end
 
@@ -56,7 +56,7 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
               subauthority: nil,
               user_language: ['de']
             }
-          expect(described_class.new(request, {}).search_header).to eq expected_results
+          expect(described_class.new(request: request, params: {}).search_header).to eq expected_results
         end
       end
     end
@@ -85,7 +85,7 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
             subauthority: 'person',
             user_language: ['sp']
           }
-        expect(described_class.new(request, fetch_params).fetch_header).to eq expected_results
+        expect(described_class.new(request: request, params: fetch_params).fetch_header).to eq expected_results
       end
     end
 
@@ -101,7 +101,7 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
               subauthority: nil,
               user_language: nil
             }
-          expect(described_class.new(request, {}).fetch_header).to eq expected_results
+          expect(described_class.new(request: request, params: {}).fetch_header).to eq expected_results
         end
       end
 
@@ -116,7 +116,7 @@ RSpec.describe Qa::LinkedData::RequestHeaderService do
               subauthority: nil,
               user_language: ['de']
             }
-          expect(described_class.new(request, {}).fetch_header).to eq expected_results
+          expect(described_class.new(request: request, params: {}).fetch_header).to eq expected_results
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -13,10 +13,10 @@ authors:
 - Mike Stroming
 - Adam Wead
 - E. Lynette Rayle
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -322,6 +322,7 @@ files:
 - app/services/qa/linked_data/mapper/graph_predicate_mapper_service.rb
 - app/services/qa/linked_data/mapper/search_results_mapper_service.rb
 - app/services/qa/linked_data/mapper/term_results_mapper_service.rb
+- app/services/qa/linked_data/performance_data_service.rb
 - app/services/qa/linked_data/request_header_service.rb
 - app/views/layouts/qa/application.html.erb
 - config/authorities.yml
@@ -556,6 +557,7 @@ files:
 - spec/services/linked_data/mapper/graph_predicate_mapper_service_spec.rb
 - spec/services/linked_data/mapper/search_results_mapper_service_spec.rb
 - spec/services/linked_data/mapper/term_results_mapper_service_spec.rb
+- spec/services/linked_data/performance_data_service_spec.rb
 - spec/services/linked_data/request_header_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/include_hash.rb
@@ -565,7 +567,7 @@ homepage: https://github.com/projecthydra/questioning_authority
 licenses:
 - APACHE-2
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -580,8 +582,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.14
+signing_key: 
 specification_version: 4
 summary: You should question your authorities.
 test_files:
@@ -724,6 +727,7 @@ test_files:
 - spec/services/linked_data/mapper/context_mapper_service_spec.rb
 - spec/services/linked_data/mapper/graph_predicate_mapper_service_spec.rb
 - spec/services/linked_data/deep_sort_service_spec.rb
+- spec/services/linked_data/performance_data_service_spec.rb
 - spec/services/linked_data/language_service_spec.rb
 - spec/services/linked_data/authority_url_service_spec.rb
 - spec/services/iri_template_service_spec.rb