fog-aliyun 0.3.17 → 0.4.0

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Aliyun
     class Storage
@@ -7,29 +9,26 @@ module Fog
         # Get an expiring object https url from Cloud Files
         #
         # ==== Parameters
-        # * container<~String> - Name of container containing object
-        # * object<~String> - Name of object to get expiring url for
+        # * bucket_name<~String> - Name of bucket
+        # * object_name<~String> - Name of object to get expiring url for
         # * expires<~Integer> - An expiry time for this url
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
-        def get_object_https_url_public(object, expires, options = {})
-          options = options.reject { |_key, value| value.nil? }
-          bucket_name = options[:bucket]
-          bucket_name ||= @aliyun_oss_bucket
+        def get_object_https_url_public(bucket_name, object_name, expires)
           bucket = @oss_client.get_bucket(bucket_name)
           acl = bucket.acl()
 
           if acl == 'private'
             expires_time = (Time.now.to_i + (expires.nil? ? 0 : expires.to_i)).to_s
-            resource = bucket_name + '/' + object
+            resource = bucket_name + '/' + object_name
             signature = sign('GET', expires_time, nil, resource)
-            'https://' + bucket_name + '.' + @host + '/' + object +
+            'https://' + bucket_name + '.' + @host + '/' + object_name +
               '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
-              '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+              '&Signature=' + Addressable::URI.encode_component(signature, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           elsif acl == 'public-read' || acl == 'public-read-write'
-            'https://' + bucket_name + '.' + @host + '/' + object
+            'https://' + bucket_name + '.' + @host + '/' + object_name
           else
             'acl is wrong with value:' + acl
           end

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

@@ -0,0 +1,13 @@
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+        # List information about OSS buckets for authorized user
+        #
+        def get_service
+          @oss_protocol.list_buckets
+        end
+      end
+    end
+  end
+end

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

@@ -7,20 +7,32 @@ module Fog
         # Get headers for object
         #
         # ==== Parameters
-        # * object<~String> - Name of object to look for
+        # * object_name<~String> - Name of object to look for
         #
-        def head_object(object, options = {})
-          bucket_name = options[:bucket]
-          bucket_name ||= @aliyun_oss_bucket
-          resource = bucket_name + '/' + object
-          ret = request(
-            expects: [200, 404],
-            method: 'HEAD',
-            path: object,
-            bucket: bucket_name,
-            resource: resource
-          )
-          ret
+        def head_object(bucket_name, object_name, options={})
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+
+          # Currently, the ruby sdk does not support versionId
+          # if version_id = options.delete('versionId')
+          #   query = {'versionId' => version_id}
+          # end
+          headers = {}
+          headers['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header if options['If-Modified-Since']
+          headers['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header if options['If-Modified-Since']
+          headers.merge!(options)
+          resources = {
+              :bucket => bucket_name,
+              :object => object_name
+          }
+          http_options = {
+              :headers => headers
+          }
+          @oss_http.head(resources, http_options)
         end
       end
     end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+        # Initiate a multipart upload
+        #
+        # @param bucket_name [String] Name of bucket to create
+        # @param object_name [String] Name of object to create
+        # @param options [Hash]
+        #
+        # @see https://help.aliyun.com/document_detail/31992.html
+        #
+        def initiate_multipart_upload(bucket_name, object_name, options = {})
+          @oss_protocol.initiate_multipart_upload(bucket_name, object_name, options)
+        end
+      end
+    end
+  end
+end

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

@@ -5,33 +5,13 @@ module Fog
     class Storage
       class Real
         def list_buckets(options = {})
-          prefix = options[:prefix]
-          marker = options[:marker]
-          maxKeys = options[:maxKeys] || 1000
+          maxKeys = options[:max_keys] || 1000
           maxKeys = maxKeys.to_i
-          maxKeys =[maxKeys,1000].min.to_s
+          maxKeys = [maxKeys, 1000].min
 
-          path = ''
-          if prefix
-            path += '?prefix=' + prefix
-            path += '&marker=' + marker if marker
-            path += '&max-keys=' + maxKeys if maxKeys
-
-          elsif marker
-            path += '?marker=' + marker
-            path += '&max-keys=' + maxKeys if maxKeys
-
-          elsif maxKeys
-            path += '?max-keys=' + maxKeys
-          end
-
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            path: path
-          )
-          xml = ret.data[:body]
-          XmlSimple.xml_in(xml)['Buckets'][0]
+          options[:limit] = maxKeys
+          options.delete(:max_keys)
+          @oss_protocol.list_buckets(options)
         end
       end
     end

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

@@ -4,74 +4,22 @@ module Fog
   module Aliyun
     class Storage
       class Real
-        def list_objects(options = {})
-          bucket = options['bucket']
-          bucket ||= @aliyun_oss_bucket
-          prefix = options['prefix']
-          marker = options['marker']
-          # Set the ListObjects max limitation to 1000
-          maxKeys = options[:maxKeys]||1000
+        def list_objects(bucket_name, options = {})
+          maxKeys = options[:max_keys] || 1000
           maxKeys = maxKeys.to_i
-          maxKeys = [maxKeys,1000].min.to_s
-          delimiter = options['delimiter']
+          maxKeys = [maxKeys, 1000].min
 
-          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)
+          options[:limit] = maxKeys
+          options.delete(:max_keys)
+          @oss_protocol.list_objects(bucket_name, options)
         end
 
-        def list_multipart_uploads(bucket, _options = {})
-          path = '?uploads'
-          resource = bucket + '/' + path
-
-          ret = request(
-            expects: 200,
-            method: 'GET',
-            path: path,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])['Upload']
+        def list_multipart_uploads(bucket_name, _options = {})
+          @oss_protocol.list_multipart_uploads(bucket_name, _options)
         end
 
-        def list_parts(bucket, object, uploadid, _options = {})
-          path = object + '?uploadId=' + uploadid
-          resource = bucket + '/' + path
-
-          ret = request(
-            expects: 200,
-            method: 'GET',
-            path: path,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])['Part']
+        def list_parts(bucket_name, object_name, upload_id, _options = {})
+          @oss_protocol.list_parts(bucket_name, object_name, upload_id, _options)
         end
       end
     end

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

@@ -4,14 +4,8 @@ module Fog
   module Aliyun
     class Storage
       class Real
-        def put_bucket(bucketName)
-          resource = bucketName + '/'
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            resource: resource,
-            bucket: bucketName
-          )
+        def put_bucket(bucket_name, options = {})
+          @oss_protocol.create_bucket(bucket_name, options)
         end
       end
     end

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

@@ -7,133 +7,27 @@ module Fog
         # Put details for object
         #
         # ==== Parameters
-        # * object<~String> - Name of object to look for
+        # * bucket_name<~String> - Name of bucket to look for
+        # * object_name<~String> - Object of object to look for
+        # * data<~File>
+        # * options<~Hash>
         #
-        def put_object(object, file = nil, options = {})
-          bucket_name = options[:bucket]
-          bucket_name ||= @aliyun_oss_bucket
-          bucket = @oss_client.get_bucket(bucket_name)
-          return bucket.put_object(object) if file.nil?
-          # With a single PUT operation you can upload objects up to 5 GB in size.
-          if file.size > 5_368_709_120
-            bucket.resumable_upload(object, file.path)
-          end
-          bucket.put_object(object, :file => file.path)
-        end
-
-        def put_object_with_body(object, body, options = {})
-          bucket_name = options[:bucket]
-          bucket_name ||= @aliyun_oss_bucket
-
-          resource = bucket_name + '/' + object
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: object,
-            bucket: bucket_name,
-            resource: resource,
-            body: body
-          )
-        end
-
-        def put_folder(bucket, folder)
-          path = folder + '/'
-          resource = bucket + '/' + folder + '/'
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: path,
-            bucket: bucket,
-            resource: resource
-          )
-        end
-
-        def put_multipart_object(bucket, object, file)
-          # find the right uploadid
-          uploads = list_multipart_uploads(bucket)
-          upload = (uploads&.find { |tmpupload| tmpupload['Key'][0] == object })
-
-          uploadedSize = 0
-          start_partNumber = 1
-          if !upload.nil?
-            uploadId = upload['UploadId'][0]
-            parts = list_parts(bucket, object, uploadId)
-            if !parts.nil? && !parts.empty?
-              if parts[-1]['Size'][0].to_i != 5_242_880
-                # the part is the last one, if its size is over 5m, then finish this upload
-                complete_multipart_upload(bucket, object, uploadId)
-                return
+        def put_object(bucket_name, object_name, data, options = {})
+          if data.is_a? ::File
+            @oss_protocol.put_object(bucket_name, object_name, options)do |sw|
+              while line = data.read(16*1024)
+                sw.write(line)
               end
-              uploadedSize = (parts[0]['Size'][0].to_i * (parts.size - 1)) + parts[-1]['Size'][0].to_i
-              start_partNumber = parts[-1]['PartNumber'][0].to_i + 1
             end
           else
-            # create upload ID
-            uploadId = initiate_multipart_upload(bucket, object)
-          end
-
-          if file.size <= uploadedSize
-            complete_multipart_upload(bucket, object, uploadId)
-            return
-          end
-
-          end_partNumber = (file.size + 5_242_880 - 1) / 5_242_880
-          file.seek(uploadedSize)
-
-          for i in start_partNumber..end_partNumber
-            body = file.read(5_242_880)
-            upload_part(bucket, object, i.to_s, uploadId, body)
-          end
-
-          complete_multipart_upload(bucket, object, uploadId)
-        end
-
-        def initiate_multipart_upload(bucket, object)
-          path = object + '?uploads'
-          resource = bucket + '/' + path
-          ret = request(
-            expects: 200,
-            method: 'POST',
-            path: path,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])['UploadId'][0]
-        end
-
-        def upload_part(bucket, object, partNumber, uploadId, body)
-          path = object + '?partNumber=' + partNumber + '&uploadId=' + uploadId
-          resource = bucket + '/' + path
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            body: body
-          )
-        end
-
-        def complete_multipart_upload(bucket, object, uploadId)
-          parts = list_parts(bucket, object, uploadId, options = {})
-          request_part = []
-          return if parts.empty?
-          for i in 0..(parts.size - 1)
-            part = parts[i]
-            request_part[i] = { 'PartNumber' => part['PartNumber'], 'ETag' => part['ETag'] }
+            content=StringIO.new(data.dup)
+            @oss_protocol.put_object(bucket_name, object_name, options)do |sw|
+              while line=content.read(16*1024)
+                sw.write(line)
+              end
+            end
+            content.close
           end
-          body = XmlSimple.xml_out({ 'Part' => request_part }, 'RootName' => 'CompleteMultipartUpload')
-
-          path = object + '?uploadId=' + uploadId
-          resource = bucket + '/' + path
-          request(
-            expects: 200,
-            method: 'POST',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            body: body
-          )
         end
       end
     end

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.17'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.4.0
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han, Guimin He
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -134,28 +128,42 @@ 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: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.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 +333,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
@@ -363,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fog provider for Alibaba Cloud Web Services.

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