fog-aliyun 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5da51b9b9b9dba901f7d457ca4dc24ac63a2dc271691920b648f47041102d913
-  data.tar.gz: f76b4c63734441c9fc4d1d7089f70f9d37d9d91b433e23d8400bd84e009eb14c
+  metadata.gz: 4d434b8e3569bc8c5d6f4c0223d37f7affcb9bf3a78a744f3ebef9973b173400
+  data.tar.gz: ca6e6783bfd1c0169c4ac2588af139ce9b6373ecc76d27addabab82a7fbdbf0d
 SHA512:
-  metadata.gz: a87085ec484fcdf4a1140cd3f0ae390fe5cdc444791024e3263facb2977318ee5a6a1c2e76ff0d3b47deda665abe61405f3956e421dc36be43ba071e0ca5e5f4
-  data.tar.gz: a3382c51257b146bf3e3d7803042cc36b241965330d72a345816dcedb8d92799aed0e84c6b8fbf57a53659fa9dab9fb2f9be9e6e7337fc9c5288e64a43c68acc
+  metadata.gz: 9f75f52309dc5433c02635faf7b572a6ab3371cdffacbf26ca1597da2d9107e9d89ffa24923d0921f2204c45db88f1eb60136bde8b29fc8e90756f096a22e685
+  data.tar.gz: b37f84ef7c0a17dc8d7891e317b3937e6a7097f90177368761b30aae36ddb179242e22e0880c25ee94da0c2c2dceb2f4669bfd29584e70fafd43b9aa16c93b64

data/.gitignore

