qingstor-sdk 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33359165658b13aa899f8ffdbb30f2562f9c0db9
-  data.tar.gz: ccb554de7a1c9c00ee90963655cb6c877dbe74ff
+  metadata.gz: 121f4fa26d746085c9c07a1217863b907228aaac
+  data.tar.gz: b41e30469b51ea9d1ce6acd983d9371bfc41a348
 SHA512:
-  metadata.gz: 8752923dafeeffbb74d46f4cc0054d23e7a066640f5762a00ad9732d27eb99055672dd01b958d3f7fd043b9cb8cdd0eea1b11767978650d835fb26f7da38a484
-  data.tar.gz: 00ffd9672d3f59322029a0afd5fe958b25c704f00deba2f80570e7d5c2535ee957aefd0ab216744b7f59e47ec21ffc8c5ad1b61f6c3bbaaa757426550ed482c5
+  metadata.gz: 26183f925125c74f9cafdd94786229f4a87ff9689dfcdea1a63a58f26a4ad9a5be7d034b7284e56578a269d70b45c7bca096b2e4747289d2950ee63aec384b57
+  data.tar.gz: b5c50f4616a145c5637c16eec5aee9f28fe8f0c1a943a195fd41a049235efa26b6a48da0acd4eeeda949707c95e34484c92a1a13f41c3110ed2b211489a6db9b

data/README.md

@@ -40,7 +40,7 @@ $ bundle install
 Get code from GitHub:
 
 ``` bash
-$ git clone git@https://github.com/yunify/qingstor-sdk-ruby.git
+$ git clone git@github.com:yunify/qingstor-sdk-ruby.git
 ```
 
 Build and install with bundler:
@@ -66,8 +66,8 @@ otherwise.
 ___API Access Key Example:___
 
 ``` yaml
-access_key_id: 'WMAGPAJBJRKQEBRCEADPWMAGPAJBJRK'
-secret_access_key: 'Qkk89OcoIaMVZ0iOfnfivjxL7W5o7oOumMvvUiuF'
+access_key_id: 'ACCESS_KEY_ID_EXAMPLE'
+secret_access_key: 'SECRET_ACCESS_KEY_EXAMPLE'
 ```
 
 ### Code Example
@@ -164,6 +164,17 @@ connection_retries: 3
 log_level: 'warn'
 ```
 
+## Change Log
+All notable changes to QingStor SDK for Ruby will be documented here.
+
+### [v2.0.1] - 2016-12-16
+#### Changed
+- Improve the implementation of deleting multiple objects.
+
+### v2.0.0 - 2016-12-14
+#### Added
+- QingStor SDK for the Ruby programming language.
+
 ## Reference Documentations
 
 - [QingStor Documentation](https://docs.qingcloud.com/qingstor/index.html)
@@ -172,8 +183,14 @@ log_level: 'warn'
 
 ## Contributing
 
-This repository is automatically generated, please contribute to [`Snips`](https://github.com/yunify/snips) instead.
+1. Fork it ( https://github.com/yunify/qingstor-sdk-ruby/fork )
+2. Create your feature branch (`git checkout -b new-feature`)
+3. Commit your changes (`git commit -asm 'Add some feature'`)
+4. Push to the branch (`git push origin new-feature`)
+5. Create a new Pull Request
 
 ## LICENSE
 
 The Apache License (Version 2.0, January 2004).
+
+[v2.0.1]: https://github.com/yunify/qingstor-sdk-ruby/compare/v2.0.0...v2.0.1

data/lib/qingstor/sdk/request/preprocessor.rb

@@ -14,6 +14,9 @@
 #  | limitations under the License.
 #  +-------------------------------------------------------------------------
 
+require 'base64'
+require 'digest'
+
 require 'active_support/core_ext/hash/keys'
 require 'mimemagic'
 
@@ -54,7 +57,14 @@ module QingStor
 
       def self.request_body(input)
         body = input[:request_body]
-        body.is_a?(File) ? body.read : body
+        body = body.is_a?(File) ? body.read : body
+        return body if body
+
+        if input[:request_elements] && !input[:request_elements].empty?
+          json_body = JSON.generate input[:request_elements]
+          Logger.info "QingStor request json: [#{input[:id]}] #{json_body}"
+          json_body
+        end
       end
 
       def self.request_headers(input)
@@ -79,9 +89,14 @@ module QingStor
           input[:request_headers][:'Content-Type'] = 'application/octet-stream'
         end
         unless input[:request_headers][:'User-Agent']
-          ua = "QingStorSDK/#{QingStor::SDK::VERSION} (Ruby v#{RUBY_VERSION}; #{RUBY_PLATFORM})"
+          ua = "qingstor-sdk-ruby/#{QingStor::SDK::VERSION} (Ruby v#{RUBY_VERSION}; #{RUBY_PLATFORM})"
           input[:request_headers][:'User-Agent'] = ua
         end
+
+        if input[:api_name] == 'Delete Multiple Objects'
+          input[:request_headers][:'Content-MD5'] = Base64.encode64(Digest::MD5.digest(input[:request_body])).strip
+        end
+
         input[:request_headers]
       end
 

data/lib/qingstor/sdk/request/request.rb

@@ -66,8 +66,8 @@ module QingStor
         self.request_url = "#{input[:request_endpoint]}#{Signer.escape input[:request_uri]}#{query_string}"
 
         request      = new_http_request input[:request_method], request_url
-        request.body = build_request_body input[:request_body], input[:request_elements]
-        input[:request_headers].each { |k, v| request.add_field k.to_s, v }
+        request.body = input[:request_body]
+        input[:request_headers].each { |k, v| request[k.to_s] = v }
 
         self.http_request = request
       end
@@ -102,18 +102,6 @@ module QingStor
         end
       end
 
-      def build_request_body(request_body, request_elements)
-        if request_body
-          request_body
-        elsif request_elements
-          unless request_elements.empty?
-            json_body = JSON.generate request_elements
-            Logger.info "QingStor request json: [#{input[:id]}] #{json_body}"
-            json_body
-          end
-        end
-      end
-
       def new_http_request(method, url)
         case method
         when 'GET'

data/lib/qingstor/sdk/service/bucket.rb

@@ -46,9 +46,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             204, # Bucket deleted
           ],
@@ -86,9 +84,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -126,9 +122,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             204, # No content
           ],
@@ -166,9 +160,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             204, # No content
           ],
@@ -188,14 +180,14 @@ module QingStor
 
       # delete_multiple_objects: Delete multiple objects from the bucket.
       # Documentation URL: https://docs.qingcloud.com/qingstor/api/bucket/delete_multiple.html
-      def delete_multiple_objects(content_md5: '', objects: [],
+      def delete_multiple_objects(objects: [],
                                   quiet: nil)
-        request = delete_multiple_objects_request content_md5: content_md5, objects: objects,
-          quiet: quiet
+        request = delete_multiple_objects_request objects: objects,
+                                                  quiet:   quiet
         request.send
       end
 
-      def delete_multiple_objects_request(content_md5: '', objects: [],
+      def delete_multiple_objects_request(objects: [],
                                           quiet: nil)
         input = {
           config:           config,
@@ -206,15 +198,12 @@ module QingStor
           request_params:   {
           },
           request_headers:  {
-            'Content-MD5' => content_md5,
           },
           request_elements: {
             'objects' => objects,
             'quiet'   => quiet,
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -229,10 +218,6 @@ module QingStor
       def delete_multiple_objects_input_validate(input)
         input.deep_stringify_keys!
 
-        unless !input['request_headers']['Content-MD5'].nil? && !input['request_headers']['Content-MD5'].to_s.empty?
-          raise ParameterRequiredError.new('Content-MD5', 'DeleteMultipleObjectsInput')
-        end
-
         unless !input['request_elements']['objects'].nil? && !input['request_elements']['objects'].to_s.empty?
           raise ParameterRequiredError.new('objects', 'DeleteMultipleObjectsInput')
         end
@@ -263,9 +248,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -303,9 +286,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -343,9 +324,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -383,9 +362,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -423,9 +400,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -463,9 +438,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -516,9 +489,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -556,9 +527,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             201, # Bucket created
           ],
@@ -597,9 +566,7 @@ module QingStor
           request_elements: {
             'acl' => acl,
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -678,9 +645,7 @@ module QingStor
           request_elements: {
             'cors_rules' => cors_rules,
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -733,9 +698,7 @@ module QingStor
           request_elements: {
             'source_site' => source_site,
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -778,9 +741,7 @@ module QingStor
           request_elements: {
             'statement' => statement,
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],

data/lib/qingstor/sdk/service/object.rb

@@ -43,9 +43,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             204, # Object multipart deleted
           ],
@@ -103,9 +101,7 @@ module QingStor
           request_elements: {
             'object_parts' => object_parts,
           },
-
           request_body:     nil,
-
           status_code:      [
             201, # Object created
           ],
@@ -154,9 +150,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             204, # Object deleted
           ],
@@ -224,9 +218,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
             206,  # Partial content
@@ -293,9 +285,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -347,9 +337,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -397,9 +385,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -451,9 +437,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],
@@ -496,6 +480,7 @@ module QingStor
                      x_qs_encryption_customer_algorithm: '',
                      x_qs_encryption_customer_key: '',
                      x_qs_encryption_customer_key_md5: '',
+                     x_qs_fetch_if_unmodified_since: '',
                      x_qs_fetch_source: '',
                      x_qs_move_source: '',
                      body: nil)
@@ -514,6 +499,7 @@ module QingStor
                                                  x_qs_encryption_customer_algorithm:             x_qs_encryption_customer_algorithm,
                                                  x_qs_encryption_customer_key:                   x_qs_encryption_customer_key,
                                                  x_qs_encryption_customer_key_md5:               x_qs_encryption_customer_key_md5,
+                                                 x_qs_fetch_if_unmodified_since:                 x_qs_fetch_if_unmodified_since,
                                                  x_qs_fetch_source:                              x_qs_fetch_source,
                                                  x_qs_move_source:                               x_qs_move_source,
                                                  body:                                           body
@@ -535,6 +521,7 @@ module QingStor
                              x_qs_encryption_customer_algorithm: '',
                              x_qs_encryption_customer_key: '',
                              x_qs_encryption_customer_key_md5: '',
+                             x_qs_fetch_if_unmodified_since: '',
                              x_qs_fetch_source: '',
                              x_qs_move_source: '',
                              body: nil)
@@ -563,14 +550,13 @@ module QingStor
             'X-QS-Encryption-Customer-Algorithm'             => x_qs_encryption_customer_algorithm,
             'X-QS-Encryption-Customer-Key'                   => x_qs_encryption_customer_key,
             'X-QS-Encryption-Customer-Key-MD5'               => x_qs_encryption_customer_key_md5,
+            'X-QS-Fetch-If-Unmodified-Since'                 => x_qs_fetch_if_unmodified_since,
             'X-QS-Fetch-Source'                              => x_qs_fetch_source,
             'X-QS-Move-Source'                               => x_qs_move_source,
           },
           request_elements: {
           },
-
           request_body:     body,
-
           status_code:      [
             201, # Object created
           ],
@@ -634,9 +620,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     body,
-
           status_code:      [
             201, # Object multipart created
           ],

data/lib/qingstor/sdk/service/qingstor.rb

@@ -48,9 +48,7 @@ module QingStor
           },
           request_elements: {
           },
-
           request_body:     nil,
-
           status_code:      [
             200, # OK
           ],

data/lib/qingstor/sdk/version.rb

@@ -16,6 +16,6 @@
 
 module QingStor
   module SDK
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qingstor-sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
-- Jingwen Peng
+- Yunify SDK Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,9 +108,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.45.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.45.0
 description: The official QingStor SDK for Ruby programming language.
 email:
-- pengsrc@yunify.com
+- sdk_group@yunify.com
 executables: []
 extensions: []
 extra_rdoc_files: []