fog-aliyun 0.3.18 → 0.3.19

data/lib/fog/aliyun/requests/storage/upload_part.rb

@@ -0,0 +1,24 @@
+
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+        # Upload a part for a multipart upload
+        #
+        # @param bucket_name [String] Name of bucket to add part to
+        # @param object_name [String] Name of object to add part to
+        # @param upload_id [String] Id of upload to add part to
+        # @param part_number [String] Index of part in upload
+        # @param data [File||String] Content for part
+        #
+        # @see https://help.aliyun.com/document_detail/31993.html
+        #
+        def upload_part(bucket_name, object_name, upload_id, part_number, data)
+          @oss_protocol.upload_part(bucket_name, object_name, upload_id, part_number) do |sw|
+              sw.write(data)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aliyun/storage.rb

@@ -9,6 +9,7 @@ AliyunOssSdk= Aliyun::OSS
 module Fog
   module Aliyun
     class Storage < Fog::Service
+      COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
       DEFAULT_REGION = 'cn-hangzhou'
 
       DEFAULT_SCHEME = 'https'
@@ -36,19 +37,23 @@ module Fog
       request :copy_object
       request :delete_bucket
       request :delete_object
+      request :delete_multiple_objects
       request :get_bucket
+      request :get_bucket_location
       request :get_object
+      request :get_object_acl
       request :get_object_http_url
       request :get_object_https_url
       request :head_object
       request :put_bucket
       request :put_object
+      request :get_service
       request :list_buckets
       request :list_objects
-      request :get_containers
-      request :get_container
-      request :delete_container
-      request :put_container
+      request :initiate_multipart_upload
+      request :upload_part
+      request :complete_multipart_upload
+      request :abort_multipart_upload
 
       class Real
         # Initialize connection to OSS
@@ -121,6 +126,7 @@ module Fog
               :access_key_secret => @aliyun_accesskey_secret
           )
           @oss_http = AliyunOssSdk::HTTP.new(@oss_config)
+          @oss_protocol = AliyunOssSdk::Protocol.new(@oss_config)
         end
 
         def reload
@@ -136,6 +142,16 @@ module Fog
           end
         end
 
+        def object_to_path(object_name=nil)
+          '/' + escape(object_name.to_s).gsub('%2F','/')
+        end
+
+        def escape(string)
+          string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) {
+            "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
+          }
+        end
+
         def request(params)
           method = params[:method]
           time = Time.new.utc

data/lib/fog/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Fog
   module Aliyun
-    VERSION = '0.3.18'
+    VERSION = '0.3.19'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han, Guimin He
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,28 +134,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: aliyun-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -325,22 +325,26 @@ files:
 - lib/fog/aliyun/requests/compute/start_server.rb
 - lib/fog/aliyun/requests/compute/stop_server.rb
 - lib/fog/aliyun/requests/compute/unassociate_eip_address.rb
+- lib/fog/aliyun/requests/storage/abort_multipart_upload.rb
+- lib/fog/aliyun/requests/storage/complete_multipart_upload.rb
 - lib/fog/aliyun/requests/storage/copy_object.rb
 - lib/fog/aliyun/requests/storage/delete_bucket.rb
-- lib/fog/aliyun/requests/storage/delete_container.rb
+- lib/fog/aliyun/requests/storage/delete_multiple_objects.rb
 - lib/fog/aliyun/requests/storage/delete_object.rb
 - lib/fog/aliyun/requests/storage/get_bucket.rb
-- lib/fog/aliyun/requests/storage/get_container.rb
-- lib/fog/aliyun/requests/storage/get_containers.rb
+- lib/fog/aliyun/requests/storage/get_bucket_location.rb
 - lib/fog/aliyun/requests/storage/get_object.rb
+- lib/fog/aliyun/requests/storage/get_object_acl.rb
 - lib/fog/aliyun/requests/storage/get_object_http_url.rb
 - lib/fog/aliyun/requests/storage/get_object_https_url.rb
+- lib/fog/aliyun/requests/storage/get_service.rb
 - lib/fog/aliyun/requests/storage/head_object.rb
+- lib/fog/aliyun/requests/storage/initiate_multipart_upload.rb
 - lib/fog/aliyun/requests/storage/list_buckets.rb
 - lib/fog/aliyun/requests/storage/list_objects.rb
 - lib/fog/aliyun/requests/storage/put_bucket.rb
