alipan-sdk 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 391e43dcbc839df82035ba6a730fe7d274054d5fa8147fc8742847668cca0b46
-  data.tar.gz: 96afad1647af9260c3340f6bd9ecde58c593db444ad0cce301e0e1285dc0124f
+  metadata.gz: e4628bf443c49974992f06af3a266a6554f631efe8affb8e96fe4a0f1211c91e
+  data.tar.gz: d3dc3210dc35128e261c25454dfa36f5fd16384ad2d280e226520b9e03f81ac7
 SHA512:
-  metadata.gz: 95e7da78fb03144dc9c1b26843b0e0d8733391b1ee28a6dbb363964cc39257d1d07ffc5ecbe575cedc4eb46e695ea088791d5275f1d4be0c9fa7e00e0ebbbcb2
-  data.tar.gz: '08f4d6470a21d3f7ec5f5e8e37ea45c52834a3baf8c7953715ee8d190114a5fb6d7244737c7f3be9d640f110c76795b78812e35adf6740a56a764234fb08f18f'
+  metadata.gz: 9356ddf651b4f762cbcfe0c20c70dd3050f50307975647c0d21054a1b1b101047ebbc7d27f15c03c53abaa885bb251c9ea0a204dca95ca0e00da0149fa78189c
+  data.tar.gz: 1ee6392d663d57d12490c4ae12f007ad2343cee00bf2bb34dd729d6131ea6468b369b26c758b69a74cc060a1bde8b4d91d6fdd1fafa0480686a570d61a8f9549

data/README.md

@@ -1,39 +1,45 @@
 # Alipan SDK for Ruby
 
