fog-aliyun 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 111b9682a34af25b9856551baebc1acaff7a7b41c613d37f65ef47a9d5fd2e96
-  data.tar.gz: 242585bce56cba8e443a991e44f5b1b7306b61ded43c0b57e8af7a4e48bcd408
+  metadata.gz: 1282dc25fa74615eb50ae3d68e2e6a4525712cf12d7b2af1741a18b61b4842da
+  data.tar.gz: 07b73a4fcfb1ad04d1bf16d5127153b554633afe7a91aa31a1675533680b1478
 SHA512:
-  metadata.gz: fc4e02bae46ba2520af281d5321fe517b4030439239d771eddc89a235052627831ab13768e9784100654d0e6ba883bb6b15de0ddd5234cac446ac38d007f9424
-  data.tar.gz: df23687c6c0103993eb2bc5c276ce9f5c45ec8ff7c9478e80de1b7faff5d6cf32764c520316854fae4d3404425778a7912703f274216fe2a1671842142822380
+  metadata.gz: 0bd08522fda123aa1a0fac945ca83bf09a16ac811594eafb8b3d36d2d4f354298dc8146dfe1c64608dc90a3d1fb55c9bc4c9a1ab647316d63048cda15d6ecb54
+  data.tar.gz: 346b5a912c43de55a7ed3067d7fb1bfc3c8e7f216e512eb880aa9eb7c5f144bc32857e786e2346bef2034f7ee0125179497afcf88736e61da4159aec1f9dbf09

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

@@ -30,6 +30,9 @@ module Fog
         # If key is a directory(including /), return an existed or a new one;
         # If key does not contain /, if bucket, return '', else return an existed or a new one directory;
         def get(key, options = {})
+          if key.is_a? Array
+            key = key[0]
+          end
           if !key.nil? && key != '' && key != '.'
             key = key.chomp('/')
             if key.include? '/'
@@ -37,14 +40,34 @@ module Fog
               ret = service.head_object(dir, options)
               new(key: key) if ret.data[:status] == 200
             else
-              data = service.get_bucket(key)
-              if data.class == Hash && data.key?('Code') && !data['Code'].nil? && !data['Code'].empty?
-                dir = key + '/'
-                ret = service.head_object(dir, options)
-                new(key: key) if ret.data[:status] == 200
-              else
-                new(key: '')
+              remap_attributes(options, {
+                  :delimiter  => 'delimiter',
+                  :marker     => 'marker',
+                  :max_keys   => 'max-keys',
+                  :prefix     => 'prefix'
+              })
+              data = service.get_bucket(key, options)
+              directory = new(:key => data['Name'], :is_persisted => true)
+              options = {}
+              for k, v in data
+                if ['CommonPrefixes', 'Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(k)
+                  # Sometimes, the v will be a Array, like "Name"=>["blobstore-droplet1"], "Prefix"=>[{}], "Marker"=>[{}], "MaxKeys"=>["100"], "Delimiter"=>[{}], "IsTruncated"=>["false"]
+                  # and there needs to parse them
+                  if !v.nil? && (v.is_a? Array) && (v.size > 0)
+                    if v[0].is_a? Hash
+                      v = nil
+                    else
+                      v = v[0]
+                    end
+                  end
+                  options[k] = v
+                end
+              end
+              directory.files.merge_attributes(options)
+              if data.key?('Contents') && !data['Contents'].nil?
+                directory.files.load(data['Contents'])
               end
+              directory
             end
           else
             new(key: '')

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

@@ -7,7 +7,7 @@ module Fog
   module Storage
     class Aliyun
       class Directory < Fog::Model
-        identity :key
+        identity :key, :aliases => ['Key', 'Name', 'name']
 
         def destroy
           requires :key
@@ -15,7 +15,6 @@ module Fog
           ret = service.list_objects(prefix: prefix)['Contents']
 
           if ret.nil?
-            puts ' Not found: Direction not exist!'
             false
           elsif ret.size == 1
             service.delete_container(key)
@@ -48,7 +47,6 @@ module Fog
           if !key.nil? && key != '' && key != '.' && !(key.include? '/')
             data = service.get_bucket(key)
             if data.class == Hash && data.key?('Code') && !data['Code'].nil? && !data['Code'].empty?
-              puts "[INFO] The key #{key} is not a bucket and create one folder named with it."
               service.put_container(key)
             end
           end

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

@@ -6,7 +6,7 @@ module Fog
   module Storage
     class Aliyun
       class File < Fog::Model
-        identity :key, aliases: 'name'
+        identity :key, aliases: ['Key', 'Name', 'name']
         attribute :date, aliases: 'Date'
         attribute :content_length, aliases: 'Content-Length', type: :integer
         attribute :content_type, aliases: 'Content-Type'
@@ -35,32 +35,32 @@ module Fog
 
         def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
-          directory_key = collection.check_directory_key(directory.key)
+          source_bucket, directory_key = collection.check_directory_key(directory.key)
           source_object = if directory_key == ''
                             key
                           else
                             directory_key + '/' + key
                           end
-          target_directory_key = collection.check_directory_key(target_directory_key)
+          target_bucket, target_directory_key = collection.check_directory_key(target_directory_key)
           target_object = if target_directory_key == ''
                             target_file_key
                           else
                             target_directory_key + '/' + target_file_key
                           end
-          service.copy_object(nil, source_object, nil, target_object, options)
+          service.copy_object(source_bucket, source_object, target_bucket, target_object, options)
           target_directory = service.directories.new(key: target_directory_key)
           target_directory.files.get(target_file_key)
         end
 
         def destroy
           requires :directory, :key
-          directory_key = collection.check_directory_key(directory.key)
+          bucket_name, directory_key = collection.check_directory_key(directory.key)
           object = if directory_key == ''
                      key
                    else
                      directory_key + '/' + key
                    end
-          service.delete_object(object)
+          service.delete_object(object, bucket: bucket_name)
           true
         end
 
@@ -94,13 +94,13 @@ module Fog
           expires = expires.nil? ? 0 : expires.to_i
 
           requires :directory, :key
-          directory_key = collection.check_directory_key(directory.key)
+          bucket_name, directory_key = collection.check_directory_key(directory.key)
           object = if directory_key == ''
                      key
                    else
                      directory_key + '/' + key
                    end
-          service.get_object_http_url_public(object, expires, options)
+          service.get_object_http_url_public(object, expires, options.merge(bucket: bucket_name))
         end
 
         def public_url
@@ -113,16 +113,16 @@ module Fog
           options['Content-Type'] = content_type if content_type
           options['Content-Disposition'] = content_disposition if content_disposition
           options.merge!(metadata_to_headers)
-          directory_key = collection.check_directory_key(directory.key)
+          bucket_name, directory_key = collection.check_directory_key(directory.key)
           object = if directory_key == ''
                      key
                    else
                      directory_key + '/' + key
                    end
           if body.is_a?(::File)
-            data = service.put_object(object, body, options).data
+            data = service.put_object(object, body, options.merge(bucket: bucket_name)).data
           elsif body.is_a?(String)
-            data = service.put_object_with_body(object, body, options).data
+            data = service.put_object_with_body(object, body, options.merge(bucket: bucket_name)).data
           else
             raise Fog::Storage::Aliyun::Error, " Forbidden: Invalid body type: #{body.class}!"
           end
@@ -172,14 +172,14 @@ module Fog
 
         def metadata_attributes
           if last_modified
-            directory_key = collection.check_directory_key(directory.key)
+            bucket_name, directory_key = collection.check_directory_key(directory.key)
             object = if directory_key == ''
                        key
                      else
                        directory_key + '/' + key
                      end
 
-            data = service.head_object(object).data
+            data = service.head_object(object, bucket: bucket_name).data
             if data[:status] == 200
               headers = data[:headers]
               headers.select! { |k, _v| metadata_attribute?(k) }

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

@@ -9,9 +9,13 @@ module Fog
       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
 
@@ -21,6 +25,10 @@ module Fog
         #    If so, it will return directly to avoid to create a new redundant folder named with directory_key.
         #    This point will be applied to multi-bucket and make bucket as a directory scenario.
         def check_directory_key(directory_key)
+          bucket_name = nil
+          if directory_key.is_a? Array
+            directory_key = directory_key[0]
+          end
           if directory_key != ''
             # trim the suffix '/'
             directory_key = directory_key.chomp('/')
@@ -29,25 +37,23 @@ module Fog
               directory_key
             else
               data = service.get_bucket(directory_key)
-              puts "[DEBUG] Getting the bucket named with directory name #{directory_key}..."
               if data.class == Hash && data.key?('Code') && !data['Code'].nil? && !data['Code'].empty?
-                puts "[INFO] The directory name #{directory_key} is not a bucket and will create one folder named with it."
                 directory_key
               else
-                puts "[INFO] The directory name #{directory_key} is a bucket and store objects directly."
-                ''
+                bucket_name = directory_key
+                directory_key = ''
               end
             end
-          else
-            ''
           end
+          return bucket_name, directory_key
         end
 
         def all(_options = {})
           requires :directory
-          directory_key = check_directory_key(directory.key)
-          prefix = directory_key + '/' if directory_key != '' && directory_key != '.' && !directory_key.nil?
-          files = service.list_objects(prefix: prefix)['Contents']
+          bucket_name, directory_key = check_directory_key(directory.key)
+          prefix_value = prefix
+          prefix_value = directory_key + '/' + prefix if directory_key != '' && directory_key != '.' && !directory_key.nil?
+          files = service.list_objects(prefix: prefix_value, bucket: bucket_name)['Contents']
           return if files.nil?
           data = []
           i = 0
@@ -88,14 +94,14 @@ module Fog
 
         def get(key)
           requires :directory
-          directory_key = check_directory_key(directory.key)
+          bucket_name, directory_key = check_directory_key(directory.key)
           object = if directory_key == ''
                      key
                    else
                      directory_key + '/' + key
                    end
           begin
-            data = service.get_object(object)
+            data = service.get_object(object, nil, bucket: bucket_name)
           rescue StandardError => error
             case error.response.body
             when %r{<Code>NoSuchKey</Code>},%r{<Code>SymlinkTargetNotExist</Code>}
@@ -115,7 +121,7 @@ module Fog
               _end = i * Excon::CHUNK_SIZE - 1
               range = "#{_start}-#{_end}"
               begin
-                data = service.get_object(object, range)
+                data = service.get_object(object, range, bucket: bucket_name)
                 chunk = data[:body]
               rescue StandardError => error
                 case error.response.body
@@ -157,48 +163,48 @@ module Fog
 
         def get_url(key)
           requires :directory
-          directory_key = check_directory_key(directory.key)
+          bucket_name, directory_key = check_directory_key(directory.key)
           object = if directory_key == ''
                      key
                    else
                      directory_key + '/' + key
                    end
-          service.get_object_http_url_public(object, 3600)
+          service.get_object_http_url_public(object, 3600, bucket: bucket_name)
         end
 
         def get_http_url(key, expires, options = {})
           requires :directory
-          directory_key = check_directory_key(directory.key)
+          bucket_name, directory_key = check_directory_key(directory.key)
           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(object, expires, options.merge(bucket: bucket_name))
         end
 
         def get_https_url(key, expires, options = {})
           requires :directory
-          directory_key = check_directory_key(directory.key)
+          bucket_name, directory_key = check_directory_key(directory.key)
           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(object, expires, options.merge(bucket: bucket_name))
         end
 
         def head(key, _options = {})
           requires :directory
-          directory_key = check_directory_key(directory.key)
+          bucket_name, directory_key = check_directory_key(directory.key)
           object = if directory_key == ''
                      key
                    else
                      directory_key + '/' + key
                    end
-          data = service.head_object(object).data
+          data = service.head_object(object, bucket: bucket_name).data
           return nil if data[:status] == 404
           lastModified = data[:headers]['Last-Modified']
           last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
@@ -225,6 +231,13 @@ module Fog
 
         def new(attributes = {})
           requires :directory
+          # Sometimes, the v will be a Array, like "Prefix"=>[{}], "Marker"=>[xxxx], "MaxKeys"=>["100"], "IsTruncated"=>["false"]
+          # and there needs to parse them
+          for k, v in attributes
+            if !v.nil? && (v.is_a? Array) && (v.size > 0)
+              attributes[k] = v[0]
+            end
+          end
           super({ directory: directory }.merge!(attributes))
         end
       end

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

@@ -4,7 +4,7 @@ module Fog
   module Storage
     class Aliyun
       class Real
-        def get_bucket(bucket)
+        def get_bucket(bucket, options = {})
           location = get_bucket_location(bucket)
           # If there is an error, it will return a Hash with error code, host id and others
           # If can not get a valid location, will return one using region
@@ -15,13 +15,38 @@ module Fog
             location = 'oss-' + @aliyun_region_id
           end
           endpoint = 'http://' + location + '.aliyuncs.com'
+
+          prefix = options['prefix']
+          marker = options['marker']
+          maxKeys = options['max_keys']
+          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, 404],
             method: 'GET',
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            endpoint: endpoint,
+            path: path
           )
           xml = ret.data[:body]
           XmlSimple.xml_in(xml)

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

@@ -14,21 +14,21 @@ module Fog
 
           path = ''
           if prefix
-            path += '?prefix=' + prefix
+            path += '/?prefix=' + prefix
             path += '&marker=' + marker if marker
-            path += '&max-keys=' + maxKeys if maxKeys
+            path += '&max-keys=' + maxKeys.to_s if maxKeys
             path += '&delimiter=' + delimiter if delimiter
 
           elsif marker
-            path += '?marker=' + marker
-            path += '&max-keys=' + maxKeys if maxKeys
+            path += '/?marker=' + marker
+            path += '&max-keys=' + maxKeys.to_s if maxKeys
             path += '&delimiter=' + delimiter if delimiter
 
           elsif maxKeys
-            path += '?max-keys=' + maxKeys
+            path += '/?max-keys=' + maxKeys.to_s
             path += '&delimiter=' + delimiter if delimiter
           elsif delimiter
-            path += '?delimiter=' + delimiter
+            path += '/?delimiter=' + delimiter
           end
 
           resource = bucket + '/'

data/lib/fog/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Fog
   module Aliyun
-    VERSION = '0.3.8'
+    VERSION = '0.3.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han, Guimin He
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler