dragonfly 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4918846aff69a7cb7483d21babadf9f74d674d91
-  data.tar.gz: e015447812e545b186c422b355de1916fc474201
+  metadata.gz: 785986a8487e1cb1e971e16b2eb88dc51794d490
+  data.tar.gz: e76af75be5d2f6a224a042ab4f6b53dd8de93e5d
 SHA512:
-  metadata.gz: 5642ce50bb25ffd86a4960be6d69e011d285c749e54c572a2977399775ce7e30f9634bfe72bae98f5f2d1cb3e24ba860e6e711457a288b02f920a184142123c9
-  data.tar.gz: c665ecd2f6c045a668abc45197900ca9a4fd75c3028dcf7085cc6cf1799d82c3c882d97d48eb11f792dfc59947143198ad918b60ee92155a981e5f1d40904dd9
+  metadata.gz: 528e4445092921b2c590cf787c6a23aa1a0c3f912ae9bea19416f60672605693735d33d0c6f709334c68555b087afeb7b72bfd7666187c3745eecc9fb891d27f
+  data.tar.gz: c814aa4308afd5bb698c3e2f61605ffe6650d244fe8fbe3d84b843cf266c4e5ad9ea062d0bf0195b0856f758b213331e1d5ee9f4f1349fcd9dcd63710dcf0e8d

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
   - "1.9.3"
-  - "2.0.0"
+  - "2.0"
   - "2.1"
   - "2.2"
-  - "2.3.0"
+  - "2.3"
+  - "2.4"
   - "jruby"
 script: bundle exec rspec spec
 before_install:

data/History.md

@@ -1,3 +1,12 @@
+1.1.2 (2017-05-06)
+===================
+Fixes
+-----
+- Allow relative redirect urls in `fetch_url` (zorec)
+- Fixed Forwardable deprecation warnings (neodude)
+- Fixed incorrect detection of empty directories in ruby 2.4 (yuszuv)
+- Store content type in meta if it's available so we don't lose information (Lukas Svoboda)
+
 1.1.1 (2016-10-26)
 ===================
 Features

data/README.md

@@ -44,7 +44,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.1.1'
+gem 'dragonfly', '~> 1.1.2'
 ```
 
 Require with

data/lib/dragonfly/content.rb

@@ -79,7 +79,7 @@ module Dragonfly
     # @example "image/jpeg"
     # @return [String]
     def mime_type
-      app.mime_type_for(ext)
+      meta['mime_type'] || app.mime_type_for(ext)
     end
 
     # Set the content using a pre-registered generator

data/lib/dragonfly/file_data_store.rb

@@ -168,7 +168,7 @@ module Dragonfly
     end
 
     def directory_empty?(path)
-      Dir.entries(path) == ['.','..']
+      Dir.entries(path).sort == ['.','..'].sort
     end
 
     def root_path?(dir)

data/lib/dragonfly/job/fetch_url.rb

@@ -43,8 +43,8 @@ module Dragonfly
         if data_uri?
           update_from_data_uri
         else
-          data = get_following_redirects(url)
-          job.content.update(data, 'name' => filename)
+          response = get_following_redirects(url)
+          job.content.update(response.body || "", 'name' => filename, 'mime_type' => response.content_type)
         end
       end
 
@@ -54,8 +54,9 @@ module Dragonfly
         raise TooManyRedirects, "url #{url} redirected too many times" if redirect_limit == 0
         response = get(url)
         case response
-        when Net::HTTPSuccess then response.body || ""
-        when Net::HTTPRedirection then get_following_redirects(response['location'], redirect_limit-1)
+        when Net::HTTPSuccess then response
+        when Net::HTTPRedirection then
+          get_following_redirects(redirect_url(url, response['location']), redirect_limit-1)
         else
           response.error!
         end
@@ -83,7 +84,7 @@ module Dragonfly
         if mime_type && b64_data
           data = Base64.decode64(b64_data)
           ext = app.ext_for(mime_type)
-          job.content.update(data, 'name' => "file.#{ext}")
+          job.content.update(data, 'name' => "file.#{ext}", 'mime_type' => mime_type)
         else
           raise CannotHandle, "fetch_url can only deal with base64-encoded data uris with specified content type"
         end
@@ -102,6 +103,13 @@ module Dragonfly
         end
       end
 
+      def redirect_url(current_url, following_url)
+        redirect_url = URI.parse(following_url)
+        if redirect_url.relative?
+          redirect_url = URI::join(current_url, following_url)
+        end
+        redirect_url
+      end
     end
   end
 end

data/lib/dragonfly/temp_object.rb

@@ -84,6 +84,19 @@ module Dragonfly
       @data ||= file{|f| f.read }
     end
 
+    def tempfile
+      raise Closed, "can't read from tempfile as TempObject has been closed" if closed?
+      @tempfile ||= begin
+        case
+        when @data
+          @tempfile = Utils.new_tempfile(ext, @data)
+        when @pathname
+          @tempfile = copy_to_tempfile(@pathname.expand_path)
+        end
+        @tempfile
+      end
+    end
+
     def file(&block)
       f = tempfile.open
       tempfile.binmode
@@ -174,19 +187,6 @@ module Dragonfly
 
     private
 
-    def tempfile
-      raise Closed, "can't read from tempfile as TempObject has been closed" if closed?
-      @tempfile ||= begin
-        case
-        when @data
-          @tempfile = Utils.new_tempfile(ext, @data)
-        when @pathname
-          @tempfile = copy_to_tempfile(@pathname.expand_path)
-        end
-        @tempfile
-      end
-    end
-
     def block_size
       8192
     end

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/dragonfly/content_spec.rb

@@ -67,11 +67,20 @@ describe Dragonfly::Content do
   end
 
   describe "mime_type" do
-    it "takes it from the extension" do
-      content.name = "thing"
-      content.mime_type.should == "application/octet-stream"
-      content.name = "thing.png"
-      content.mime_type.should == "image/png"
+    context "when mime_type is stored in meta" do
+      it "takes it form meta" do
+        content.name = "thing.png"
+        content.meta.update("mime_type" => "text/html")
+        content.mime_type.should == "text/html"
+      end
+    end
+    context "when mime_type is not stored in meta" do
+      it "takes it from the extension" do
+        content.name = "thing"
+        content.mime_type.should == "application/octet-stream"
+        content.name = "thing.png"
+        content.mime_type.should == "image/png"
+      end
     end
   end
 

data/spec/dragonfly/image_magick/processors/convert_spec.rb

@@ -8,7 +8,6 @@ describe Dragonfly::ImageMagick::Processors::Convert do
 
   let(:app){ test_app }
   let(:image){ sample_content('beach.png') } # 280x355
-  let(:pdf){ sample_content('memo.pdf') }
   let(:processor){ Dragonfly::ImageMagick::Processors::Convert.new }
 
   it "should allow for general convert commands" do
@@ -55,11 +54,12 @@ describe Dragonfly::ImageMagick::Processors::Convert do
   end
 
   it "accepts input arguments for convert commands" do
-    pdf2 = pdf.clone
-    processor.call(pdf, '-scale 85x110', 'format' => 'png')
-    processor.call(pdf2, '-scale 85x110', 'format' => 'png', 'input_args' => '-density 150')
+    image2 = image.clone
+    processor.call(image, '')
+    processor.call(image2, '', 'input_args' => '-extract 50x50+10+10')
 
-    pdf.should_not equal_image(pdf2)
+    image.should_not equal_image(image2)
+    image2.should have_width(50)
   end
 
   it "allows converting using specific delegates" do

data/spec/dragonfly/job/fetch_url_spec.rb

@@ -19,6 +19,12 @@ describe Dragonfly::Job::FetchUrl do
     job.data.should == "result!"
   end
 
+  it "should set the mime_type when returned by the request" do
+    stub_request(:get, %r{http://thing\.com.*}).to_return(:body => '<ok />', :headers => {'Content-Type' => 'text/html'})
+    expect(job.fetch_url('http://place.com').mime_type).to eq('application/octet-stream')
+    expect(job.fetch_url('http://thing.com').mime_type).to eq('text/html')
+  end
+
   it "should default to http" do
     job.fetch_url!('place.com')
     job.data.should == "result!"
@@ -140,6 +146,12 @@ describe Dragonfly::Job::FetchUrl do
         job.fetch_url('redirectme.com').apply
       }.to raise_error(Dragonfly::Job::FetchUrl::TooManyRedirects)
     end
+
+    it "follows relative responses" do
+      stub_request(:get, "redirectme.com").to_return(:status => 302, :headers => {'Location' => 'relative-path.html'})
+      stub_request(:get, "redirectme.com/relative-path.html").to_return(:body => "OK!")
+      job.fetch_url('redirectme.com').data.should == 'OK!'
+    end
   end
 
   describe "data uris" do

data/spec/support/simple_matchers.rb

@@ -9,7 +9,7 @@ end
 
 RSpec::Matchers.define :be_an_empty_directory do
   match do |given|
-    !!ENV['TRAVIS'] || (Dir.entries(given) == ['.','..'])
+    !!ENV['TRAVIS'] || (Dir.entries(given).sort == ['.','..'].sort)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -178,7 +178,6 @@ files:
 - samples/beach.png
 - samples/egg.png
 - samples/gif.gif
-- samples/memo.pdf
 - samples/round.gif
 - samples/sample.docx
 - samples/taj.jpg