carrierwave-ftp 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df0afee16e1ea7ec251387b0d40e51b34125f393
-  data.tar.gz: 60e317278e41bce9435f0ae5a2f91b34ce354575
+  metadata.gz: 551b48c6149faaa78b66b77b7b119c5bd0a42219
+  data.tar.gz: 9e1a295293d824b6fb476280ac7df4d7070abbc7
 SHA512:
-  metadata.gz: 1b8ba3eb90cf8cace416957dfa485cd14c0b62bd3c8e1946df51d68b39d8d60fd43ffb69323eb4ecc3a68843603626b3733a8e66dac2fd7767ff632a236bf0e2
-  data.tar.gz: c966647c7f64e7d23f61cb911b0617bfaedef048c62178ff4aa807ef5148cc31918bdbd1f4a12479eaf9ce4277fea00adb8af47f33da44d8f7e2525a0afe6bec
+  metadata.gz: 7740cafb26fd31fb035751504d7b026f4c2af965d4a01e1b8ca9866d4e00acfbf5a49ad838ccc643a744a3ebb68fc2a8edc69cf2d6eee786339464ea2a8031fe
+  data.tar.gz: 24e35b324a658daf03a49e8d57a85d73079fed6c21c3089d8fa4d75be272657df553af1d8a9f05dc39ba9a846700d614df5248d8909eb492870449aa664e0f10

data/lib/carrierwave/storage/ftp.rb

@@ -77,7 +77,7 @@ module CarrierWave
         end
 
         def content_type
-          @content_type || file.content_type
+          @content_type || inferred_content_type
         end
 
         def content_type=(new_content_type)
@@ -94,6 +94,10 @@ module CarrierWave
 
         private
 
+        def inferred_content_type
+          SanitizedFile.new(path).content_type
+        end
+
         def connection
           if @uploader.ftp_tls
             ftp = ExFTPTLS.new

data/lib/carrierwave/storage/ftp/version.rb

@@ -1,7 +1,7 @@
 module Carrierwave
   module Storage
     class FTP
-      VERSION = "0.4.0"
+      VERSION = '0.4.1'.freeze
     end
   end
 end

data/lib/carrierwave/storage/sftp.rb

@@ -69,7 +69,7 @@ module CarrierWave
         end
 
         def content_type
-          @content_type || file.content_type
+          @content_type || inferred_content_type
         end
 
         def content_type=(new_content_type)
@@ -85,6 +85,10 @@ module CarrierWave
 
         private
 
+        def inferred_content_type
+          SanitizedFile.new(path).content_type
+        end
+
         def use_ssl?
           @uploader.sftp_url.start_with?('https')
         end

data/spec/ftp_file_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'carrierwave/storage/ftp'
+
+describe CarrierWave::Storage::FTP::File do
+  let(:uploader) do
+    Class.new(CarrierWave::Uploader::Base) do
+      storage :ftp
+    end.tap do |u|
+      allow(u).to receive(:store_path).and_return('uploads/test.jpg')
+    end
+  end
+
+  let(:base) { CarrierWave::Storage::FTP.new(uploader) }
+
+  let(:file) do
+    CarrierWave::Storage::FTP::File.new(uploader, base, uploader.store_path)
+  end
+
+  let(:mime_type) { double('mime_type') }
+
+  describe '#content_type' do
+    it 'delegates to base file by default' do
+      sanitized_file = CarrierWave::SanitizedFile.new(file)
+      expect(CarrierWave::SanitizedFile).to receive(:new).with(file.path).
+        and_return(sanitized_file)
+      expect(sanitized_file).to receive(:content_type).and_return(mime_type)
+
+      expect(file.content_type).to eq(mime_type)
+    end
+
+    it 'permits overriding the default value' do
+      file.content_type = mime_type
+
+      expect(file.content_type).to eq(mime_type)
+    end
+  end
+end

data/spec/ftp_spec.rb

@@ -140,8 +140,7 @@ describe CarrierWave::Storage::FTP do
     end
 
     it "returns the content_type of the file" do
-      @stored.should_receive(:file).and_return(Struct.new(:content_type).new('some/type'))
-      @stored.content_type.should == 'some/type'
+      @stored.content_type.should == 'image/jpeg'
     end
   end
 end

data/spec/sftp_file_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'carrierwave/storage/sftp'
+
+describe CarrierWave::Storage::SFTP::File do
+  let(:uploader) do
+    Class.new(CarrierWave::Uploader::Base) do
+      storage :sftp
+    end.tap do |u|
+      allow(u).to receive(:store_path).and_return('uploads/test.jpg')
+    end
+  end
+
+  let(:base) { CarrierWave::Storage::SFTP.new(uploader) }
+
+  let(:file) do
+    CarrierWave::Storage::SFTP::File.new(uploader, base, uploader.store_path)
+  end
+
+  let(:mime_type) { double('mime_type') }
+
+  describe '#content_type' do
+    it 'delegates to base file by default' do
+      sanitized_file = CarrierWave::SanitizedFile.new(file)
+      expect(CarrierWave::SanitizedFile).to receive(:new).with(file.path).
+        and_return(sanitized_file)
+      expect(sanitized_file).to receive(:content_type).and_return(mime_type)
+
+      expect(file.content_type).to eq(mime_type)
+    end
+
+    it 'permits overriding the default value' do
+      file.content_type = mime_type
+
+      expect(file.content_type).to eq(mime_type)
+    end
+  end
+end

data/spec/sftp_spec.rb

@@ -102,8 +102,7 @@ describe CarrierWave::Storage::SFTP do
     end
 
     it "returns the content_type of the file" do
-      @stored.should_receive(:file).and_return(Struct.new(:content_type).new('some/type'))
-      @stored.content_type.should == 'some/type'
+      @stored.content_type.should == 'image/jpeg'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-ftp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Luan Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -104,8 +104,10 @@ files:
 - lib/carrierwave/storage/ftp/ex_sftp.rb
 - lib/carrierwave/storage/ftp/version.rb
 - lib/carrierwave/storage/sftp.rb
+- spec/ftp_file_spec.rb
 - spec/ftp_spec.rb
 - spec/ftp_tls_spec.rb
+- spec/sftp_file_spec.rb
 - spec/sftp_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/luan/carrierwave-ftp
@@ -133,7 +135,9 @@ signing_key:
 specification_version: 4
 summary: FTP support for CarrierWave
 test_files:
+- spec/ftp_file_spec.rb
 - spec/ftp_spec.rb
 - spec/ftp_tls_spec.rb
+- spec/sftp_file_spec.rb
 - spec/sftp_spec.rb
 - spec/spec_helper.rb