yandex_disk 1.0.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDJiNmU3ZWM2ZWUwMzVmMzU0NmJmMTBkMzczZjU4NmY1ODk1OGNiYg==
+    YzJiNjlmZTg4ODAxNDRhM2RkNzE0NDMwNDgxNDgwMzRjZGU3N2EwOQ==
   data.tar.gz: !binary |-
-    NjE3MjRiM2Y0YzAxNmE2ZGFmNmM0ZGQwZGNhZWRlMTFlMTdhNGJkZA==
+    NDM5NjVmNmY3N2Q2NjhiMTllNTE4NDFjZjQxNjM2ZWJjMzk5YTc4Yg==
 SHA512:
   metadata.gz: !binary |-
-    OTgyMzRkZDUwYmFlNjMyYzU3ZDIwZmViNWVhZGQ4MzkwNGQ5NDhlNmI5OGY3
-    ZTM1MzRhMzA0YjMxMDJiMjU3MjA1YmJkYTdhMDBmYWQ5NWI2YzBjNGVhMTc2
-    ZDA5NjcyZWRhYjdlODUxMzliYzZjNzdiZDE3YjczYTVjZmNmNWE=
+    YWVhZGNkZTg5MmUyMmI0MWNlZmJhZmFlMDY5NjdlYWY3MzYyNDdlMmY5ZDUy
+    ZWEyOWY0ZWQyY2UzZTRmOGI2MTA5OWFiMzA5YzYxMzJjNTdkOTk5M2M5ZTRj
+    Yjc5NDliYTVmMWNiYTlkMDJjZDU2YjU0ODQ0OGEwZDcwOTY4MWU=
   data.tar.gz: !binary |-
-    YTg0OTZjMTU1OTBjMDJhYTcwOTNhYWYyMjI0ZWY1ZDliZTBlYjVkMmZkNjFk
-    YjA3Mzk2NWMyZDM2NTM4ZTc3YTNlOWUxNmU3YjRiZTMxOGI2ODkyMzEyOWVl
-    MzkyMjA4NjQxMjJmMTk5M2E0M2Y1Yzk5N2ZjYTU2NjhhOGM4NDU=
+    OGU1YTAyZGRkM2MwYWQyY2Q5NzBiYjkxZjE1NWY2YTYwMjU5ZTdjMDA2ODgx
+    OGNiMWQ4MGI1YTVkMDJlYjA0ZTZhOTQ4YjJlODA5ZjY2MGJjN2FjOTU5MmFj
+    YzQyZGEwMWJjNDNiMzYwMDkwYzY4NTgzM2VkODZkYWUyNDc1ZWU=

data/lib/yandex_disk/api.rb

@@ -17,7 +17,6 @@ module YandexDisk
       @token = 'Basic ' + Base64.encode64("#{login}:#{pwd}")
     end
 
-    # TODO gzip file when sending
     # Example:
     #   yd.upload('/home/graph.pdf', 'my/work')
     #   => true
@@ -33,10 +32,9 @@ module YandexDisk
       raise RequestError, "File not found." if file.nil? || !File.file?(file)
       # create path
       create_path(path) if options[:force]
-      options[:chunk_size] ||= 100
+      options[:chunk_size] ||= 1024
       @file = File.open(file)
       options[:headers] = {'Expect' => '100-continue',
-                           #'Content-Encoding' => 'gzip',
                            'Transfer-Encoding' => 'chunked',
                            'content-type' => 'application/binary'}
 
@@ -62,8 +60,8 @@ module YandexDisk
       data = nil
       # unzip if zipped
       if @response.header['Content-Encoding'] == 'gzip'
-        sio = StringIO.new( @response.body )
-        gz = Zlib::GzipReader.new( sio )
+        s_io = StringIO.new(@response.body)
+        gz = Zlib::GzipReader.new(s_io)
         data = gz.read
       else
         data = @response.body
@@ -92,14 +90,19 @@ module YandexDisk
     # Example:
     #   yd.size
     #   => {:available => 312312, :used => 3123}
-    def size
+    # Arguments:
+    #   options:
+    #      readable: return size in human readable format e.g, 100K 128M 1G (false for default)
+    def size(options = {})
       body = '<?xml version="1.0" encoding="utf-8"?><D:propfind xmlns:D="DAV:"><D:prop><D:quota-available-bytes/><D:quota-used-bytes/></D:prop></D:propfind>'
       send_propfind(0, {:body => body})
       xml = REXML::Document.new(@response.body)
       prop = 'd:multistatus/d:response/d:propstat/d:prop/'
+      available_b = xml.elements[prop + 'd:quota-available-bytes'].text.to_i
+      used_b = xml.elements[prop + 'd:quota-used-bytes'].text.to_i
 
-      return {:available => xml.elements[prop + 'd:quota-available-bytes'].text.to_i,
-             :used => xml.elements[prop + 'd:quota-used-bytes'].text.to_i}
+      return {:available => available_b.to_readable(options[:h_size]),
+             :used => used_b.to_readable(options[:h_size])}
     end
 
     # Example:
@@ -129,7 +132,8 @@ module YandexDisk
     #
     # Arguments:
     #   path: path to yandex disk directory or file
-    def properties(path)
+    #   h_size: return size in human readable format e.g, 100K 128M 1G (false for default)
+    def properties(path, options = {})
       body = '<?xml version="1.0" encoding="utf-8"?><propfind xmlns="DAV:"><prop><displayname/><creationdate/><getlastmodified/><getcontenttype/><getcontentlength/><public_url xmlns="urn:yandex:disk:meta"/></prop></propfind>'
       send_propfind(0, {:path => path, :body => body})
       prop = 'd:multistatus/d:response/d:propstat/d:prop/'
@@ -141,7 +145,7 @@ module YandexDisk
               :created => xml.elements[prop + 'd:getlastmodified'].text,
               :updated => xml.elements[prop + 'd:getlastmodified'].text,
               :type => type ? type : 'dir',
-              :size => size,
+              :size => size.to_readable(options[:h_size]),
               :is_file => size > 0,
               :public_url => xml.elements[prop + 'public_url'].text}
     end
@@ -158,26 +162,28 @@ module YandexDisk
     #
     # Arguments:
     #   path: path to yandex disk directory (default is <b>root</b>)
-    #   with_root: include information of root directory or not (<b>false</b> for default)
-    def files(path = '', with_root = true)
+    #   root: include information of root directory or not (<b>false</b> for default)
+    #   h_size: return size in human readable format e.g, 100K 128M 1G (false for default)
+    def files(path = '', options = {})
       send_propfind(1, {:path => path})
       xml = REXML::Document.new(@response.body)
       prop = 'd:propstat/d:prop/'
       files = []
       xml.elements.each('d:multistatus/d:response') do |res|
         name = URI.decode(res.elements[prop + 'd:displayname'].text)
-        next if !with_root && path.split('/').last == name
+        next if !options[:root] && path.split('/').last == name
         size = res.elements[prop + 'd:getcontentlength'].text.to_i
 
         files << {:name => name,
                   :path => URI.decode(res.elements['d:href'].text),
                   :created => res.elements[prop + 'd:creationdate'].text,
                   :updated => res.elements[prop + 'd:getlastmodified'].text,
-                  :size => size,
+                  :size => size.to_readable(options[:h_size]),
                   :is_file => size > 0}
       end
       return files
     end
+    alias_method :ls, :files
 
     # Example:
     #   yd.copy('/home/graph.pdf', 'my/work')
@@ -273,6 +279,7 @@ module YandexDisk
       send_request(:propfind, options.merge!(headers))
     end
 
+    # return true if successful
     def send_request(method, args = {})
       # headers
       headers = {'Authorization' => @token}

data/lib/yandex_disk/cfg.rb

@@ -1,5 +1,5 @@
 module YandexDisk
-  VERSION   = '1.0.0'
+  VERSION   = '1.1.1'
   HOME_PAGE = 'https://github.com/denwwer/yandex_disk'
   API_URL   = 'https://webdav.yandex.ru'
   # DON'T TURN ON DEBUG FOR PRODUCTION

data/lib/yandex_disk/chunked.rb

@@ -13,9 +13,11 @@ module YandexDisk
         @file.read(@size)
       end
     end
+
     def eof!
       @file.eof!
     end
+
     def eof?
       @file.eof?
     end

data/lib/yandex_disk/ext.rb

@@ -10,4 +10,21 @@ module YandexDisk
       self.nil? || !self || self.empty?
     end
   end
+
+  class ::Integer
+    def to_readable(convert)
+      return self unless convert
+
+      conv = {'Byte' => 1024,
+              'KB'   => 1024**2,
+              'MB'   => 1024**3,
+              'GB'   => 1024**4}
+
+      conv.each do |suf, size|
+        next if self >= size
+        return "%.2f %s" % [ self / (size / 1024).to_f, suf ]
+      end
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@
 require 'simplecov'
 SimpleCov.start
 require 'rubygems'
-require 'bundler/setup'
 require 'yandex_disk'
 require 'fileutils'
 

data/spec/yandex_disk_spec.rb

@@ -1,7 +1,5 @@
 #encoding: UTF-8
 require 'spec_helper'
-require 'net/http'
-require 'uri'
 require 'fastimage'
 
 describe YandexDisk do
@@ -27,9 +25,18 @@ describe YandexDisk do
       @yd = YandexDisk.login(LOGIN, PWD)
     end
 
-    it 'should return available and used space' do
-      size = @yd.size
-      expect(size[:used] > 0 && size[:available] > 0).to be_true
+    describe 'size' do
+      it 'should be in bytes' do
+        size = @yd.size
+        expect(size[:used] > 0 && size[:available] > 0).to be_true
+      end
+
+      it 'should be in readable format' do
+        size = @yd.size(:h_size => true)
+        mask = /Byte|KB|MB|GB/
+        expect(size[:used].match(mask)[0].empty? &&
+               size[:available].match(mask)[0].empty?).to be_false
+      end
     end
 
     it 'should return list of files' do
@@ -76,7 +83,7 @@ describe YandexDisk do
         # copy directory
         @yd.copy(src, des)
         # check files
-        @yd.files(src, false).size.should eq 2
+        @yd.files(src).size.should eq 2
         files.each do |file, text|
           download_and_validate(File.join(des, file), text)
         end
@@ -94,31 +101,31 @@ describe YandexDisk do
         @yd.upload(@text_file, 'my', {:force => true}).should be_true
       end
 
-      it 'should be downloaded and valid' do
+      it 'should be downloaded and validate' do
         @yd.upload(@text_file, 'my', {:force => true}).should be_true
         path = 'my/' + File.basename(@text_file)
         download_and_validate(path)
       end
       # its related to copy dir
-      it 'should by copied to new directory' do
+      it 'should by copied' do
         @yd.upload(@text_file, 'my', {:force => true})
         f_name = File.basename(@text_file)
         file = 'my/' + f_name
         new_path = 'my/text'
-        @yd.create_path(new_path)
-        @yd.copy(file, new_path)
+        @yd.create_path(new_path).should be_true
+        @yd.copy(file, new_path).should be_true
         # file still exist in src path
         @yd.exist?(file).should be_true
         download_and_validate(File.join(new_path, f_name))
       end
 
-      it 'should by moved to new directory' do
+      it 'should by moved' do
         @yd.upload(@text_file, 'my', {:force => true})
         f_name = File.basename(@text_file)
         file = 'my/' + f_name
         new_path = 'my/text'
         @yd.create_path(new_path)
-        @yd.move(file, new_path)
+        @yd.move(file, new_path).should be_true
         # file not exist in src path
         @yd.exist?(file).should be_false
         download_and_validate(File.join(new_path, f_name))
@@ -129,7 +136,7 @@ describe YandexDisk do
         @yd.upload(@text_file)
         f_name = File.basename(@text_file)
         download_and_validate(f_name)
-        @yd.delete(f_name)
+        @yd.delete(f_name).should be_true
         @yd.exist?(f_name).should be_false
       end
 
@@ -154,14 +161,19 @@ describe YandexDisk do
         end
 
         it 'should return image in M size'do
-          @yd.preview('my/' + @f_name, 'm', DOWNLOAD_PATH)
+          @yd.preview('my/' + @f_name, 'm', DOWNLOAD_PATH).should be_true
           File.file?( File.join(DOWNLOAD_PATH, @f_name) ).should be_true
         end
 
         it 'should return image in 300x250 size'do
-          @yd.preview('my/' + @f_name, '300x250', DOWNLOAD_PATH)
+          @yd.preview('my/' + @f_name, '300x250', DOWNLOAD_PATH).should be_true
           FastImage.size( File.join(DOWNLOAD_PATH, @f_name) ).should eq [300, 250]
         end
+
+        it 'should return image in 128 pixels wide'do
+          @yd.preview('my/' + @f_name, 128, DOWNLOAD_PATH).should be_true
+          FastImage.size( File.join(DOWNLOAD_PATH, @f_name) )[0].should eq 128
+        end
       end
 
       after(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex_disk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Boris Murga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -65,8 +65,6 @@ files:
 - lib/yandex_disk/cfg.rb
 - spec/spec_helper.rb
 - spec/files/README
-- spec/files/sample.jpg
-- spec/files/sample.txt
 - spec/yandex_disk_spec.rb
 homepage: https://github.com/denwwer/yandex_disk
 licenses:
@@ -96,6 +94,4 @@ summary: API for Yandex Disk
 test_files:
 - spec/spec_helper.rb
 - spec/files/README
-- spec/files/sample.jpg
-- spec/files/sample.txt
 - spec/yandex_disk_spec.rb

data/spec/files/sample.txt

@@ -1 +0,0 @@
-Hi developer.