carrierwave-webdav 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730556ae8749e7612051df3d9a58507587c27ecf
-  data.tar.gz: 5af49b859816d545b742baed6b27db795957a0ec
+  metadata.gz: 7afa6a736d2e4a796bd8de0c8189e5fa85c83686
+  data.tar.gz: a592e5bb352ff48b83979192106f39e936d0feb6
 SHA512:
-  metadata.gz: a364a9e0dde34f08fc9604d78c08d8a5df4af3d29488628c8dd9aead7f0ebca19de1b70c21f5b04d8a2b490bd46852836e17640f348dd97f711fefa3d91855e7
-  data.tar.gz: f240e83ed8de34d96a605edac86b7a6ab1d46855b34f41da85f4d1f0cda379e7f468534bccc3c8ff3338e104d1e898858def31990d9ff889e9cb7dc3698510c5
+  metadata.gz: 313de2c855d2893543a952579f9410c217cb5a263199653ec31b091c80574502488819c8a06d3183c77ede0e3b952111ee43ee7f03e354265415644353e2e88b
+  data.tar.gz: 61da6ba39dfaff6fede3d1820ed7cb74e938820c25ca68a4e1aeb400ff6fa750cf0313734a411414b3a15980b589c706c9ab1bf620191e7622948746f5c4d19c

data/README.md

@@ -1,7 +1,7 @@
 # CarrierWave for WebDAV
 
 This gem adds support for WebDAV to
-[CarrierWave](https://github.com/jnicklas/carrierwave/)
+[CarrierWave](https://github.com/carrierwaveuploader/carrierwave/)
 
 ## Installation
 
@@ -20,7 +20,7 @@ Or, in Rails you can add it to your Gemfile:
 ## Getting Started
 
 Follow the "Getting Started" directions in the main
-[Carrierwave repository](https://raw.github.com/jnicklas/carrierwave/).
+[Carrierwave repository](https://github.com/carrierwaveuploader/carrierwave/).
 
 ## Using WebDAV store
 
@@ -30,6 +30,7 @@ In Rails, add WebDAV settings to `config/initializers/carrierwave.rb`
 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_username = 'your webdav username'
   config.webdav_password = 'your webdav password'
 end

data/lib/carrierwave/storage/webdav.rb

@@ -46,13 +46,12 @@ module CarrierWave
           @uploader = uploader
           @server = uploader.webdav_server
           @server.sub! /\/$/, ''
+          @write_server = uploader.webdav_write_server
+          @write_server.sub!(/\/$/, '') if @write_server
           @username = uploader.webdav_username
           @password = uploader.webdav_password || ''
-          if @username
-            @options = { basic_auth: { username: @username, password: @password }}
-          else
-            @options = {}
-          end
+          @options = {}
+          @options = { basic_auth: { username: @username, password: @password } } if @username
         end
 
         def read
@@ -61,7 +60,7 @@ module CarrierWave
 
         def write(file)
           mkcol
-          HTTParty.put(url, options.merge({ body: file }))
+          HTTParty.put(write_url, options.merge({ body: file }))
         end
 
         def length
@@ -69,7 +68,7 @@ module CarrierWave
         end
 
         def delete
-          HTTParty.delete(url, options)
+          HTTParty.delete(write_url, options)
         end
 
         def url
@@ -82,13 +81,18 @@ module CarrierWave
 
       private
 
+        def write_url
+          @write_server ? "#{@write_server}/#{path}" : url
+        end
+
         def mkcol
           dirs = []
           path.split('/')[0...-1].each do |dir|
             dirs << "#{dirs[-1]}/#{dir}"
           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("#{server}#{dir}", options)
+            HTTParty.mkcol("#{use_server}#{dir}", options)
           end # Make collections recursively
         end
       end # File

data/lib/carrierwave/webdav/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module WebDAV
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/carrierwave/webdav.rb

@@ -7,6 +7,7 @@ class CarrierWave::Uploader::Base
   add_config :webdav_username
   add_config :webdav_password
   add_config :webdav_server
+  add_config :webdav_write_server
 
   configure do |config|
     config.storage_engines[:webdav] = 'CarrierWave::Storage::WebDAV'

data/spec/lib/webdav_spec.rb

@@ -22,37 +22,65 @@ describe CarrierWave::Storage::WebDAV do
     @uri.user = @uploader.webdav_username
     @uri.password = @uploader.webdav_password
     @uri.merge! @uploader.store_path
-
-    stub_mkcol @uri
-    stub_put @uri
-
-    @webdav_file = @storage.store!(@file)
   end
 
   it 'should store from WebDAV' do
+    stub_mkcol @uri
+    stub_put @uri
+    webdav_file = @storage.store!(@file)
     stub_get @uri
-    expect(@file.read).to eq(@webdav_file.read)
+    expect(@file.read).to eq(webdav_file.read)
   end
 
   it 'should retrieve a file from WebDAV' do
+    stub_mkcol @uri
+    stub_put @uri
+    webdav_file = @storage.store!(@file)
     stub_get @uri
-    retrieved_file = @storage.retrieve!(@webdav_file)
+    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))
   end
 
   it 'should delete a file from WebDAV' do
+    stub_mkcol @uri
+    stub_put @uri
+    webdav_file = @storage.store!(@file)
     stub_delete @uri
-    expect(Net::HTTPOK).to eq(@webdav_file.delete.response.class)
+    expect(Net::HTTPOK).to eq(webdav_file.delete.response.class)
   end
 
   it 'should size equal' do
+    stub_mkcol @uri
+    stub_put @uri
+    webdav_file = @storage.store!(@file)
     stub_get @uri
-    expect(@file.size).to eq(@webdav_file.size)
+    expect(@file.size).to eq(webdav_file.size)
   end
 
   it 'should url equal' do
-    expect("#{@uploader.webdav_server}/#{@uploader.store_path}").to eq(@webdav_file.url)
+    stub_mkcol @uri
+    stub_put @uri
+    webdav_file = @storage.store!(@file)
+    expect("#{@uploader.webdav_server}/#{@uploader.store_path}").to eq(webdav_file.url)
+  end
+
+  it 'should save through secure server' do
+    CarrierWave.configure do |config|
+      config.webdav_write_server = 'https://secure.your.webdavserver.com/dav/'
+    end
+
+    secure_uri = URI(@uploader.webdav_write_server)
+    secure_uri.user = @uploader.webdav_username
+    secure_uri.password = @uploader.webdav_password
+    secure_uri.merge! @uploader.store_path
+
+    stub_mkcol secure_uri
+    stub_put secure_uri
+    webdav_file = @storage.store!(@file)
+
+    stub_get @uri
+    expect(@file.read).to eq(webdav_file.read)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-webdav
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Qinix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: WebDAV support for CarrierWave