daveg: adding the addressable gem, and sprinkling some Addressable pa…

…rsing into the parse_uri method.

dragonfly.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("rack", [">= 0"])
   spec.add_runtime_dependency("multi_json", ["~> 1.0"])
+  spec.add_runtime_dependency("addressable", ["~> 2.3"])
 
   spec.add_development_dependency("rspec", ["~> 2.5"])
   spec.add_development_dependency("webmock")

lib/dragonfly/job/fetch_url.rb

@@ -2,6 +2,7 @@
 require 'net/http'
 require 'base64'
 require 'dragonfly/job/step'
+require 'addressable/uri'
 
 module Dragonfly
   class Job
@@ -84,7 +85,10 @@ def parse_url(url)
         URI.parse(url)
       rescue URI::InvalidURIError
         begin
-          URI.parse(URI.escape(url))
+          encoded_uri = Addressable::URI.parse(url).normalize.to_s
+          URI.parse(encoded_uri)
+        rescue Addressable::URI::InvalidURIError => e
+          raise BadURI, e.message
         rescue URI::InvalidURIError => e
           raise BadURI, e.message
         end

spec/dragonfly/job/fetch_url_spec.rb

@@ -96,15 +96,15 @@
 
   describe "escaping" do
     before do
-      stub_request(:get, "escapedurl.com/escaped%20url.jpg").to_return(:body => "OK!")
+      stub_request(:get, "escapedurl.com/escaped%20url%5B1%5D.jpg").to_return(:body => "OK!")
     end
 
     it "works with escaped urls" do
-      job.fetch_url('escapedurl.com/escaped%20url.jpg').data.should == 'OK!'
+      job.fetch_url('escapedurl.com/escaped%20url%5B1%5D.jpg').data.should == 'OK!'
     end
 
     it "tries to escape unescaped urls" do
-      job.fetch_url('escapedurl.com/escaped url.jpg').data.should == 'OK!'
+      job.fetch_url('escapedurl.com/escaped url[1].jpg').data.should == 'OK!'
     end
 
     it "still blows up with bad urls" do