-- lib/fog/aliyun/requests/storage/put_container.rb
 - lib/fog/aliyun/requests/storage/put_object.rb
+- lib/fog/aliyun/requests/storage/upload_part.rb
 - lib/fog/aliyun/storage.rb
 - lib/fog/aliyun/version.rb
 - lib/fog/bin/aliyun.rb

data/lib/fog/aliyun/requests/storage/delete_container.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Fog
-  module Aliyun
-    class Storage
-      class Real
-        # Delete an existing container
-        #
-        # ==== Parameters
-        # * container<~String> - Name of container to delete
-        # * options
-        #
-        def delete_container(container, options = {})
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          object = container + '/'
-          resource = bucket + '/' + object
-
-          request(
-            expects: 204,
-            method: 'DELETE',
-            path: object,
-            bucket: bucket,
-            resource: resource
-          )
-        end
-      end
-    end
-  end
-end

data/lib/fog/aliyun/requests/storage/get_container.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Fog
-  module Aliyun
-    class Storage
-      class Real
-        def get_container(container, options = {})
-          options = options.reject { |_key, value| value.nil? }
-
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-
-          marker = options[:marker]
-          maxKeys = options[:maxKeys]||1000
-          maxKeys = maxKeys.to_i
-          maxKeys = [maxKeys,1000].min.to_s
-          delimiter = '/'
-
-          path = ''
-
-          prefix = if container == '' || container == '.' || container.nil?
-                     nil
-                   else
-                     container + '/'
-                   end
-
-          if prefix
-            path += '?prefix=' + prefix
-            path += '&marker=' + marker if marker
-            path += '&max-keys=' + maxKeys if maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-          elsif marker
-            path += '?marker=' + marker
-            path += '&max-keys=' + maxKeys if maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-          elsif maxKeys
-            path += '?max-keys=' + maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-          elsif delimiter
-            path += '?delimiter=' + delimiter
-          end
-
-          resource = bucket + '/'
-          ret = request(
-            expects: [200, 203, 400],
-            method: 'GET',
-            path: path,
-            resource: resource,
-            bucket: bucket
-          )
-          xml = ret.data[:body]
-          XmlSimple.xml_in(xml)['CommonPrefixes']
-        end
-      end
-    end
-  end
-end

data/lib/fog/aliyun/requests/storage/get_containers.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Fog
-  module Aliyun
-    class Storage
-      class Real
-        # List existing storage containers
-        #
-        # ==== Parameters
-        # * options<~Hash>:
-        #   * 'maxKeys'<~Integer> - Upper limit to number of results returned
-        #   * 'marker'<~String> - Only return objects with name greater than this value
-        #
-        # ==== Returns
-        #
-        def get_containers(options = {})
-          options = options.reject { |_key, value| value.nil? }
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          prefix = options[:prefix]
-          marker = options[:marker]
-          maxKeys = options[:maxKeys]||1000
-          maxKeys = maxKeys.to_i
-          maxKeys = [maxKeys,1000].min.to_s
-          delimiter = '/'
-
-          path = ''
-          if prefix
-            path += '?prefix=' + prefix
-            path += '&marker=' + marker if marker
-            path += '&max-keys=' + maxKeys if maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-
-          elsif marker
-            path += '?marker=' + marker
-            path += '&max-keys=' + maxKeys if maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-
-          elsif maxKeys
-            path += '?max-keys=' + maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-
-          elsif delimiter
-            path += '?delimiter=' + delimiter
-          end
-
-          resource = bucket + '/'
-          ret = request(
-            expects: [200, 203, 400],
-            method: 'GET',
-            path: path,
-            resource: resource,
-            bucket: bucket
-          )
-          xml = ret.data[:body]
-          XmlSimple.xml_in(xml)['CommonPrefixes']
-        end
-      end
-    end
-  end
-end

data/lib/fog/aliyun/requests/storage/put_container.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Fog
-  module Aliyun
-    class Storage
-      class Real
-        # Create a new container
-        #
-        # ==== Parameters
-        # * name<~String> - Name for container
-        #
-        def put_container(name, options = {})
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-
-          path = name + '/'
-          resource = bucket + '/' + name + '/'
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: path,
-            bucket: bucket,
-            resource: resource
-          )
-        end
-      end
-    end
-  end
-end