carrierwave-ftp 0.2.0 → 0.2.1

data/README.md

@@ -14,7 +14,7 @@ Require it in your code:
 
 Or, in Rails you can add it to your Gemfile:
 
-    gem 'carrierwave-ftp', :require => 'carrierwave/storage/all' # both FTP/SFTP
+    gem 'carrierwave-ftp', :require => 'carrierwave/storage/ftp/all' # both FTP/SFTP
     gem 'carrierwave-ftp', :require => 'carrierwave/storage/ftp' # FTP only
     gem 'carrierwave-ftp', :require => 'carrierwave/storage/sftp' # SFTP only
 

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

@@ -1,7 +1,7 @@
 module Carrierwave
   module Storage
     class FTP
-      VERSION = "0.2.0"
+      VERSION = "0.2.1"
     end
   end
 end

data/lib/carrierwave/storage/ftp.rb

@@ -53,7 +53,15 @@ module CarrierWave
         end
 
         def read
-          http_get_body(url)
+          file.body
+        end
+
+        def content_type
+          @content_type || file.content_type
+        end
+
+        def content_type=(new_content_type)
+          @content_type = new_content_type
         end
 
         def delete
@@ -65,15 +73,13 @@ module CarrierWave
 
         private
 
-        def http_get_body(url)
+        def file
           require 'net/http'
           url = URI.parse(url)
           req = Net::HTTP::Get.new(url.path)
-          res = Net::HTTP.start(url.host, url.port) do |http|
+          Net::HTTP.start(url.host, url.port) do |http|
             http.request(req)
           end
-
-          res.body
         end
 
         def connection

data/lib/carrierwave/storage/sftp.rb

@@ -51,7 +51,15 @@ module CarrierWave
         end
 
         def read
-          http_get_body(url)
+          file.body
+        end
+
+        def content_type
+          @content_type || file.content_type
+        end
+
+        def content_type=(new_content_type)
+          @content_type = new_content_type
         end
 
         def delete
@@ -66,15 +74,13 @@ module CarrierWave
           "#{@uploader.sftp_folder}/#{path}"
         end
 
-        def http_get_body(url)
+        def file
           require 'net/http'
           url = URI.parse(url)
           req = Net::HTTP::Get.new(url.path)
-          res = Net::HTTP.start(url.host, url.port) do |http|
+          Net::HTTP.start(url.host, url.port) do |http|
             http.request(req)
           end
-
-          res.body
         end
 
         def connection

data/spec/ftp_spec.rb

@@ -90,8 +90,13 @@ describe CarrierWave::Storage::FTP do
     end
 
     it "returns the content of the file" do
-      @stored.should_receive(:http_get_body).with(@stored.url).and_return('some content')
+      @stored.should_receive(:file).and_return(Struct.new(:body).new('some content'))
       @stored.read.should == 'some content'
     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'
+    end
   end
 end

data/spec/sftp_spec.rb

@@ -88,8 +88,13 @@ describe CarrierWave::Storage::SFTP do
     end
 
     it "returns the content of the file" do
-      @stored.should_receive(:http_get_body).with(@stored.url).and_return('some content')
+      @stored.should_receive(:file).and_return(Struct.new(:body).new('some content'))
       @stored.read.should == 'some content'
     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'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-ftp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 290347820507570724
+      hash: 2900138492913729311
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 290347820507570724
+      hash: 2900138492913729311
 requirements: []
 rubyforge_project: carrierwave-ftp
 rubygems_version: 1.8.23