From 643dca0071e52d6aaca5a87384beedb29fb6e92b Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 29 Nov 2018 14:28:29 +0000
Subject: [PATCH] Use asset fingerprinter to serve images

This means we can cache them forever, and only invalidate the cache
when the image changes.
---
 app/asset_fingerprinter.py                           |  5 ++---
 .../service-settings/branding/email-options.html     |  2 +-
 app/templates/views/signedout.html                   | 10 +++++-----
 app/templates/views/using-notify.html                |  2 +-
 tests/app/main/test_asset_fingerprinter.py           | 12 ++++++------
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/asset_fingerprinter.py b/app/asset_fingerprinter.py
index e712a5ebe..228b9d512 100644
--- a/app/asset_fingerprinter.py
+++ b/app/asset_fingerprinter.py
@@ -1,4 +1,3 @@
-import codecs
 import hashlib
 
 
@@ -37,11 +36,11 @@ class AssetFingerprinter(object):
 
     def get_asset_fingerprint(self, asset_file_path):
         return hashlib.md5(
-            self.get_asset_file_contents(asset_file_path).encode('utf-8')
+            self.get_asset_file_contents(asset_file_path)
         ).hexdigest()
 
     def get_asset_file_contents(self, asset_file_path):
-        with codecs.open(asset_file_path, encoding='utf-8') as asset_file:
+        with open(asset_file_path, 'rb') as asset_file:
             contents = asset_file.read()
         return contents
 
diff --git a/app/templates/views/service-settings/branding/email-options.html b/app/templates/views/service-settings/branding/email-options.html
index 28771e7ba..d91073164 100644
--- a/app/templates/views/service-settings/branding/email-options.html
+++ b/app/templates/views/service-settings/branding/email-options.html
@@ -26,7 +26,7 @@
         {% for option in form.options %}
           <div class="column-one-quarter">
             <label for="{{ option.id }}">
-              <img src="{{ asset_path }}images/branding-options/{{ option.data }}.png" alt="" class="bordered-image bottom-gutter-1-3">
+              <img src="{{ asset_url('images/branding-options/{}.png'.format(option.data)) }}" alt="" class="bordered-image bottom-gutter-1-3">
             </label>
             {{ radio(option) }}
           </div>
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index d45aaaabe..79c23f081 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -54,7 +54,7 @@
         </p>
       </div>
       <div class="column-half">
-        <img src="{{ asset_path }}images/product/01-templates.svg" alt="">
+        <img src="{{ asset_url('images/product/01-templates.svg') }}" alt="">
       </div>
     </div>
   </div>
@@ -71,7 +71,7 @@
       </div>
       <div class="column-half">
         <img
-          src="{{ asset_path }}images/product/02-reporting.svg"
+          src="{{ asset_url('images/product/02-reporting.svg') }}"
           alt="A screenshot of GOV.UK Notify showing counts of emails and text messages sent"
         >
       </div>
@@ -88,7 +88,7 @@
           phone&nbsp;numbers and Notify sends the messages.
         </p>
         <img
-          src="{{ asset_path }}images/product/03-spreadsheet.svg"
+          src="{{ asset_url('images/product/03-spreadsheet.svg') }}"
           alt="A screenshot of a spreadsheet with columns for email address, name and colour"
         >
       </div>
@@ -98,7 +98,7 @@
           back office system.
         </p>
         <img
-          src="{{ asset_path }}images/product/04-api.svg"
+          src="{{ asset_url('images/product/04-api.svg') }}"
           alt="A screenshot of some computer code with a notify.send_email function"
         >
       </div>
@@ -180,7 +180,7 @@
       </div>
       <div class="column-half">
         <img
-          src="{{ asset_path }}images/product/team.jpg"
+          src="{{ asset_url('images/product/team.jpg') }}"
           alt="A photo of the GOV.UK Notify team gathered around a big screen. One team member is pointing at a graph on the screen."
         >
       </div>
diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html
index a0874223e..ceefd2e16 100644
--- a/app/templates/views/using-notify.html
+++ b/app/templates/views/using-notify.html
@@ -37,7 +37,7 @@
     <h2 id="messagedeliveryandfailure" class="heading-medium">Sending messages</h2>
     <p>When you send a message, it moves through different states in Notify.</p>
     <img
-        src="{{ asset_path }}images/message-sending-flow.svg"
+        src="{{ asset_url('images/message-sending-flow.svg') }}"
         alt="A picture of the sending flow of messages in Notify, showing the three states of Sending, Delivered, And Failed. Also shows the next
              steps when messages fail, deleting data and trying a new channel for permanent failures, and trying again or trying a new channel for
              temporary failures"
diff --git a/tests/app/main/test_asset_fingerprinter.py b/tests/app/main/test_asset_fingerprinter.py
index 2e36cd847..581294dbd 100644
--- a/tests/app/main/test_asset_fingerprinter.py
+++ b/tests/app/main/test_asset_fingerprinter.py
@@ -10,7 +10,7 @@ class TestAssetFingerprint(object):
             body {
                 font-family: nta;
             }
-        """
+        """.encode('utf-8')
         asset_fingerprinter = AssetFingerprinter(
             asset_root='/suppliers/static/'
         )
@@ -27,7 +27,7 @@ class TestAssetFingerprint(object):
         get_file_content_mock = mocker.patch.object(AssetFingerprinter, 'get_asset_file_contents')
         get_file_content_mock.return_value = """
             document.write('Hello world!');
-        """
+        """.encode('utf-8')
         fingerprinter = AssetFingerprinter()
         fingerprinter.get_url('javascripts/application.js')
         fingerprinter.get_asset_file_contents.assert_called_with(
@@ -40,7 +40,7 @@ class TestAssetFingerprint(object):
             body {
                 font-family: nta;
             }
-        """
+        """.encode('utf-8')
         asset_fingerprinter = AssetFingerprinter()
         assert (
             asset_fingerprinter.get_asset_fingerprint('application.css') ==
@@ -56,11 +56,11 @@ class TestAssetFingerprint(object):
             body {
                 font-family: nta;
             }
-        """
+        """.encode('utf-8')
         css_hash = asset_fingerprinter.get_asset_fingerprint('application.css')
         get_file_content_mock.return_value = """
             document.write('Hello world!');
-        """
+        """.encode('utf-8')
         js_hash = asset_fingerprinter.get_asset_fingerprint('application.js')
         assert (
             js_hash != css_hash
@@ -72,7 +72,7 @@ class TestAssetFingerprint(object):
             body {
                 font-family: nta;
             }
-        """
+        """.encode('utf-8')
         fingerprinter = AssetFingerprinter()
         assert (
             fingerprinter.get_url('application.css') ==