dragonfly 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe5f948bd5e670d97c683750532bb5612d5f754
-  data.tar.gz: 9d267698e7df156ccae311e7ab79b66989d89343
+  metadata.gz: c443c8f0fc5b7be3523df81d24f3fa02d4cde7a1
+  data.tar.gz: b68fd67ac67553ec180304a099a37e6625db4692
 SHA512:
-  metadata.gz: e3e76e51825eb12335a794e48c017d86f695ee9b43164c048f0dde267da4ac9b5c9a8bf0c6e9936f3daa4c6f12255257933b3148664e8d66973ff403d72e9cd1
-  data.tar.gz: 9f256720478cc17ae88e32a3264db632b439283cedb8d3deb2989f1b6ec3802fbfa11acc521cfed55ba23af90f229c72e00b4558b564c9b8b24f3d0ce0a69410
+  metadata.gz: 3af5d4adc707c1089838cda7b65242ad2c3820dabf7c498e0ffdddb71768cc68f2eb970d7682fdac020e3fa416fb44b7bcb6f01706aedff1a72c56003a0b7be9
+  data.tar.gz: b29fe47d2ce93f8f638d116b2964c345a591b237731ba68fcc22fad87428ed9bc02f3cf3663907f7b4a90270198a07f5a57638b3c75a3880ff8035eb77c9c00d

data/History.md

@@ -1,3 +1,9 @@
+1.0.4 (2014-04-11)
+===================
+Fixes
+-----
+- fetch_url is more forgiving - assume escaped, if not escape
+
 1.0.3 (2014-01-28)
 ===================
 Fixes

data/README.md

@@ -54,7 +54,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.0.3'
+gem 'dragonfly', '~> 1.0.4'
 ```
 
 Require with

data/lib/dragonfly/job/fetch_url.rb

@@ -15,6 +15,7 @@ module Dragonfly
       end
       class CannotHandle < RuntimeError; end
       class TooManyRedirects < RuntimeError; end
+      class BadURI < RuntimeError; end
 
       def init
         job.url_attributes.name = filename
@@ -25,12 +26,12 @@ module Dragonfly
       end
 
       def url
-        @url ||= uri =~ /^\w+:/ ? uri : "http://#{uri}"
+        @url ||= uri =~ /^\w+:[^\d]/ ? uri : "http://#{uri}"
       end
 
       def filename
         return if data_uri?
-        @filename ||= URI.parse(url).path[/[^\/]+$/]
+        @filename ||= parse_url(url).path[/[^\/]+$/]
       end
 
       def data_uri?
@@ -41,14 +42,16 @@ module Dragonfly
         if data_uri?
           update_from_data_uri
         else
-          data = get(URI.escape(url))
+          data = get(url)
           job.content.update(data, 'name' => filename)
         end
       end
 
+      private
+
       def get(url, redirect_limit=10)
         raise TooManyRedirects, "url #{url} redirected too many times" if redirect_limit == 0
-        response = Net::HTTP.get_response(URI.parse(url))
+        response = Net::HTTP.get_response(parse_url(url))
         case response
         when Net::HTTPSuccess then response.body || ""
         when Net::HTTPRedirection then get(response['location'], redirect_limit-1)
@@ -70,6 +73,16 @@ module Dragonfly
         end
       end
 
+      def parse_url(url)
+        URI.parse(url)
+      rescue URI::InvalidURIError
+        begin
+          URI.parse(URI.escape(url))
+        rescue URI::InvalidURIError => e
+          raise BadURI, e.message
+        end
+      end
+
     end
   end
 end

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/dragonfly/image_magick/plugin_spec.rb

@@ -124,7 +124,7 @@ describe "a configured imagemagick app" do
   describe "identify" do
     it "gives the output of the command line" do
       image.identify.should =~ /280/
-      image.identify("-format %h").should == "355\n"
+      image.identify("-format %h").chomp.should == "355"
     end
   end
 

data/spec/dragonfly/job/fetch_url_spec.rb

@@ -6,7 +6,7 @@ describe Dragonfly::Job::FetchUrl do
   let (:job) { Dragonfly::Job.new(app) }
 
   before(:each) do
-    stub_request(:get, %r{http://place\.com/.*}).to_return(:body => 'result!')
+    stub_request(:get, %r{http://place\.com.*}).to_return(:body => 'result!')
   end
 
   it "adds a step" do
@@ -35,7 +35,8 @@ describe Dragonfly::Job::FetchUrl do
     "http://place.com",
     "place.com/",
     "place.com/stuff/",
-    "place.com/?things"
+    "place.com/?things",
+    "place.com:8080"
   ].each do |url|
     it "doesn't set the name if there isn't one, e.g. for #{url}" do
       job.fetch_url!(url)
@@ -52,7 +53,8 @@ describe Dragonfly::Job::FetchUrl do
     "place.com/dung.beetle",
     "http://place.com/dung.beetle",
     "place.com/stuff/dung.beetle",
-    "place.com/dung.beetle?morethings"
+    "place.com/dung.beetle?morethings",
+    "place.com:8080/dung.beetle"
   ].each do |url|
     it "sets the name if there is one, e.g. for #{url}" do
       job.fetch_url!(url)
@@ -65,6 +67,13 @@ describe Dragonfly::Job::FetchUrl do
     end
   end
 
+  it "works with domain:port" do
+    stub_request(:get, "localhost:8080").to_return(:body => "okay!")
+    thing = job.fetch_url('localhost:8080')
+    thing.name.should be_nil
+    thing.data.should == 'okay!'
+  end
+
   it "should raise an error if not found" do
     stub_request(:get, "notfound.com").to_return(:status => 404, :body => "BLAH")
     expect{
@@ -85,24 +94,46 @@ describe Dragonfly::Job::FetchUrl do
     }
   end
 
-  it "should follow redirects" do
-    stub_request(:get, "redirectme.com").to_return(:status => 302, :headers => {'Location' => 'http://ok.com'})
-    stub_request(:get, "ok.com").to_return(:body => "OK!")
-    job.fetch_url('redirectme.com').data.should == 'OK!'
-  end
+  describe "escaping" do
+    before do
+      stub_request(:get, "escapedurl.com/escaped%20url.jpg").to_return(:body => "OK!")
+    end
+
+    it "works with escaped urls" do
+      job.fetch_url('escapedurl.com/escaped%20url.jpg').data.should == 'OK!'
+    end
+
+    it "tries to escape unescaped urls" do
+      job.fetch_url('escapedurl.com/escaped url.jpg').data.should == 'OK!'
+    end
 
-  it "follows redirects to https" do
-    stub_request(:get, "redirectme.com").to_return(:status => 302, :headers => {'Location' => 'https://ok.com'})
-    stub_request(:get, /ok.com/).to_return(:body => "OK!")
-    job.fetch_url('redirectme.com').data.should == 'OK!'
+    it "still blows up with bad urls" do
+      expect {
+        job.fetch_url('1:{')
+      }.to raise_error(Dragonfly::Job::FetchUrl::BadURI)
+    end
   end
 
-  it "raises if redirecting too many times" do
-    stub_request(:get, "redirectme.com").to_return(:status => 302, :headers => {'Location' => 'http://redirectme-back.com'})
-    stub_request(:get, "redirectme-back.com").to_return(:status => 302, :headers => {'Location' => 'http://redirectme.com'})
-    expect {
-      job.fetch_url('redirectme.com').apply
-    }.to raise_error(Dragonfly::Job::FetchUrl::TooManyRedirects)
+  describe "redirects" do
+    it "should follow redirects" do
+      stub_request(:get, "redirectme.com").to_return(:status => 302, :headers => {'Location' => 'http://ok.com'})
+      stub_request(:get, "ok.com").to_return(:body => "OK!")
+      job.fetch_url('redirectme.com').data.should == 'OK!'
+    end
+
+    it "follows redirects to https" do
+      stub_request(:get, "redirectme.com").to_return(:status => 302, :headers => {'Location' => 'https://ok.com'})
+      stub_request(:get, /ok.com/).to_return(:body => "OK!")
+      job.fetch_url('redirectme.com').data.should == 'OK!'
+    end
+
+    it "raises if redirecting too many times" do
+      stub_request(:get, "redirectme.com").to_return(:status => 302, :headers => {'Location' => 'http://redirectme-back.com'})
+      stub_request(:get, "redirectme-back.com").to_return(:status => 302, :headers => {'Location' => 'http://redirectme.com'})
+      expect {
+        job.fetch_url('redirectme.com').apply
+      }.to raise_error(Dragonfly::Job::FetchUrl::TooManyRedirects)
+    end
   end
 
   describe "data uris" do

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -90,9 +90,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - History.md
 - LICENSE
@@ -240,17 +240,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.