qa_server 0.1.99 → 1.0.0

data/app/presenters/qa_server/monitor_status_presenter.rb

@@ -1,36 +1,39 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'gruff'
+
 # This presenter class provides all data needed by the view that monitors status of authorities.
 module QaServer
-  class MonitorStatusPresenter
-
-    # @param authority_count [Integer] number of loaded authorities
-    # @param authority_status [AuthorityStatus] summary status of the latest run of test scenarios
+  class MonitorStatusPresenter # rubocop:disable Metrics/ClassLength
+    # @param current_summary [ScenarioRunSummary] summary status of the latest run of test scenarios
     # @param current_data [Array<Hash>] current set of failures for the latest test run, if any
-    # @param historical_data [Array<Hash>] data for past failures
-    def initialize(authority_count:, authority_status:, current_data:, historical_data:)
-      @authority_count = authority_count
-      @authority_status = authority_status
-      @current_failures = current_data
-      @history = historical_data
+    # @param historical_summary_data [Array<Hash>] summary of past failuring runs per authority to drive chart
+    def initialize(current_summary:, current_failure_data:, historical_summary_data:, performance_data:)
+      @current_summary = current_summary
+      @current_failure_data = current_failure_data
+      @historical_summary_data = historical_summary_data
+      @performance_data = performance_data
     end
 
     # @return [String] date of last test run
     def last_updated
-      @authority_status.dt_stamp.in_time_zone("Eastern Time (US & Canada)").strftime("%m/%d/%y - %I:%M %p")
+      @current_summary.run_dt_stamp.in_time_zone("Eastern Time (US & Canada)").strftime("%m/%d/%y - %I:%M %p")
     end
 
     # @return [String] date of first recorded test run
     def first_updated
-      AuthorityStatus.first.dt_stamp.in_time_zone("Eastern Time (US & Canada)").strftime("%m/%d/%y - %I:%M %p")
+      QaServer::ScenarioRunRegistry.first.dt_stamp.in_time_zone("Eastern Time (US & Canada)").strftime("%m/%d/%y - %I:%M %p")
     end
 
     # @return [Integer] number of loaded authorities
     def authorities_count
-      @authority_count
+      @current_summary.authority_count
     end
 
     # @return [Integer] number of authorities with failing tests in the latest test run
     def failing_authorities_count
-      @current_failures.map { |f| f[:authority_name] }.uniq.count
+      @current_failure_data.map { |f| f[:authority_name] }.uniq.count
     end
 
     # @return [String] css style class representing whether all tests passed or any failed
@@ -40,17 +43,17 @@ module QaServer
 
     # @return [Integer] number of tests in the latest test run
     def tests_count
-      @authority_status.test_count
+      @current_summary.total_scenario_count
     end
 
     # @return [Integer] number of passing tests in the latest test run
     def passing_tests_count
-      tests_count - failing_tests_count
+      @current_summary.passing_scenario_count
     end
 
     # @return [Integer] number of failing tests in the latest test run
     def failing_tests_count
-      @current_failures.count
+      @current_summary.failing_scenario_count
     end
 
     # @return [String] css style class representing whether all tests passed or any failed
@@ -69,7 +72,7 @@ module QaServer
     #       url: '/qa/search/linked_data/locnames_ld4l_cache/person?q=mark twain&maxRecords=4',
     #       err_message: 'Exception: Something went wrong.' }, ... ]
     def failures
-      @current_failures
+      @current_failure_data
     end
 
     # @return [Boolean] true if failure data exists for the latest test run; otherwise false
@@ -77,32 +80,85 @@ module QaServer
       failing_tests_count.positive?
     end
 
-    # @return [Array<Hash>] historical test data to be displayed
+    # @return [Array<Hash>] historical test data to be displayed (authname, failing, passing)
     # @example
-    #   [ { days_failing: 1, authority_name: 'AGROVOC_DIRECT' },
-    #     { days_failing: 3, authority_name: 'AGROVOC_LD4L_CACHE' },
-    #     { days_failing: 0, authority_name: 'LOCNAMES_LD4L_CACHE' } ]
-    def history
-      # TODO: STUBED -- need to include history of past failures -- Question: How much data to save?
-      # Want to answer questions like...
-      #   * # of failing days out of # of days run
-      #   * # type of failures... can't load authority vs. exception vs. no data returned
-      #   * for a given authority, did all tests fail or just a few?
-      #   * are tests failing for a particular subauthority?
-      #   * are tests failing for a particular type (search vs. term)
-      history = []
-      entry = { days_failing: 3,
-                authority_name: "FOO",
-                subauthority_name: "bar",
-                service: 'test',
-                action: 'search' }
-      history << entry
+    #   [ [ 'agrovoc', 0, 24 ],
+    #     [ 'geonames_ld4l_cache', 2, 22 ] ... ]
+    def historical_summary
+      @historical_summary_data
     end
 
     # @return [Boolean] true if historical test data exists; otherwise false
     def history?
-      # TODO: STUBED -- need check for history data
+      return true if @historical_summary_data.present?
       false
     end
+
+    def historical_graph
+      # g = Gruff::SideStackedBar.new('800x400')
+      g = Gruff::SideStackedBar.new
+      graph_theme(g)
+      g.title = ''
+      historical_data = rework_historical_data_for_gruff
+      g.labels = historical_data[0]
+      g.data('Fail', historical_data[1])
+      g.data('Pass', historical_data[2])
+      g.write historical_graph_full_path
+      File.join(historical_graph_relative_path, historical_graph_filename)
+    end
+
+    # @return [String] the name of the css style class to use for the status cell based on the status of the scenario test.
+    def status_style_class(status)
+      "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.
+    def status_label(status)
+      case status[:status]
+      when :good
+        QaServer::ScenarioRunHistory::GOOD_MARKER
+      when :bad
+        QaServer::ScenarioRunHistory::BAD_MARKER
+      when :unknown
+        QaServer::ScenarioRunHistory::UNKNOWN_MARKER
+      end
+    end
+
+    private
+
+      def graph_theme(g)
+        g.theme_pastel
+        g.colors = ['#ffcccc', '#ccffcc']
+        g.marker_font_size = 12
+        g.x_axis_increment = 10
+      end
+
+      def historical_graph_full_path
+        path = Rails.root.join('app', 'assets', 'images', historical_graph_relative_path)
+        FileUtils.mkdir_p path
+        File.join(path, historical_graph_filename)
+      end
+
+      def historical_graph_relative_path
+        File.join('qa_server', 'charts')
+      end
+
+      def historical_graph_filename
+        'historical_side_stacked_bar.png'
+      end
+
+      def rework_historical_data_for_gruff
+        labels = {}
+        pass_data = []
+        fail_data = []
+        i = 0
+        historical_summary.each do |data|
+          labels[i] = data[0]
+          i += 1
+          fail_data << data[1]
+          pass_data << data[2]
+        end
+        [labels, fail_data, pass_data]
+      end
   end
 end

data/app/services/qa_server/authority_lister_service.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 # Provide service methods for getting a list of all authorities and scenarios for an authority.
 module QaServer
   class AuthorityListerService
-
     # Return a list of supported authorities
     # @return [Array<String>] list of authorities
     def self.authorities_list
@@ -18,14 +18,14 @@ module QaServer
       list_searches(scenarios, status_log)
     end
 
-    private
-
-      def self.list_terms(scenarios, status_log)
-        scenarios.term_scenarios.each { |scenario| QaServer::TermScenarioValidator.new(scenario: scenario, status_log: status_log).log_without_running }
-      end
+    def self.list_terms(scenarios, status_log)
+      scenarios.term_scenarios.each { |scenario| QaServer::TermScenarioValidator.new(scenario: scenario, status_log: status_log).log_without_running }
+    end
+    private_class_method :list_terms
 
-      def self.list_searches(scenarios, status_log)
-        scenarios.search_scenarios.each { |scenario| QaServer::SearchScenarioValidator.new(scenario: scenario, status_log: status_log).log_without_running }
-      end
+    def self.list_searches(scenarios, status_log)
+      scenarios.search_scenarios.each { |scenario| QaServer::SearchScenarioValidator.new(scenario: scenario, status_log: status_log).log_without_running }
+    end
+    private_class_method :list_searches
   end
 end

data/app/services/qa_server/authority_loader_service.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 # This class loads an authority.
 module QaServer
   class AuthorityLoaderService
-
     # Load a QA authority
     # @param authority_name [String] name of the authority to load (e.g. "agrovoc_direct")
     # @param status_log [ScenarioLogger] logger to hold failure information if the authority cannot be loaded
@@ -12,27 +12,28 @@ module QaServer
         return nil if authority.blank?
       rescue Exception => e
         status_log.add(authority_name: authority_name,
-                       status: ScenarioValidator::FAIL,
+                       status: QaServer::ScenarioValidator::FAIL,
                        error_message: "Unable to load authority '#{authority_name}'; cause: #{e.message}")
         return nil
       end
       authority
     end
 
-    private
-      def self.authority_key(authority_name)
-        authority_name.upcase.to_sym
-      end
+    def self.authority_key(authority_name)
+      authority_name.upcase.to_sym
+    end
+    private_class_method :authority_key
 
-      def self.load_authority(authority_name, status_log)
-        authority = Qa::Authorities::LinkedData::GenericAuthority.new(authority_key(authority_name))
-        if authority.blank?
-          status_log.add(authority_name: authority_name,
-                         status: ScenarioValidator::FAIL,
-                         error_message: "Unable to load authority '#{authority_name}'; cause: UNKNOWN") unless authority.present?
-          return nil
-        end
-        authority
+    def self.load_authority(authority_name, status_log)
+      authority = Qa::Authorities::LinkedData::GenericAuthority.new(authority_key(authority_name))
+      if authority.blank?
+        status_log.add(authority_name: authority_name,
+                       status: QaServer::ScenarioValidator::FAIL,
+                       error_message: "Unable to load authority '#{authority_name}'; cause: UNKNOWN")
+        return nil
+      end
+      authority
     end
+    private_class_method :load_authority
   end
 end

data/app/services/qa_server/authority_validator_service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Provide service methods for running a a set of validation scenarios for an authority.
 module QaServer
   class AuthorityValidatorService
@@ -6,10 +7,10 @@ module QaServer
                     :search_validator_class,
                     :scenarios_loader_class
 
-    self.validator_class = ScenarioValidator
-    self.term_validator_class = TermScenarioValidator
-    self.search_validator_class = SearchScenarioValidator
-    self.scenarios_loader_class = ScenariosLoaderService
+    self.validator_class = QaServer::ScenarioValidator
+    self.term_validator_class = QaServer::TermScenarioValidator
+    self.search_validator_class = QaServer::SearchScenarioValidator
+    self.scenarios_loader_class = QaServer::ScenariosLoaderService
 
     VALIDATE_CONNECTIONS = validator_class::VALIDATE_CONNECTION
     VALIDATE_ACCURACY = validator_class::VALIDATE_ACCURACY
@@ -27,15 +28,14 @@ module QaServer
       run_searches(scenarios, status_log, validation_type)
     end
 
+    def self.run_terms(scenarios, status_log, validation_type)
+      scenarios.term_scenarios.each { |scenario| term_validator_class.new(scenario: scenario, status_log: status_log, validation_type: validation_type).run }
+    end
+    private_class_method :run_terms
 
-    private
-
-      def self.run_terms(scenarios, status_log, validation_type)
-        scenarios.term_scenarios.each { |scenario| term_validator_class.new(scenario: scenario, status_log: status_log, validation_type: validation_type).run }
-      end
-
-      def self.run_searches(scenarios, status_log, validation_type)
-        scenarios.search_scenarios.each { |scenario| search_validator_class.new(scenario: scenario, status_log: status_log, validation_type: validation_type).run }
-      end
+    def self.run_searches(scenarios, status_log, validation_type)
+      scenarios.search_scenarios.each { |scenario| search_validator_class.new(scenario: scenario, status_log: status_log, validation_type: validation_type).run }
+    end
+    private_class_method :run_searches
   end
 end

data/app/services/qa_server/database_migrator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators/active_record'
 
 module QaServer

data/app/services/qa_server/scenarios_loader_service.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 # This class loads scenario configuration file for an authority.
 module QaServer
   class ScenariosLoaderService
-
     # Load scenarios for testing an authority
     # @param authority_name [String] name of the authority to load (e.g. "agrovoc_direct")
     # @param status_log [ScenarioLogger] logger to hold failure information if the scenarios cannot be loaded
@@ -15,43 +15,45 @@ module QaServer
         scenarios_config = load_config(authority_name, status_log)
         return nil if scenarios_config.blank?
 
-        scenarios = Scenarios.new(authority: authority, authority_name: authority_name, scenarios_config: scenarios_config)
+        scenarios = QaServer::Scenarios.new(authority: authority, authority_name: authority_name, scenarios_config: scenarios_config)
       rescue Exception => e
         status_log.add(authority_name: authority_name,
-                       status: ScenarioValidator::FAIL,
+                       status: QaServer::ScenarioValidator::FAIL,
                        error_message: "Unable to load scenarios for authority '#{authority_name}'; cause: #{e.message}")
         return nil
       end
       scenarios
     end
 
-    private
-
-      def self.load_authority(authority_name, status_log)
-        AuthorityLoaderService.load(authority_name: authority_name, status_log: status_log)
-      end
-
-      def self.load_config(authority_name, status_log)
-        scenarios_config = YAML.load_file(scenario_path(authority_name))
-        unless scenarios_config.present?
-          status_log.add(authority_name: authority_name,
-                         status: ScenarioValidator::FAIL,
-                         error_message: "Unable to load scenarios for authority '#{authority_name}'; cause: UNKNOWN")
-          return nil
-        end
-        scenarios_config
-      end
+    def self.load_authority(authority_name, status_log)
+      QaServer::AuthorityLoaderService.load(authority_name: authority_name, status_log: status_log)
+    end
+    private_class_method :load_authority
 
-      def self.scenarios_exist?(authority_name, status_log)
-        return true if File.exists?(scenario_path(authority_name))
+    def self.load_config(authority_name, status_log)
+      scenarios_config = YAML.load_file(scenario_path(authority_name))
+      unless scenarios_config.present?
         status_log.add(authority_name: authority_name,
-                       status: ScenarioValidator::FAIL,
-                       error_message: "Unable to load scenarios for authority '#{authority_name}'; cause: #{scenario_path} does not exist.")
-        false
+                       status: QaServer::ScenarioValidator::FAIL,
+                       error_message: "Unable to load scenarios for authority '#{authority_name}'; cause: UNKNOWN")
+        return nil
       end
+      scenarios_config
+    end
+    private_class_method :load_config
+
+    def self.scenarios_exist?(authority_name, status_log)
+      return true if File.exist?(scenario_path(authority_name))
+      status_log.add(authority_name: authority_name,
+                     status: QaServer::ScenarioValidator::FAIL,
+                     error_message: "Unable to load scenarios for authority '#{authority_name}'; cause: #{scenario_path} does not exist.")
+      false
+    end
+    private_class_method :scenarios_exist?
 
-      def self.scenario_path(authority_name)
-        File.join(::Rails.root, 'config', 'authorities', 'linked_data', 'scenarios', "#{authority_name.downcase}_validation.yml")
-      end
+    def self.scenario_path(authority_name)
+      File.join(::Rails.root, 'config', 'authorities', 'linked_data', 'scenarios', "#{authority_name.downcase}_validation.yml")
+    end
+    private_class_method :scenario_path
   end
 end

data/app/validators/qa_server/scenario_validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # ABSTRACT class providing common methods for running a scenario of any type.
 module QaServer
   class ScenarioValidator
@@ -10,6 +11,8 @@ module QaServer
     ALL_VALIDATIONS = :all_validations
     DEFAULT_VALIDATION_TYPE = VALIDATE_CONNECTION
 
+    attr_reader :status_log, :scenario, :validation_type
+
     # @param scenario [SearchScenario | TermScenario] the scenario to run
     # @param status_log [ScenarioLogger] logger for recording test results
     # @param validation_type [Symbol] the type of scenarios to run (e.g. VALIDATE_CONNECTION, VALIDATE_ACCURACY, ALL_VALIDATIONS)
@@ -33,18 +36,16 @@ module QaServer
     private
 
       # Log the structure of the scenario and status of a test run.
-      def log(status: nil, errmsg: nil, expected: nil, actual: nil, target: nil)
-        status_log.add(authority_name: authority_name,
-                       status: status,
-                       validation_type: scenario_validation_type,
-                       subauth: subauthority_name,
-                       service: service,
-                       action: action,
-                       url: url,
-                       error_message: errmsg,
-                       expected: expected,
-                       actual: actual,
-                       target: target)
+      # @param [Hash] status_info holding information to be logged
+      # @see QaServer::ScenarioLogger
+      def log(status_info = {})
+        status_info[:authority_name] = authority_name
+        status_info[:validation_type] = scenario_validation_type
+        status_info[:subauth] = subauthority_name
+        status_info[:service] = service
+        status_info[:action] = action
+        status_info[:url] = url
+        status_log.add(status_info)
       end
 
       def run_accuracy_scenario
