carrierwave-webdav 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fbbacc8489704bb68e0c181f4819f5e835b9df21
-  data.tar.gz: f170dd3e53ecd19028177d6b64b800fbd70c55a1
+SHA256:
+  metadata.gz: 27f93efb8393806ab738e97c7be04ef421f0c1fbeaaaa2477ad3ddf6dc2b1115
+  data.tar.gz: 89b9a7419294f1c00a7914dab5bfcf31b04df4dbe56b0f29d80462219af595f5
 SHA512:
-  metadata.gz: b63df00595ec605460c02e9c34b6e7535d587afee7f80c7876ae0fdcd8236c2e20fe4125d7f061a82246fbf775f032b9e5ee27fcece8969683c771f2d3d93fe9
-  data.tar.gz: 38332a2224a0f1707dd12c3456aafa3cdb8c7e5808c13afbb05761e0b80a2b37da8ab4006d88b29f375c60bcd16b8cd43705f10e205177661f69eb003dcdb526
+  metadata.gz: c4bf66881ba5352d4badb60e2b6ff2a8a66fd1dc014edcfb42bdf0a3ca1db73867c0e93ad89440716c2853de2a241f0c4818778d856fffe932a58e1b053d49c6
+  data.tar.gz: f812070f628a7673683ffa82f1323d8bcb38fcbe7c70e78279a378222f4f2dc70a01b75f1ce33294293ca74303cb6cb9c14ab2f78c98ebeb6f241865e278c633

data/README.md

