shrine-webdav 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd2b1d205b1bf8156e9e2012af459a4006ca6b3c
-  data.tar.gz: e933550a6bf5b00dd2913f2c6452a9b07c36b53a
+  metadata.gz: f33b8bdebb3c93cadde0cf85989b55f7bceeb44e
+  data.tar.gz: 7676d1394a2038d41a04eaf6508081335038e410
 SHA512:
-  metadata.gz: c3ecbce7d30601bab187544f8654be9cb7599a80ae9f1e7bac60d79035b34359e2a001df306686c30ce070490b4f6972b6b1209f7d97f164ff3c683157a1533a
-  data.tar.gz: 516e0c8ebeba3067e1e0b5903e76512d19dee824f8ab97e640a5a4181c2e90c27da32c8ae19a3fcf1ece159e3a9e92ab23a7ed4b72897eeffd5ff213b9b72430
+  metadata.gz: 2cf2c1e6c2839389c2f19cecde93a2bbd5e8ebca58ef6f69fae5e7ca0e532aec0b676791b0c22867ed1fa63e24b4dcdbc3bb901d76405f7b4dfb6d9d838e93f9
+  data.tar.gz: 9a3009956f3d585824764dad2681095989967349665b1a2ab4b443d0ad380927b1d559992cb3ac262fc8110674a4d58904d11e528b9ee6768c15caea1e3bb893

data/lib/shrine/storage/webdav.rb

@@ -7,15 +7,16 @@ class Shrine
     class WebDAV
       def initialize(host:, prefix: nil)
         @host = host
-        mkpath(prefix) unless prefix.nil? || prefix.empty?
-        @host = path(host, prefix)
+        @prefix = prefix
+        @prefixed_host = path(@host, @prefix)
       end
 
       def upload(io, id, shrine_metadata: {}, **upload_options)
         mkpath_to_file(id)
-        response = HTTP.put(path(@host, id), body: io.read)
+        uri = path(@prefixed_host, id)
+        response = HTTP.put(uri, body: io.read)
         return if (200..299).cover?(response.code.to_i)
-        raise Error, "uploading of #{path(@host, id)} failed, the server response was #{response}"
+        raise Error, "uploading of #{uri} failed, the server response was #{response}"
       end
 
       def url(id, **options)
@@ -23,41 +24,46 @@ class Shrine
       end
 
       def open(id)
-        Down::Http.open(path(@host, id))
+        Down::Http.open(path(@prefixed_host, id))
       end
 
       def exists?(id)
-        response = HTTP.head(path(@host, id))
+        response = HTTP.head(path(@prefixed_host, id))
         (200..299).cover?(response.code.to_i)
       end
 
       def delete(id)
-        HTTP.delete(path(@host, id))
+        HTTP.delete(path(@prefixed_host, id))
       end
 
       private
 
       def path(host, uri)
-        [host, uri].compact.join('/')
+        (uri.nil? || uri.empty?) ? host : [host, uri].compact.join('/')
       end
 
       def mkpath_to_file(path_to_file)
+        @prefix_created ||= create_prefix
         last_slash = path_to_file.rindex('/')
         if last_slash
           path = path_to_file[0..last_slash]
-          mkpath(path)
+          mkpath(@prefixed_host, path)
         end
       end
 
-      def mkpath(path)
+      def create_prefix
+        mkpath(@host, @prefix) unless @prefix.nil? || @prefix.empty?
+      end
+
+      def mkpath(host, path)
         dirs = []
         path.split('/').each do |dir|
           dirs << "#{dirs[-1]}/#{dir}"
         end
         dirs.each do |dir|
-          response = HTTP.request(:mkcol, "#{@host}#{dir}")
+          response = HTTP.request(:mkcol, "#{host}#{dir}")
           unless (200..301).cover?(response.code.to_i)
-            raise Error, "creation of directory #{@host}#{dir} failed, the server response was #{response}"
+            raise Error, "creation of directory #{host}#{dir} failed, the server response was #{response}"
           end
         end
       end

data/shrine-webdav.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'shrine-webdav'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['Ivan Kushmantsev']
   spec.email         = ['i.kushmantsev@fun-box.ru']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shrine-webdav
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ivan Kushmantsev