qingstor-sdk 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 121f4fa26d746085c9c07a1217863b907228aaac
-  data.tar.gz: b41e30469b51ea9d1ce6acd983d9371bfc41a348
+  metadata.gz: 085dc72ef0fba628a4b5333907aa8908ccc13d09
+  data.tar.gz: 8aefd7a35683cedafacc9d9ac210ad6ff1963d08
 SHA512:
-  metadata.gz: 26183f925125c74f9cafdd94786229f4a87ff9689dfcdea1a63a58f26a4ad9a5be7d034b7284e56578a269d70b45c7bca096b2e4747289d2950ee63aec384b57
-  data.tar.gz: b5c50f4616a145c5637c16eec5aee9f28fe8f0c1a943a195fd41a049235efa26b6a48da0acd4eeeda949707c95e34484c92a1a13f41c3110ed2b211489a6db9b
+  metadata.gz: 11d22ac48463e77c861b4a2de66927d6a09ab51c67f9cbd0c2619e392dc0d4b5a751f4c06c0b48b753f898fe6ab440b99f665131db2b6b7ae181c26fc6ee25c7
+  data.tar.gz: e987a50acafb8b714a283abe3c3bcd4e74891a34a030ccc2dead7b00424587510cf6ca7ab7f6e575e8240572a5fc2c3ce45706be982114ec03aac9c2d3af9079

data/README.md

@@ -167,11 +167,23 @@ log_level: 'warn'
 ## Change Log
 All notable changes to QingStor SDK for Ruby will be documented here.
 
+### [v2.1.0] - 2016-12-24
+
+#### Changed
+- Fix signer bug.
+- Add more parameters to sign.
+
+#### Added
+- Add request parameters for GET Object.
+- Add IP address conditions for bucket policy.
+
 ### [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.
 
@@ -193,4 +205,5 @@ All notable changes to QingStor SDK for Ruby will be documented here.
 
 The Apache License (Version 2.0, January 2004).
 
+[v2.1.0]: https://github.com/yunify/qingstor-sdk-ruby/compare/v2.0.1...v2.1.0
 [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,7 @@
 #  | limitations under the License.
 #  +-------------------------------------------------------------------------
 
+require 'cgi'
 require 'base64'
 require 'digest'
 
@@ -29,6 +30,7 @@ module QingStor
         input[:request_uri]      = request_uri input
         input[:request_body]     = request_body input
         input[:request_headers]  = request_headers input
+        input[:request_params]   = request_params input
 
         display = {}
         input.each { |k, v| display[k] = v unless k.to_s == 'request_body' }
@@ -100,6 +102,16 @@ module QingStor
         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'
+          end
+        end
+        input[:request_params]
+      end
+
       def self.decorate_input(input)
         input.deep_symbolize_keys!
         input[:id] = (Random.new.rand * 1_000_000).to_int

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

@@ -63,7 +63,7 @@ module QingStor
       def build
         params           = input[:request_params].map { |k, v| "#{k}=#{v}" }
         query_string     = !params.empty? ? "?#{params.join '&'}" : ''
-        self.request_url = "#{input[:request_endpoint]}#{Signer.escape input[:request_uri]}#{query_string}"
+        self.request_url = "#{input[:request_endpoint]}#{input[:request_uri]}#{query_string}"
 
         request      = new_http_request input[:request_method], request_url
         request.body = input[:request_body]

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

@@ -87,29 +87,24 @@ module QingStor
       end
 
       def self.canonicalized_resource(input)
-        path = escape input[:request_uri]
+        path = input[:request_uri]
 
         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}=#{escape v}" : k
+            !v.nil? && v != '' ? "#{k}=#{CGI.unescape v}" : k
           end
         }.compact.join '&'
         params = path.include?('?') ? "&#{params}" : "?#{params}" if params != ''
         "#{path}#{params}"
       end
 
-      def self.escape(original)
-        result = CGI.escape(original)
-        result.gsub! '%3F', '?'
-        result.gsub! '%2F', '/'
-        result.gsub! '+', '%20'
-        result.gsub! '%2B', '+'
-        result
-      end
-
       def self.sub_resource?(key)
-        %w(acl cors delete mirror part_number policy stats upload_id uploads).include? key
+        %w(
+          acl cors delete mirror part_number policy stats upload_id uploads
+          response-expires response-cache-control response-content-type
+          response-content-language response-content-encoding response-content-disposition
+        ).include? key
       end
     end
   end

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

@@ -767,10 +767,18 @@ module QingStor
 
           unless x['condition'].nil?
 
+            unless x['condition']['ip_address'].nil?
+
+            end
+
             unless x['condition']['is_null'].nil?
 
             end
 
+            unless x['condition']['not_ip_address'].nil?
+
+            end
+
             unless x['condition']['string_like'].nil?
 
             end

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

@@ -170,7 +170,12 @@ module QingStor
 
       # get_object: Retrieve the object.
       # Documentation URL: https://docs.qingcloud.com/qingstor/api/object/get.html
-      def get_object(object_key, if_match: '',
+      def get_object(object_key, response_cache_control: '',
+                     response_content_disposition: '',
+                     response_content_encoding: '',
+                     response_content_language: '',
+                     response_content_type: '',
+                     response_expires: '', if_match: '',
                      if_modified_since: '',
                      if_none_match: '',
                      if_unmodified_since: '',
@@ -178,18 +183,28 @@ module QingStor
                      x_qs_encryption_customer_algorithm: '',
                      x_qs_encryption_customer_key: '',
                      x_qs_encryption_customer_key_md5: '')
-        request = get_object_request object_key, if_match:                           if_match,
-                                                 if_modified_since:                  if_modified_since,
-                                                 if_none_match:                      if_none_match,
-                                                 if_unmodified_since:                if_unmodified_since,
-                                                 range:                              range,
-                                                 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
+        request = get_object_request object_key, response_cache_control: response_cache_control,
+          response_content_disposition: response_content_disposition,
+          response_content_encoding: response_content_encoding,
+          response_content_language: response_content_language,
+          response_content_type: response_content_type,
+          response_expires: response_expires, if_match: if_match,
+          if_modified_since: if_modified_since,
+          if_none_match: if_none_match,
+          if_unmodified_since: if_unmodified_since,
+          range: range,
+          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
         request.send
       end
 
-      def get_object_request(object_key, if_match: '',
+      def get_object_request(object_key, response_cache_control: '',
+                             response_content_disposition: '',
+                             response_content_encoding: '',
+                             response_content_language: '',
+                             response_content_type: '',
+                             response_expires: '', if_match: '',
                              if_modified_since: '',
                              if_none_match: '',
                              if_unmodified_since: '',
@@ -205,6 +220,12 @@ module QingStor
           request_method:   'GET',
           request_uri:      '/<bucket-name>/<object-key>',
           request_params:   {
+            'response-cache-control'       => response_cache_control,
+            'response-content-disposition' => response_content_disposition,
+            'response-content-encoding'    => response_content_encoding,
+            'response-content-language'    => response_content_language,
+            'response-content-type'        => response_content_type,
+            'response-expires'             => response_expires,
           },
           request_headers:  {
             'If-Match'                           => if_match,

data/lib/qingstor/sdk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qingstor-sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Yunify SDK Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport