qingstor-sdk 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263b91ca92ae77072e2332a22e1bdb7cbff66f1c
-  data.tar.gz: 71ce0e672123b085c239af8cc3234f5c8bc96eea
+  metadata.gz: 077caf573d40509928daa24c05cfc408e48507d3
+  data.tar.gz: fd249954ffe298be5d12febad583f88f2124d13b
 SHA512:
-  metadata.gz: ff856c3fd10328cc09f4080c526bcea7fd8707145f6bae10bf21b092352198637f7bcada0caf5c00ef80c821b70d8595dc5d96ec8241e74346e01bd77ad15f3a
-  data.tar.gz: e07eb400e5a6afafcf084611d79f94469c0381ffa79f0eafc1f9091106936744cb382e76e812614c1d6c2ec8526866ce7d2c74a82df649d25cc4f8c0aa0ec5a1
+  metadata.gz: 96ca254d7e4090112d58ff1da2cf7917dad9148a188b0cf38aa3f7f961ec482c2ec9643e8456e8a13fb4cd910c6e91d3ca3e89e17eeaa4721f402fd48978beb9
+  data.tar.gz: 58002a2563f7f51147386998c8fe4ec9a910068f3e5840ff6e41a37163a1737edcdba68ae598e3ee697b12fc09027f551de4627277893a6663af55386d951442

data/README.md

@@ -1,11 +1,9 @@
 # QingStor::SDK
 
-<span style="display: inline-block">
 [![Build Status](https://travis-ci.org/yunify/qingstor-sdk-ruby.svg?branch=master)](https://travis-ci.org/yunify/qingstor-sdk-ruby)
 [![Gem Version](https://badge.fury.io/rb/qingstor-sdk.svg)](http://badge.fury.io/rb/qingstor-sdk)
 [![API Reference](http://img.shields.io/badge/api-reference-green.svg)](https://docs.qingcloud.com/qingstor/)
 [![License](http://img.shields.io/badge/license-apache%20v2-blue.svg)](https://github.com/yunify/qingstor-sdk-ruby/blob/master/LICENSE)
-</span>
 
 The official QingStor SDK for Ruby programming language.
 
@@ -165,6 +163,18 @@ log_level: 'warn'
 ## Change Log
 All notable changes to QingStor SDK for Ruby will be documented here.
 
+### [v1.9.3] - 2017-03-15
+
+#### Added
+
+- Allow user to append additional info to User-Agent.
+- Add request parameters for GET Object.
+- Add IP address conditions for bucket policy.
+
+### Fixed
+
+- Resource is not mandatory in bucket policy statement.
+
 ### [v1.9.2] - 2017-01-23
 
 #### Fixed
@@ -203,5 +213,6 @@ All notable changes to QingStor SDK for Ruby will be documented here.
 The Apache License (Version 2.0, January 2004).
 
 [master]: https://github.com/yunify/qingstor-sdk-ruby/tree/master
+[v1.9.3]: https://github.com/yunify/qingstor-sdk-ruby/compare/v1.9.2...v1.9.3
 [v1.9.2]: https://github.com/yunify/qingstor-sdk-ruby/compare/v1.9.1...v1.9.2
 [v1.9.1]: https://github.com/yunify/qingstor-sdk-ruby/compare/v1.9.0...v1.9.1

data/lib/qingstor/sdk/general/config.rb

@@ -46,6 +46,23 @@ module QingStor
         self
       end
 
+      def check
+        [:access_key_id, :secret_access_key, :host, :port, :protocol].each do |x|
+          if !self[x] || self[x].to_s.empty?
+            raise ConfigurationError, "#{x.to_sym} not specified"
+          end
+        end
+        if self[:additional_user_agent] && !self[:additional_user_agent].empty?
+          self[:additional_user_agent].each_byte do |x|
+            # Allow space(32) to ~(126) in ASCII Table, exclude "(34).
+            if x < 32 || x > 126 || x == 32 || x == 34
+              raise ConfigurationError, 'additional User-Agent contains characters that not allowed'
+            end
+          end
+        end
+        self
+      end
+
       def load_default_config
         load_config_from_file Contract::DEFAULT_CONFIG_FILEPATH
       end

data/lib/qingstor/sdk/general/default/config.yaml

@@ -1,12 +1,15 @@
 # QingStor services configuration
 
-#access_key_id: 'ACCESS_KEY_ID'
-#secret_access_key: 'SECRET_ACCESS_KEY'
+#access_key_id: ACCESS_KEY_ID
+#secret_access_key: SECRET_ACCESS_KEY
 
-host: 'qingstor.com'
+host: qingstor.com
 port: 443
-protocol: 'https'
+protocol: https
 connection_retries: 3
 
+# Additional User-Agent
+additional_user_agent: ""
+
 # Valid log levels are "debug", "info", "warn", "error", and "fatal".
-log_level: 'warn'
+log_level: warn

data/lib/qingstor/sdk/general/error.rb

@@ -14,11 +14,21 @@
 #  | limitations under the License.
 #  +-------------------------------------------------------------------------
 
-module QingCloud
+module QingStor
   module SDK
     class SDKError < StandardError
     end
 
+    class ConfigurationError < SDKError
+      def initialize(error_message)
+        @error_message = error_message
+      end
+
+      def message
+        "configuration is not valid, #{@error_message}"
+      end
+    end
+
     class NetworkError < SDKError
     end
 

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

@@ -51,7 +51,7 @@ module QingStor
       def self.request_uri(input)
         unless input[:properties].nil?
           input[:properties].each do |k, v|
-            input[:request_uri].gsub! "<#{k}>", v.to_s
+            input[:request_uri].gsub! "<#{k}>", (escape v.to_s)
           end
         end
         input[:request_uri]
@@ -92,6 +92,9 @@ module QingStor
         end
         unless input[:request_headers][:'User-Agent']
           ua = "qingstor-sdk-ruby/#{QingStor::SDK::VERSION} (Ruby v#{RUBY_VERSION}; #{RUBY_PLATFORM})"
+          if input[:config][:additional_user_agent] && !input[:config][:additional_user_agent].empty?
+            ua = "#{ua} #{input[:config][:additional_user_agent]}"
+          end
           input[:request_headers][:'User-Agent'] = ua
         end
 
@@ -99,14 +102,17 @@ module QingStor
           input[:request_headers][:'Content-MD5'] = Base64.encode64(Digest::MD5.digest(input[:request_body])).strip
         end
 
+        input[:request_headers].map do |k, v|
+          input[:request_headers][k] = escape v.to_s unless v.to_s.ascii_only?
+        end
+
         input[:request_headers]
       end
 
       def self.request_params(input)
         unless input[:request_params].nil?
           input[:request_params].map do |k, v|
-            input[:request_params][k] = CGI.escape v.to_s
-            input[:request_params][k].gsub! '+', '%20'
+            input[:request_params][k] = escape v.to_s
           end
         end
         input[:request_params]
@@ -125,6 +131,14 @@ module QingStor
         end
         object
       end
+
+      def self.escape(origin)
+        origin = CGI.escape origin
+        origin.gsub! '%2F', '/'
+        origin.gsub! '%3D', '='
+        origin.gsub! '+', '%20'
+        origin
+      end
     end
   end
 end

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

@@ -63,10 +63,13 @@ module QingStor
 
       def build
         params           = input[:request_params].map { |k, v| "#{k}=#{v}" }
-        query_string     = !params.empty? ? "?#{params.join '&'}" : ''
+        query_string     = params.join '&'
+        if query_string && !query_string.empty?
+          query_string = "#{input[:request_uri].include?('?') ? '&' : '?'}#{query_string}"
+        end
         self.request_url = URI "#{input[:request_endpoint]}#{input[:request_uri]}#{query_string}"
 
-        request      = new_http_request input[:request_method], request_url.path
+        request      = new_http_request input[:request_method], request_url.to_s
         request.body = input[:request_body]
         input[:request_headers].each { |k, v| request[k.to_s] = v }
 

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

@@ -87,19 +87,14 @@ module QingStor
       end
 
       def self.canonicalized_resource(input)
-        path = CGI.escape input[:request_uri]
-        path.gsub! '%3F', '?'
-        path.gsub! '%2F', '/'
-        path.gsub! '+', '%20'
-
         params = input[:request_params].keys.sort.map { |k|
           if sub_resource? k.to_s
             v = input[:request_params][k].to_s.strip
             !v.nil? && v != '' ? "#{k}=#{CGI.unescape v}" : k
           end
         }.compact.join '&'
-        params = path.include?('?') ? "&#{params}" : "?#{params}" if params != ''
-        "#{path}#{params}"
+        params = input[:request_uri].include?('?') ? "&#{params}" : "?#{params}" if params != ''
+        "#{input[:request_uri]}#{params}"
       end
 
       def self.sub_resource?(key)

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

@@ -522,6 +522,58 @@ module QingStor
 
       public
 
+      # list_multipart_uploads: List multipart uploads in the bucket.
+      # Documentation URL: https://docs.qingcloud.com/qingstor/api/bucket/list_multipart_uploads.html
+      #
+      # == Options
+      #
+      # * +:delimiter+ - Put all keys that share a common prefix into a list
+      # * +:limit+ - Results count limit
+      # * +:marker+ - Limit results to keys that start at this marker
+      # * +:prefix+ - Limits results to keys that begin with the prefix
+      #
+      def list_multipart_uploads(options = {})
+        options.deep_stringify_keys!
+        request = list_multipart_uploads_request options
+        request.send
+      end
+
+      def list_multipart_uploads_request(options = {})
+        options.deep_stringify_keys!
+        input = {
+          config:           config,
+          properties:       properties,
+          api_name:         'List Multipart Uploads',
+          request_method:   'GET',
+          request_uri:      '/<bucket-name>?uploads',
+          request_params:   {
+            'delimiter' => options['delimiter'],
+            'limit'     => options['limit'],
+            'marker'    => options['marker'],
+            'prefix'    => options['prefix'],
+          },
+          request_headers:  {
+          },
+          request_elements: {
+          },
+          request_body:     nil,
+          status_code:      [
+            200, # OK
+          ],
+        }
+
+        list_multipart_uploads_input_validate input
+        Request.new input
+      end
+
+      private
+
+      def list_multipart_uploads_input_validate(input)
+        input.deep_stringify_keys!
+      end
+
+      public
+
       # list_objects: Retrieve the object list in a bucket.
       # Documentation URL: https://docs.qingcloud.com/qingstor/api/bucket/get.html
       #
@@ -909,10 +961,6 @@ module QingStor
             raise ParameterRequiredError.new('id', 'statement')
           end
 
-          unless !x['resource'].nil? && !x['resource'].to_s.empty?
-            raise ParameterRequiredError.new('resource', 'statement')
-          end
-
           unless !x['user'].nil? && !x['user'].to_s.empty?
             raise ParameterRequiredError.new('user', 'statement')
           end

data/lib/qingstor/sdk/version.rb

@@ -16,6 +16,6 @@
 
 module QingStor
   module SDK
-    VERSION = '1.9.2'.freeze
+    VERSION = '1.9.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qingstor-sdk
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Yunify SDK Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport