yandex-disk 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42f0c7884f42dcd37fefa77569a482362dfc6299
-  data.tar.gz: 671e00b8bd8266a902c279b358b99d7bb025f648
+  metadata.gz: 23dcd981d7eb0cc5b888019fd9807d936b7dfe3c
+  data.tar.gz: 1a39ad88ca3b303cdc1c9e8f13958a79bc0d5ee1
 SHA512:
-  metadata.gz: 02063f9671ec83c4b79ee08f05c36f908aa79dc683e864a4378362cfac34888faebf02c1046c7c879089790df081c86243ff09132feb136da95873b61209ae50
-  data.tar.gz: 14eaa321bc25830b2a9ae6063e0d2b5f420c7638aeebaa892316bf6c5aa558a724add0b247ffb89cad8283683df6f4f4e49151b14ebfae83f7b06a7cd6c0cbc3
+  metadata.gz: b2539167f83cb414f64e790a923f39dd2a024266e3efe7e753cb22e55678b0a885ec75329a260bd1290fa95b18a8e01cb9bc1b96835947275c9fbbd03dd0731a
+  data.tar.gz: 86d90585dc811a40d49f333076fcade0bd9c9a92b3044ec9fed4228ebdb15508a4954a6754bcb0632b9ad191bc2b2f93460cff7a2daa80d6c3bcccd9eb1b6c60

data/README.md

@@ -19,8 +19,12 @@ Add this line to your application's Gemfile:
 ## Usage
 
 ```ruby
+# authorize via oauth access token...
 disk = Yandex::Disk::Client.new(:access_token => 'YOUR_ACCESS_TOKEN')
 
+# ...or use login password for authorization
+disk = Yandex::Disk::Client.new(:login => 'me', :password => 'secret')
+
 # to upload file to Yandex.Disk
 disk.put('path/to/local/file', '/path/to/remote/file') # returns `true` if everything is ok
 
@@ -41,6 +45,12 @@ disk.copy('/path/to/remote/file/or/dir', '/path/to/new/remote/file/or/dir')
 disk.move('/path/to/remote/file/or/dir', '/path/to/new/remote/file/or/dir')
 # delete file/dir
 disk.delete('/path/to/remote/file/or/dir') # returns `true` if everything is ok
+
+# to get quotas
+disk.space # returns hash like { :quota_available_bytes => 2488943615, :quota_used_bytes => 2488943615 }
+
+# to get dir contents
+disk.list('/') # returns array with hashes like [{:href=>"/",:resourcetype=>:collection,:getlastmodified=><DateTime>,:getcontentlength=>0,:displayname=>"disk",:creationdate=><DateTime>},{:href=>"/readme.pdf",:getlastmodified=><DateTime>,:getcontentlength=>455833,:displayname=>"readme.pdf",:creationdate=><DateTime>}]
 ```
 
 ## Using it with [backup gem](https://github.com/meskyanichi/backup)
@@ -49,7 +59,7 @@ disk.delete('/path/to/remote/file/or/dir') # returns `true` if everything is ok
 require 'yandex/disk/backup/storage'
 
 Backup::Model.new(:my_backup, 'Description for my_backup') do
-  split_into_chunks_of 250
+  split_into_chunks_of 50
 
   database PostgreSQL do |db|
     db.name               = 'pg_db_name'
@@ -64,7 +74,6 @@ Backup::Model.new(:my_backup, 'Description for my_backup') do
     disk.path         = '/backups/'
     disk.keep = 5
   end
-
 end
 ```
 

data/lib/yandex/disk/client.rb

@@ -1,16 +1,25 @@
 # coding: utf-8
 
+require 'base64'
 require 'faraday'
 require 'faraday_middleware'
 
+Faraday::Connection::METHODS << :propfind
+
 module Yandex
   module Disk
     class Client
+      autoload :Request, 'yandex/disk/client/request'
 
       def initialize options={}
         @timeout = options[:timeout] || 300
         @http = Faraday.new(:url => 'https://webdav.yandex.ru') do |builder|
-          builder.request :authorization, "OAuth", options[:access_token]
+          if options[:access_token].present?
+            builder.request :authorization, "OAuth", options[:access_token]
+          else
+            basic_token = Base64.encode64("#{options[:login]}:#{options[:password]}")
+            builder.request :authorization, "Basic", basic_token
+          end
 
           builder.response :follow_redirects
 
@@ -44,6 +53,16 @@ module Yandex
         @http.get(path)
       end
 
+      def space
+        request = Request::Space.new(@http)
+        request.perform
+      end
+
+      def list path
+        request = Request::List.new(@http, path)
+        request.perform
+      end
+
       alias_method :mkdir, :mkcol
 
       def mkdir_p path

data/lib/yandex/disk/client/request.rb

@@ -0,0 +1,4 @@
+module Yandex::Disk::Client::Request
+  autoload :Space, 'yandex/disk/client/request/space'
+  autoload :List, 'yandex/disk/client/request/list'
+end

data/lib/yandex/disk/client/request/list.rb

@@ -0,0 +1,89 @@
+require 'nokogiri'
+
+class Yandex::Disk::Client::Request::List
+  HEADERS = {
+    :Depth => 1
+  }
+
+  def initialize http, path
+    @http = http
+    @path = path
+  end
+
+  def perform
+    response = @http.run_request :propfind, @path, nil, HEADERS
+    parse_result = parse(response.body)
+    parse_result.list
+  end
+
+
+  private
+
+  class ListParser < Nokogiri::XML::SAX::Document
+    attr_reader :list
+
+    def initialize
+      @list = []
+    end
+
+    def start_element name, attributes = []
+      case name
+        when 'd:href'
+          @current = {}
+          @is_href = true
+
+        when 'd:displayname'
+          @is_displayname = true
+
+        when 'd:getcontentlength'
+          @is_getcontentlength = true
+
+        when 'd:creationdate'
+          @is_creationdate = true
+
+        when 'd:getlastmodified'
+          @is_getlastmodified = true
+
+        when 'd:collection'
+          @current[:resourcetype] = :collection
+      end
+    end
+
+    def end_element name, attributes = []
+      case name
+        when 'd:href'
+          @list << @current if @current
+          @is_href = false
+
+        when 'd:displayname'
+          @is_displayname = false
+
+        when 'd:getcontentlength'
+          @is_getcontentlength = false
+
+        when 'd:creationdate'
+          @is_creationdate = false
+
+        when 'd:getlastmodified'
+          @is_getlastmodified = false
+      end
+    end
+
+    def characters string
+      @current[:href] = string if @is_href
+      @current[:displayname] = string if @is_displayname
+      @current[:getcontentlength] = string.to_i if @is_getcontentlength
+      @current[:creationdate] = DateTime.parse(string) if @is_creationdate
+      @current[:getlastmodified] = DateTime.parse(string) if @is_getlastmodified
+    end
+  end
+
+  def parse body
+    list_parser = ListParser.new
+
+    parser = Nokogiri::XML::SAX::Parser.new(list_parser)
+    parser.parse(body)
+
+    list_parser
+  end
+end

data/lib/yandex/disk/client/request/space.rb

@@ -0,0 +1,56 @@
+require 'nokogiri'
+
+class Yandex::Disk::Client::Request::Space
+  BODY = '<D:propfind xmlns:D="DAV:">
+  <D:prop>
+    <D:quota-available-bytes/>
+    <D:quota-used-bytes/>
+  </D:prop>
+</D:propfind>'
+  HEADERS = {
+    :Depth => 0
+  }
+
+  def initialize http
+    @http = http
+  end
+
+  def perform
+    response = @http.run_request :propfind, '/', BODY, HEADERS
+    parse_result = parse(response.body)
+    {
+      :quota_available_bytes => parse_result.quota_available_bytes,
+      :quota_used_bytes => parse_result.quota_used_bytes
+    }
+  end
+
+
+  private
+
+  class AttriutesParser < Nokogiri::XML::SAX::Document
+    attr_reader :quota_available_bytes, :quota_used_bytes
+
+    def start_element name, attributes = []
+      case name
+        when 'd:quota-used-bytes'
+          @is_quota_used_bytes = true
+        when 'd:quota-available-bytes'
+          @is_quota_available_bytes = true
+      end
+    end
+
+    def characters string
+      @quota_used_bytes = string.to_i if @is_quota_used_bytes
+      @quota_available_bytes = string.to_i if @is_quota_available_bytes
+    end
+  end
+
+  def parse body
+    attributes_parser = AttriutesParser.new
+
+    parser = Nokogiri::XML::SAX::Parser.new(attributes_parser)
+    parser.parse(body)
+
+    attributes_parser
+  end
+end

data/lib/yandex/disk/version.rb

@@ -2,6 +2,6 @@
 
 module Yandex
   module Disk
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/yandex-disk.gemspec

@@ -6,8 +6,8 @@ require 'yandex/disk/version'
 Gem::Specification.new do |spec|
   spec.name          = "yandex-disk"
   spec.version       = Yandex::Disk::VERSION
-  spec.authors       = ["Yury Korolev"]
-  spec.email         = ["yurykorolev@me.com"]
+  spec.authors       = ["Yury Korolev", "Alexandr Borisov"]
+  spec.email         = ["yurykorolev@me.com", "aishek@gmail.com"]
   spec.description   = %q{Ruby client for Yandex.Disk}
   spec.summary       = %q{Ruby client for Yandex.Disk with backup gem support}
   spec.homepage      = "https://github.com/anjlab/yandex-disk"
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency('faraday', '~> 0.8')
+  spec.add_dependency('nokogiri', '~> 1.6.0')
   spec.add_dependency('faraday_middleware', '~> 0.9.0')
   spec.add_dependency('excon', '>= 0.16')
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: yandex-disk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yury Korolev
+- Alexandr Borisov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,6 +25,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +98,7 @@ dependencies:
 description: Ruby client for Yandex.Disk
 email:
 - yurykorolev@me.com
+- aishek@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -95,6 +111,9 @@ files:
 - lib/yandex/disk.rb
 - lib/yandex/disk/backup/storage.rb
 - lib/yandex/disk/client.rb
+- lib/yandex/disk/client/request.rb
+- lib/yandex/disk/client/request/list.rb
+- lib/yandex/disk/client/request/space.rb
 - lib/yandex/disk/version.rb
 - test/yandex_dist_test.rb
 - yandex-disk.gemspec