-TODO: Delete this and the text below, and describe your gem
+[![Gem Version](https://badge.fury.io/rb/alipan-sdk.svg)](https://badge.fury.io/rb/alipan-sdk)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/alipan`. To experiment with that code, run `bin/console` for an interactive prompt.
+## 关于
 
-## Installation
+阿里云盘SDK  方便Ruby客户端程序调用
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+## 快速开始
 
-Install the gem and add to the application's Gemfile by executing:
+### 鉴权配置
+
+登录官网[阿里云盘开发者门户](https://www.alipan.com/developer/f)  按照开发文档获取access_token
+
+### 安装Alipan SDK for Ruby
 
 ```bash
-bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+gem install alipan-sdk
 ```
 
-If bundler is not being used to manage dependencies, install the gem by executing:
+并在你的程序中或者`irb`命令下包含:
 
 ```bash
-gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+require 'alipan'
 ```
 
-## Usage
+### 创建Client
+client = Alipan::Client.new({:access_token=>"xxx"})
 
-TODO: Write usage instructions here
+`access_token`是您的鉴权信息
 
-## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+**请妥善保管您的access_token  泄露之后可能影响您的数据安全**
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+### 获取drive
+drive = client.get_drive
 
-## Contributing
+### 获取object
+objects = drive.list_objects
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/alipan.
+## 更多
 
-## License
+更多文档请查看:
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+[阿里云盘开发者门户](https://www.alipan.com/developer/f)

data/lib/alipan/drive.rb

@@ -13,5 +13,23 @@ module Alipan
 		def list_objects(opts = {})
 			Iterator::Objects.new(@protocol, resource_drive_id, 'root', opts).to_enum
 		end
+
+		def get_object(key, opts = {}, &block)
+			obj = nil
+			file = opts[:file]
+			if file
+				File.open(File.expand_path(file), 'wb') do |f|
+					obj = @protocol.get_object(resource_drive_id, key, opts) do |chunk|
+						f.write(chunk)
+					end
+				end
+			elsif block
+				obj = @protocol.get_object(resource_drive_id, key, opts, &block)
+			else
+				obj = @protocol.get_object(resource_drive_id, key, opts)
+			end
+
+			obj
+		end
 	end
 end

data/lib/alipan/http.rb

@@ -16,6 +16,10 @@ module Alipan
 			@config = config
     end
 
+    def handle_response(r, &block)
+      r.read_body { |chunk| yield chunk }
+    end
+
 		def get(resources = {}, http_options = {}, &block)
       do_request('GET', resources, http_options, &block)
     end
@@ -45,7 +49,7 @@ module Alipan
     def do_request(verb, resources = {}, http_options = {}, &block)
     	sub_res = resources[:sub_res]
 
-      headers = http_options[:headers] || {}
+      headers = {}
       headers['Content-Type'] ||= DEFAULT_CONTENT_TYPE
       headers[AUTH_HEADER] = @config.access_token if @config.access_token
 
@@ -55,8 +59,8 @@ module Alipan
       block_response = ->(r) { handle_response(r, &block) } if block
       request = RestClient::Request.new(
         :method => verb,
-        :url => "https://open.aliyundrive.com#{sub_res}",
-        :headers => headers,
+        :url => "#{sub_res}".start_with?("/") ? "https://open.aliyundrive.com#{sub_res}" : "#{sub_res}",
+        :headers => http_options[:headers] || headers,
         :payload => http_options[:body],
         :block_response => block_response,
         :open_timeout => @config.open_timeout  || OPEN_TIMEOUT,
@@ -64,6 +68,7 @@ module Alipan
       )
       response = request.execute do |resp, &blk|
         if resp.code >= 300
+          e = RuntimeError.new JSON.parse(resp.body)
           logger.error(e.to_s)
           raise e
         else
@@ -71,6 +76,11 @@ module Alipan
         end
       end
 
+      unless response.is_a?(RestClient::Response)
+        response = RestClient::Response.create(nil, response, request)
+        response.return!
+      end
+
       logger.debug("Received HTTP response, code: #{response.code}, headers: " \
                     "#{response.headers}, body: #{response.body}")
 

data/lib/alipan/object.rb

@@ -6,12 +6,7 @@ module Alipan
 		attrs :drive_id, :file_id, :parent_file_id,
 		:name, :size, :file_extension, :content_hash, 
 		:category, :type, :thumbnail, :url, :created_at, 
-		:updated_at, :play_cursor, :video_media_metadata, 
-		:video_preview_metadata
+		:updated_at, :video_media_metadata, :video_preview_metadata
 
-		def initialize(opts = {}, protocol = nil)
-			super(opts)
-			@protocol = protocol
-		end
 	end
 end

data/lib/alipan/protocol.rb

@@ -27,13 +27,14 @@ module Alipan
 				:backup_drive_id => body.fetch(:backup_drive_id.to_s),
 				:folder_id => body.fetch(:folder_id.to_s)
 			}, self)
+
 			logger.info("Done get drive, drive: #{drive}")
 
 			drive
 		end
 
 		def list_objects(drive_id, parent_file_id, opts = {})
-			logger.info("Begin list objects, options: #{opts}")
+			logger.debug("Begin list object, drive: #{drive_id}, options: #{opts}")
 
 			payload = {
 				:drive_id => drive_id,
@@ -45,8 +46,23 @@ module Alipan
 			body = JSON.parse(r.body)
 
 			objects = body[:items.to_s].map do |item|
-				Object.new(item, self)
-			end
+				Object.new(
+					:drive_id => item.fetch(:drive_id.to_s),
+					:file_id => item.fetch(:file_id.to_s),
+					:parent_file_id => item.fetch(:parent_file_id.to_s),
+					:name => item.fetch(:name.to_s),
+					:size => item.fetch(:size.to_s),
+					:file_extension => item.fetch(:file_extension.to_s),
+					:content_hash => item.fetch(:content_hash.to_s),
+					:category => item.fetch(:category.to_s),
+					:type => item.fetch(:type.to_s),
+					:thumbnail => item.fetch(:thumbnail.to_s),
+					:url => item.fetch(:url.to_s),
+					:created_at => item.fetch(:created_at.to_s),
+					:updated_at => item.fetch(:updated_at.to_s),
+					:video_media_metadata => item.fetch(:video_media_metadata.to_s),
+					:video_preview_metadata => item.fetch(:video_preview_metadata.to_s))
+			end || []
 
 			more = {
 				:marker => body[:next_marker.to_s]
@@ -56,5 +72,55 @@ module Alipan
 
 			[objects, more]
 		end
+
+		def get_object(drive_id, object_name, opts = {}, &block)
+			logger.debug("Begin get object, drive_id: #{drive_id}, "\
+                     "object: #{object_name}")
+
+			payload = {
+				:drive_id => drive_id,
+				:file_path => "#{object_name}".start_with?("/") ? "#{object_name}" : "/#{object_name}"
+			}
+
+			r = @http.post( {:sub_res => "/adrive/v1.0/openFile/get_by_path"}, {:body => payload.to_json})
+			body = JSON.parse(r.body)
+
+			obj = Object.new(
+					:drive_id => body.fetch(:drive_id.to_s),
+					:file_id => body.fetch(:file_id.to_s),
+					:parent_file_id => body.fetch(:parent_file_id.to_s),
+					:name => body.fetch(:name.to_s),
+					:size => body.fetch(:size.to_s),
+					:file_extension => body.fetch(:file_extension.to_s),
+					:content_hash => body.fetch(:content_hash.to_s),
+					:category => body.fetch(:category.to_s),
+					:type => body.fetch(:type.to_s),
+					:thumbnail => body.fetch(:thumbnail.to_s),
+					:url => body.fetch(:url.to_s),
+					:created_at => body.fetch(:created_at.to_s),
+					:updated_at => body.fetch(:updated_at.to_s),
+					:video_media_metadata => body.fetch(:video_media_metadata.to_s),
+					:video_preview_metadata => body.fetch(:video_preview_metadata.to_s))
+
+			if block_given?
+				if obj.type == 'folder' || obj.file_id.nil?
+					yield nil
+				else
+					payload = {
+						:drive_id => drive_id,
+						:file_id => obj.file_id
+					}
+
+					r = @http.post( {:sub_res => "/adrive/v1.0/openFile/getDownloadUrl"}, {:body => payload.to_json})
+					body = JSON.parse(r.body)
+
+					@http.get( {:sub_res => body.fetch(:url.to_s)}, {:headers => {}}, &block) 
+				end
+			end
+
+			logger.debug("Done get object")
+
+			obj
+		end
 	end
 end

data/lib/alipan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alipan
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/alipan.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'pry'
 require_relative "alipan/common"
 require_relative "alipan/config"
 require_relative "alipan/client"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alipan-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - freeshenls