fog-aliyun 0.3.3 → 0.4.0

data/lib/fog/aliyun/models/storage/files.rb

@@ -2,45 +2,48 @@
 
 require 'fog/core/collection'
 require 'fog/aliyun/models/storage/file'
+require 'aliyun/oss'
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Files < Fog::Collection
         attribute :directory
         attribute :limit
-        attribute :marker
+        attribute :prefix,          :aliases => 'Prefix'
         attribute :path
-        attribute :prefix
+        attribute :common_prefixes, :aliases => 'CommonPrefixes'
+        attribute :delimiter,       :aliases => 'Delimiter'
+        attribute :is_truncated,    :aliases => 'IsTruncated'
+        attribute :marker,          :aliases => 'Marker'
+        attribute :max_keys,        :aliases => ['MaxKeys', 'max-keys']
 
-        model Fog::Storage::Aliyun::File
+        model Fog::Aliyun::Storage::File
 
-        def all(_options = {})
+        def all(options = {})
           requires :directory
-          prefix = directory.key + '/' if directory.key != '' && directory.key != '.' && !directory.key.nil?
-          files = service.list_objects(prefix: prefix)['Contents']
-          return if files.nil?
-          data = []
-          i = 0
-          files.each do |file|
-            next unless file['Key'][0][-1] != '/'
-            content_length = file['Size'][0].to_i
-            key = file['Key'][0]
-            lastModified = file['LastModified'][0]
-            last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
-            type = file['Type'][0]
-            data[i] = { content_length: content_length,
-                        key: key,
-                        last_modified: last_modified,
-                        etag: file['ETag'][0],
-                        object_type: type }
-            i += 1
+          options = {
+              'delimiter': delimiter,
+              'marker': marker,
+              'max-keys': max_keys.to_i,
+              'prefix': prefix
+          }.merge!(options)
+          options = options.reject {|key,value| value.nil? || value.to_s.empty?}
+          merge_attributes(options)
+          parent = directory.collection.get(
+              directory.key,
+              options
+          )
+          if parent
+            merge_attributes(parent.files.attributes)
+            load(parent.files.map {|file| file.attributes})
+          else
+            nil
           end
-
-          load(data)
         end
 
-        alias each_file_this_page each
+        alias_method :each_file_this_page, :each
+
         def each
           if !block_given?
             self
@@ -48,7 +51,7 @@ module Fog
             subset = dup.all
 
             subset.each_file_this_page { |f| yield f }
-            while subset.length == (subset.limit || 10_000)
+            while subset.is_truncated
               subset = subset.all(marker: subset.last.key)
               subset.each_file_this_page { |f| yield f }
             end
@@ -57,131 +60,69 @@ module Fog
           end
         end
 
-        def get(key)
+        def get(key, options = {}, &block)
           requires :directory
-          object = if directory.key == ''
-                     key
-                   else
-                     directory.key + '/' + key
-                   end
           begin
-            data = service.get_object(object)
-          rescue StandardError => error
-            case error.response.body
-            when %r{<Code>NoSuchKey</Code>}
+            data = service.get_object(directory.key, key, options, &block)
+            normalize_headers(data)
+            file_data = data.headers.merge({
+                                               :body => data.body,
+                                               :key  => key
+                                           })
+            new(file_data)
+          rescue Exception => error
+            if error.respond_to?(:http_code) && error.http_code.to_i == 404
               nil
             else
               raise(error)
             end
           end
-
-          contentLen = data[:headers]['Content-Length'].to_i
-
-          if block_given?
-            pagesNum = (contentLen + Excon::CHUNK_SIZE - 1) / Excon::CHUNK_SIZE
-
-            for i in 1..pagesNum
-              _start = (i - 1) * Excon::CHUNK_SIZE
-              _end = i * Excon::CHUNK_SIZE - 1
-              range = "#{_start}-#{_end}"
-              data = service.get_object(object, range)
-              chunk = data[:body]
-              yield(chunk)
-              body = nil
-            end
-          else
-            body = data[:body]
-          end
-
-          lastModified = data[:headers]['Last-Modified']
-          last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
-
-          date = data[:headers]['Date']
-          date = (Time.parse(date).localtime if !date.nil? && date != '')
-          file_data = {
-            body: body,
-            content_length: contentLen,
-            key: key,
-            last_modified: last_modified,
-            content_type: data[:headers]['Content-Type'],
-            etag: data[:headers]['ETag'],
-            date: date,
-            connection: data[:headers]['Connection'],
-            accept_ranges: data[:headers]['Accept-Ranges'],
-            server: data[:headers]['Server'],
-            object_type: data[:headers]['x-oss-object-type'],
-            content_disposition: data[:headers]['Content-Disposition']
-          }
-
-          new(file_data)
         end
 
-        def get_url(key)
+        # @param options[Hash] No need to use
+        def get_url(key, options = {})
           requires :directory
-          object = if directory.key == ''
-                     key
-                   else
-                     directory.key + '/' + key
-                   end
-          service.get_object_http_url_public(object, 3600)
+          service.get_object_http_url_public(directory.key, key, 3600)
         end
 
+        # @param options[Hash] No need to use
         def get_http_url(key, expires, options = {})
           requires :directory
-          object = if directory.key == ''
-                     key
-                   else
-                     directory.key + '/' + key
-                   end
-          expires = expires.nil? ? 0 : expires.to_i
-          service.get_object_http_url_public(object, expires, options)
+          service.get_object_http_url_public(directory.key, key, expires)
         end
 
+        # @param options[Hash] No need to use
         def get_https_url(key, expires, options = {})
           requires :directory
-          object = if directory.key == ''
-                     key
-                   else
-                     directory.key + '/' + key
-                   end
-          expires = expires.nil? ? 0 : expires.to_i
-          service.get_object_https_url_public(object, expires, options)
+          service.get_object_https_url_public(directory.key, key, expires)
         end
 
-        def head(key, _options = {})
+        def head(key, options = {})
           requires :directory
-          object = if directory.key == ''
-                     key
-                   else
-                     directory.key + '/' + key
-                   end
-          data = service.head_object(object).data
-          lastModified = data[:headers]['Last-Modified']
-          last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
-
-          date = data[:headers]['Date']
-          date = (Time.parse(date).localtime if !date.nil? && date != '')
-
-          file_data = {
-            content_length: data[:headers]['Content-Length'].to_i,
-            key: key,
-            last_modified: last_modified,
-            content_type: data[:headers]['Content-Type'],
-            etag: data[:headers]['ETag'],
-            date: date,
-            connection: data[:headers]['Connection'],
-            accept_ranges: data[:headers]['Accept-Ranges'],
-            server: data[:headers]['Server'],
-            object_type: data[:headers]['x-oss-object-type']
-          }
-          new(file_data)
-        rescue Fog::Storage::Aliyun::NotFound
-          nil
+          begin
+            data = service.head_object(directory.key, key, options)
+            normalize_headers(data)
+            file_data = data.headers.merge({
+                                               :key => key
+                                           })
+            new(file_data)
+          rescue Exception => error
+            if error.respond_to?(:http_code) && error.http_code.to_i == 404
+              nil
+            else
+              raise(error)
+            end
+          end
         end
 
         def new(attributes = {})
           requires :directory
-          super({ directory: directory }.merge!(attributes))
+          super({ :directory => directory }.merge!(attributes))
+        end
+
+        def normalize_headers(data)
+          data.headers[:last_modified] = Time.parse(data.headers[:last_modified])
+          data.headers[:etag] = data.headers[:etag].gsub('"','')
         end
       end
     end

data/lib/fog/aliyun/requests/compute/allocate_eip_address.rb

@@ -26,7 +26,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           # optional parameters

data/lib/fog/aliyun/requests/compute/allocate_public_ip_address.rb

@@ -20,7 +20,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

data/lib/fog/aliyun/requests/compute/associate_eip_address.rb

@@ -22,7 +22,7 @@ module Fog
 
           type = options['instance_type']
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

data/lib/fog/aliyun/requests/compute/attach_disk.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -23,7 +25,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['InstanceId'] = instanceId
@@ -46,7 +48,7 @@ module Fog
           if device
             parameters['Device'] = device
             pathUrl += '&Device='
-            pathUrl += URI.encode(device, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+            pathUrl += Addressable::URI.encode_component(device, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           end
 
           signature = sign(@aliyun_accesskey_secret, parameters)

data/lib/fog/aliyun/requests/compute/create_disk.rb

@@ -25,7 +25,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['ZoneId'] = @aliyun_zone_id
@@ -90,7 +90,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['ZoneId'] = @aliyun_zone_id

data/lib/fog/aliyun/requests/compute/create_image.rb

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SnapshotId'] = snapshotId

data/lib/fog/aliyun/requests/compute/create_security_group.rb

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           name = options[:name]

data/lib/fog/aliyun/requests/compute/create_security_group_egress_ip_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securitygroup_id
@@ -19,7 +21,7 @@ module Fog
 
           parameters['DestCidrIp'] = destCidrIp
           pathUrl += '&DestCidrIp='
-          pathUrl += URI.encode(destCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(destCidrIp, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           nicType ||= 'intranet'
           parameters['NicType'] = nicType
           pathUrl += '&NicType='
@@ -29,7 +31,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'

data/lib/fog/aliyun/requests/compute/create_security_group_egress_sg_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securitygroup_id
@@ -30,7 +32,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'

data/lib/fog/aliyun/requests/compute/create_security_group_ip_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securitygroup_id
@@ -19,7 +21,7 @@ module Fog
 
           parameters['SourceCidrIp'] = sourceCidrIp
           pathUrl += '&SourceCidrIp='
-          pathUrl += URI.encode(sourceCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(sourceCidrIp, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           nicType ||= 'intranet'
           parameters['NicType'] = nicType
           pathUrl += '&NicType='
@@ -29,7 +31,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'

data/lib/fog/aliyun/requests/compute/create_security_group_sg_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securitygroup_id
@@ -30,7 +32,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'

data/lib/fog/aliyun/requests/compute/create_server.rb

@@ -10,7 +10,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['ImageId'] = imageId
@@ -68,19 +68,30 @@ module Fog
               _parameters['PrivateIpAddress'] = _PrivateIpAddress
               _pathURL += '&PrivateIpAddress=' + _PrivateIpAddress
             end
-          else
+          end
 
-            _InternetMaxBandwidthIn = options[:InternetMaxBandwidthIn]
-            if _InternetMaxBandwidthIn
-              _parameters['InternetMaxBandwidthIn'] = _InternetMaxBandwidthIn
-              _pathURL += '&InternetMaxBandwidthIn=' + _InternetMaxBandwidthIn
-            end
+          _InternetMaxBandwidthIn = options[:InternetMaxBandwidthIn]
+          if _InternetMaxBandwidthIn
+            _parameters['InternetMaxBandwidthIn'] = _InternetMaxBandwidthIn
+            _pathURL += '&InternetMaxBandwidthIn=' + _InternetMaxBandwidthIn
+          end
 
-            _InternetMaxBandwidthOut = options[:InternetMaxBandwidthOut]
-            if _InternetMaxBandwidthOut
-              _parameters['InternetMaxBandwidthOut'] = _InternetMaxBandwidthOut
-              _pathURL += '&InternetMaxBandwidthOut=' + _InternetMaxBandwidthOut
-            end
+          _InternetMaxBandwidthOut = options[:InternetMaxBandwidthOut]
+          if _InternetMaxBandwidthOut
+            _parameters['InternetMaxBandwidthOut'] = _InternetMaxBandwidthOut
+            _pathURL += '&InternetMaxBandwidthOut=' + _InternetMaxBandwidthOut
+          end
+
+          _KeyPairName = options[:KeyPairName]
+          if _KeyPairName
+            _parameters['KeyPairName'] = _KeyPairName
+            _pathURL += '&KeyPairName=' + _KeyPairName
+          end
+
+          _UserData = options[:UserData]
+          if _UserData
+            _parameters['UserData'] = _UserData
+            _pathURL += '&UserData=' + _UserData
           end
 
           _signature = sign(@aliyun_accesskey_secret, _parameters)

data/lib/fog/aliyun/requests/compute/create_snapshot.rb

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['DiskId'] = diskId

data/lib/fog/aliyun/requests/compute/create_vpc.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -10,12 +12,12 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['CidrBlock'] = cidrBlock
           pathUrl += '&CidrBlock='
-          pathUrl += URI.encode(cidrBlock, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(cidrBlock, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           name = options[:name]
           desc = options[:description]

data/lib/fog/aliyun/requests/compute/create_vswitch.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['VpcId'] = vpcId
@@ -19,7 +21,7 @@ module Fog
 
           parameters['CidrBlock'] = cidrBlock
           pathUrl += '&CidrBlock='
-          pathUrl += URI.encode(cidrBlock, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(cidrBlock, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           parameters['ZoneId'] = @aliyun_zone_id
           pathUrl += '&ZoneId='

data/lib/fog/aliyun/requests/compute/delete_disk.rb

@@ -20,7 +20,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['DiskId'] = diskId

data/lib/fog/aliyun/requests/compute/delete_image.rb

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['ImageId'] = imageId

data/lib/fog/aliyun/requests/compute/delete_security_group.rb

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           if security_group_id

data/lib/fog/aliyun/requests/compute/delete_security_group_egress_ip_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securitygroup_id
@@ -19,7 +21,7 @@ module Fog
 
           parameters['DestCidrIp'] = destCidrIp
           pathUrl += '&DestCidrIp='
-          pathUrl += URI.encode(destCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(destCidrIp, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           nicType ||= 'intranet'
           parameters['NicType'] = nicType
           pathUrl += '&NicType='
@@ -29,7 +31,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'