fog-aliyun 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f324e607c567e9377a324698f35edd82667312c28fce1d3d8dc2e7e771af19
-  data.tar.gz: 608ea19f6289e5fc3e6ab8642f1326b7b88cb81639853b91f98be251923633e5
+  metadata.gz: 111b9682a34af25b9856551baebc1acaff7a7b41c613d37f65ef47a9d5fd2e96
+  data.tar.gz: 242585bce56cba8e443a991e44f5b1b7306b61ded43c0b57e8af7a4e48bcd408
 SHA512:
-  metadata.gz: 80f63cc617a5e1d1758955342ae252c94e89dbb429575ad8da406100d3dd56a446dd34cbfa896be2c8908e7fd118e7cfb6e87f648def81a52b812c1f72832be8
-  data.tar.gz: 1da3cd3a1a3d8bc19d2290fdce54f2e9efe1e26849a93a8a5a2b7310f3303c46e1550d0e445cd316b1a7a8fdd5c39f2a07f79a19351e3857b02bd6cf117df37d
+  metadata.gz: fc4e02bae46ba2520af281d5321fe517b4030439239d771eddc89a235052627831ab13768e9784100654d0e6ba883bb6b15de0ddd5234cac446ac38d007f9424
+  data.tar.gz: df23687c6c0103993eb2bc5c276ce9f5c45ec8ff7c9478e80de1b7faff5d6cf32764c520316854fae4d3404425778a7912703f274216fe2a1671842142822380

data/fog-aliyun.gemspec

@@ -7,10 +7,10 @@ require 'fog/aliyun/version'
 Gem::Specification.new do |spec|
   spec.name = 'fog-aliyun'
   spec.version = Fog::Aliyun::VERSION
-  spec.authors = ['Qinsi Deng, Jianxun Li, Jane Han']
-  spec.email = ['dengqinsi@sina.com']
+  spec.authors = ['Qinsi Deng, Jianxun Li, Jane Han, Guimin He']
+  spec.email = ['dengqinsi@sina.com', 'guimin.hgm@alibaba-inc.com']
 
-  spec.summary = 'Fog provider for Aliyun Web Services.'
+  spec.summary = 'Fog provider for Alibaba Cloud Web Services.'
   spec.description = 'As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will support more aliyun services later.'
   spec.homepage = 'https://github.com/fog/fog-aliyun'
   spec.license = 'MIT'

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

@@ -38,8 +38,6 @@ module Fog
               new(key: key) if ret.data[:status] == 200
             else
               data = service.get_bucket(key)
-              puts "[DEBUG] Getting the bucket named with #{key}..."
-              puts data
               if data.class == Hash && data.key?('Code') && !data['Code'].nil? && !data['Code'].empty?
                 dir = key + '/'
                 ret = service.head_object(dir, options)

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

@@ -41,7 +41,18 @@ module Fog
 
         def save
           requires :key
-          service.put_container(key)
+
+          # Checking whether the key is a bucket and meet the multi-bucket scenario.
+          # If the key is a existing bucket, return it directly.
+          key = key.chomp('/')
+          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
+
           true
         end
       end

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

@@ -35,11 +35,13 @@ module Fog
 
         def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
-          source_object = if directory.key == ''
+          directory_key = collection.check_directory_key(directory.key)
+          source_object = if directory_key == ''
                             key
                           else
-                            directory.key + '/' + key
+                            directory_key + '/' + key
                           end
+          target_directory_key = collection.check_directory_key(target_directory_key)
           target_object = if target_directory_key == ''
                             target_file_key
                           else
@@ -52,10 +54,11 @@ module Fog
 
         def destroy
           requires :directory, :key
-          object = if directory.key == ''
+          directory_key = collection.check_directory_key(directory.key)
+          object = if directory_key == ''
                      key
                    else
-                     directory.key + '/' + key
+                     directory_key + '/' + key
                    end
           service.delete_object(object)
           true
@@ -91,10 +94,11 @@ module Fog
           expires = expires.nil? ? 0 : expires.to_i
 
           requires :directory, :key
-          object = if directory.key == ''
+          directory_key = collection.check_directory_key(directory.key)
+          object = if directory_key == ''
                      key
                    else