@@ -1,6 +1,7 @@
 # CarrierWave for WebDAV
 
 [![Build Status](https://travis-ci.org/qinix/carrierwave-webdav.png?branch=master)](https://travis-ci.org/qinix/carrierwave-webdav)
+[![Coverage Status](https://coveralls.io/repos/github/qinix/carrierwave-webdav/badge.svg?branch=master)](https://coveralls.io/github/qinix/carrierwave-webdav?branch=master)
 
 This gem adds support for WebDAV to
 [CarrierWave](https://github.com/carrierwaveuploader/carrierwave/)
@@ -57,4 +58,3 @@ them yourself. In Rails for example, you could use the `send_data` method.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-

data/lib/carrierwave/httparty_monkey.rb

@@ -8,6 +8,7 @@ module HTTParty
 
   class Request
     SupportedHTTPMethods << Net::HTTP::Mkcol
+    SupportedHTTPMethods << Net::HTTP::Propfind
   end
 
   module ClassMethods
@@ -15,6 +16,11 @@ module HTTParty
     def mkcol(path, options = {}, &block)
       perform_request Net::HTTP::Mkcol, path, options, &block
     end
+
+    # Perform a PROPFIND request to a path
+    def propfind(path, options = {}, &block)
+      perform_request Net::HTTP::Propfind, path, options, &block
+    end
   end
 
   class Basement
@@ -24,5 +30,8 @@ module HTTParty
   def self.mkcol(*args, &block)
     Basement.mkcol(*args, &block)
   end
-end # HTTParty
 
+  def self.propfind(*args, &block)
+    Basement.propfind(*args, &block)
+  end
+end # HTTParty

data/lib/carrierwave/storage/webdav.rb

@@ -16,7 +16,7 @@ module CarrierWave
       #
       def cache!(file)
         cached = build_webdav_file(uploader.cache_path)
-        cached.write(file.read)
+        cached.write(file)
         cached
       end
 
@@ -65,7 +65,7 @@ module CarrierWave
       #
       def store!(file)
         stored = build_webdav_file(uploader.store_path)
-        stored.write(file.read)
+        stored.write(file)
         stored
       end
 

data/lib/carrierwave/webdav/file.rb

@@ -42,7 +42,16 @@ module CarrierWave
           res = mkcol
         end
 
-        res = HTTParty.put(write_url, options.merge({ body: file }))
+        ::File.open(file.file, 'rb') do |io|
+          res = HTTParty.put(write_url, options.merge({
+            body_stream: io,
+            headers: {
+              'Transfer-Encoding' => 'chunked',
+              'Content-Type' => file.content_type
+            }
+          }))
+        end
+
         if res.code != 201 and res.code != 204
           raise CarrierWave::IntegrityError.new("Can't put a new file: #{res.inspect}")
         end
@@ -50,7 +59,7 @@ module CarrierWave
       end
 
       def length
-        read.bytesize
+        headers.content_length
       end
 
       def content_type
@@ -99,6 +108,9 @@ module CarrierWave
         end # Make path like a/b/c/t.txt to array ['/a', '/a/b', '/a/b/c']
         use_server = @write_server ? @write_server : server
         dirs.each do |dir|
+          # skip if dir already exists
+          next if HTTParty.propfind("#{use_server}#{dir}", options).code == 207
+
           res = HTTParty.mkcol("#{use_server}#{dir}", options)
           unless [200, 201, 207, 409].include? res.code
             raise CarrierWave::IntegrityError.new("Can't create a new collection: #{res.inspect}")

data/lib/carrierwave/webdav/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module WebDAV
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/spec/lib/webdav_storage_spec.rb

@@ -18,6 +18,7 @@ describe CarrierWave::Storage::WebDAV do
 
     @storage = CarrierWave::Storage::WebDAV.new(@uploader)
     @file = CarrierWave::SanitizedFile.new(file_path('test.txt'))
+    @file.content_type = 'text/plain'
 
     # NOTE: specs fail with this options
     #
@@ -31,16 +32,16 @@ describe CarrierWave::Storage::WebDAV do
   describe '#cache!' do
     it 'should cache from WebDAV' do
       stub_mkcol @cache_uri
-      stub_put @cache_uri
+      stub_put(@cache_uri, @file.path)
       webdav_file = @storage.cache!(@file)
-      stub_get @cache_uri
+      stub_get(@cache_uri, @file.path)
       expect(@file.read).to eq(webdav_file.read)
     end
   end
 
   describe '#retrieve_from_cache!' do
     it 'should retreive a cache file from WebDAV' do
-      stub_get @cache_uri
+      stub_get(@cache_uri, @file.path)
       webdav_file = @storage.retrieve_from_cache!('tmp_test.txt')
       expect(@file.read).to eq(webdav_file.read)
     end
@@ -56,17 +57,17 @@ describe CarrierWave::Storage::WebDAV do
 
   it 'should store from WebDAV' do
     stub_mkcol @uri
-    stub_put @uri
+    stub_put(@uri, @file.path)
     webdav_file = @storage.store!(@file)
-    stub_get @uri
+    stub_get(@uri, @file.path)
     expect(@file.read).to eq(webdav_file.read)
   end
 
   it 'should retrieve a file from WebDAV' do
     stub_mkcol @uri
-    stub_put @uri
+    stub_put(@uri, @file.path)
     webdav_file = @storage.store!(@file)
-    stub_get @uri
+    stub_get(@uri, @file.path)
     retrieved_file = @storage.retrieve!(webdav_file)
     expect(@file.read).to eq(retrieved_file.read)
     expect(File.basename(@file.path)).to eq(File.basename(retrieved_file.path))
@@ -74,7 +75,7 @@ describe CarrierWave::Storage::WebDAV do
 
   it 'should delete a file from WebDAV' do
     stub_mkcol @uri
-    stub_put @uri
+    stub_put(@uri, @file.path)
     webdav_file = @storage.store!(@file)
     stub_delete @uri
     expect(Net::HTTPOK).to eq(webdav_file.delete.response.class)
@@ -82,23 +83,23 @@ describe CarrierWave::Storage::WebDAV do
 
   it 'should size equal' do
     stub_mkcol @uri
-    stub_put @uri
+    stub_put(@uri, @file.path)
     webdav_file = @storage.store!(@file)
-    stub_get @uri
+    stub_head(@uri, @file.path)
     expect(@file.size).to eq(webdav_file.size)
   end
 
   it 'assigns file content type to attribute' do
     stub_mkcol @uri
-    stub_put @uri
+    stub_put(@uri, @file.path)
     webdav_file = @storage.store!(@file)
-    stub_head @uri
+    stub_head(@uri, @file.path)
     expect(@file.content_type).to eq(webdav_file.content_type)
   end
 
   it 'should url equal' do
     stub_mkcol @uri
-    stub_put @uri
+    stub_put(@uri, @file.path)
     webdav_file = @storage.store!(@file)
     expect("#{@uploader.webdav_server}/#{@uploader.store_path}").to eq(webdav_file.url)
   end
@@ -125,10 +126,10 @@ describe CarrierWave::Storage::WebDAV do
       # secure_uri.password = @uploader.webdav_password
 
       stub_mkcol secure_uri
-      stub_put secure_uri
+      stub_put(secure_uri, @file.path)
       webdav_file = @storage.store!(@file)
 
-      stub_get @uri
+      stub_get(@uri, @file.path)
       expect(@file.read).to eq(webdav_file.read)
     end
   end

data/spec/supports/helpers.rb

@@ -1,22 +1,39 @@
+require 'mime/types'
+
 module Helpers
 
   def file_path( *paths )
     File.expand_path(File.join(File.dirname(__FILE__), '../fixtures', *paths))
   end
 
-  def stub_get(url)
+  def mime_type(path)
+    ::MIME::Types.type_for(path).first.to_s
+  end
+
+  def file_response(path)
+    {
+      :status => 200,
+      :body => File.read(path),
+      :headers => {
+        'Content-Type' => mime_type(path),
+        'Content-Length' => File.size(path).to_s
+      }
+    }
+  end
+
+  def stub_get(url, path)
     stub_request(:get, url.to_s).
-        to_return(:status => 200, :body => 'Hello, this is test data.', :headers => {})
+        to_return(file_response(path))
   end
 
-  def stub_head(url)
+  def stub_head(url, path)
     stub_request(:head, url.to_s).
-        to_return(:status => 200, :body => '', :headers => {'Content-type' => 'text/plain'})
+        to_return(file_response(path))
   end
 
-  def stub_put(url)
+  def stub_put(url, path)
     stub_request(:put, url.to_s).
-        with(:body => 'Hello, this is test data.').
+        with(:body => File.read(path)).
         to_return(:status => 201, :body => '', :headers => {})
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-webdav
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Qinix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -82,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: WebDAV support for CarrierWave