From 284b56bee93266eb1bb7b5be6f5cbb3a82428ca3 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 13 Sep 2015 10:48:33 +0100
Subject: [PATCH 1/1] Use image_optim to optimize SVG assets with svgo

---
 Gemfile                |  3 +++
 Gemfile.lock           | 12 ++++++++++++
 config/application.rb  |  3 +++
 config/image_optim.yml |  9 +++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 config/image_optim.yml

diff --git a/Gemfile b/Gemfile
index 3c8c3548b..51ce4cb2b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,6 +40,9 @@ gem "r2"
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
 
+# Use image_optim to optimise images
+gem "image_optim"
+
 # Load rails plugins
 gem "rails-i18n", "~> 4.0.0"
 gem "dynamic_form"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4dc07fee5..fda6fccae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -84,8 +84,10 @@ GEM
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.6.0)
+    exifr (1.2.3.1)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
+    fspath (2.1.1)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     hashie (3.4.2)
@@ -98,6 +100,14 @@ GEM
     i18n (0.7.0)
     i18n-js (3.0.0.rc11)
       i18n (~> 0.6)
+    image_optim (0.21.0)
+      exifr (~> 1.2, >= 1.2.2)
+      fspath (~> 2.1)
+      image_size (~> 1.3)
+      in_threads (~> 1.3)
+      progress (~> 3.0, >= 3.0.1)
+    image_size (1.4.1)
+    in_threads (1.3.1)
     jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -189,6 +199,7 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
+    progress (3.1.0)
     psych (2.0.15)
     r2 (0.2.5)
     rack (1.6.4)
@@ -315,6 +326,7 @@ DEPENDENCIES
   http_accept_language (~> 2.0.0)
   httpclient
   i18n-js (>= 3.0.0.rc10)
+  image_optim
   jquery-rails
   jshint
   json
diff --git a/config/application.rb b/config/application.rb
index 142e436c5..be2cc0a99 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -56,5 +56,8 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
+
+    # Configure image optimisation
+    config.assets.image_optim = YAML.load_file("#{Rails.root}/config/image_optim.yml")
   end
 end
diff --git a/config/image_optim.yml b/config/image_optim.yml
new file mode 100644
index 000000000..61fb95b80
--- /dev/null
+++ b/config/image_optim.yml
@@ -0,0 +1,9 @@
+skip_missing_workers: true
+pngout: false
+pngcrush: false
+advpng: false
+optipng: false
+pngquant: false
+jhead: false
+jpegoptim: false
+gifsicle: false
-- 
2.43.2