-                     directory.key + '/' + key
+                     directory_key + '/' + key
                    end
           service.get_object_http_url_public(object, expires, options)
         end
@@ -109,11 +113,11 @@ module Fog
           options['Content-Type'] = content_type if content_type
           options['Content-Disposition'] = content_disposition if content_disposition
           options.merge!(metadata_to_headers)
-
-          object = if directory.key == ''
+          directory_key = collection.check_directory_key(directory.key)
+          object = if directory_key == ''
                      key
                    else
-                     directory.key + '/' + key
+                     directory_key + '/' + key
                    end
           if body.is_a?(::File)
             data = service.put_object(object, body, options).data
@@ -168,10 +172,11 @@ module Fog
 
         def metadata_attributes
           if last_modified
-            object = if directory.key == ''
+            directory_key = collection.check_directory_key(directory.key)
+            object = if directory_key == ''
                        key
                      else
-                       directory.key + '/' + key
+                       directory_key + '/' + key
                      end
 
             data = service.head_object(object).data

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

@@ -15,9 +15,38 @@ module Fog
 
         model Fog::Storage::Aliyun::File
 
+        # check_directory_key have two functions:
+        # 1. trim the directory_key suffix '/'
+        # 2. checking whether the directory_key is a bucket.
+        #    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)
+          if directory_key != ''
+            # trim the suffix '/'
+            directory_key = directory_key.chomp('/')
+            # The bucket name can not contain '/', so if directory_key, return directory.
+            if directory_key.include? '/'
+              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."
+                ''
+              end
+            end
+          else
+            ''
+          end
+        end
+
         def all(_options = {})
           requires :directory
-          prefix = directory.key + '/' if directory.key != '' && directory.key != '.' && !directory.key.nil?
+          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']
           return if files.nil?
           data = []
@@ -59,10 +88,11 @@ module Fog
 
         def get(key)
           requires :directory
-          object = if directory.key == ''
+          directory_key = check_directory_key(directory.key)
+          object = if directory_key == ''
                      key
                    else
-                     directory.key + '/' + key
+                     directory_key + '/' + key
                    end
           begin
             data = service.get_object(object)
@@ -127,20 +157,22 @@ module Fog
 
         def get_url(key)
           requires :directory
-          object = if directory.key == ''
+          directory_key = check_directory_key(directory.key)
+          object = if directory_key == ''
                      key
                    else
-                     directory.key + '/' + key
+                     directory_key + '/' + key
                    end
           service.get_object_http_url_public(object, 3600)
         end
 
         def get_http_url(key, expires, options = {})
           requires :directory
-          object = if directory.key == ''
+          directory_key = check_directory_key(directory.key)
+          object = if directory_key == ''
                      key
                    else
-                     directory.key + '/' + key
+                     directory_key + '/' + key
                    end
           expires = expires.nil? ? 0 : expires.to_i
           service.get_object_http_url_public(object, expires, options)
@@ -148,10 +180,11 @@ module Fog
 
         def get_https_url(key, expires, options = {})
           requires :directory
-          object = if directory.key == ''
+          directory_key = check_directory_key(directory.key)
+          object = if directory_key == ''
                      key
                    else
-                     directory.key + '/' + key
+                     directory_key + '/' + key
                    end
           expires = expires.nil? ? 0 : expires.to_i
           service.get_object_https_url_public(object, expires, options)
@@ -159,10 +192,11 @@ module Fog
 
         def head(key, _options = {})
           requires :directory
-          object = if directory.key == ''
+          directory_key = check_directory_key(directory.key)
+          object = if directory_key == ''
                      key
                    else
-                     directory.key + '/' + key
+                     directory_key + '/' + key
                    end
           data = service.head_object(object).data
           return nil if data[:status] == 404

data/lib/fog/aliyun/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
-- Qinsi Deng, Jianxun Li, Jane Han
+- Qinsi Deng, Jianxun Li, Jane Han, Guimin He
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ description: As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will suppo
   more aliyun services later.
 email:
 - dengqinsi@sina.com
+- guimin.hgm@alibaba-inc.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -308,5 +309,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: Fog provider for Aliyun Web Services.
+summary: Fog provider for Alibaba Cloud Web Services.
 test_files: []