carrierwave-webdav 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f980e67aeef264ba639bd4b7f5444284e11cb16e
-  data.tar.gz: db3baa02d5a18f70465aa9b54c74e53cf1dc8052
+  metadata.gz: 104e3949932f6d0d79ecc6e963ec20e22933ce97
+  data.tar.gz: 3ef2f1fb1586bf186c5a9c44e7e1721beae7bffa
 SHA512:
-  metadata.gz: 211100cf7ac9244b7c400c12f10d97ad13d8144d8934bdedf225d5269613934c710c498f67a0fa369c947ebdd7ec7335c48535ac504260e22f68ed8e60b8aa9b
-  data.tar.gz: d1a00fac73f81a9d7eb9450c3d96141e1ab495e50b343ae47db5f5ccaad1304b0f1c0b912a473ccd883373d9adc579c5f45fd73f0b1cf2597152c709b0c991fc
+  metadata.gz: 172a6e8b9adb899ecdb5fecaeb67e99518554ac49bab2e644b1f9266d8f1147f0a9c74e150f49511b4c096361756ed31d103de63ea42c5ce4aa56cabe378c491
+  data.tar.gz: 2099b07cfcbf6264bfb83e780ce874c6aace8ad37eff9692b8346eeefc0fe163678813b45e78b32df44da29ec0034f55a58b93d2ea50dd6a405e0177ffa590ff

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.2.2

data/lib/carrierwave/storage/webdav.rb

@@ -56,7 +56,7 @@ module CarrierWave
         end
 
         def read
-          res = HTTParty.get(url, options)
+          res = HTTParty.get(read_url, options)
           if res.code != 200
             raise CarrierWave::IntegrityError.new("Can't download a file: #{res.inspect}")
           end
@@ -64,7 +64,7 @@ module CarrierWave
         end
 
         def headers
-          res = HTTParty.head(url, options)
+          res = HTTParty.head(read_url, options)
           if res.code != 200
             raise CarrierWave::IntegrityError.new("Can't headers for a file: #{res.inspect}")
           end
@@ -100,7 +100,11 @@ module CarrierWave
         end
 
         def url
-          "#{server}/#{path}"
+          if host = uploader.asset_host
+            host.respond_to?(:call) ? host.call(self) : [host, path].join('/')
+          else
+            read_url
+          end
         end
 
         alias :content_length :length
@@ -109,8 +113,12 @@ module CarrierWave
 
       private
 
+        def read_url
+          "#{server}/#{path}"
+        end
+
         def write_url
-          @write_server ? "#{@write_server}/#{path}" : url
+          @write_server ? "#{@write_server}/#{path}" : read_url
         end
 
         def mkcol

data/lib/carrierwave/webdav/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module WebDAV
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

data/spec/lib/webdav_spec.rb

@@ -91,4 +91,33 @@ describe CarrierWave::Storage::WebDAV do
     expect(@file.read).to eq(webdav_file.read)
   end
 
+  describe 'File#url' do
+    let(:root) { Pathname.new(@file.path).dirname }
+    let(:path) { @uploader.path.sub(root.to_path, '') }
+
+    before do
+      CarrierWave.configure do |config|
+        config.asset_host = host
+        config.root = root
+      end
+    end
+
+    context 'when asset_host is set' do
+      let(:host) { 'http://asset.host' }
+
+      it 'path contains asset_host' do
+        @uploader.cache!(@file)
+        expect(@uploader.url).to eq [host, path].join
+      end
+    end
+
+    context 'when asset_host is not set' do
+      let(:host) { nil }
+
+      it 'path does not contain asset_host' do
+        @uploader.cache!(@file)
+        expect(@uploader.url).to eq path
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-webdav
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Qinix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2016-09-30 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.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: WebDAV support for CarrierWave
@@ -89,3 +89,4 @@ test_files:
 - spec/lib/webdav_spec.rb
 - spec/spec_helper.rb
 - spec/supports/helpers.rb
+has_rdoc: