yandex-disk 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c71e6ea1679231d1f83ea5afeb8a2eb379f65b18
-  data.tar.gz: 8f92f22ce3ec568e9c5746a71ceb5c3a5d797bdf
+  metadata.gz: 57ed5ceebc98623641748f8f16b410c8b66118c4
+  data.tar.gz: c832f15ada10ebdbb3c770138d34941a25c6e518
 SHA512:
-  metadata.gz: dacd55bae8a4d95c9d2bfd77309ae5bf80595567f4cb3cece204a4d67e4ff56b15991fbe02ddcf6245cfbe31c4bbadbda5f9b9d1bb2b2f53a3c49dce670dd6f2
-  data.tar.gz: fbcafcd34a7a00d709ad6661ea0061a5c2bda0be542f0989cc436a70ce815a9fb457f83c94513e1c4004ad4f9e6ba2b3b33bdf5f6c620aeced4a48b93c179c49
+  metadata.gz: f592e2c576488414f639f3985ece832deac747078e47f30987f562556027b9faa7e7094eeb55e3d9a0a287d68dc53a60ccc13cf17c2865a30b689fd479cae910
+  data.tar.gz: fc156a49408e7235bda13f34c566235df523acef5a6bbda78bcad32890c7a2c9d6bbd149e7941623c28d1edab4ff8283c66cd98930db2482bdec0d05c4aebaae

data/lib/yandex/disk/backup/storage.rb

@@ -25,7 +25,7 @@ module Backup
             src = File.join(Config.tmp_path, filename)
             dest = File.join(remote_path, filename)
             Logger.info "Storing '#{ dest }'..."
-            disk.put(src, dest)
+            disk.put!(src, dest)
           end
         end
 

data/lib/yandex/disk/client.rb

@@ -7,77 +7,112 @@ module Yandex
   module Disk
     class Client
 
-    def initialize options={}
-      @http = Faraday.new(:url => 'https://webdav.yandex.ru') do |builder|
-        builder.request :authorization, "OAuth", options[:access_token]
+      def initialize options={}
+        @http = Faraday.new(:url => 'https://webdav.yandex.ru') do |builder|
+          builder.request :authorization, "OAuth", options[:access_token]
 
-        builder.response :follow_redirects
+          builder.response :follow_redirects
 
-        if faraday_configurator = options[:faraday_configurator]
-          faraday_configurator.call(builder)
-        else
-          builder.adapter :excon
+          if faraday_configurator = options[:faraday_configurator]
+            faraday_configurator.call(builder)
+          else
+            builder.adapter :excon
+          end
         end
       end
-    end
 
-    def put src, dest
-      res = @http.put do |req|
-        req.url dest
-        req.headers['Content-Type'] = 'application/binary'
-        req.body = File.open(src)
+      def put src, dest
+        put_response(src, dest).success?
       end
-      res.success?
-    end
 
-    def mkcol path
-      request = @http.build_request('MKCOL') do |req|
-        req.url(path)
+      def put! src, dest
+        res = put_response(src, dest)
+        raise res.body unless res.success?
       end
 
-      env = request.to_env(@http)
-      res = @http.app.call(env)
-      res.success?
-    end
+      def mkcol path
+        mkcol_response(path).success?
+      end
 
-    alias_method :mkdir, :mkcol
+      def mkcol!
+        res = mkcol_response(path)
+        raise res.body unless res.success?
+      end
 
-    def mkdir_p path
-      path_parts = []
-      path.split('/').each do |part|
-        path_parts << part
-        mkdir(path_parts.join('/'))
+      def get path
+        @http.get(path)
       end
-    end
 
-    def get path
-      @http.get(path)
-    end
+      alias_method :mkdir, :mkcol
 
-    def copy src, dest
-      file_operation 'COPY', src, dest
-    end
+      def mkdir_p path
+        path_parts = []
+        path.split('/').each do |part|
+          path_parts << part
+          mkdir(path_parts.join('/'))
+        end
+      end
 
-    def move src, dest
-      file_operation 'MOVE', src, dest
-    end
+      def copy src, dest
+        file_operation_response('COPY', src, dest).success?
+      end
 
-    def delete path
-      @http.delete(path).success?
-    end
+      def copy! src, dest
+        res = file_operation_response('COPY', src, dest)
+        raise res.body unless res.success?
+      end
+
+      def move src, dest
+        file_operation_response('MOVE', src, dest).success?
+      end
 
-    private
+      def move! src, dest
+        res = file_operation_response('MOVE', src, dest)
+        raise res.body unless res.success?
+      end
 
-    def file_operation op, src, dest
-      request = @http.build_request(op) do |req|
-        req.url(path)
-        req.headers['Destination'] = dest
+      def delete path
+        delete_response(path).success?
       end
 
-      env = request.to_env(@http)
-      res = @http.app.call(env)
-      res.success?
+      def delete! path
+        res = delete_response(path)
+        raise res.body unless res.success?
+      end
+
+      private
+
+      def put_response src, dest
+        @http.put do |req|
+          req.url dest
+          req.headers['Content-Type'] = 'application/binary'
+          req.body = File.open(src)
+        end
+      end
+
+      def mkcol_response path
+        request = @http.build_request('MKCOL') do |req|
+          req.url(path)
+        end
+
+        env = request.to_env(@http)
+        @http.app.call(env)
+      end
+
+      def file_operation_response op, src, dest
+        request = @http.build_request(op) do |req|
+          req.url(path)
+          req.headers['Destination'] = dest
+        end
+
+        env = request.to_env(@http)
+        res = @http.app.call(env)
+        res.success?
+      end
+
+      def delete_response path
+        @http.delete(path)
+      end
     end
   end
-  end
 end

data/lib/yandex/disk/version.rb

@@ -2,6 +2,6 @@
 
 module Yandex
   module Disk
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/yandex_dist_test.rb

@@ -17,6 +17,17 @@ class YandexDiskTest < MiniTest::Unit::TestCase
     assert_equal File.read('README.md'), remote.body
   end
 
+  def test_put!
+    assert_raises RuntimeError do
+      begin
+        @disk.put!('README.md', '/folder/that/doesnt/exists/README.md')
+      rescue RuntimeError => e
+        assert_equal 'store: parent folder was not found', e.message
+        raise e
+      end
+    end
+  end
+
   def test_delete_and_mkdir
     @disk.delete('/a')
     assert !@disk.mkdir('/a/b')
@@ -25,6 +36,18 @@ class YandexDiskTest < MiniTest::Unit::TestCase
     assert @disk.delete('/a')
   end
 
+  def test_delete!
+    @disk.delete('/a')
+    assert_raises RuntimeError do
+      begin
+        @disk.delete!('/a')
+      rescue RuntimeError => e
+        assert_equal 'resource not found', e.message
+        raise e
+      end
+    end
+  end
+
   def test_put_in_nested_folder
     assert !@disk.put('README.md', '/new_folder/README.md')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex-disk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yury Korolev