fix for http_proxy

catch some exceptions

Gemfile

@@ -4,4 +4,6 @@ gem 'rack'
 gem 'rack-cache', :require => "rack/cache"
 gem 'rqrcode'
 gem 'rmagick'
+# uncomment if you need http_proxy until bitly is updated
+#gem 'bitly', :git => 'http://github.com/whomwah/bitly.git'
 gem 'bitly'

Rakefile

@@ -5,5 +5,10 @@ task :test do
   Rake::TestTask.new
 end
 
+desc "Clear cache"
+task :clear_cache do
+  system "rm -rf /tmp/rack"
+end
+
 task :default => 'test'
 

webapp.rb

@@ -54,6 +54,8 @@ def shorten(url)
       Bitly.use_api_version_3
       bitly = Bitly.new(BITLY[:username], BITLY[:api_key])
       bitly.shorten(url).short_url
+    rescue SocketError
+      nil
     end
 
     def is_bbc?(url)
@@ -99,6 +101,8 @@ def to_qrcode_base64(blob)
     redirect to('/') unless is_bbc?(url)
 
     short = shorten(url)
+    halt 404, "Error! I can't connect to bit.ly" unless short
+
     code = short.split('/').last
     size = params[:size] ? params[:size].to_i : 0
     @qrcode = {