carrierwave-ftp 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733b55dc035d784e453a4cc42e1cfe667a0edf78
-  data.tar.gz: bf5515e09b90e499f05123abfc62d224abcb3f62
+  metadata.gz: 31e43c5de34482d8a3d0680c836a41d01e3c3edd
+  data.tar.gz: e4a49a6eeacb8a8d38749f1f2ad1b9de8f556252
 SHA512:
-  metadata.gz: 6e01e2ca2f537aaacd0f70f228b2ba9b6646c60338d4d475e0665324e52d064676974bc59ae7d6919e79f0b45bacd068d6a701b5f499bd30883fe91e1f477de4
-  data.tar.gz: 68940a5d70b055a8842452319b3b66b3aaf69ec078e9d3c1f13917bc93ff135c67a17f430e90f0b6f3b707f5ad1a243de095eeb505dd0f39a6913d202c908034
+  metadata.gz: b66955f8546ea7335f70d41f659a82d9b8d683791089501295b72e0aaf7bf76c15c665d185c750be90b271c7d510ade975099cdd4f398fa731d4cc3a3bed978f
+  data.tar.gz: 6854601fb8f78cf6eba0aa73383079a5ab8d8a244f962c41ca138aa9b6bf608499c68abc858ab74a4ab027576c6b4c62120618bfb879e6326a5c5f1caf62ee97

data/.travis.yml

@@ -1,5 +1,25 @@
 language: ruby
+
+pre:
+ - gem update bundler
+
+cache: bundler
+
 rvm:
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+ - 2.0
+ - 2.1
+ - 2.2.3
+ - ruby-head
+ - jruby
+ - jruby-head
+
+env:
+  - JRUBY_OPTS="--2.0"
+
+sudo: false
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+  fast_finish: true

data/lib/carrierwave/storage/ftp.rb

@@ -40,7 +40,13 @@ module CarrierWave
         def to_file
           temp_file = Tempfile.new(filename)
           temp_file.binmode
-          temp_file.write file.body
+          connection do |ftp|
+            ftp.chdir(::File.dirname "#{@uploader.ftp_folder}/#{path}")
+            ftp.get(filename, nil) do |data|
+              temp_file.write(data)
+            end
+          end
+          temp_file.rewind
           temp_file
         end
 
@@ -60,7 +66,10 @@ module CarrierWave
         end
 
         def read
-          file.body
+          file = to_file
+          content = file.read
+          file.close
+          content
         end
 
         def content_type
@@ -81,16 +90,6 @@ module CarrierWave
 
         private
 
-        def file
-          require 'net/http'
-          url = URI.parse(self.url)
-          req = Net::HTTP::Get.new(url.path)
-          Net::HTTP.start(url.host, url.port) do |http|
-            http.request(req)
-          end
-        rescue
-        end
-
         def connection
           ftp = ExFTP.new
           ftp.connect(@uploader.ftp_host, @uploader.ftp_port)

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

@@ -1,7 +1,7 @@
 module Carrierwave
   module Storage
     class FTP
-      VERSION = "0.2.8"
+      VERSION = "0.3.0"
     end
   end
 end

data/lib/carrierwave/storage/sftp.rb

@@ -39,7 +39,10 @@ module CarrierWave
         def to_file
           temp_file = Tempfile.new(filename)
           temp_file.binmode
-          temp_file.write file.body
+          connection do |sftp|
+            sftp.download!(full_path, temp_file)
+          end
+          temp_file.rewind
           temp_file
         end
 
@@ -58,7 +61,10 @@ module CarrierWave
         end
 
         def read
-          file.body
+          file = to_file
+          content = file.read
+          file.close
+          content
         end
 
         def content_type
@@ -78,17 +84,12 @@ module CarrierWave
 
         private
 
-        def full_path
-          "#{@uploader.sftp_folder}/#{path}"
+        def use_ssl?
+          @uploader.sftp_url.start_with?('https')
         end
 
-        def file
-          require 'net/http'
-          url = URI.parse(self.url)
-          req = Net::HTTP::Get.new(url.path)
-          Net::HTTP.start(url.host, url.port) do |http|
-            http.request(req)
-          end
+        def full_path
+          "#{@uploader.sftp_folder}/#{path}"
         end
 
         def connection

data/spec/ftp_spec.rb

@@ -96,12 +96,14 @@ describe CarrierWave::Storage::FTP do
     end
 
     it "returns to_file" do
-      @stored.should_receive(:file).and_return(Struct.new(:body).new('some content'))
+      @ftp.should_receive(:chdir).with('~/public_html/uploads')
+      @ftp.should_receive(:get).with('test.jpg', nil).and_yield('some content')
       @stored.to_file.size.should == 'some content'.length
     end
 
     it "returns the content of the file" do
-      @stored.should_receive(:file).and_return(Struct.new(:body).new('some content'))
+      @ftp.should_receive(:chdir).with('~/public_html/uploads')
+      @ftp.should_receive(:get).with('test.jpg', nil).and_yield('some content')
       @stored.read.should == 'some content'
     end
 

data/spec/sftp_spec.rb

@@ -44,16 +44,16 @@ describe CarrierWave::Storage::SFTP do
 
   describe 'after upload' do
     before do
-      sftp = double(:sftp_connection)
-      Net::SFTP.stub(:start).and_return(sftp)
-      sftp.stub(:mkdir_p!)
-      sftp.stub(:upload!)
-      sftp.stub(:close_channel)
+      @sftp = double(:sftp_connection)
+      Net::SFTP.stub(:start).and_return(@sftp)
+      @sftp.stub(:mkdir_p!)
+      @sftp.stub(:upload!)
+      @sftp.stub(:close_channel)
       @stored = @storage.store!(@file)
     end
 
-    it "should use the calculated URL when retrieving a file" do
-      @stored.should_receive(:url).and_return('http://example.com/')
+    it "should use the ftp when retrieving a file" do
+      @sftp.should_receive(:download!).with(@stored.send(:full_path), kind_of(Tempfile))
       @stored.read
     end
 
@@ -92,13 +92,13 @@ describe CarrierWave::Storage::SFTP do
     end
 
     it "returns to_file" do
-      @stored.should_receive(:file).and_return(Struct.new(:body).new('some content'))
-      @stored.to_file.size.should == 'some content'.length
+      @sftp.should_receive(:download!).with(@stored.send(:full_path), kind_of(Tempfile))
+      @stored.to_file.size.should == 0
     end
 
     it "returns the content of the file" do
-      @stored.should_receive(:file).and_return(Struct.new(:body).new('some content'))
-      @stored.read.should == 'some content'
+      @sftp.should_receive(:download!).with(@stored.send(:full_path), kind_of(Tempfile))
+      @stored.read.should == ''
     end
 
     it "returns the content_type of the file" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-ftp
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Luan Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: carrierwave-ftp
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: FTP support for CarrierWave