yandex-disk 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23dcd981d7eb0cc5b888019fd9807d936b7dfe3c
-  data.tar.gz: 1a39ad88ca3b303cdc1c9e8f13958a79bc0d5ee1
+  metadata.gz: 2373008c136eba6c7c1bf1992cd0c7c9866c546b
+  data.tar.gz: 5e8029a4482dc046169e9a8b34b6a4f6e26671f6
 SHA512:
-  metadata.gz: b2539167f83cb414f64e790a923f39dd2a024266e3efe7e753cb22e55678b0a885ec75329a260bd1290fa95b18a8e01cb9bc1b96835947275c9fbbd03dd0731a
-  data.tar.gz: 86d90585dc811a40d49f333076fcade0bd9c9a92b3044ec9fed4228ebdb15508a4954a6754bcb0632b9ad191bc2b2f93460cff7a2daa80d6c3bcccd9eb1b6c60
+  metadata.gz: 013c2a3742601670d8d9fbdaa06a99e19b752afc717ae0cf5d533e67a17254e5cb3ff0ed80850122453d0695fd85b04084d5776b98c43e83cba49c4cf76d7662
+  data.tar.gz: df5bb80dfd8be83cd80bf68c017f4d943748d850c2fa431f01062c21cac7daedee3565fb44aad8349d2536d73a2ee0d1573af4c0067cb742769d7b00b8dd4094

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 large-file.psd
 tmp
+.idea/

data/lib/yandex/disk/client.rb

@@ -14,11 +14,13 @@ module Yandex
       def initialize options={}
         @timeout = options[:timeout] || 300
         @http = Faraday.new(:url => 'https://webdav.yandex.ru') do |builder|
-          if options[:access_token].present?
+          if options[:access_token] && options[:access_token].length > 0
             builder.request :authorization, "OAuth", options[:access_token]
-          else
+          elsif options[:login] && options[:password]
             basic_token = Base64.encode64("#{options[:login]}:#{options[:password]}")
             builder.request :authorization, "Basic", basic_token
+          else
+            raise ArgumentError, 'No :access_token or :login and :password'
           end
 
           builder.response :follow_redirects

data/lib/yandex/disk/version.rb

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

data/test/yandex_dist_test.rb

@@ -1,6 +1,8 @@
-require 'test/unit'
+require "minitest/autorun"
 require File.expand_path(File.dirname(__FILE__) + '/../lib/yandex/disk')
 
+MiniTest::Unit.autorun
+
 class YandexDiskTest < MiniTest::Unit::TestCase
 
   def setup
@@ -9,6 +11,20 @@ class YandexDiskTest < MiniTest::Unit::TestCase
 
   def test_initilize
     assert @disk
+
+    error_message = 'No :access_token or :login and :password'
+
+    assert_raises ArgumentError, error_message do
+      Yandex::Disk::Client.new
+    end
+
+    assert_raises ArgumentError, error_message do
+      Yandex::Disk::Client.new login: 'login_without_password'
+    end
+
+    assert_raises ArgumentError, error_message do
+      Yandex::Disk::Client.new password: 'password_without_login'
+    end
   end
 
   def test_put_and_get
@@ -22,13 +38,8 @@ class YandexDiskTest < MiniTest::Unit::TestCase
   # 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
+    assert_raises RuntimeError, 'store: parent folder was not found' do
+      @disk.put!('README.md', '/folder/that/doesnt/exists/README.md')
     end
   end
 
@@ -42,13 +53,8 @@ class YandexDiskTest < MiniTest::Unit::TestCase
 
   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
+    assert_raises RuntimeError, 'resource not found' do
+      @disk.delete!('/a')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex-disk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Yury Korolev
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby client for Yandex.Disk
@@ -103,7 +103,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,17 +127,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Ruby client for Yandex.Disk with backup gem support