@@ -58,15 +59,16 @@ module QaServer
       # Runs the test in the block passed by the specific scenario type.
       # @return [Symbol] :good (PASS) or :unknown (UNKNOWN) based on whether enough results were returned
       def test_connection(min_expected_size: MIN_EXPECTED_SIZE, scenario_type_name:)
-        begin
-          results = yield if block_given?
-          actual_size = results.to_s.length
-          status = actual_size > min_expected_size ? PASS : UNKNOWN
-          errmsg = (status == PASS) ? '' : "#{scenario_type_name.capitalize} scenario unknown status; cause: Results actual size (#{actual_size} < expected size (#{min_expected_size})"
-          log(status: status, errmsg: errmsg)
-        rescue Exception => e
-          log(status: FAIL, errmsg: "Exception executing #{scenario_type_name} scenario; cause: #{e.message}")
-        end
+        dt_start = Time.now.utc
+        results = yield if block_given?
+        dt_end = Time.now.utc
+        actual_size = results.to_s.length
+        status = actual_size > min_expected_size ? PASS : UNKNOWN
+        errmsg = status == PASS ? '' : "#{scenario_type_name.capitalize} scenario unknown status; cause: Results actual size (#{actual_size} < expected size (#{min_expected_size})"
+        log(status: status, errmsg: errmsg, normalization_run_time: (dt_end - dt_start)) # TODO: need to get run times from results
+      rescue Exception => e
+        dt_end = Time.now.utc
+        log(status: FAIL, errmsg: "Exception executing #{scenario_type_name} scenario; cause: #{e.message}", request_run_time: (dt_end - dt_start))
       end
 
       def authority
@@ -93,18 +95,6 @@ module QaServer
         # ABSTRACT - must be implemented by scenario validator for specific types
       end
 
-      def status_log
-        @status_log
-      end
-
-      def scenario
-        @scenario
-      end
-
-      def validation_type
-        @validation_type
-      end
-
       def scenario_validation_type
         return VALIDATE_CONNECTION if connection_scenario?
         return VALIDATE_ACCURACY if accuracy_scenario?
@@ -122,12 +112,12 @@ module QaServer
       end
 
       def accuracy_scenario?
-        # ABSTRACT define in specific scenario type validator (i.e. TermScenarioValidator, SearchScenarioValidator)
+        # ABSTRACT define in specific scenario type validator (i.e. QaServer::TermScenarioValidator, QaServer::SearchScenarioValidator)
         false
       end
 
       def connection_scenario?
-        # ABSTRACT define in specific scenario type validator (i.e. TermScenarioValidator, SearchScenarioValidator)
+        # ABSTRACT define in specific scenario type validator (i.e. QaServer::TermScenarioValidator, QaServer::SearchScenarioValidator)
         false
       end
   end

data/app/validators/qa_server/search_scenario_validator.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require 'json'
 
 # This class runs a single search scenario and logs the results.
 module QaServer
   class SearchScenarioValidator < ScenarioValidator
-    SEARCH_ACTION = 'search'.freeze
+    SEARCH_ACTION = 'search'
 
     # @param scenario [SearchScenario] the scenario to run
     # @param status_log [ScenarioLogger] logger for recording test results
@@ -38,17 +39,19 @@ module QaServer
 
       # Runs the accuracy test and log results
       def test_accuracy(subject_uri:, expected_by_position:)
-        begin
-          results = yield if block_given?
-          if results.blank?
-            log(status: UNKNOWN, errmsg: "Search position scenario failed; cause: no results found", expected: expected_by_position, target: subject_uri)
-            return
-          end
-
-          check_position(results, subject_uri, expected_by_position)
-        rescue Exception => e
-          log(status: FAIL, errmsg: "Exception executing search position scenario; cause: #{e.message}", expected: expected_by_position, target: subject_uri)
+        dt_start = Time.now.utc
+        results = yield if block_given?
+        dt_end = Time.now.utc
+        if results.blank?
+          log(status: UNKNOWN, errmsg: "Search position scenario failed; cause: no results found", expected: expected_by_position, target: subject_uri, request_run_time: (dt_end - dt_start))
+          return
         end
+
+        check_position(results, subject_uri, expected_by_position, total_run_time: (dt_end - dt_start)) # TODO: need to get run times from results
+      rescue Exception => e
+        dt_end = Time.now.utc
+        log(status: FAIL, errmsg: "Exception executing search position scenario; cause: #{e.message}",
+            expected: expected_by_position, target: subject_uri, request_run_time: (dt_end - dt_start))
       end
 
       def accuracy_scenario?
@@ -61,24 +64,28 @@ module QaServer
         !accuracy_scenario?
       end
 
-      def check_position(results, subject_uri, expected_by_position)
-        actual_position = subject_position(results, subject_uri)
+      def check_position(results, subject_uri, expected_by_position, total_run_time)
+        actual_position = subject_position(results, subject_uri, total_run_time)
         return if actual_position.blank?
 
         actual_position += 1
         if actual_position <= expected_by_position
-          log(status: PASS, expected: expected_by_position, actual: actual_position, target: subject_uri)
+          log(status: PASS, expected: expected_by_position, actual: actual_position, target: subject_uri,
+              normalization_run_time: run_time) # TODO: need to get run times from results
         else
-          log(status: UNKNOWN, errmsg: 'Subject URI not found by the expected position.', expected: expected_by_position, actual: actual_position, target: subject_uri)
+          log(status: UNKNOWN, errmsg: 'Subject URI not found by the expected position.',
+              expected: expected_by_position, actual: actual_position, target: subject_uri,
+              normalization_run_time: total_run_time) # TODO: need to get run times from results
         end
       end
 
-      def subject_position(results, subject_uri)
+      def subject_position(results, subject_uri, total_run_time)
         0.upto(results.size - 1) do |position|
           return position if results[position][:uri] == subject_uri
         end
-        log(status: UNKNOWN, errmsg: "Search position scenario failed; cause: subject uri (#{subject_uri}) not found in results", expected: scenario.expected_by_position, target: subject_uri)
-        return nil
+        log(status: UNKNOWN, errmsg: "Search position scenario failed; cause: subject uri (#{subject_uri}) not found in results",
+            expected: scenario.expected_by_position, target: subject_uri, normalization_run_time: total_run_time) # TODO: need to get run times from results
+        nil
       end
   end
 end

data/app/validators/qa_server/term_scenario_validator.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 # This class runs a single term scenario and logs the results.
 module QaServer
   class TermScenarioValidator < ScenarioValidator
-    TERM_ACTION = 'term'.freeze
+    TERM_ACTION = 'term'
 
     # @param scenario [TermScenario] the scenario to run
     # @param status_log [ScenarioLogger] logger for recording test results

data/app/views/qa_server/check_status/index.html.erb

@@ -56,7 +56,7 @@
     </tr>
     <% @presenter.connection_status_data.each do |status| %>
     <tr>
-      <td class="<%= @presenter.status_style_class(status) %>"><%= status[:status_label] %></td>
+      <td class="<%= @presenter.status_style_class(status) %>"><%= @presenter.status_label(status) %></td>
       <td><%= status[:authority_name] %></td>
       <td><%= status[:subauthority_name] %></td>
       <td><%= status[:service] %></td>

data/app/views/qa_server/homepage/index.html.erb

@@ -1,10 +1,10 @@
 <div class="page-description">
   <p class="welcome">This service provides authority <b>lookup for single terms</b> and <b>search for terms</b> matching a query.
     See <a href="<%= "#{main_app.root_path}usage" %>">Usage</a> for more information.</p>
-  <p class="welcome2">It has been created as part of the
-    <a href="http://ld4l.org" target="_blank">LD4L Labs project</a>, and is operated by
+  <p class="welcome2">It was created as part of the
+    <a href="http://ld4l.org" target="_blank">Linked Data for Libraries - Labs</a> project and continues to be supported by the <a href="https://wiki.duraspace.org/x/9xgRBg" class="navbar-link" target="_blank">Linked Data for Production</a> project.  It is operated by
     <a href="http://www.library.cornell.edu/" target="_blank">Cornell University Library</a>
     in collaboration with the
     <a href="https://www.slis.uiowa.edu/" target="_blank">School of Library and Information Science, University of Iowa</a>.
-    This work was funded through a grant from the <a href="https://mellon.org/" target="_blank">Andrew W. Mellon Foundation</a>.</p>
+    This work was funded through grants from the <a href="https://mellon.org/" target="_blank">Andrew W. Mellon Foundation</a>.</p>
 </div>