aliyun-oss-sdk 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0001949a848455a73f2af7665744b7ec2582cfae
-  data.tar.gz: ec117f792a2ec628b3f42aa8b58815d2756fcd54
+  metadata.gz: bbf195d34ce4df49ea7a519ff4d05f2c53844a4a
+  data.tar.gz: 0acc746359cfb2ce02a6eb005a61f10f41acbd9d
 SHA512:
-  metadata.gz: 041d6e77f4becdf642768b07516252f44dfcb4c1857c3d8b602ec5e291a8f10e5b5efb56147b2f403885c88fa0ae9d2ace2b4d12cd6f53f0203e1683ab411d82
-  data.tar.gz: 7a6f40dec1bc333cbc16b208eb7536647196c51cd64ba8dc7f726b407ef390918e7383e753dabb8aa0354781576a619428b3194e297c6c194b4e9e3dcadb56c5
+  metadata.gz: f5faaf0e6ac940d44ddd5a2367d54ffdfdc7d8008badf749159fb83a15092f003fd8c7b11017736823fa2d112ac294ec51ecc249f413abc0807ca516fba14fb2
+  data.tar.gz: fe02419091a96c091998b603d0cc9d08e28639d3f4e9c28c1a03e86f865d7702782deee8d1c7457dedd64239153a1004c4b0bb3e08908729ca96f755d6b6239d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.1.8
+-----
+
+- Escape special charaters in object name;
+
 0.1.7
 -----
 

data/lib/aliyun/oss/api/bucket_objects.rb

@@ -40,7 +40,6 @@ module Aliyun
         #
         # @return [Response]
         def bucket_create_object(key, file, headers = {})
-          Utils.clean_object_name!(key)
           Utils.stringify_keys!(headers)
           http.put("/#{key}", headers: headers, body: Utils.to_data(file), bucket: bucket, key: key)
         end
@@ -68,7 +67,6 @@ module Aliyun
           fail('source_bucket must be not empty!') if source_bucket.nil? || source_bucket.empty?
           fail('source_key must be not empty!') if source_key.nil? || source_key.empty?
 
-          Utils.clean_object_name!(key)
           Utils.stringify_keys!(headers)
           headers.merge!('x-oss-copy-source' => "/#{source_bucket}/#{source_key}")
 
@@ -88,7 +86,6 @@ module Aliyun
         #
         # @return [Response]
         def bucket_append_object(key, file, position = 0, headers = {})
-          Utils.clean_object_name!(key)
           Utils.stringify_keys!(headers)
 
           query = { 'append' => true, 'position' => position }
@@ -118,7 +115,6 @@ module Aliyun
         #
         # @return [Response]
         def bucket_get_object(key, query = {}, headers = {})
-          Utils.clean_object_name!(key)
           Utils.stringify_keys!(query)
           Utils.stringify_keys!(headers)
 
@@ -134,7 +130,6 @@ module Aliyun
         def bucket_get_object_share_link(key, expired_in_seconds)
           expire_time = Time.now.to_i + expired_in_seconds
 
-          Utils.clean_object_name!(key)
           signature = Authorization.get_temporary_signature(
             @secret_key,
             expire_time,
@@ -155,7 +150,6 @@ module Aliyun
         #
         # @return [Response]
         def bucket_delete_object(key)
-          Utils.clean_object_name!(key)
           http.delete("/#{key}", bucket: bucket, key: key)
         end
 
@@ -190,7 +184,6 @@ module Aliyun
         #
         # @return [Response]
         def bucket_get_meta_object(key, headers = {})
-          Utils.clean_object_name!(key)
           Utils.stringify_keys!(headers)
           http.head("/#{key}", headers: headers, bucket: bucket, key: key)
         end
@@ -205,7 +198,6 @@ module Aliyun
         #
         # @return [Response]
         def bucket_get_object_acl(key)
-          Utils.clean_object_name!(key)
           query = { 'acl' => true }
           http.get("/#{key}", query: query, bucket: bucket, key: key)
         end
@@ -221,7 +213,6 @@ module Aliyun
         #
         # @return [Response]
         def bucket_set_object_acl(key, acl)
-          Utils.clean_object_name!(key)
           query = { 'acl' => true }
           headers = { 'x-oss-object-acl' => acl }
           http.put("/#{key}", query: query, headers: headers, bucket: bucket, key: key)

data/lib/aliyun/oss/http.rb

@@ -13,31 +13,31 @@ module Aliyun
         @host = host
       end
 
-      def get(uri, options = {})
-        request('GET', uri, options)
+      def get(path, options = {})
+        request('GET', path, options)
       end
 
-      def put(uri, options = {})
+      def put(path, options = {})
         headers = default_content_type.merge(options[:headers] || {})
-        request('PUT', uri, options.merge(headers: headers))
+        request('PUT', path, options.merge(headers: headers))
       end
 
-      def post(uri, options = {})
+      def post(path, options = {})
         headers = default_content_type.merge(options[:headers] || {})
-        request('POST', uri, options.merge(headers: headers))
+        request('POST', path, options.merge(headers: headers))
       end
 
-      def delete(uri, options = {})
+      def delete(path, options = {})
         headers = default_content_type.merge(options[:headers] || {})
-        request('DELETE', uri, options.merge(headers: headers))
+        request('DELETE', path, options.merge(headers: headers))
       end
 
-      def options(uri, options = {})
-        request('OPTIONS', uri, options)
+      def options(path, options = {})
+        request('OPTIONS', path, options)
       end
 
-      def head(uri, options = {})
-        request('HEAD', uri, options)
+      def head(path, options = {})
+        request('HEAD', path, options)
       end
 
       private
@@ -49,7 +49,7 @@ module Aliyun
 
         append_headers!(headers, verb, body, options)
 
-        path = api_endpoint(headers['Host']) + resource
+        path = get_path(headers['Host'], resource)
         options = { headers: headers, query: query, body: body, uri_adapter: Addressable::URI }
 
         wrap(HTTParty.__send__(verb.downcase, path, options))
@@ -128,6 +128,11 @@ module Aliyun
         "http://#{host}"
       end
 
+      def get_path(host, resource)
+        fixed = resource.split('/').map { |res| CGI.escape(res) }.join('/')
+        api_endpoint(host) + fixed
+      end
+
       def user_agent
         "aliyun-oss-sdk-ruby/#{Aliyun::Oss::VERSION} " \
         "(#{RbConfig::CONFIG['host_os']} ruby-#{RbConfig::CONFIG['ruby_version']})"

data/lib/aliyun/oss/utils.rb

@@ -7,11 +7,6 @@ module Aliyun
   module Oss
     class Utils
 
-      # remove special charaters in object name https://github.com/aliyun-beta/aliyun-oss-ruby-sdk/issues/9
-      def self.clean_object_name!(key)
-        key.gsub!(/[#%]/, '')
-      end
-
       # Get endpoint
       #
       # @example

data/lib/aliyun/oss/version.rb

@@ -1,5 +1,5 @@
 module Aliyun
   module Oss
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-oss-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Newell Zhu