fog-aliyun 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 376e9d625d0f891e03da5fa24434bf5788e37a8c4a376a68c36e0491ec7db99e
-  data.tar.gz: 9aa48ef8f48fedfdbb039396f6541684454a99ab596da88aeb69080dbc683c30
+  metadata.gz: 71f324e607c567e9377a324698f35edd82667312c28fce1d3d8dc2e7e771af19
+  data.tar.gz: 608ea19f6289e5fc3e6ab8642f1326b7b88cb81639853b91f98be251923633e5
 SHA512:
-  metadata.gz: fd565acfa305709b20e24775a94ca17eb3dd12f2151361fca6a0cf40fa43993108b18d02b6d9fe6ecef86fabc7a64204710c4efe6650c62d0c94c90002ebcf42
-  data.tar.gz: 641a2b4a09e558c29851bebd8ec089f6fd872f6c568f3076ca74c6d7909adb3b99d0fe32bfa7e05059e45630fc0f6422a5a97945b3b719f16e60b4cbbe874287
+  metadata.gz: 80f63cc617a5e1d1758955342ae252c94e89dbb429575ad8da406100d3dd56a446dd34cbfa896be2c8908e7fd118e7cfb6e87f648def81a52b812c1f72832be8
+  data.tar.gz: 1da3cd3a1a3d8bc19d2290fdce54f2e9efe1e26849a93a8a5a2b7310f3303c46e1550d0e445cd316b1a7a8fdd5c39f2a07f79a19351e3857b02bd6cf117df37d

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

@@ -31,13 +31,16 @@ module Fog
         # If key does not contain /, if bucket, return '', else return an existed or a new one directory;
         def get(key, options = {})
           if !key.nil? && key != '' && key != '.'
+            key = key.chomp('/')
             if key.include? '/'
               dir = key + '/'
               ret = service.head_object(dir, options)
               new(key: key) if ret.data[:status] == 200
             else
               data = service.get_bucket(key)
-              if data[:status] == 404
+              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)
                 new(key: key) if ret.data[:status] == 200

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

@@ -6,10 +6,18 @@ module Fog
       class Real
         def get_bucket(bucket)
           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
+          if location.class == Hash && location.key?('HostId')
+            value = location['HostId']
+            location = value[0].split('.')[1]
+          else
+            location = 'oss-' + @aliyun_region_id
+          end
           endpoint = 'http://' + location + '.aliyuncs.com'
           resource = bucket + '/'
           ret = request(
-            expects: [200, 203],
+            expects: [200, 203, 404],
             method: 'GET',
             bucket: bucket,
             resource: resource,
@@ -23,7 +31,7 @@ module Fog
           attribute = '?location'
           resource = bucket + '/' + attribute
           ret = request(
-            expects: [200, 203],
+            expects: [200, 203, 403, 404],
             method: 'GET',
             path: attribute,
             bucket: bucket,

data/lib/fog/aliyun/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler