fog-aliyun 0.3.13 → 0.3.19

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

@@ -0,0 +1,33 @@
+require 'nokogiri'
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+
+        # Get location constraint for an OSS bucket
+        #
+        # @param bucket_name [String] name of bucket to get location constraint for
+        #
+        # @see https://help.aliyun.com/document_detail/31967.html
+        #
+        # note: The OSS Ruby sdk does not support get_bucket_location and there needs to parse response
+
+        def get_bucket_location(bucket_name)
+          data = @oss_http.get({:bucket => bucket_name, :sub_res => { 'location' => nil} }, {})
+          doc = parse_xml(data.body)
+          doc.at_css("LocationConstraint").text
+        end
+
+        private
+
+        def parse_xml(content)
+          doc = Nokogiri::XML(content) do |config|
+            config.options |= Nokogiri::XML::ParseOptions::NOBLANKS
+          end
+
+          doc
+        end
+      end
+    end
+  end
+end

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

@@ -7,21 +7,39 @@ module Fog
         # Get details for object
         #
         # ==== Parameters
-        # * object<~String> - Name of object to look for
+        # * object_name<~String> - Name of object to look for
         #
-        def get_object(object, range = nil, options = {})
+        def get_object(bucket_name, object_name, options = {}, &block)
           options = options.reject { |_key, value| value.nil? }
-          bucket_name = options[:bucket]
-          bucket_name ||= @aliyun_oss_bucket
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
           # Using OSS ruby SDK to fix performance issue
-          bucket = @oss_client.get_bucket(bucket_name)
-          body = Array.new
-          obj = bucket.get_object(object) do |chunk|
-            body << chunk
+          http_options = { :headers => {} }
+          http_options[:query] = options.delete('query') || {}
+
+          http_options[:headers].merge!(options)
+          if options['If-Modified-Since']
+            http_options[:headers]['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header
           end
-          response = {}
-          obj.instance_variables.each {|var| response[var.to_s.delete("@")] = obj.instance_variable_get(var) }
-          response.merge({:body => body.join('')})
+          if options['If-Unmodified-Since']
+            http_options[:headers]['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header
+          end
+
+          if block_given?
+            http_options[:response_block] = Proc.new
+          end
+
+          resources = {
+              :bucket => bucket_name,
+              :object => object_name
+          }
+
+          @oss_http.get(resources, http_options, &block)
+
         end
       end
     end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+
+        # Get access control list for an S3 object
+        #
+        # @param bucket_name [String] name of bucket containing object
+        # @param object_name [String] name of object to get access control list for
+        # @param options [Hash]
+        # @option options versionId [String] specify a particular version to retrieve
+
+        def get_object_acl(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
+
+          # At present, sdk does not support versionId
+          # if version_id = options.delete('versionId')
+          #   query['versionId'] = version_id
+          # end
+          @oss_protocol.get_object_acl(bucket_name, object_name)
+        end
+      end
+    end
+  end
+end

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

@@ -7,29 +7,26 @@ module Fog
         # Get an expiring object http url
         #
         # ==== 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_http_url_public(object, expires, options = {})
-          options = options.reject { |_key, value| value.nil? }
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          acl = get_bucket_acl(bucket)
-          location = get_bucket_location(bucket)
+        def get_object_http_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 + '/' + object
+            resource = bucket_name + '/' + object_name
             signature = sign('GET', expires_time, nil, resource)
-            'http://' + bucket + '.' + location + '.aliyuncs.com/' + object +
+            'http://' + bucket_name + '.' + @host + '/' + object_name +
               '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
               '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
           elsif acl == 'public-read' || acl == 'public-read-write'
-            'http://' + bucket + '.' + location + '.aliyuncs.com/' + object
+            'http://' + bucket_name + '.' + @host + '/' + object_name
           else
             'acl is wrong with value:' + acl
           end

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

@@ -7,29 +7,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 = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          acl = get_bucket_acl(bucket)
-          location = get_bucket_location(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 + '/' + object
+            resource = bucket_name + '/' + object_name
             signature = sign('GET', expires_time, nil, resource)
-            'https://' + bucket + '.' + location + '.aliyuncs.com/' + object +
+            'https://' + bucket_name + '.' + @host + '/' + object_name +
               '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
               '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
           elsif acl == 'public-read' || acl == 'public-read-write'
-            'https://' + bucket + '.' + location + '.aliyuncs.com/' + 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,21 +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 = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          resource = bucket + '/' + object
-          ret = request(
-            expects: [200, 404],
-            method: 'HEAD',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            location: get_bucket_location(bucket)
-          )
-          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,31 +5,13 @@ module Fog
     class Storage
       class Real
         def list_buckets(options = {})
-          prefix = options[:prefix]
-          marker = options[:marker]
-          maxKeys = options[:maxKeys]
+          maxKeys = options[:max_keys] || 1000
+          maxKeys = maxKeys.to_i
+          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,79 +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['max-keys'] || 1000
+        def list_objects(bucket_name, options = {})
+          maxKeys = options[:max_keys] || 1000
+          maxKeys = maxKeys.to_i
           maxKeys = [maxKeys, 1000].min
-          delimiter = options['delimiter']
 
-          path = ''
-          if prefix
-            path += '/?prefix=' + prefix
-            path += '&marker=' + marker if marker
-            path += '&max-keys=' + maxKeys.to_s if maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-
-          elsif marker
-            path += '/?marker=' + marker
-            path += '&max-keys=' + maxKeys.to_s if maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-
-          elsif maxKeys
-            path += '/?max-keys=' + maxKeys.to_s
-            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, location, _options = {})
-          location ||= get_bucket_location(bucket)
-
-          path = '?uploads'
-          resource = bucket + '/' + path
-
-          ret = request(
-            expects: 200,
-            method: 'GET',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            location: location
-          )
-          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, location, uploadid, _options = {})
-          location ||= get_bucket_location(bucket)
-
-          path = object + '?uploadId=' + uploadid
-          resource = bucket + '/' + path
-
-          ret = request(
-            expects: 200,
-            method: 'GET',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            location: location
-          )
-          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,153 +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 = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          return put_folder(bucket, object) if file.nil?
-
-          # put multiparts if object's size is over 100m
-          return put_multipart_object(bucket, object, file) if file.size > 104_857_600
-
-          body = file.read
-
-          resource = bucket + '/' + object
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            body: body,
-            location: get_bucket_location(bucket)
-          )
-        end
-
-        def put_object_with_body(object, body, options = {})
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-
-          resource = bucket + '/' + object
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            body: body,
-            location: get_bucket_location(bucket)
-          )
-        end
-
-        def put_folder(bucket, folder)
-          path = folder + '/'
-          resource = bucket + '/' + folder + '/'
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            location: get_bucket_location(bucket)
-          )
-        end
-
-        def put_multipart_object(bucket, object, file)
-          location = get_bucket_location(bucket)
-
-          # find the right uploadid
-          uploads = list_multipart_uploads(bucket, location)
-          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, location, 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, location, 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, location)
-          end
-
-          if file.size <= uploadedSize
-            complete_multipart_upload(bucket, object, location, 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, location, i.to_s, uploadId, body)
-          end
-
-          complete_multipart_upload(bucket, object, location, uploadId)
-        end
-
-        def initiate_multipart_upload(bucket, object, location)
-          location ||= get_bucket_location(bucket)
-          path = object + '?uploads'
-          resource = bucket + '/' + path
-          ret = request(
-            expects: 200,
-            method: 'POST',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            location: location
-          )
-          XmlSimple.xml_in(ret.data[:body])['UploadId'][0]
-        end
-
-        def upload_part(bucket, object, location, partNumber, uploadId, body)
-          location ||= get_bucket_location(bucket)
-          path = object + '?partNumber=' + partNumber + '&uploadId=' + uploadId
-          resource = bucket + '/' + path
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            body: body,
-            location: location
-          )
-        end
-
-        def complete_multipart_upload(bucket, object, location, uploadId)
-          location ||= get_bucket_location(bucket)
-          parts = list_parts(bucket, object, location, 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,
-            location: location,
-            body: body
-          )
         end
       end
     end