qa_server 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 860edda3341250dd5f1fc4db164b95f8f24bf832
-  data.tar.gz: 89cb1ccc0f86ef647d490dd416bf27b00f598d86
+  metadata.gz: 3f5c0789b598b78ba1ac24e8070d989c92147bad
+  data.tar.gz: a3d686757d3cb4f9279c505416c6c3a54edbc00c
 SHA512:
-  metadata.gz: f43f63cbfda11c203e79fb8aeeb4a8f05dac3051ea4225593fe82244343d35b8076a3db11672c913bf80eb8df8cfd0216bc7a6218d296c9772b516e32edeb41f
-  data.tar.gz: 9192ba67322874947fc9f979d7545369de86d041a533361621ac091013cbb04230b0f756d2b6d570a0c5fc992dce27548d6b86dfd93ff95733c39a134b542546
+  metadata.gz: fc7340db3cc8a3aaf1d20449608427b57c7aa03a0d096b67b093330c92e97b4af7035acd20833bcf74e440056eebd7a6b37bf5224c95686d14294812612ad447
+  data.tar.gz: d7e0ae7f314ec9c7fb9d16783947a2a9cb5d7dea10388b6ad777c0da8a2e9c5ca035511bd519ed3b4bcb3314e6c782a6901983459a5872cdea0980c0333a6d56

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 6.1.0 (2020-02-17)
+
+* change historical summary to show number of days instead of number of tests (original intent)
+* default tests to connection tests
+* update authorities to v2.2 configs
+* add authority cerl_ld4l_cache
+
 ### 6.0.0 (2020-02-13)
 
 * refactor generation of performance graphs to minimize db access and calculations

data/app/controllers/concerns/qa_server/authority_validation_behavior.rb

@@ -7,7 +7,6 @@ module QaServer
     VALIDATE_CONNECTIONS = 'connections'
     VALIDATE_ACCURACY = 'accuracy'
     ALL_VALIDATIONS = 'all_checks'
-    DEFAULT_VALIDATION_TYPE = QaServer::AuthorityValidatorService
 
     included do
       class_attribute :validator_class,
@@ -33,7 +32,7 @@ module QaServer
         @authorities_list ||= lister_class.authorities_list
       end
 
-      def validate(authorities_list, validation_type = DEFAULT_VALIDATION_TYPE)
+      def validate(authorities_list, validation_type = validator_class::DEFAULT_VALIDATION_TYPE)
         return if authorities_list.blank?
         authorities_list.each { |auth_name| validate_authority(auth_name, validation_type) }
       end
@@ -71,7 +70,7 @@ module QaServer
         when VALIDATE_ACCURACY
           validator_class::VALIDATE_ACCURACY
         else
-          DEFAULT_VALIDATION_TYPE
+          validator_class::DEFAULT_VALIDATION_TYPE
         end
       end
   end

data/app/controllers/qa_server/monitor_status_controller.rb

@@ -104,9 +104,7 @@ module QaServer
       end
 
       def log_header
-        QaServer.config.monitor_logger.debug("----------------------------------------------------------------------")
-        QaServer.config.monitor_logger.debug("                         loading monitor status page")
-        QaServer.config.monitor_logger.debug("----------------------------------------------------------------------")
+        QaServer.config.monitor_logger.debug("-------------------------------------  monitor status  ---------------------------------")
         QaServer.config.monitor_logger.info("(#{self.class}##{__method__}) monitor status page request (refresh_tests? # #{refresh_tests?}, " \
                                          "refresh_history? # #{refresh_history?}, refresh_performance? # #{refresh_performance?})")
       end

data/app/jobs/qa_server/monitor_tests_job.rb

@@ -11,22 +11,25 @@ module QaServer
 
     # def perform(job_id:)
     def perform
-      Rails.cache.fetch("QaServer::MonitorTestsController/latest_run", expires_in: QaServer::MonitorCacheService.cache_expiry, race_condition_ttl: 5.minutes, force: true) do
+      Rails.cache.fetch("QaServer::MonitorTestsController/latest_test_run_from_cache", expires_in: QaServer::MonitorCacheService.cache_expiry, race_condition_ttl: 5.minutes, force: true) do
         job_id = SecureRandom.uuid
         monitor_tests_job_id = job_id unless monitor_tests_job_id
-        if monitor_tests_job_id == job_id # avoid race conditions
-          QaServer.config.monitor_logger.info("(#{self.class}##{__method__}-#{job_id}) RUNNING monitoring tests")
-          validate(authorities_list)
-          scenario_run_registry_class.save_run(scenarios_results: status_log.to_a)
-          QaServer.config.monitor_logger.info("(#{self.class}##{__method__}-#{job_id}) COMPLETED monitoring tests")
-          reset_monitor_tests_job_id
-        end
+        run_tests if monitor_tests_job_id == job_id # avoid race conditions
         scenario_run_registry_class.latest_run
       end
     end
 
     private
 
+      def run_tests
+        QaServer.config.monitor_logger.info("(#{self.class}##{__method__}-#{job_id}) RUNNING monitoring tests")
+        validate(authorities_list)
+        log_results(authorities_list, status_log.to_a)
+        scenario_run_registry_class.save_run(scenarios_results: status_log.to_a)
+        QaServer.config.monitor_logger.info("(#{self.class}##{__method__}-#{job_id}) COMPLETED monitoring tests")
+        reset_monitor_tests_job_id
+      end
+
       # @return [String, Boolean] Returns job id of the job currently running tests; otherwise, false if tests are not running
       def monitor_tests_job_id
         Rails.cache.fetch("QaServer:monitor_tests-job_id", expires_in: 2.hours, race_condition_ttl: 5.minutes) { false }
@@ -36,7 +39,7 @@ module QaServer
       # @param job_id [String] UUID for job running the tests
       def monitor_tests_job_id=(job_id)
         # check to see if there is a current job already running tests
-        current_job_id = Rails.cache.fetch("QaServer:monitor_tests-job_id", expires_in: 2.hours, race_condition_ttl: 30.seconds) { job_id }
+        current_job_id = Rails.cache.fetch("QaServer:monitor_tests-job_id", expires_in: 2.hours, race_condition_ttl: 5.seconds) { job_id }
 
         # current_job_id may be false meaning tests are not currently running; in which case, it is ok to force set job_id
         Rails.cache.fetch("QaServer:monitor_tests-job_id", expires_in: 2.hours, race_condition_ttl: 30.seconds, force: true) { job_id } unless current_job_id
@@ -46,5 +49,10 @@ module QaServer
       def reset_monitor_tests_job_id
         Rails.cache.fetch("QaServer:monitor_tests-job_id", expires_in: 2.hours, race_condition_ttl: 30.seconds, force: true) { false }
       end
+
+      def log_results(authorities_list, results)
+        QaServer.config.monitor_logger.warn("(#{self.class}##{__method__}-#{job_id}) authorities_list is empty") if authorities_list&.empty?
+        QaServer.config.monitor_logger.warn("(#{self.class}##{__method__}-#{job_id}) test results are empty") if results&.empty?
+      end
   end
 end

data/app/models/qa_server/scenario_run_history.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # Provide access to the scenario_run_history database table which tracks scenario runs over time.
 module QaServer
-  class ScenarioRunHistory < ActiveRecord::Base
+  class ScenarioRunHistory < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
     self.table_name = 'scenario_run_history'
     belongs_to :scenario_run_registry
     enum scenario_type: [:connection, :accuracy, :performance], _suffix: :type
@@ -20,6 +20,7 @@ module QaServer
       # @param run_id [Integer] the run on which to gather statistics
       # @param result [Hash] the scenario result to be saved
       def save_result(run_id:, scenario_result:)
+        registry = QaServer::ScenarioRunRegistry.find(run_id)
         QaServer::ScenarioRunHistory.create(scenario_run_registry_id: run_id,
                                             status: scenario_result[:status],
                                             authority_name: scenario_result[:authority_name],
@@ -28,7 +29,8 @@ module QaServer
                                             action: scenario_result[:action],
                                             url: scenario_result[:url],
                                             err_message: scenario_result[:err_message],
-                                            run_time: scenario_result[:run_time])
+                                            run_time: scenario_result[:run_time],
+                                            date: registry.dt_stamp.to_date)
       end
 
       # Get a summary of passing/failing tests for a run.
@@ -45,7 +47,7 @@ module QaServer
       #   * total_scenario_count: 159,
       def run_summary(scenario_run:, force: false)
         Rails.cache.fetch("QaServer::ScenarioRunHistory/#{__method__}", expires_in: QaServer::MonitorCacheService.cache_expiry, race_condition_ttl: 1.minute, force: force) do
-          QaServer.config.monitor_logger.info("(QaServer::ScenarioRunHistory##{__method__}) - creating summary of latest run - cache expired or refresh requested (force: #{force})")
+          QaServer.config.monitor_logger.info("(QaServer::ScenarioRunHistory##{__method__}) - CALCULATING summary of latest run - cache expired or refresh requested (force: #{force})")
           status = status_counts_in_run(run_id: scenario_run.id)
           summary_class.new(run_id: scenario_run.id,
                             run_dt_stamp: scenario_run.dt_stamp,
@@ -136,16 +138,38 @@ module QaServer
       # Get a summary level of historical data
       # @returns [Array<Array>] summary of passing/failing tests for each authority
       # @example [auth_name, failing, passing]
-      #   { 'agrovoc' => { "good" => 0, "bad" => 24 },
-      #     'geonames_ld4l_cache' => { "good" => 2, "bad" => 22 } }
+      #   { 'agrovoc' => { good: 31, bad: 2 },
+      #     'geonames_ld4l_cache' => { good: 32, bad: 1 } }
       def historical_summary(force: false)
         Rails.cache.fetch("QaServer::ScenarioRunHistory/#{__method__}", expires_in: QaServer::MonitorCacheService.cache_expiry, race_condition_ttl: 1.minute, force: force) do
-          runs_per_authority_for_time_period
+          QaServer.config.monitor_logger.info("(QaServer::ScenarioRunHistory##{__method__}) - CALCULATING authority connection history - cache expired or refresh requested (force: #{force})")
+          days_good = count_days(:good)
+          days_bad = count_days(:bad)
+          days_unknown = count_days(:unknown)
+          keys = (days_good.keys + days_bad.keys + days_unknown.keys).uniq.sort
+          keys.each_with_object({}) do |auth, hash|
+            hash[auth] = { good: day_count(auth, days_good), bad: day_count(auth, days_bad) + day_count(auth, days_unknown) }
+          end
         end
       end
 
       private
 
+        def day_count(auth, days)
+          days&.key?(auth) ? days[auth] : 0
+        end
+
+        def count_days(status)
+          where = time_period_where
+          where[:status] = status
+          auths = QaServer::ScenarioRunHistory.where(where).select("authority_name").group("date, authority_name")
+                                              .order("authority_name").pluck(:authority_name)
+          auths.each_with_object({}) do |auth, hash|
+            hash[auth] = 0 unless hash.key? auth
+            hash[auth] += 1
+          end
+        end
+
         def authorities_in_run(run_id:)
           QaServer::ScenarioRunHistory.where(scenario_run_registry_id: run_id).pluck(:authority_name).uniq
         end
@@ -180,11 +204,11 @@ module QaServer
         def time_period_where
           case expected_time_period
           when :day
-            QaServer::TimePeriodService.where_clause_for_last_24_hours(dt_table: :scenario_run_registry)
+            QaServer::TimePeriodService.where_clause_for_last_24_hours(dt_table: :scenario_run_history, dt_column: :date)
           when :month
-            QaServer::TimePeriodService.where_clause_for_last_30_days(dt_table: :scenario_run_registry)
+            QaServer::TimePeriodService.where_clause_for_last_30_days(dt_table: :scenario_run_history, dt_column: :date)
           when :year
-            QaServer::TimePeriodService.where_clause_for_last_12_months(dt_table: :scenario_run_registry)
+            QaServer::TimePeriodService.where_clause_for_last_12_months(dt_table: :scenario_run_history, dt_column: :date)
           else
             all_records
           end

data/app/presenters/qa_server/monitor_status/history_presenter.rb

@@ -67,7 +67,7 @@ module QaServer::MonitorStatus
       "status-#{status[:status]}"
     end
 
-    # @return [String] the name of the css style class to use for the status cell based on the status of the scenario test.
+    # @return [String] the marker to use for the status cell based on the status of the scenario test
     def status_label(status)
       case status[:status]
       when :good
@@ -84,11 +84,11 @@ module QaServer::MonitorStatus
     end
 
     def days_authority_passing(historical_entry)
-      historical_entry[1]["good"]
+      historical_entry[1][:good]
     end
 
     def days_authority_failing(historical_entry)
-      historical_entry[1]["bad"]
+      historical_entry[1][:bad]
     end
 
     def days_authority_tested(historical_entry)
@@ -100,12 +100,12 @@ module QaServer::MonitorStatus
     end
 
     def percent_authority_failing_str(historical_entry)
-      "#{percent_authority_failing(historical_entry) * 100}%"
+      ActiveSupport::NumberHelper.number_to_percentage(percent_authority_failing(historical_entry) * 100, precision: 1)
     end
 
     def failure_style_class(historical_entry)
       return "status-neutral" if days_authority_failing(historical_entry) <= 0
-      percent_authority_failing(historical_entry) < 0.1 ? "status-unknown" : "status-bad"
+      percent_authority_failing(historical_entry) < 0.10 ? "status-unknown" : "status-bad"
     end
 
     def passing_style_class(historical_entry)
@@ -149,8 +149,8 @@ module QaServer::MonitorStatus
         historical_summary.each do |auth, data|
           labels[i] = auth
           i += 1
-          fail_data << data["bad"]
-          pass_data << data["good"]
+          fail_data << data[:bad]
+          pass_data << data[:good]
         end
         [labels, fail_data, pass_data]
       end

data/app/services/qa_server/performance_datatable_service.rb

@@ -26,7 +26,7 @@ module QaServer
       #   }
       def calculate_datatable_data(force:)
         Rails.cache.fetch("QaServer::PerformanceDatatableService/#{__method__}", expires_in: QaServer::MonitorCacheService.cache_expiry, race_condition_ttl: 5.minutes, force: force) do
-          QaServer.config.monitor_logger.info("(QaServer::PerformanceDatatableService##{__method__}) - calculating performance datatable stats - cache expired or refresh requested (force: #{force})")
+          QaServer.config.monitor_logger.info("(QaServer::PerformanceDatatableService##{__method__}) - CALCULATING performance datatable stats - cache expired or refresh requested (force: #{force})")
           data = {}
           auths = authority_list_class.authorities_list
           data[ALL_AUTH] = datatable_data_for_authority

data/app/services/qa_server/performance_graph_data_service.rb

@@ -45,11 +45,11 @@ module QaServer
       #     AGROVOC_LD4L_CACHE: { ... # same data for each authority  }
       #   }
       def calculate_graph_data(force:)
-        QaServer.config.monitor_logger.info("(QaServer::PerformanceGraphDataService##{__method__}) - calculating performance graph data")
         QaServer.config.performance_cache.write_all
         data = {}
         auths = authority_list_class.authorities_list
         calculate_all = force || cache_expired?
+        QaServer.config.monitor_logger.info("(QaServer::PerformanceGraphDataService##{__method__}) - CALCULATING performance graph data (calculate_all: #{calculate_all})")
         data[ALL_AUTH] = graph_data_for_authority(force: force, calculate_all: calculate_all)
         auths.each { |auth_name| data[auth_name] = graph_data_for_authority(authority_name: auth_name, force: force, calculate_all: calculate_all) }
         data
@@ -83,7 +83,6 @@ module QaServer
           avgs = Rails.cache.fetch("QaServer::PerformanceGraphDataService/#{__method__}/#{authority_name || ALL_AUTH}/#{action}/#{FOR_DAY}",
                                    expires_in: QaServer::TimeService.current_time.end_of_hour - QaServer::TimeService.current_time,
                                    race_condition_ttl: 1.hour, force: force) do
-            QaServer.config.monitor_logger.info("(QaServer::PerformanceGraphDataService##{__method__}) - calculating performance stats - cache expired or refresh requested (force: #{force})")
             calculate_last_24_hours(authority_name, action)
           end
           calculate_last_hour(authority_name, action, avgs)
@@ -104,7 +103,6 @@ module QaServer
         def average_last_30_days(authority_name: nil, action: nil, force: false)
           Rails.cache.fetch("QaServer::PerformanceGraphDataService/#{__method__}/#{authority_name || ALL_AUTH}/#{action}/#{FOR_MONTH}",
                             expires_in: QaServer::MonitorCacheService.cache_expiry, race_condition_ttl: 1.hour, force: force) do
-            QaServer.config.monitor_logger.info("(QaServer::PerformanceGraphDataService##{__method__}) - calculating performance stats - cache expired or refresh requested (force: #{force})")
             calculate_last_30_days(authority_name, action)
           end
         end
@@ -124,7 +122,6 @@ module QaServer
         def average_last_12_months(authority_name: nil, action: nil, force: false)
           Rails.cache.fetch("QaServer::PerformanceGraphDataService/#{__method__}/#{authority_name || ALL_AUTH}/#{action}/#{FOR_YEAR}",
                             expires_in: QaServer::MonitorCacheService.cache_expiry, race_condition_ttl: 1.hour, force: force) do
-            QaServer.config.monitor_logger.info("(QaServer::PerformanceGraphDataService##{__method__}) - calculating performance stats - cache expired or refresh requested (force: #{force})")
             calculate_last_12_months(authority_name, action)
           end
         end

data/app/services/qa_server/time_period_service.rb

@@ -17,9 +17,9 @@ module QaServer
       #   { dt_stamp: start_hour..end_hour, authority: 'LOC_DIRECT' }
       # @example returned where when no authority
       #   { dt_stamp: start_hour..end_hour }
-      def where_clause_for_last_24_hours(auth_name: nil, auth_table: nil, dt_table: nil)
+      def where_clause_for_last_24_hours(auth_name: nil, auth_table: nil, dt_table: nil, dt_column: :dt_stamp)
         validate_params(auth_name, auth_table, dt_table)
-        where_clause = where_for_dt_stamp(dt_table, 1.day)
+        where_clause = where_for_dt_stamp(dt_table, dt_column, 1.day)
         where_with_authority(where_clause, auth_name, auth_table)
       end
 
@@ -37,9 +37,9 @@ module QaServer
       #   { dt_stamp: start_day..end_day, authority: 'LOC_DIRECT' }
       # @example returned where when no authority
       #   { dt_stamp: start_day..end_day }
-      def where_clause_for_last_30_days(auth_name: nil, auth_table: nil, dt_table: nil)
+      def where_clause_for_last_30_days(auth_name: nil, auth_table: nil, dt_table: nil, dt_column: :dt_stamp)
         validate_params(auth_name, auth_table, dt_table)
-        where_clause = where_for_dt_stamp(dt_table, 1.month)
+        where_clause = where_for_dt_stamp(dt_table, dt_column, 1.month)
         where_with_authority(where_clause, auth_name, auth_table)
       end
 
@@ -57,18 +57,18 @@ module QaServer
       #   { dt_stamp: start_month..end_month, authority: 'LOC_DIRECT' }
       # @example returned where when no authority
       #   { dt_stamp: start_month..end_month }
-      def where_clause_for_last_12_months(auth_name: nil, auth_table: nil, dt_table: nil)
+      def where_clause_for_last_12_months(auth_name: nil, auth_table: nil, dt_table: nil, dt_column: :dt_stamp)
         validate_params(auth_name, auth_table, dt_table)
-        where_clause = where_for_dt_stamp(dt_table, 1.year)
+        where_clause = where_for_dt_stamp(dt_table, dt_column, 1.year)
         where_with_authority(where_clause, auth_name, auth_table)
       end
 
       private
 
-        def where_for_dt_stamp(dt_table, time_period)
+        def where_for_dt_stamp(dt_table, dt_column, time_period)
           end_range = QaServer::TimeService.current_time
           start_range = end_range - time_period
-          where_clause = { dt_stamp: start_range..end_range }
+          where_clause = { dt_column => start_range..end_range }
           where_clause = { dt_table => where_clause } unless dt_table.nil?
           where_clause
         end

data/lib/generators/qa_server/templates/config/authorities/linked_data/agrovoc_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "vivo": "http://vivoweb.org/ontology/core#"
   },
@@ -77,8 +78,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "label_ldpath": "skos:prefLabel ::xsd:string",
       "sort_ldpath":  "vivo:rank ::xsd:string"
@@ -117,14 +121,6 @@
           "expansion_label_ldpath": "skos:prefLabel ::xsd:string"
         }
       ]
-    },
-    "subauthorities": {
-      "person":         "Person",
-      "organization":   "Organization",
-      "place":          "Place",
-      "intangible":     "Intangible",
-      "geocoordinates": "GeoCoordinates",
-      "work":           "Work"
     }
   }
 }

data/lib/generators/qa_server/templates/config/authorities/linked_data/cerl_ld4l_cache.json

@@ -0,0 +1,168 @@
+{
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
+  "prefixes": {
+    "rdaGr2": "http://rdvocab.info/ElementsGr2/",
+    "rdaGr3": "http://rdvocab.info/ElementsGr3/",
+    "ct": "http://www.cerl.org/namespaces/thesaurus",
+    "rdaRelGr2": "http://metadataregistry.org/uri/schema/RDARelationshipsGR2",
+    "vivo": "http://vivoweb.org/ontology/core#"
+  },
+  "term": {
+    "url": {
+      "@context": "http://www.w3.org/ns/hydra/context.jsonld",
+      "@type":    "IriTemplate",
+      "template": "http://services.ld4l.org/ld4l_services/cerl_lookup.jsp?uri={term_uri}",
+      "variableRepresentation": "BasicRepresentation",
+      "mapping": [
+        {
+          "@type":    "IriTemplateMapping",
+          "variable": "term_uri",
+          "property": "hydra:freetextQuery",
+          "required": true,
+          "encode":   true
+        }
+      ]
+    },
+    "qa_replacement_patterns": {
+      "term_id": "term_uri"
+    },
+    "term_id": "URI",
+    "results": {
+      "label_ldpath":    "skos:prefLabel ::xsd:string",
+      "altlabel_ldpath": "skos:altLabel ::xsd:string",
+      "broader_ldpath":  "skos:broader ::xsd:anyURI",
+      "narrower_ldpath": "skos:narrower ::xsd:anyURI",
+      "sameas_ldpath":   "skos:exactMatch ::xsd:anyURI"
+    }
+  },
+  "search": {
+    "url": {
+      "@context": "http://www.w3.org/ns/hydra/context.jsonld",
+      "@type": "IriTemplate",
+      "template": "http://services.ld4l.org/ld4l_services/cerl_batch.jsp?{?query}&{?maxRecords}&{?startRecord}&{?entity}&{?lang}",
+      "variableRepresentation": "BasicRepresentation",
+      "mapping": [
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "query",
+          "property": "hydra:freetextQuery",
+          "required": true,
+          "encode": true
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "entity",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": ""
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "maxRecords",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "20"
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "startRecord",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "1"
+        },
+        {
+          "@type": "IriTemplateMapping",
+          "variable": "lang",
+          "property": "hydra:freetextQuery",
+          "required": false,
+          "default": "en"
+        }
+      ]
+    },
+    "qa_replacement_patterns": {
+      "query":   "query",
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
+    },
+    "total_count_ldpath": "vivo:count",
+    "results": {
+      "label_ldpath": "rdaGr2:nameOfThePerson | rdaGr2:nameOfTheCorporateBody | ct:imprintName ::xsd:string",
+      "sort_ldpath":  "vivo:rank ::xsd:string"
+    },
+    "context": {
+      "properties": [
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.name",
+          "property_label_default": "Name",
+          "ldpath": "rdaGr2:nameOfThePerson | rdaGr2:nameOfTheCorporateBody | ct:imprintName :: xsd:string",
+          "selectable": true,
+          "drillable": false
+        },
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.biographical_information",
+          "property_label_default": "Biographical information",
+          "ldpath": "rdaGr2:biographicalInformation :: xsd:string",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.dates_of_activity",
+          "property_label_default": "Dates of activity",
+          "ldpath": "ct:datesOfActivity",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.activity",
+          "property_label_default": "Activity",
+          "ldpath": "rdaGr2:fieldOfActivityOfThePerson | ct:activityNote :: xsd:string",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.device",
+          "property_label_default": "Device",
+          "ldpath": "ct:signOrDevice/ct:hasDescription :: xsd:string",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.variant_name",
+          "property_label_default": "Variant name",
+          "ldpath": "rdaGr2:variantNameForThePerson | rdaGr2:variantNameForTheCorporateBody | ct:variantImprintName :: xsd:string",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.affiliation",
+          "property_label_default": "Affiliation",
+          "ldpath": "rdaRelGr2:relatedCorporateBody :: xsd:string",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.address",
+          "property_label_default": "Address",
+          "ldpath": "ct:locationOfActivity/ct:hasAddress :: xsd:string",
+          "selectable": false,
+          "drillable": false
+        },
+        {
+          "property_label_i18n": "qa.linked_data.authority.cerl_ld4l_cache.location",
+          "property_label_default": "Location",
+          "ldpath": "(rdaGr2:placeAssociatedWithTheCorporateBody/rdaGr3:nameOfThePlace) | (ct:locationOfActivity/ct:hasPlace/rdaGr3:nameOfThePlace) :: xsd:string",
+          "selectable": false,
+          "drillable": false
+        }
+      ]
+    },
+    "subauthorities": {
+      "person":    "Person",
+      "corporate": "Corporate",
+      "imprint":   "Imprint"
+    }
+  }
+}
+

data/lib/generators/qa_server/templates/config/authorities/linked_data/dbpedia_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "dbpedia": "http://dbpedia.org/property/",
     "vivo":    "http://vivoweb.org/ontology/core#"
@@ -76,8 +77,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "language": ["en"],
     "results": {
       "id_ldpath":    "dbpedia:id ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/geonames_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "geo":      "http://www.w3.org/2003/01/geo/wgs84_pos#",
     "geonames": "http://www.geonames.org/ontology#",
@@ -78,8 +79,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "language": ["en"],
     "results": {
       "label_ldpath":    "geonames:name ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/getty_aat_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "vivo":    "http://vivoweb.org/ontology/core#"
   },
@@ -78,8 +79,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "subauth"
+      "subauth": "subauth",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_ldpath":    "dc:identifier ::xsd:string",
       "label_ldpath": "skos:prefLabel ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/getty_tgn_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "getty":   "http://vocab.getty.edu/ontology#",
     "vivo":    "http://vivoweb.org/ontology/core#"
@@ -71,8 +72,11 @@
       ]
     },
     "qa_replacement_patterns": {
-      "query":   "query"
+      "query":   "query",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_ldpath":    "dc:identifier ::xsd:string",
       "label_ldpath": "skos:prefLabel ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/getty_ulan_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "vivo":    "http://vivoweb.org/ontology/core#"
   },
@@ -78,8 +79,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_ldpath":    "dc:identifier ::xsd:string",
       "label_ldpath": "skos:prefLabel ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/locdemographics_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "loc":     "http://id.loc.gov/vocabulary/identifiers/",
     "madsrdf": "http://www.loc.gov/mads/rdf/v1#",
@@ -70,8 +71,11 @@
       ]
     },
     "qa_replacement_patterns": {
-      "query":   "query"
+      "query":   "query",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "label_ldpath":    "skos:prefLabel ::xsd:string",
       "sort_ldpath":     "vivo:rank ::xsd:string"

data/lib/generators/qa_server/templates/config/authorities/linked_data/locgenres_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "loc":     "http://id.loc.gov/vocabulary/identifiers/",
     "madsrdf": "http://www.loc.gov/mads/rdf/v1#",
@@ -87,8 +88,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_ldpath":    "loc:lccn ::xsd:string",
       "label_ldpath": "skos:prefLabel | madsrdf:variantLabel ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/locnames_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "loc":     "http://id.loc.gov/vocabulary/identifiers/",
     "madsrdf": "http://www.loc.gov/mads/rdf/v1#",
@@ -78,8 +79,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_ldpath":    "loc:lccn ::xsd:string",
       "label_ldpath": "madsrdf:authoritativeLabel ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/locnames_rwo_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "loc":     "http://id.loc.gov/vocabulary/identifiers/",
     "madsrdf": "http://www.loc.gov/mads/rdf/v1#",
@@ -78,8 +79,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_ldpath":    "^madsrdf:identifiesRWO/loc:lccn ::xsd:string",
       "label_ldpath": "rdfs:label ::xsd:string",
@@ -225,6 +229,13 @@
           "ldpath": "^madsrdf:identifiesRWO/madsrdf:editorialNote :: xsd:string",
           "selectable": false,
           "drillable": false
+        },
+        {
+          "property_label_default": "Authority URI",
+          "property_label_i18n": "qa.linked_data.authority.locnames_ld4l_cache.authority_uri",
+          "ldpath": "^madsrdf:identifiesRWO :: xsd:string",
+          "selectable": false,
+          "drillable": false
         }
       ]
     },

data/lib/generators/qa_server/templates/config/authorities/linked_data/locperformance_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "loc":     "http://id.loc.gov/vocabulary/identifiers/",
     "madsrdf": "http://www.loc.gov/mads/rdf/v1#",
@@ -70,8 +71,11 @@
       ]
     },
     "qa_replacement_patterns": {
-      "query":   "query"
+      "query":   "query",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "label_ldpath": "skos:prefLabel ::xsd:string",
       "sort_ldpath":  "vivo:rank ::xsd:string"

data/lib/generators/qa_server/templates/config/authorities/linked_data/locsubjects_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "loc":     "http://id.loc.gov/vocabulary/identifiers/",
     "madsrdf": "http://www.loc.gov/mads/rdf/v1#",
@@ -71,8 +72,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "label_ldpath": "madsrdf:authoritativeLabel ::xsd:string",
       "sort_ldpath":  "vivo:rank ::xsd:string"

data/lib/generators/qa_server/templates/config/authorities/linked_data/mesh_nlm_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "nlmmesh": "http://id.nlm.nih.gov/mesh/vocab#",
     "vivo": "http://vivoweb.org/ontology/core#"
@@ -66,8 +67,11 @@
       ]
     },
     "qa_replacement_patterns": {
-      "query":   "query"
+      "query":   "query",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_ldpath":    "nlmmesh:identifier ::xsd:string",
       "label_ldpath": "nlmmesh:prefLabel ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/nalt_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "vivo": "http://vivoweb.org/ontology/core#"
   },
@@ -77,8 +78,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "label_ldpath": "skos:prefLabel ::xsd:string",
       "sort_ldpath":  "vivo:rank ::xsd:string"

data/lib/generators/qa_server/templates/config/authorities/linked_data/oclcfast_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "dcterms": "http://purl.org/dc/terms/",
     "vivo":    "http://vivoweb.org/ontology/core#"
@@ -77,8 +78,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "id_ldpath":    "dcterms:identifier ::xsd:string",
       "label_ldpath": "skos:prefLabel ::xsd:string",

data/lib/generators/qa_server/templates/config/authorities/linked_data/rda_registry_ld4l_cache.json

@@ -1,5 +1,6 @@
 {
-  "QA_CONFIG_VERSION": "2.1",
+  "QA_CONFIG_VERSION": "2.2",
+  "service_uri": "http://ld4l.org/ld4l_services/cache",
   "prefixes": {
     "vivo": "http://vivoweb.org/ontology/core#"
   },
@@ -49,8 +50,11 @@
     },
     "qa_replacement_patterns": {
       "query":   "query",
-      "subauth": "entity"
+      "subauth": "entity",
+      "start_record": "startRecord",
+      "requested_records": "maxRecords"
     },
