carrierwave-webdav 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6aca97a12e750142521b99fe361241d9e721dd9
-  data.tar.gz: b07d7718171c193ddbabe0a80844d7a6ef2e23f1
+  metadata.gz: f796cdb81a5978a2a642c3717a5e6a4816c09ebd
+  data.tar.gz: 12bebb033dbc078ce8b28847b3a77c1463e3489f
 SHA512:
-  metadata.gz: e4d409491c6be24f43677b822e0ff5a8fd511ce80426ce680e1b771263110e79f498539d3902323de6b6a1807b4e3f97014a5ceda9b5269a0d98c5809bced399
-  data.tar.gz: 12f24a977ba7210d6b42e6803cbf038afefb1117e9d82522479e70391854b14dc076323c37847a6afa6f42930dc588ce50a93ffa2ceb70e70fac4b18c661827c
+  metadata.gz: f6b9e900ce9e8ee85239e690c016e609c3000b43d376b34f7bab3399de42135ae114ef3c8f48d464b1e76657add2978305b9ff4b74538589012522e6190e0afb
+  data.tar.gz: c8b4513c4a1a4f6a67933577db38ddd0318333a1379b7c901e4d1f2c41407b339b97f97fecedf38f5709950f35f7daa7a5af6449882191b6be717054eedb2565

data/README.md

@@ -33,6 +33,7 @@ CarrierWave.configure do |config|
   config.storage = :webdav
   config.webdav_server = 'https://your.webdav_server.com/dav' # Your WebDAV url.
   # config.webdav_write_server = 'https://secure.your.webdavserver.com/dav/' # This is an optional attribute. It can save on one server and read from another server. (Contributed by @eychu. Thanks)
+  # config.webdav_autocreates_dirs = true # if automatic directory creation is enabled on the server (disables explicit directory creation)
   config.webdav_username = 'your webdav username'
   config.webdav_password = 'your webdav password'
 end

data/lib/carrierwave/storage/webdav.rb

@@ -52,19 +52,35 @@ module CarrierWave
           @password = uploader.webdav_password || ''
           @options = {}
           @options = { basic_auth: { username: @username, password: @password } } if @username
+          @create_dirs = !uploader.webdav_autocreates_dirs
         end
 
         def read
-          HTTParty.get(url, options).body
+          res = HTTParty.get(url, options)
+          if res.code != 200
+            raise CarrierWave::IntegrityError.new("Can't download a file: #{res.inspect}")
+          end
+          res.body
         end
 
         def headers
-          HTTParty.get(url, options).headers
+          res = HTTParty.head(url, options)
+          if res.code != 200
+            raise CarrierWave::IntegrityError.new("Can't headers for a file: #{res.inspect}")
+          end
+          res.headers
         end
 
         def write(file)
-          mkcol
-          HTTParty.put(write_url, options.merge({ body: file }))
+          if @create_dirs
+            res = mkcol
+          end
+
+          res = HTTParty.put(write_url, options.merge({ body: file }))
+          if res.code != 201 and res.code != 204
+            raise CarrierWave::IntegrityError.new("Can't put a new file: #{res.inspect}")
+          end
+          res
         end
 
         def length
@@ -76,7 +92,11 @@ module CarrierWave
         end
 
         def delete
-          HTTParty.delete(write_url, options)
+          res = HTTParty.delete(write_url, options)
+          if res.code != 200 and res.code != 404
+            raise CarrierWave::IntegrityError.new("Can't delete a file: #{res.inspect}")
+          end
+          res
         end
 
         def url
@@ -100,7 +120,10 @@ 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|
-            HTTParty.mkcol("#{use_server}#{dir}", options)
+            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}")
+            end
           end # Make collections recursively
         end
       end # File

data/lib/carrierwave/webdav.rb

@@ -8,9 +8,9 @@ class CarrierWave::Uploader::Base
   add_config :webdav_password
   add_config :webdav_server
   add_config :webdav_write_server
+  add_config :webdav_autocreates_dirs
 
   configure do |config|
     config.storage_engines[:webdav] = 'CarrierWave::Storage::WebDAV'
   end
 end
-

data/lib/carrierwave/webdav/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module WebDAV
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/spec/lib/webdav_spec.rb

@@ -13,7 +13,7 @@ describe CarrierWave::Storage::WebDAV do
     end
 
     @uploader = CarrierWave::Uploader::Base.new
-    @uploader.stub! store_path: 'uploads/test.txt'
+    @uploader.stub store_path: 'uploads/test.txt'
 
     @storage = CarrierWave::Storage::WebDAV.new(@uploader)
     @file = CarrierWave::SanitizedFile.new(file_path('test.txt'))
@@ -62,7 +62,7 @@ describe CarrierWave::Storage::WebDAV do
     stub_mkcol @uri
     stub_put @uri
     webdav_file = @storage.store!(@file)
-    stub_get @uri
+    stub_head @uri
     expect(@file.content_type).to eq(webdav_file.content_type)
   end
 
@@ -91,4 +91,4 @@ describe CarrierWave::Storage::WebDAV do
     expect(@file.read).to eq(webdav_file.read)
   end
 
-end
+end

data/spec/supports/helpers.rb

@@ -9,10 +9,15 @@ module Helpers
         to_return(:status => 200, :body => 'Hello, this is test data.', :headers => {})
   end
 
+  def stub_head(url)
+    stub_request(:head, url.to_s).
+        to_return(:status => 200, :body => '', :headers => {'Content-type' => 'text/plain'})
+  end
+
   def stub_put(url)
     stub_request(:put, url.to_s).
         with(:body => 'Hello, this is test data.').
-        to_return(:status => 200, :body => '', :headers => {})
+        to_return(:status => 201, :body => '', :headers => {})
   end
 
   def stub_mkcol(url)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-webdav
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Qinix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: WebDAV support for CarrierWave
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -70,17 +70,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: WebDAV support for CarrierWave