@@ -23,3 +23,5 @@ tmp
 *.a
 mkmf.log
 gemfiles/*.lock
+morethan100m
+*.log

data/README.md

@@ -30,9 +30,9 @@ Since it's a bad practice to have your credentials in source code, you should lo
 
 ```
 default:
-  :aliyun_accesskey_id:     <YOUR_ACCESS_KEY_ID>,
-  :aliyun_accesskey_secret: <YOUR_SECRET_ACCESS_KEY>,
-  :aliyun_region_id:        <YOUR_TARGET_REGION>
+  aliyun_accesskey_id:     "<YOUR_ACCESS_KEY_ID>"
+  aliyun_accesskey_secret: "<YOUR_SECRET_ACCESS_KEY>"
+  aliyun_region_id:        "<YOUR_TARGET_REGION>"
 ```
 
 ### Connecting to OSS
@@ -307,6 +307,64 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Testing
+
+
+
+To run test suite use the following command:
+
+```
+rake spec
+```
+
+### Code coverage
+
+To run test suite with code coverage:
+
+```
+export COVERAGE=true
+rake spec
+```
+
+The result will be generated in `coverage` folder.
+
+### Integration tests
+
+To run integration tests please prepare a set of AliCloud credentials to be used by integration tests.
+
+Define the credentials and bucket in `~/.fog` file in using following format:
+
+```
+default:
+  aliyun_accesskey_id:     "...access key..." # You can create a set of credentials  
+  aliyun_accesskey_secret: "...secret..." # using Alicloud console portal
+  aliyun_region_id:        "...region name..." # Example: cn-shanghai
+  aliyun_oss_bucket:       "...name of the bucket..." # Example: fog-integration-test-bucket
+```
+
+WARNING: Do NOT use any productive account credentials and buckets for the testing, it may be harmful to your data!
+
+The tests are using [https://github.com/aliyun/aliyun-cli#installation](Aliyun CLI) to setup integration bucket and content for tests, 
+please install it locally before running integration tests.
+
+Aliyun CLI will be configured automatically as part of test execution using the credentials provided for fog connection.
+
+Then run the test suite with `INTEGRATION` environment variable to activate integration tests:
+
+```
+export INTEGRATION=true
+rake spec
+```
+
+### Performance test
+
+Performance tests are providing memory consumption report for download/upload operations.
+
+```
+export PERFORMANCE=true
+rake spec
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/fog-aliyun.gemspec

@@ -26,6 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'memory_profiler'
+  spec.add_development_dependency 'aliyun-sdk'
 
   spec.add_dependency 'fog-core'
   spec.add_dependency 'fog-json'

data/lib/fog/aliyun.rb

@@ -2,19 +2,16 @@
 
 require 'fog/core'
 require 'fog/json'
-require 'fog/aliyun/version'
+require File.expand_path('../aliyun/version', __FILE__)
 
 module Fog
-  module Compute
-    autoload :Aliyun, 'fog/aliyun/compute'
-  end
-
-  module Storage
-    autoload :Aliyun, 'fog/aliyun/storage'
-  end
-
   module Aliyun
     extend Fog::Provider
+
+    # Services
+    autoload :Compute,          File.expand_path('../aliyun/compute', __FILE__)
+    autoload :Storage,          File.expand_path('../aliyun/storage', __FILE__)
+
     service(:compute, 'Compute')
     service(:storage, 'Storage')
   end

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

@@ -4,10 +4,10 @@ require 'fog/core/collection'
 require 'fog/aliyun/models/storage/directory'
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Directories < Fog::Collection
-        model Fog::Storage::Aliyun::Directory
+        model Fog::Aliyun::Storage::Directory
 
         def all
           containers = service.get_containers
@@ -72,7 +72,7 @@ module Fog
           else
             new(key: '')
           end
-        rescue Fog::Storage::Aliyun::NotFound
+        rescue Fog::Aliyun::Storage::NotFound
           nil
         end
       end

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

@@ -4,8 +4,8 @@ require 'fog/core/model'
 require 'fog/aliyun/models/storage/files'
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Directory < Fog::Model
         identity :key, :aliases => ['Key', 'Name', 'name']
 
@@ -20,14 +20,14 @@ module Fog
             service.delete_container(key)
             true
           else
-            raise Fog::Storage::Aliyun::Error, ' Forbidden: Direction not empty!'
+            raise Fog::Aliyun::Storage::Error, ' Forbidden: Direction not empty!'
             false
           end
         end
 
         def files
           @files ||= begin
-            Fog::Storage::Aliyun::Files.new(
+            Fog::Aliyun::Storage::Files.new(
               directory: self,
               service: service
             )

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

@@ -3,8 +3,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class File < Fog::Model
         identity :key, aliases: ['Key', 'Name', 'name']
         attribute :date, aliases: 'Date'
@@ -124,7 +124,7 @@ module Fog
           elsif body.is_a?(String)
             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}!"
+            raise Fog::Aliyun::Storage::Error, " Forbidden: Invalid body type: #{body.class}!"
           end
           update_attributes_from(data)
           refresh_metadata

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

@@ -2,10 +2,11 @@
 
 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
@@ -17,7 +18,7 @@ module Fog
         attribute :marker,          :aliases => 'Marker'
         attribute :max_keys,        :aliases => ['MaxKeys', 'max-keys']
 
-        model Fog::Storage::Aliyun::File
+        model Fog::Aliyun::Storage::File
 
         # check_directory_key have two functions:
         # 1. trim the directory_key suffix '/'
@@ -48,12 +49,20 @@ module Fog
           return bucket_name, directory_key
         end
 
-        def all(_options = {})
+        def all(options = {})
           requires :directory
           bucket_name, directory_key = check_directory_key(directory.key)
-          prefix_value = prefix
+          remap_attributes(options, {
+              :delimiter  => 'delimiter',
+              :marker     => 'marker',
+              :max_keys   => 'max-keys',
+              :prefix     => 'prefix'
+          })
+          prefix_value = options['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']
+          options['prefix'] = prefix_value
+          options['bucket'] = bucket_name
+          files = service.list_objects(options)['Contents']
           return if files.nil?
           data = []
           i = 0
@@ -102,63 +111,34 @@ module Fog
                    end
           begin
             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>}
+            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: data[:body],
+                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 AliyunOssSdk::ServerError => error
+            case error.error_code
+            when %r{NoSuchKey},%r{SymlinkTargetNotExist}
               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}"
-              begin
-                data = service.get_object(object, range, bucket: bucket_name)
-                chunk = data[:body]
-              rescue StandardError => error
-                case error.response.body
-                  when %r{<Code>NoSuchKey</Code>},%r{<Code>SymlinkTargetNotExist</Code>}
-                    chunk = ''
-                  else
-                    raise(error)
-                end
-              end
-              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)
@@ -225,7 +205,7 @@ module Fog
             object_type: data[:headers]['x-oss-object-type']
           }
           new(file_data)
-        rescue Fog::Storage::Aliyun::NotFound
+        rescue Fog::Aliyun::Storage::NotFound
           nil
         end
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Copy object
         #
@@ -19,8 +19,6 @@ module Fog
           source_bucket ||= bucket
           target_bucket ||= bucket
           headers = { 'x-oss-copy-source' => "/#{source_bucket}/#{source_object}" }
-          location = get_bucket_location(target_bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           resource = target_bucket + '/' + target_object
           request(expects: [200, 203],
                   headers: headers,
@@ -28,7 +26,7 @@ module Fog
                   path: target_object,
                   bucket: target_bucket,
                   resource: resource,
-                  endpoint: endpoint)
+                  location: get_bucket_location(bucket))
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Delete an existing bucket
         #
@@ -10,15 +10,13 @@ module Fog
         # * bucket<~String> - Name of bucket to delete
         #
         def delete_bucket(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           resource = bucket + '/'
           request(
             expects: 204,
             method: 'DELETE',
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
       end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Delete an existing container
         #
@@ -13,8 +13,6 @@ module Fog
         def delete_container(container, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           object = container + '/'
           resource = bucket + '/' + object
 
@@ -24,7 +22,7 @@ module Fog
             path: object,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
       end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Delete an existing object
         #
@@ -12,8 +12,6 @@ module Fog
         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,
@@ -21,15 +19,11 @@ module Fog
             path: object,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         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
 
@@ -39,7 +33,8 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            endpoint: endpoint,
+            location: get_bucket_location(bucket)
           )
         end
       end

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

@@ -1,25 +1,14 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         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
-          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'
-
           prefix = options['prefix']
           marker = options['marker']
           # Set the GetBucket max limitation to 1000
-          maxKeys = options['max_keys'] || 1000
+          maxKeys = options['max-keys'] || 1000
           maxKeys = [maxKeys, 1000].min
           delimiter = options['delimiter']
           path = ''
@@ -47,7 +36,7 @@ module Fog
             method: 'GET',
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint,
+            location: get_bucket_location(bucket),
             path: path
           )
           xml = ret.data[:body]
@@ -64,12 +53,17 @@ module Fog
             bucket: bucket,
             resource: resource
           )
-          XmlSimple.xml_in(ret.data[:body])
+          # 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
+          location = XmlSimple.xml_in(ret.data[:body])
+          if location.class == Hash && location.key?('HostId')
+            value = location['HostId']
+            location = value[0].split('.')[1]
+          end
+          location ||= 'oss-' + @aliyun_region_id
         end
 
         def get_bucket_acl(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?acl'
           resource = bucket + '/' + attribute
           ret = request(
@@ -78,14 +72,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])['AccessControlList'][0]['Grant'][0]
         end
 
         def get_bucket_CORSRules(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?cors'
           resource = bucket + '/' + attribute
           ret = request(
@@ -94,14 +86,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])['CORSRule'][0] if ret.data[:status] != 404
         end
 
         def get_bucket_lifecycle(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?lifecycle'
           resource = bucket + '/' + attribute
           ret = request(
@@ -110,14 +100,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])['Rule'][0] if ret.data[:status] != 404
         end
 
         def get_bucket_logging(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?logging'
           resource = bucket + '/' + attribute
           ret = request(
@@ -126,14 +114,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])['LoggingEnabled'][0]['TargetPrefix']
         end
 
         def get_bucket_referer(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?referer'
           resource = bucket + '/' + attribute
           ret = request(
@@ -142,14 +128,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])
         end
 
         def get_bucket_website(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?website'
           resource = bucket + '/' + attribute
           ret = request(
@@ -158,7 +142,7 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body]) if ret.data[:status] != 404
         end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         def get_container(container, options = {})
           options = options.reject { |_key, value| value.nil? }

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # List existing storage containers
         #
@@ -42,13 +42,18 @@ module Fog
             path += '?delimiter=' + delimiter
           end
 
-          location = get_bucket_location(bucket)
+          endpoint = options[:endpoint]
+          if endpoint.nil?
+            location = get_bucket_location(bucket)
+          end
           resource = bucket + '/'
           ret = request(
             expects: [200, 203, 400],
             method: 'GET',
             path: path,
             resource: resource,
+            endpoint: endpoint,
+            location: location,
             bucket: bucket
           )
           xml = ret.data[:body]

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Get details for object
         #
@@ -11,30 +11,17 @@ module Fog
         #
         def get_object(object, range = nil, options = {})
           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'
+          bucket_name = options[:bucket]
+          bucket_name ||= @aliyun_oss_bucket
+          # Using OSS ruby SDK to fix performance issue
+          bucket = @oss_client.get_bucket(bucket_name)
+          body = Array.new
+          obj = bucket.get_object(object) do |chunk|
+            body << chunk
           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 }
-          end
-
-          response = request(para)
-          response.data
+          response = {}
+          obj.instance_variables.each {|var| response[var.to_s.delete("@")] = obj.instance_variable_get(var) }
+          response.merge({:body => body.join('')})
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Get an expiring object http url
         #

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Get an expiring object https url from Cloud Files
         #

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Get headers for object
         #
@@ -12,8 +12,6 @@ module Fog
         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],
@@ -21,7 +19,7 @@ module Fog
             path: object,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           ret
         end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         def list_buckets(options = {})
           prefix = options[:prefix]

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

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         def list_objects(options = {})
-          bucket = options[:bucket]
+          bucket = options['bucket']
           bucket ||= @aliyun_oss_bucket
-          prefix = options[:prefix]
-          marker = options[:marker]
+          prefix = options['prefix']
+          marker = options['marker']
           # Set the ListObjects max limitation to 1000
-          maxKeys = options[:maxKeys] || 1000
+          maxKeys = options['max-keys'] || 1000
           maxKeys = [maxKeys, 1000].min
-          delimiter = options[:delimiter]
+          delimiter = options['delimiter']
 
           path = ''
           if prefix
@@ -45,11 +45,9 @@ module Fog
           XmlSimple.xml_in(xml)
         end
 
-        def list_multipart_uploads(bucket, endpoint, _options = {})
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def list_multipart_uploads(bucket, location, _options = {})
+          location ||= get_bucket_location(bucket)
+
           path = '?uploads'
           resource = bucket + '/' + path
 
@@ -59,16 +57,14 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: location
           )
           XmlSimple.xml_in(ret.data[:body])['Upload']
         end
 
-        def list_parts(bucket, object, endpoint, uploadid, _options = {})
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def list_parts(bucket, object, location, uploadid, _options = {})
+          location ||= get_bucket_location(bucket)
+
           path = object + '?uploadId=' + uploadid
           resource = bucket + '/' + path
 
@@ -78,7 +74,7 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: location
           )
           XmlSimple.xml_in(ret.data[:body])['Part']
         end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         def put_bucket(bucketName)
           resource = bucketName + '/'

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Create a new container
         #
@@ -12,8 +12,6 @@ module Fog
         def put_container(name, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
 
           path = name + '/'
           resource = bucket + '/' + name + '/'
@@ -23,7 +21,7 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
       end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Put details for object
         #
@@ -12,9 +12,7 @@ module Fog
         def put_object(object, file = nil, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          return put_folder(bucket, object, endpoint) if file.nil?
+          return put_folder(bucket, object) if file.nil?
 
           # put multiparts if object's size is over 100m
           return put_multipart_object(bucket, object, file) if file.size > 104_857_600
@@ -29,15 +27,13 @@ module Fog
             bucket: bucket,
             resource: resource,
             body: body,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
 
         def put_object_with_body(object, body, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
 
           resource = bucket + '/' + object
           request(
@@ -47,15 +43,11 @@ module Fog
             bucket: bucket,
             resource: resource,
             body: body,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
 
-        def put_folder(bucket, folder, endpoint)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def put_folder(bucket, folder)
           path = folder + '/'
           resource = bucket + '/' + folder + '/'
           request(
@@ -64,27 +56,26 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
 
         def put_multipart_object(bucket, object, file)
           location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
 
           # find the right uploadid
-          uploads = list_multipart_uploads(bucket, endpoint)
+          uploads = list_multipart_uploads(bucket, location)
           upload = (uploads&.find { |tmpupload| tmpupload['Key'][0] == object })
 
           uploadedSize = 0
           start_partNumber = 1
           if !upload.nil?
             uploadId = upload['UploadId'][0]
-            parts = list_parts(bucket, object, endpoint, uploadId)
+            parts = list_parts(bucket, object, location, uploadId)
             if !parts.nil? && !parts.empty?
               if parts[-1]['Size'][0].to_i != 5_242_880
                 # the part is the last one, if its size is over 5m, then finish this upload
-                complete_multipart_upload(bucket, object, endpoint, uploadId)
+                complete_multipart_upload(bucket, object, location, uploadId)
                 return
               end
               uploadedSize = (parts[0]['Size'][0].to_i * (parts.size - 1)) + parts[-1]['Size'][0].to_i
@@ -92,11 +83,11 @@ module Fog
             end
           else
             # create upload ID
-            uploadId = initiate_multipart_upload(bucket, object, endpoint)
+            uploadId = initiate_multipart_upload(bucket, object, location)
           end
 
           if file.size <= uploadedSize
-            complete_multipart_upload(bucket, object, endpoint, uploadId)
+            complete_multipart_upload(bucket, object, location, uploadId)
             return
           end
 
@@ -105,17 +96,14 @@ module Fog
 
           for i in start_partNumber..end_partNumber
             body = file.read(5_242_880)
-            upload_part(bucket, object, endpoint, i.to_s, uploadId, body)
+            upload_part(bucket, object, location, i.to_s, uploadId, body)
           end
 
-          complete_multipart_upload(bucket, object, endpoint, uploadId)
+          complete_multipart_upload(bucket, object, location, uploadId)
         end
 
-        def initiate_multipart_upload(bucket, object, endpoint)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def initiate_multipart_upload(bucket, object, location)
+          location ||= get_bucket_location(bucket)
           path = object + '?uploads'
           resource = bucket + '/' + path
           ret = request(
@@ -124,16 +112,13 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: location
           )
           XmlSimple.xml_in(ret.data[:body])['UploadId'][0]
         end
 
-        def upload_part(bucket, object, endpoint, partNumber, uploadId, body)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def upload_part(bucket, object, location, partNumber, uploadId, body)
+          location ||= get_bucket_location(bucket)
           path = object + '?partNumber=' + partNumber + '&uploadId=' + uploadId
           resource = bucket + '/' + path
           request(
@@ -143,16 +128,13 @@ module Fog
             bucket: bucket,
             resource: resource,
             body: body,
-            endpoint: endpoint
+            location: location
           )
         end
 
-        def complete_multipart_upload(bucket, object, endpoint, uploadId)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
-          parts = list_parts(bucket, object, endpoint, uploadId, options = {})
+        def complete_multipart_upload(bucket, object, location, uploadId)
+          location ||= get_bucket_location(bucket)
+          parts = list_parts(bucket, object, location, uploadId, options = {})
           request_part = []
           return if parts.empty?
           for i in 0..(parts.size - 1)
@@ -169,7 +151,7 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint,
+            location: location,
             body: body
           )
         end

data/lib/fog/aliyun/storage.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 require 'xmlsimple'
+require 'aliyun/oss'
+
+# Using Aliyun OSS Ruby SDK
+AliyunOssSdk= Aliyun::OSS
 
 module Fog
-  module Storage
-    class Aliyun < Fog::Service
+  module Aliyun
+    class Storage < Fog::Service
       DEFAULT_REGION = 'cn-hangzhou'
 
-      DEFAULT_SCHEME = 'http'
+      DEFAULT_SCHEME = 'https'
       DEFAULT_SCHEME_PORT = {
         'http' => 80,
         'https' => 443
@@ -97,6 +101,11 @@ module Fog
           @port = uri.port || DEFAULT_SCHEME_PORT[@scheme]
 
           @persistent = options[:persistent] || false
+          @oss_client = AliyunOssSdk::Client.new(
+                                     :endpoint => @aliyun_oss_endpoint,
+                                     :access_key_id => @aliyun_accesskey_id,
+                                     :access_key_secret => @aliyun_accesskey_secret
+          )
         end
 
         def reload
@@ -118,19 +127,22 @@ module Fog
           date = time.strftime('%a, %d %b %Y %H:%M:%S GMT')
 
           endpoint = params[:endpoint]
+          location = params[:location]
           if endpoint
             uri = URI.parse(endpoint)
             host = uri.host
             path = uri.path
             port = uri.port
             scheme = uri.scheme
-          else
-            host = @host
-            path = @path
-            port = @port
-            scheme = @scheme
+          elsif location
+            host = location + '.aliyuncs.com'
           end
 
+          host ||= @host
+          path ||= @path
+          port ||= @port
+          scheme ||= @scheme
+
           bucket = params[:bucket]
           tmpHost = if bucket
                       bucket + '.' + host
@@ -143,8 +155,10 @@ module Fog
 
           begin
             headers = ''
-            params[:headers]&.each do |k, v|
+            if params[:headers]
+              params[:headers].each do |k, v|
               headers += "#{k}:#{v}\n" if k != 'Range'
+              end
             end
             signature = sign(method, date, contentType, params[:resource], headers)
             response = @connection.request(params.merge(headers: {
@@ -157,7 +171,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
                   when Excon::Errors::NotFound
-                    Fog::Storage::Aliyun::NotFound.slurp(error)
+                    Fog::Aliyun::Storage::NotFound.slurp(error)
                   else
                     error
                   end

data/lib/fog/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Fog
   module Aliyun
-    VERSION = '0.3.10'
+    VERSION = '0.3.11'
   end
 end

data/lib/fog/bin/aliyun.rb

@@ -5,7 +5,7 @@ class Aliyun < Fog::Bin
     def class_for(key)
       case key
       when :storage
-        Fog::Storage::Aliyun
+        Fog::Aliyun::Storage
       when :compute
         Fog::Compute::Aliyun
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han, Guimin He
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aliyun-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement