yandex_client 0.1.0 → 1.0.1

data/lib/yandex_client/dav/prop_find_response.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'ox'
+require 'cgi'
+
+module YandexClient
+  class Dav
+    class PropFindResponse
+      include Enumerable
+
+      SUCCESS_STATUS = 'HTTP/1.1 200 OK'
+
+      class Item
+        attr_reader :name, :created_at, :last_modified, :content_type
+
+        def initialize(name, node)
+          @name = name
+          @folder = node[:'d:resourcetype'].is_a?(Hash)
+
+          load_node_data(node)
+        end
+
+        def folder?
+          @folder
+        end
+
+        def file?
+          !@folder
+        end
+
+        private
+
+        def load_node_data(node)
+          @created_at = node.fetch(:'d:creationdate')
+          @last_modified = node.fetch(:'d:getlastmodified')
+
+          return if folder?
+
+          @etag = node.fetch(:'d:getetag')
+          @size = node.fetch(:'d:getcontentlength').to_i
+          @content_type = node.fetch(:'d:getcontenttype')
+
+          define_singleton_method(:etag) { @etag }
+          define_singleton_method(:size) { @size }
+          define_singleton_method(:content_type) { @content_type }
+        end
+      end
+
+      def initialize(xml)
+        @doc = Ox.load(
+          xml.dup.force_encoding('UTF-8'),
+          mode: :hash
+        )
+      end
+
+      def each
+        @doc[:'d:multistatus'].each do |node|
+          next if (response = node[:'d:response']).nil?
+
+          name = CGI.unescape(response.fetch(:'d:href'))
+          node_data = response.fetch(:'d:propstat')
+
+          raise ParseError unless node_data.fetch(:'d:status') == SUCCESS_STATUS
+
+          yield Item.new(name, node_data.fetch(:'d:prop'))
+        end
+      end
+    end
+  end
+end

data/lib/yandex_client/dav.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'digest'
+require 'http'
+require 'yandex_client/dav/prop_find_response'
+
+module YandexClient
+  # https://tech.yandex.ru/disk/doc/dg/reference/put-docpage/
+  #
+  # Chainable client:
+  #
+  # YandexClient::Dav[access_token]
+  #   .put('1.txt', '/a/b/c/1.txt')
+  #   .put(File.open('1.txt', 'rb'), '/path/to/1.txt')
+  #   .put(Tempfile.new.tap { |t| t.write('say ni'); t.rewind }, '/path/to/tmp.txt')
+  #   .delete('/a/b/c/1.txt')
+  #   .mkcol('/a/b/c')
+  #   .propfind('/a/dip.yml', depth: 0)
+  #   .propfind('/a', depth: 1)
+  #   .propfind.to_a
+  class Dav
+    include Configurable
+    include ErrorHandler
+
+    ACTION_URL = 'https://webdav.yandex.ru'
+    PROPFIND_QUERY = '<?xml version="1.0" encoding="utf-8"?><propfind xmlns="DAV:"></propfind>'
+
+    attr_reader :token
+
+    class << self
+      def with_token(token)
+        new(token)
+      end
+
+      alias [] with_token
+    end
+
+    def initialize(token)
+      @token = token
+    end
+
+    def put(file, dest, etag: nil, sha256: nil, size: nil)
+      io = file.is_a?(String) ? File.open(file, 'rb') : file
+
+      headers = auth_headers.merge!(
+        'Etag' => etag || Digest::MD5.file(io.path),
+        'Sha256' => sha256 || Digest::SHA256.file(io.path),
+        'Expect' => '100-continue',
+        'Content-Length' => (size || File.size(io.path)).to_s
+      )
+
+      process_response with_config.put(url_for(dest), body: io, headers: headers)
+    end
+
+    def delete(dest)
+      process_response with_config.delete(
+        url_for(dest),
+        headers: auth_headers
+      )
+    end
+
+    def mkcol(dest)
+      process_response with_config.request(
+        :mkcol,
+        url_for(dest),
+        headers: auth_headers
+      )
+    end
+
+    def propfind(dest = '', depth = 1)
+      headers = auth_headers.merge!(
+        Depth: depth.to_s,
+        'Content-Type' => 'application/x-www-form-urlencoded',
+        'Content-Length' => PROPFIND_QUERY.length
+      )
+
+      response = with_config.request(:propfind, url_for(dest), headers: headers, body: PROPFIND_QUERY)
+      process_response(response)
+
+      PropFindResponse.new(response.body.to_s)
+    end
+
+    private
+
+    def auth_headers
+      {Authorization: "OAuth #{token}"}
+    end
+
+    def url_for(dest)
+      URI.parse(ACTION_URL).tap do |uri|
+        path = dest
+        path = "/#{path}" unless path.match?(%r{^/})
+
+        uri.path = path
+      end
+    end
+
+    def process_response(response)
+      return self if response.status.success?
+
+      error_for_response(response)
+    end
+  end
+end

data/lib/yandex_client/disk.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module YandexClient
+  # https://yandex.ru/dev/disk/api/reference/capacity-docpage/
+  # https://yandex.ru/dev/disk/api/reference/content-docpage/
+  #
+  # YandexClient::Disk[access_token].info
+  # YandexClient::Disk[access_token].download_url('path/to/file')
+  class Disk
+    include Configurable
+    include ErrorHandler
+
+    ACTION_URL = 'https://cloud-api.yandex.net'
+
+    attr_reader :token
+
+    class << self
+      def with_token(token)
+        new(token)
+      end
+
+      alias [] with_token
+    end
+
+    def initialize(token)
+      @token = token
+    end
+
+    def info
+      process_response(
+        with_config.get("#{ACTION_URL}/v1/disk/", headers: auth_headers)
+      )
+    end
+
+    def download_url(path)
+      url = URI.parse(ACTION_URL).tap do |uri|
+        uri.path = '/v1/disk/resources/download'
+        uri.query = URI.encode_www_form(path: path)
+      end
+
+      process_response(
+        with_config.get(url, headers: auth_headers)
+      ).fetch(:href)
+    end
+
+    private
+
+    def auth_headers
+      {Authorization: "OAuth #{@token}"}
+    end
+
+    def process_response(response)
+      return JSON.parse(response.body, symbolize_names: true) if response.status.success?
+
+      error_for_response(response)
+    end
+  end
+end

data/lib/yandex_client/error_handler.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module YandexClient
+  module ErrorHandler
+    private
+
+    def error_for_response(response)
+      msg = response.body.empty? ? response.status.to_s : response.body.to_s.force_encoding('UTF-8')
+      err =
+        case response.code
+        when 404
+          NotFoundError.new(msg, http_code: 404)
+        else
+          ApiRequestError.new(msg, http_code: response.code)
+        end
+
+      raise err
+    end
+  end
+end

data/lib/yandex_client/passport.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module YandexClient
+  # https://tech.yandex.ru/passport/doc/dg/reference/request-docpage/
+  #
+  # Example:
+  #   YandexClient::Passport::Client[Token.first.access_token].info
+  class Passport
+    include Configurable
+    include ErrorHandler
+
+    ACTION_URL = 'https://login.yandex.ru/info'
+
+    attr_reader :token
+
+    class << self
+      def with_token(token)
+        new(token)
+      end
+
+      alias [] with_token
+    end
+
+    def initialize(token)
+      @token = token
+    end
+
+    def info
+      process_response \
+        with_config.get(ACTION_URL, headers: auth_headers)
+    end
+
+    private
+
+    def auth_headers
+      {Authorization: "Bearer #{@token}"}
+    end
+
+    def process_response(response)
+      return JSON.parse(response.body, symbolize_names: true) if response.status.success?
+
+      error_for_response(response)
+    end
+  end
+end

data/lib/yandex_client/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module YandexClient
-  VERSION = '0.1.0'.freeze
+  VERSION = '1.0.1'
 end

data/lib/yandex_client.rb

@@ -1,30 +1,51 @@
+# frozen_string_literal: true
+
 require 'yandex_client/version'
 
+require 'yandex_client/error_handler'
+require 'yandex_client/configurable'
+
+require 'yandex_client/dav'
+require 'yandex_client/disk'
+require 'yandex_client/auth'
+require 'yandex_client/passport'
+
 module YandexClient
-  Config = Struct.new(:api_key, :api_secret, :logger)
+  Config = Struct.new \
+    :api_key,
+    :api_secret,
+    :logger,
+    :read_timeout,
+    :write_timeout,
+    :connect_timeout
 
-  def self.config
-    @config ||= Config.new
-  end
+  class ApiRequestError < StandardError
+    attr_reader :http_code
 
-  def self.configure
-    yield config
+    def initialize(msg = nil, http_code: nil)
+      if http_code
+        super "#{msg}, (http code #{http_code})"
+      else
+        super msg
+      end
+
+      @http_code = http_code
+    end
   end
 
-  autoload :Client, 'yandex_client/client'
-  autoload :ApiRequestError, 'yandex_client/api_request_error'
-  autoload :NotFoundError, 'yandex_client/not_found_error'
+  NotFoundError = Class.new(ApiRequestError)
 
-  module Auth
-    autoload :Client, 'yandex_client/auth/client'
-  end
+  class << self
+    def config
+      @config ||= Config.new(nil, nil, nil, 120, 600, 5)
+    end
 
-  module Passport
-    autoload :Client, 'yandex_client/passport/client'
-  end
+    def configure
+      yield config
+    end
 
-  module Dav
-    autoload :Client, 'yandex_client/dav/client'
-    autoload :PropfindParser, 'yandex_client/dav/propfind_parser'
+    def auth
+      @auth ||= Auth.new
+    end
   end
 end

data/yandex_client.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'yandex_client/version'
 
@@ -8,12 +10,12 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Maxim Tretyakov']
   spec.email         = ['max@tretyakov-ma.ru']
 
-  spec.summary       = %q{Yandex Client}
-  spec.description   = %q{Allows to use yandex disk as webdav nodes}
+  spec.summary       = 'Yandex Client'
+  spec.description   = 'Allows to use yandex disk as webdav nodes'
   spec.homepage      = 'https://github.com/yamax2/yandex_client'
   spec.license       = 'MIT'
 
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
@@ -21,14 +23,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'oj'
+  spec.add_runtime_dependency 'http'
   spec.add_runtime_dependency 'ox'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 10'
   spec.add_development_dependency 'rspec', '>= 3.0'
+  spec.add_development_dependency 'simplecov', '>= 0.9'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.4'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: yandex_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Maxim Tretyakov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -115,9 +129,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
+- ".pryrc"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,24 +141,24 @@ files:
 - bin/console
 - bin/setup
 - dip.yml
-- docker/Dockerfile.2.6
-- docker/docker-compose.development.yml
+- docker/Dockerfile.dip
 - docker/docker-compose.yml
+- docker/prepare_env.sh
 - lib/yandex_client.rb
-- lib/yandex_client/api_request_error.rb
-- lib/yandex_client/auth/client.rb
-- lib/yandex_client/client.rb
-- lib/yandex_client/dav/client.rb
-- lib/yandex_client/dav/propfind_parser.rb
-- lib/yandex_client/not_found_error.rb
-- lib/yandex_client/passport/client.rb
+- lib/yandex_client/auth.rb
+- lib/yandex_client/configurable.rb
+- lib/yandex_client/dav.rb
+- lib/yandex_client/dav/prop_find_response.rb
+- lib/yandex_client/disk.rb
+- lib/yandex_client/error_handler.rb
+- lib/yandex_client/passport.rb
 - lib/yandex_client/version.rb
 - yandex_client.gemspec
 homepage: https://github.com/yamax2/yandex_client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,15 +166,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.26
+signing_key:
 specification_version: 4
 summary: Yandex Client
 test_files: []