dragonfly 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c443c8f0fc5b7be3523df81d24f3fa02d4cde7a1
-  data.tar.gz: b68fd67ac67553ec180304a099a37e6625db4692
+  metadata.gz: f4447e48d0b8ae55e37417b745ad6b41874460e3
+  data.tar.gz: eec72c3113796cfb2350b92d2f423f74c09c08a8
 SHA512:
-  metadata.gz: 3af5d4adc707c1089838cda7b65242ad2c3820dabf7c498e0ffdddb71768cc68f2eb970d7682fdac020e3fa416fb44b7bcb6f01706aedff1a72c56003a0b7be9
-  data.tar.gz: b29fe47d2ce93f8f638d116b2964c345a591b237731ba68fcc22fad87428ed9bc02f3cf3663907f7b4a90270198a07f5a57638b3c75a3880ff8035eb77c9c00d
+  metadata.gz: 8b603153fca561242e794bf14dbbc2f5aa189d89d1bb61a680cc8592147f5f42742057dbc2a3817e1015b864876d9282a3b2407bd7525a779e44217b74ab17fd
+  data.tar.gz: e963b8c1b8791262b823d1b2af24f862cd799567da45cdd2676797c4822caa8c0ab5949596743032b95ac7486cc240698f88c982101f45d8570549d635406dbc

data/History.md

@@ -1,3 +1,9 @@
+1.0.5 (2014-05-15)
+===================
+Fixes
+-----
+- fetch_url wasn't correctly getting https endpoints on Ruby approx < 2
+
 1.0.4 (2014-04-11)
 ===================
 Fixes

data/README.md

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

data/lib/dragonfly/job/fetch_url.rb

@@ -42,19 +42,19 @@ module Dragonfly
         if data_uri?
           update_from_data_uri
         else
-          data = get(url)
+          data = get_following_redirects(url)
           job.content.update(data, 'name' => filename)
         end
       end
 
       private
 
-      def get(url, redirect_limit=10)
+      def get_following_redirects(url, redirect_limit=10)
         raise TooManyRedirects, "url #{url} redirected too many times" if redirect_limit == 0
-        response = Net::HTTP.get_response(parse_url(url))
+        response = get(url)
         case response
         when Net::HTTPSuccess then response.body || ""
-        when Net::HTTPRedirection then get(response['location'], redirect_limit-1)
+        when Net::HTTPRedirection then get_following_redirects(response['location'], redirect_limit-1)
         else
           response.error!
         end
@@ -62,6 +62,13 @@ module Dragonfly
         raise ErrorResponse.new(e.response.code.to_i, e.response.body)
       end
 
+      def get(url)
+        url = parse_url(url)
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true if url.scheme == 'https'
+        response = http.get(url.request_uri)
+      end
+
       def update_from_data_uri
         mime_type, b64_data = uri.scan(/^data:([^;]+);base64,(.*)$/)[0]
         if mime_type && b64_data

data/lib/dragonfly/version.rb

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

data/spec/dragonfly/job/fetch_url_spec.rb

@@ -25,7 +25,7 @@ describe Dragonfly::Job::FetchUrl do
   end
 
   it "should also work with https" do
-    stub_request(:get, /place.com/).to_return(:body => 'secure result!')
+    stub_request(:get, 'https://place.com').to_return(:body => 'secure result!')
     job.fetch_url!('https://place.com')
     job.data.should == "secure result!"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack