fog-aliyun 0.3.3 → 0.4.0

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

@@ -1,46 +1,23 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Delete an existing object
         #
         # ==== Parameters
-        # * object<~String> - Name of object to delete
+        # * bucket_name<~String> - Name of bucket to delete
+        # * object_name<~String> - Name of object to delete
         #
-        def delete_object(object, options = {})
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          resource = bucket + '/' + object
-          request(
-            expects: 204,
-            method: 'DELETE',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-        end
-
-        def abort_multipart_upload(bucket, object, endpoint, uploadid)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
-          path = object + '?uploadId=' + uploadid
-          resource = bucket + '/' + path
-
-          ret = request(
-            expects: 204,
-            method: 'DELETE',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
+        def delete_object(bucket_name, object_name, options = {})
+          # TODO Support versionId
+          # if version_id = options.delete('versionId')
+          #   query = {'versionId' => version_id}
+          # else
+          #   query = {}
+          # end
+          @oss_http.delete({:bucket => bucket_name, :object => object_name}, {:headers => options})
         end
       end
     end

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

@@ -1,131 +1,51 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
-        def get_bucket(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          resource = bucket + '/'
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-          xml = ret.data[:body]
-          XmlSimple.xml_in(xml)
+        def bucket_exists?(bucket_name)
+          @oss_client.bucket_exists?(bucket_name)
         end
 
-        def get_bucket_location(bucket)
-          attribute = '?location'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])
+        def get_bucket(bucket_name, options = {})
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+
+          # Set the GetBucket max limitation to 1000
+          maxKeys = options[:max_keys] || 1000
+          maxKeys = maxKeys.to_i
+          maxKeys = [maxKeys, 1000].min
+
+          options[:limit] = maxKeys
+          options.delete(:max_keys)
+
+          @oss_protocol.list_objects(bucket_name, options)
         end
 
-        def get_bucket_acl(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          attribute = '?acl'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-          XmlSimple.xml_in(ret.data[:body])['AccessControlList'][0]['Grant'][0]
+        def get_bucket_acl(bucket_name)
+          @oss_protocol.get_bucket_acl(bucket_name)
         end
 
-        def get_bucket_CORSRules(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          attribute = '?cors'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203, 404],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-          XmlSimple.xml_in(ret.data[:body])['CORSRule'][0] if ret.data[:status] != 404
+        def get_bucket_CORSRules(bucket_name)
+          @oss_protocol.get_bucket_cors(bucket_name)
         end
 
-        def get_bucket_lifecycle(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          attribute = '?lifecycle'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203, 404],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-          XmlSimple.xml_in(ret.data[:body])['Rule'][0] if ret.data[:status] != 404
+        def get_bucket_lifecycle(bucket_name)
+          @oss_protocol.get_bucket_lifecycle(bucket_name)
         end
 
-        def get_bucket_logging(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          attribute = '?logging'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-          XmlSimple.xml_in(ret.data[:body])['LoggingEnabled'][0]['TargetPrefix']
+        def get_bucket_logging(bucket_name)
+          @oss_protocol.get_bucket_logging(bucket_name)
         end
 
-        def get_bucket_referer(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          attribute = '?referer'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-          XmlSimple.xml_in(ret.data[:body])
+        def get_bucket_referer(bucket_name)
+          @oss_protocol.get_bucket_referer(bucket_name)
         end
 
-        def get_bucket_website(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          attribute = '?website'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203, 404],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-          XmlSimple.xml_in(ret.data[:body]) if ret.data[:status] != 404
+        def get_bucket_website(bucket_name)
+          @oss_protocol.get_bucket_website(bucket_name)
         end
       end
     end

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

@@ -1,40 +1,45 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # 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 = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          endpoint = options[:endpoint]
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
+          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
+          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
+          if options['If-Unmodified-Since']
+            http_options[:headers]['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header
           end
-          resource = bucket + '/' + object
-          para = {
-            expects: [200, 206, 404],
-            method: 'GET',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          }
 
-          if range
-            rangeStr = 'bytes=' + range
-            para[:headers] = { 'Range' => rangeStr }
+          if block_given?
+            http_options[:response_block] = Proc.new {}
           end
 
-          response = request(para)
-          response.data
+          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

@@ -1,35 +1,34 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # 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).to_s
-            resource = bucket + '/' + object
+            expires_time = (Time.now.to_i + (expires.nil? ? 0 : expires.to_i)).to_s
+            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, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+              '&Signature=' + Addressable::URI.encode_component(signature, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           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

@@ -1,35 +1,34 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # 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).to_s
-            resource = bucket + '/' + object
+            expires_time = (Time.now.to_i + (expires.nil? ? 0 : expires.to_i)).to_s
+            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, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+              '&Signature=' + Addressable::URI.encode_component(signature, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           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

@@ -1,29 +1,38 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # 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
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          resource = bucket + '/' + object
-          ret = request(
-            expects: [200, 404],
-            method: 'HEAD',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
-          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

@@ -1,35 +1,17 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    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