Merge pull request #942 from uktrade/develop

Release
uktrade · Oct 25, 2024 · 2260492 · 2260492
2 parents f0144dc + 9c63289
commit 2260492
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 25 deletions.
diff --git a/app/views/application/ping.xml.erb b/app/views/application/ping.xml.erb
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pingdom_http_custom_check>
+    <status><%= @status %></status>
+    <response_time><%= (Time.now - request.env[:timestamp]).in_milliseconds.round(3) %></response_time>
+</pingdom_http_custom_check>
+
+
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
@@ -1,8 +1,8 @@
 !!!
-/[if IE 8] <html class="no-js lt-ie10 lt-ie9" lang="en-GB">
-/[if IE 9] <html class="no-js lt-ie10" lang="en-GB">
+/[if IE 8] <html class="no-js lt-ie10 lt-ie9" lang="en-gb">
+/[if IE 9] <html class="no-js lt-ie10" lang="en-gb">
 /[if gt IE 9]
-%html.no-js{:lang => "en-GB"}
+%html.no-js{:lang => "en-gb"}
   %head
     %title= "#{t('organisation.name')} - Opportunities"
     <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/app/views/layouts/admin_transformed.html.erb b/app/views/layouts/admin_transformed.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang='en-GB'>
+<html lang='en-gb'>
 <head>
   <title><%= t('organisation.name') %> - Admin</title>
   <%= csrf_meta_tags %>

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -1,8 +1,8 @@
 !!!
-/[if IE 8] <html class="no-js lt-ie10 lt-ie9" lang="en-GB">
-/[if IE 9] <html class="no-js lt-ie10" lang="en-GB">
+/[if IE 8] <html class="no-js lt-ie10 lt-ie9" lang="en-gb">
+/[if IE 9] <html class="no-js lt-ie10" lang="en-gb">
 /[if gt IE 9]
-%html.no-js{:lang => "en-GB"}
+%html.no-js{:lang => "en-gb"}
   / <![endif]
   %head
     %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/

diff --git a/app/views/layouts/enquiries.html.erb b/app/views/layouts/enquiries.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
   <head>
     <% @page_type = 'EnquiriesPage' %>
 

diff --git a/app/views/layouts/form.html.erb b/app/views/layouts/form.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
   <head>
     <% @page_type = 'FormPage' %>
 

diff --git a/app/views/layouts/general.html.erb b/app/views/layouts/general.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
   <head>
     <title><%= t('site_name') %></title>
     <%= csrf_meta_tags %>

diff --git a/app/views/layouts/help.html.erb b/app/views/layouts/help.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang='en-GB'>
+<html lang='en-gb'>
 <head>
   <title><%= t('organisation.name') %> - Guidance</title>
   <%= csrf_meta_tags %>

diff --git a/app/views/layouts/help_article.html.erb b/app/views/layouts/help_article.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang='en-GB'>
+<html lang='en-gb'>
 <head>
   <%= content_for?(:content) ? yield(:content) : yield %>
   <title><%= t('organisation.name') %> - <%= @article.title %></title>

diff --git a/app/views/layouts/help_article_print.html.erb b/app/views/layouts/help_article_print.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang='en-GB'>
+<html lang='en-gb'>
 <head>
   <%= content_for?(:content) ? yield(:content) : yield %>
   <title><%= t('organisation.name') %> - <%= @article.title %></title>

diff --git a/app/views/layouts/landing.html.erb b/app/views/layouts/landing.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
   <% @page_type = 'LandingPage' %>
 
   <head>

diff --git a/app/views/layouts/notification.html.erb b/app/views/layouts/notification.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
   <% @page_type = 'NotificationPage' %>
 
   <head>

diff --git a/app/views/layouts/opportunity.html.erb b/app/views/layouts/opportunity.html.erb
@@ -1,12 +1,10 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
   <head>
     <% @page_type = 'OpportunityPage' %>
 
     <title><%= @opportunity.title %> - <%= t('site_name') %> - great.gov.uk</title>
     <%= csrf_meta_tags %>
-    <%= canonical_tag opportunities_url %>
-    <%= hreflang_tags opportunity_url %>
     <%= render partial: 'includes/transformation_head_tags' %>
     <%= render partial: 'includes/transformation_styles' %>
     <%= render partial: 'includes/transformation_scripts' %>

diff --git a/app/views/layouts/results.html.erb b/app/views/layouts/results.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
   <head>
     <% @page_type = 'SearchResultsPage' %>
 

diff --git a/app/views/opportunities/index.atom.builder b/app/views/opportunities/index.atom.builder
@@ -1,4 +1,4 @@
-atom_feed(schema_date: 2016, language: 'en-GB', root_url: @query.feed_root_url) do |feed|
+atom_feed(schema_date: 2016, language: 'en-gb', root_url: @query.feed_root_url) do |feed|
   feed.title t('site_name')
   feed.subtitle 'The demand is out there. You could be too.'
   feed.updated(@query.feed_updated_at) if @query.feed_updated_at

diff --git a/app/views/poc/layouts/domestic.html.erb b/app/views/poc/layouts/domestic.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
 <head>
   <title><%= t('site_name') %></title>
   <%= csrf_meta_tags %>

diff --git a/app/views/poc/layouts/form.html.erb b/app/views/poc/layouts/form.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
 <head>
   <title><%= t('site_name') %></title>
   <%= csrf_meta_tags %>

diff --git a/app/views/poc/layouts/international.html.erb b/app/views/poc/layouts/international.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB">
+<html lang="en-gb">
 <head>
   <title><%= t('organisation.name') %></title>
   <%= csrf_meta_tags %>

diff --git a/config/application.rb b/config/application.rb
@@ -1,5 +1,6 @@
 require_relative 'boot'
 require_relative '../lib/rack_x_robots_tag'
+require_relative '../lib/append_timestamp'
 require_relative '../lib/formatters/asim_formatter'
 
 require 'rails/all'
@@ -49,6 +50,9 @@ class Application < Rails::Application
     # No indexing (if env.DISALLOW_ALL_WEB_CRAWLERS)
     config.middleware.use Rack::XRobotsTag
 
+    # Add timestamp to request
+    config.middleware.use AppendTimestamp
+
     # Use Sidekiq to process jobs from ActiveJob
     config.active_job.queue_adapter = :sidekiq
 

diff --git a/config/routes.rb b/config/routes.rb
@@ -9,7 +9,8 @@
     get 'check' => 'application#check'
     get 'data_sync_check' => 'data_sync#check'
     get 'api_check' => 'application#api_check'
-    get "robots.txt" => "robots_txts#show"
+    get 'robots.txt' => 'robots_txts#show'
+    get '/pingdom/ping' => 'application#ping'
 
     devise_for :users, module: 'users', skip: :sessions
 
@@ -182,7 +183,7 @@
   get 'check' => 'application#check'
   get 'data_sync_check' => 'application#data_sync_check'
   get 'api_check' => 'application#api_check'
-  get "robots.txt" => "robots_txts#show"
+  get 'robots.txt' => 'robots_txts#show'
 
   # devise_for :users, module: 'users', skip: :sessions
 

diff --git a/lib/append_timestamp.rb b/lib/append_timestamp.rb
@@ -0,0 +1,10 @@
+class AppendTimestamp
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    env[:timestamp] = Time.now
+    @app.call(env)
+  end
+end