From 2c3062548b752175b84ea57cf3dfdf3e7fe6ec2a Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 29 May 2015 12:39:55 +1000
Subject: [PATCH] FEATURE: upgrade image compression gem

---
 Gemfile              |  8 +++-----
 Gemfile.lock         | 24 ++++++++++++------------
 lib/tasks/emoji.rake |  4 ++--
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index bab99a602..03750100f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,11 +63,9 @@ gem 'unf', require: false
 
 gem 'email_reply_parser'
 
-# note: for image_optim to correctly work you need
-# sudo apt-get install -y advancecomp gifsicle jpegoptim libjpeg-progs optipng pngcrush
-#
-# Sam: held back, getting weird errors in latest
-gem 'image_optim', '0.9.1'
+# note: for image_optim to correctly work you need to follow
+# https://github.com/toy/image_optim
+gem 'image_optim'
 gem 'multi_json'
 gem 'mustache'
 gem 'nokogiri'
diff --git a/Gemfile.lock b/Gemfile.lock
index 992ec770a..e69072faf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,7 +93,7 @@ GEM
     eventmachine (1.0.7)
     excon (0.45.3)
     execjs (2.5.2)
-    exifr (1.1.3)
+    exifr (1.2.2)
     fabrication (2.9.8)
     fakeweb (1.3.0)
     faraday (0.9.1)
@@ -113,7 +113,7 @@ GEM
     foreman (0.77.0)
       dotenv (~> 1.0.2)
       thor (~> 0.19.1)
-    fspath (2.0.6)
+    fspath (2.1.1)
     gctools (0.2.3)
     given_core (3.5.4)
       sorcerer (>= 0.3.7)
@@ -126,14 +126,14 @@ GEM
     hitimes (1.2.2)
     htmlentities (4.3.3)
     i18n (0.7.0)
-    image_optim (0.9.1)
-      exifr (~> 1.1.3)
-      fspath (~> 2.0.5)
-      image_size (~> 1.1.2)
-      in_threads (~> 1.2.0)
-      progress (~> 3.0.0)
-    image_size (1.1.5)
-    in_threads (1.2.2)
+    image_optim (0.20.2)
+      exifr (~> 1.1, >= 1.1.3)
+      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)
     jmespath (1.0.2)
       multi_json (~> 1.0)
     jquery-rails (3.1.2)
@@ -218,7 +218,7 @@ GEM
       ruby-openid
     pg (0.18.1)
     polyglot (0.3.5)
-    progress (3.0.2)
+    progress (3.1.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -419,7 +419,7 @@ DEPENDENCIES
   highline
   hiredis
   htmlentities
-  image_optim (= 0.9.1)
+  image_optim
   librarian (>= 0.0.25)
   listen (= 0.7.3)
   logster
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index 689ad9fe2..729242f9b 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -29,7 +29,7 @@ def download_emojis_for(set, url_template, options={})
     FileUtils.cd(path) do
       emoji["aliases"].each do |name|
         File.open("#{name}.png", "wb") { |f| f << data }
-        ImageOptim.new.optimize_image("#{name}.png") rescue nil
+        ImageOptim.new.optimize_image!("#{name}.png")
       end
     end
   end
@@ -56,7 +56,7 @@ def download_google_emojis(url_template)
     FileUtils.cd(path) do
       emoji["aliases"].each do |name|
         File.open("#{name}.png", "wb") { |f| f << data }
-        ImageOptim.new.optimize_image("#{name}.png") rescue nil
+        ImageOptim.new.optimize_image!("#{name}.png")
       end
     end
   end