+    "total_count_ldpath": "vivo:count",
     "results": {
       "label_ldpath": "skos:prefLabel ::xsd:string",
       "sort_ldpath":  "vivo:rank ::xsd:string"

data/lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/cerl_ld4l_cache_validation.yml

@@ -0,0 +1,61 @@
+---
+authority:
+  service: ld4l_cache
+  context: true
+search:
+  -
+    query: John Winters
+  -
+    query: John Winters
+    subauth: person
+  -
+    query: Jacob Winter
+    subauth: imprint
+  -
+    query: Typographia Plantiniana
+    subauth: corporate
+  -
+    query: Joannes Philippus de Lignamine
+    subauth: person
+    position: 1
+    subject_uri: "http://thesaurus.cerl.org/record/cnp00372755"
+    replacements:
+      maxRecords: '8'
+  -
+    query: Joannes Philippus de Lignamine
+    subauth: person
+    position: 2
+    subject_uri: "http://thesaurus.cerl.org/record/cnp00895966"
+    replacements:
+      maxRecords: '8'
+  -
+    query: Jacob Winter
+    subauth: person
+    position: 2
+    subject_uri: "http://thesaurus.cerl.org/record/cnp02081773"
+    replacements:
+      maxRecords: '8'
+  -
+    query: Jacob Winter
+    subauth: imprint
+    position: 4
+    subject_uri: "http://thesaurus.cerl.org/record/cni00081233"
+    replacements:
+      maxRecords: '8'
+  -
+    query: Plantin
+    subauth: imprint
+    position: 1
+    subject_uri: "http://thesaurus.cerl.org/record/cni00007649"
+    replacements:
+      maxRecords: '8'
+  -
+    query: Typographia Plantiniana
+    subauth: corporate
+    position: 1
+    subject_uri: "http://thesaurus.cerl.org/record/cnc00011608"
+    replacements:
+      maxRecords: '8'
+term:
+  -
+    identifier: "http://thesaurus.cerl.org/record/cnp00895966"

data/lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/geonames_direct_validation.yml

@@ -6,4 +6,4 @@ search:
     query: Ithaca
 term:
   -
-    identifier: 'http://sws.geonames.org/261707/'
+    identifier: 'https://sws.geonames.org/261707/'

data/lib/generators/qa_server/templates/db/migrate/20200213160549_add_date_column_to_scenario_run_history.rb.erb

@@ -0,0 +1,14 @@
+class AddDateColumnToScenarioRunHistory < ActiveRecord::Migration<%= migration_version %>
+  def change
+    add_column :scenario_run_history, :date, :date
+    add_index :scenario_run_history, :date
+
+    begin
+      QaServer::ScenarioRunHistory.all.each do |entry|
+        registry = QaServer::ScenarioRunRegistry.find(entry.scenario_run_registry_id)
+        entry.date = registry.dt_stamp.to_date
+        entry.save
+      end
+    end
+  end
+end

data/lib/qa_server/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module QaServer
-  VERSION = '6.0.0'
+  VERSION = '6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qa_server
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -410,6 +410,7 @@ files:
 - lib/generators/qa_server/templates/config/authorities/linked_data/DISABLED/scenarios/mesh_bioportal_ld4l_cache_validation.yml
 - lib/generators/qa_server/templates/config/authorities/linked_data/agrovoc_direct.json
 - lib/generators/qa_server/templates/config/authorities/linked_data/agrovoc_ld4l_cache.json
+- lib/generators/qa_server/templates/config/authorities/linked_data/cerl_ld4l_cache.json
 - lib/generators/qa_server/templates/config/authorities/linked_data/dbpedia_direct.json
 - lib/generators/qa_server/templates/config/authorities/linked_data/dbpedia_ld4l_cache.json
 - lib/generators/qa_server/templates/config/authorities/linked_data/geonames_direct.json
@@ -432,7 +433,7 @@ files:
 - lib/generators/qa_server/templates/config/authorities/linked_data/rda_registry_ld4l_cache.json
 - lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/agrovoc_direct_validation.yml
 - lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/agrovoc_ld4l_cache_validation.yml
-- lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/cerl_ld4_cache_validation.yml
+- lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/cerl_ld4l_cache_validation.yml
 - lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/dbpedia_direct_validation.yml
 - lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/dbpedia_ld4l_cache_validation.yml
 - lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/geonames_direct_validation.yml
@@ -468,6 +469,7 @@ files:
 - lib/generators/qa_server/templates/db/migrate/20180809045552_add_indices_to_scenario_run_history.rb.erb
 - lib/generators/qa_server/templates/db/migrate/20190813045549_create_performance_history.rb.erb
 - lib/generators/qa_server/templates/db/migrate/20191007134527_update_performance_history_table.rb.erb
+- lib/generators/qa_server/templates/db/migrate/20200213160549_add_date_column_to_scenario_run_history.rb.erb
 - lib/generators/qa_server/templates/qa_server.scss
 - lib/qa_server.rb
 - lib/qa_server/configuration.rb

data/lib/generators/qa_server/templates/config/authorities/linked_data/scenarios/cerl_ld4_cache_validation.yml

@@ -1,51 +0,0 @@
-authority:
-  service: ld4_cache
-  context: true
-
--
-    query: Joannes Philippus de Lignamine
-    subauth: person
-    position: 1
-    subject_uri: “http://thesaurus.cerl.org/record/cnp00372755”
-    replacements:
-          maxRecords: '8'
-
--
-    query: Joannes Philippus de Lignamine
-subauth: person
-    position: 2
-    subject_uri: “http://thesaurus.cerl.org/record/cnp00895966”
-    replacements:
-          maxRecords: '8'
--
-    query: Jacob Winter
-    subauth: person
-    position: 2
-    subject_uri: “http://thesaurus.cerl.org/record/cnp02081773”
-    replacements:
-            maxRecords: '8'
-
--
-    query: Jacob Winter
-    subauth: imprint
-    position: 4
-    subject_uri: “http://thesaurus.cerl.org/record/cni00081233”
-    replacements:
-            maxRecords: '8'
--
-    query: Plantin
-    subauth: imprint
-    position: 1
-    subject_uri: “http://thesaurus.cerl.org/record/cni00007649”
-    replacements:
-          maxRecords: '8'
-
-
-
--
-    query: Typographia Plantiniana
-    subauth: corporate_body
-    position: 1
-    subject_uri: “http://thesaurus.cerl.org/record/cnc00011608”
-    replacements:
-          maxRecords: '8'