From 47132f3e60c227981aa0cdea860b8892011e3798 Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Wed, 8 Oct 2014 01:21:02 -0400
Subject: [PATCH] ruby 2.1

---
 Gemfile                             |  2 +-
 Gemfile.lock                        | 65 ++++++++++++++++-------------
 script/phantomjs-save-screenshot.js |  4 ++
 3 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/Gemfile b/Gemfile
index f8b6acbe..d20ab376 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-#ruby '1.9.3'
+ruby '2.1'
 
 gem 'rails', '3.2.17'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c159ef2..d89e5183 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,7 +29,9 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    aws-sdk (1.44.0)
+    aws-sdk (1.54.0)
+      aws-sdk-v1 (= 1.54.0)
+    aws-sdk-v1 (1.54.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
     bcrypt (3.1.7)
@@ -39,7 +41,8 @@ GEM
       rails (~> 3.1)
     builder (3.0.4)
     cancan (1.6.10)
-    celluloid (0.10.0)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.4)
@@ -47,26 +50,27 @@ GEM
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
-    connection_pool (0.9.3)
-    devise (3.2.4)
+    coffee-script-source (1.8.0)
+    connection_pool (2.0.0)
+    devise (3.4.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.2.1)
     ezcrypto (0.7.2)
-    formtastic (2.2.1)
-      actionpack (>= 3.0)
+    formtastic (3.0.0)
+      actionpack (>= 3.2.13)
     formula (1.0.1)
       rails (> 3.0.0)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jbuilder (0.8.2)
       activesupport (>= 3.0.0)
     journey (1.0.4)
@@ -82,14 +86,14 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     mini_portile (0.6.0)
-    multi_json (1.10.0)
-    nokogiri (1.6.2.1)
+    multi_json (1.10.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
-    nokogiri (1.6.2.1-x86-mingw32)
+    nokogiri (1.6.3.1-x86-mingw32)
       mini_portile (= 0.6.0)
     oauth (0.4.7)
     orm_adapter (0.5.0)
-    paperclip (4.1.1)
+    paperclip (4.2.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -97,7 +101,7 @@ GEM
     pg (0.17.1)
     pg (0.17.1-x86-mingw32)
     phantomjs (1.9.7.1)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -127,20 +131,22 @@ GEM
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (2.2.2)
-    redis-namespace (1.1.1)
-      redis (< 3.0.0)
-    sass (3.3.7)
+    redis (3.1.0)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
+    responders (1.1.1)
+      railties (>= 3.2, < 4.2)
+    sass (3.4.5)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sidekiq (1.2.1)
-      celluloid (~> 0.10.0)
-      connection_pool (~> 0.9.0)
-      multi_json (~> 1)
-      redis
-      redis-namespace
+    sidekiq (3.2.5)
+      celluloid (= 0.15.2)
+      connection_pool (>= 2.0.0)
+      json
+      redis (>= 3.0.6)
+      redis-namespace (>= 1.3.1)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -155,13 +161,14 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     temple (0.6.8)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
+    timers (1.1.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
-    uglifier (2.5.0)
+    tzinfo (0.3.41)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     uservoice-ruby (0.0.11)
@@ -192,7 +199,7 @@ DEPENDENCIES
   phantomjs
   rails (= 3.2.17)
   rails3-jquery-autocomplete
-  redis (= 2.2.2)
+  redis
   sass-rails
   sidekiq
   sinatra
diff --git a/script/phantomjs-save-screenshot.js b/script/phantomjs-save-screenshot.js
index d6d615dc..6c46bc53 100755
--- a/script/phantomjs-save-screenshot.js
+++ b/script/phantomjs-save-screenshot.js
@@ -44,6 +44,10 @@ page.open(url, function (status) {
         }
       });//document.on animationDone
     });//page.evaluate
+
+    setTimeout(function(){
+      phantom.exit();
+    }, 10000)
   } else {
     //failed to load
     phantom.exit();