fog-aliyun 0.3.0 → 0.3.1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -27,8 +29,7 @@ module Fog
         end
       end
       class Mock
-        def delete_container(container, options = {})
-        end
+        def delete_container(container, options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -24,7 +26,7 @@ module Fog
         end
 
         def abort_multipart_upload(bucket, object, endpoint, uploadid)
-          if nil == endpoint
+          if endpoint.nil?
             location = get_bucket_location(bucket)
             endpoint = 'http://' + location + '.aliyuncs.com'
           end
@@ -43,8 +45,7 @@ module Fog
       end
 
       class Mock
-        def delete_object(object, options = {})
-        end
+        def delete_object(object, options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -59,9 +61,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          if 404 != ret.data[:status]
-            cors = XmlSimple.xml_in(ret.data[:body])['CORSRule'][0]
-          end
+          cors = XmlSimple.xml_in(ret.data[:body])['CORSRule'][0] if ret.data[:status] != 404
         end
 
         def get_bucket_lifecycle(bucket)
@@ -77,9 +77,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          if 404 != ret.data[:status]
-            lifecycle = XmlSimple.xml_in(ret.data[:body])['Rule'][0]
-          end
+          lifecycle = XmlSimple.xml_in(ret.data[:body])['Rule'][0] if ret.data[:status] != 404
         end
 
         def get_bucket_logging(bucket)
@@ -127,14 +125,11 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          if 404 != ret.data[:status]
-            website = XmlSimple.xml_in(ret.data[:body])
-          end
+          website = XmlSimple.xml_in(ret.data[:body]) if ret.data[:status] != 404
         end
       end
       class Mock
-        def get_bucket(bucket)
-        end
+        def get_bucket(bucket); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -52,8 +54,7 @@ module Fog
       end
 
       class Mock
-        def get_container(container, options = {})
-        end
+        def get_container(container, options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -56,8 +58,7 @@ module Fog
       end
 
       class Mock
-        def get_containers(options = {})
-        end
+        def get_containers(options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -12,7 +14,7 @@ module Fog
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
           endpoint = options[:endpoint]
-          if nil == endpoint
+          if endpoint.nil?
             location = get_bucket_location(bucket)
             endpoint = 'http://' + location + '.aliyuncs.com'
           end
@@ -37,8 +39,7 @@ module Fog
       end
 
       class Mock
-        def get_object(object, range = nil, options = {})
-        end
+        def get_object(object, range = nil, options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -19,14 +21,14 @@ module Fog
           acl = get_bucket_acl(bucket)
           location = get_bucket_location(bucket)
 
-          if 'private' == acl
+          if acl == 'private'
             expires_time = (Time.now.to_i + expires).to_s
             resource = bucket + '/' + object
             signature = sign('GET', expires_time, nil, resource)
             url = 'http://' + bucket + '.' + location + '.aliyuncs.com/' + object +
                   '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
                   '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
-          elsif 'public-read' == acl || 'public-read-write' == acl
+          elsif acl == 'public-read' || acl == 'public-read-write'
             url = 'http://' + bucket + '.' + location + '.aliyuncs.com/' + object
           else
             url = 'acl is wrong with value:' + acl
@@ -35,8 +37,7 @@ module Fog
       end
 
       class Mock
-        def get_object_http_url_public(object, expires, options = {})
-        end
+        def get_object_http_url_public(object, expires, options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -19,14 +21,14 @@ module Fog
           acl = get_bucket_acl(bucket)
           location = get_bucket_location(bucket)
 
-          if 'private' == acl
+          if acl == 'private'
             expires_time = (Time.now.to_i + expires).to_s
             resource = bucket + '/' + object
             signature = sign('GET', expires_time, nil, resource)
             url = 'https://' + bucket + '.' + location + '.aliyuncs.com/' + object +
                   '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
                   '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
-          elsif 'public-read' == acl || 'public-read-write' == acl
+          elsif acl == 'public-read' || acl == 'public-read-write'
             url = 'https://' + bucket + '.' + location + '.aliyuncs.com/' + object
           else
             url = 'acl is wrong with value:' + acl
@@ -35,8 +37,7 @@ module Fog
       end
 
       class Mock
-        def get_object_https_url_public(object, expires, options = {})
-        end
+        def get_object_https_url_public(object, expires, options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -26,8 +28,7 @@ module Fog
       end
 
       class Mock
-        def head_object(object, options = {})
-        end
+        def head_object(object, options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -32,8 +34,7 @@ module Fog
       end
 
       class Mock
-        def list_buckets(options = {})
-        end
+        def list_buckets(options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -44,7 +46,7 @@ module Fog
         end
 
         def list_multipart_uploads(bucket, endpoint, _options = {})
-          if nil == endpoint
+          if endpoint.nil?
             location = get_bucket_location(bucket)
             endpoint = 'http://' + location + '.aliyuncs.com'
           end
@@ -63,7 +65,7 @@ module Fog
         end
 
         def list_parts(bucket, object, endpoint, uploadid, _options = {})
-          if nil == endpoint
+          if endpoint.nil?
             location = get_bucket_location(bucket)
             endpoint = 'http://' + location + '.aliyuncs.com'
           end
@@ -83,8 +85,7 @@ module Fog
       end
 
       class Mock
-        def list_objects(options = {})
-        end
+        def list_objects(options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -14,8 +16,7 @@ module Fog
       end
 
       class Mock
-        def put_bucket(bucketName)
-        end
+        def put_bucket(bucketName); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -27,8 +29,7 @@ module Fog
       end
 
       class Mock
-        def put_container(name, options = {})
-        end
+        def put_container(name, options = {}); end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Storage
     class Aliyun
@@ -12,12 +14,10 @@ module Fog
           bucket ||= @aliyun_oss_bucket
           location = get_bucket_location(bucket)
           endpoint = 'http://' + location + '.aliyuncs.com'
-          return put_folder(bucket, object, endpoint) if nil == file
+          return put_folder(bucket, object, endpoint) if file.nil?
 
           # put multiparts if object's size is over 100m
-          if file.size > 104_857_600
-            return put_multipart_object(bucket, object, file)
-          end
+          return put_multipart_object(bucket, object, file) if file.size > 104_857_600
 
           body = file.read
 
@@ -52,7 +52,7 @@ module Fog
       end
 
         def put_folder(bucket, folder, endpoint)
-          if nil == endpoint
+          if endpoint.nil?
             location = get_bucket_location(bucket)
             endpoint = 'http://' + location + '.aliyuncs.com'
           end
@@ -74,19 +74,15 @@ module Fog
 
           # find the right uploadid
           uploads = list_multipart_uploads(bucket, endpoint)
-          if nil != uploads
-            upload = uploads.find { |tmpupload| tmpupload['Key'][0] == object }
-          else
-            upload = nil
-          end
+          upload = (uploads&.find { |tmpupload| tmpupload['Key'][0] == object })
 
           parts = nil
           uploadedSize = 0
           start_partNumber = 1
-          if nil != upload
+          if !upload.nil?
             uploadId = upload['UploadId'][0]
             parts = list_parts(bucket, object, endpoint, uploadId)
-            if (nil != parts) && !parts.empty?
+            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)
@@ -117,7 +113,7 @@ module Fog
         end
 
         def initiate_multipart_upload(bucket, object, endpoint)
-          if nil == endpoint
+          if endpoint.nil?
             location = get_bucket_location(bucket)
             endpoint = 'http://' + location + '.aliyuncs.com'
           end
@@ -135,7 +131,7 @@ module Fog
         end
 
         def upload_part(bucket, object, endpoint, partNumber, uploadId, body)
-          if nil == endpoint
+          if endpoint.nil?
             location = get_bucket_location(bucket)
             endpoint = 'http://' + location + '.aliyuncs.com'
           end
@@ -153,7 +149,7 @@ module Fog
         end
 
         def complete_multipart_upload(bucket, object, endpoint, uploadId)
-          if nil == endpoint
+          if endpoint.nil?
             location = get_bucket_location(bucket)
             endpoint = 'http://' + location + '.aliyuncs.com'
           end
@@ -181,8 +177,7 @@ module Fog
       end
 
       class Mock
-        def put_object(object, file = nil, options = {})
-        end
+        def put_object(object, file = nil, options = {}); end
       end
     end
   end

data/lib/fog/aliyun/storage.rb

@@ -1,29 +1,30 @@
+# frozen_string_literal: true
+
 require 'xmlsimple'
 
 module Fog
   module Storage
     class Aliyun < Fog::Service
-
       DEFAULT_REGION = 'cn-hangzhou'
 
       DEFAULT_SCHEME = 'http'
       DEFAULT_SCHEME_PORT = {
-          'http' => 80,
-          'https' => 443
-      }
+        'http' => 80,
+        'https' => 443
+      }.freeze
 
       recognizes :aliyun_oss_endpoint,
                  :aliyun_oss_location,
                  :aliyun_region_id
-      requires   :aliyun_accesskey_id,
-                 :aliyun_accesskey_secret,
-                 :aliyun_oss_bucket
+      requires :aliyun_accesskey_id,
+               :aliyun_accesskey_secret,
+               :aliyun_oss_bucket
 
       model_path 'fog/aliyun/models/storage'
-      model       :directory
-      collection  :directories
-      model       :file
-      collection  :files
+      model :directory
+      collection :directories
+      model :file
+      collection :files
 
       request_path 'fog/aliyun/requests/storage'
       request :copy_object
@@ -70,11 +71,11 @@ module Fog
 
         def initialize(options = {})
           # initialize the parameters
-          @aliyun_region_id        = options[:aliyun_region_id] || options[:aliyun_oss_location] || DEFAULT_REGION
-          @aliyun_oss_endpoint     = options[:aliyun_oss_endpoint] || region_to_endpoint(@aliyun_region_id)
-          @aliyun_accesskey_id     = options[:aliyun_accesskey_id]
+          @aliyun_region_id = options[:aliyun_region_id] || options[:aliyun_oss_location] || DEFAULT_REGION
+          @aliyun_oss_endpoint = options[:aliyun_oss_endpoint] || region_to_endpoint(@aliyun_region_id)
+          @aliyun_accesskey_id = options[:aliyun_accesskey_id]
           @aliyun_accesskey_secret = options[:aliyun_accesskey_secret]
-          @aliyun_oss_bucket       = options[:aliyun_oss_bucket]
+          @aliyun_oss_bucket = options[:aliyun_oss_bucket]
 
           # check for the parameters
           missing_credentials = []
@@ -87,15 +88,13 @@ module Fog
 
           endpoint = @aliyun_oss_endpoint
 
-          if !endpoint.start_with?(DEFAULT_SCHEME)
-            @aliyun_oss_endpoint = "#{DEFAULT_SCHEME}://#{endpoint}"
-          end
+          @aliyun_oss_endpoint = "#{DEFAULT_SCHEME}://#{endpoint}" unless endpoint.start_with?(DEFAULT_SCHEME)
 
           uri = URI.parse(@aliyun_oss_endpoint)
-          @host   = uri.host
-          @path   = uri.path
+          @host = uri.host
+          @path = uri.path
           @scheme = uri.scheme || DEFAULT_SCHEME
-          @port   = uri.port || DEFAULT_SCHEME_PORT[@scheme]
+          @port = uri.port || DEFAULT_SCHEME_PORT[@scheme]
 
           @persistent = options[:persistent] || false
         end
@@ -104,12 +103,12 @@ module Fog
           @connection.reset
         end
 
-        def region_to_endpoint(region=nil)
+        def region_to_endpoint(region = nil)
           case region.to_s
-            when ''
-              "oss-#{DEFAULT_REGION}.aliyuncs.com"
-            else
-              "oss-#{region}.aliyuncs.com"
+          when ''
+            "oss-#{DEFAULT_REGION}.aliyuncs.com"
+          else
+            "oss-#{region}.aliyuncs.com"
           end
         end
 
@@ -121,14 +120,14 @@ module Fog
           endpoint = params[:endpoint]
           if endpoint
             uri = URI.parse(endpoint)
-            host   = uri.host
-            path   = uri.path
-            port   = uri.port
+            host = uri.host
+            path = uri.path
+            port = uri.port
             scheme = uri.scheme
           else
-            host   = @host
-            path   = @path
-            port   = @port
+            host = @host
+            path = @path
+            port = @port
             scheme = @scheme
           end
 
@@ -144,10 +143,8 @@ module Fog
 
           begin
             headers = ''
-            if params[:headers]
-              params[:headers].each do |k, v|
-                headers += "#{k}:#{v}\n" if k != 'Range'
-              end
+            params[:headers]&.each do |k, v|
+              headers += "#{k}:#{v}\n" if k != 'Range'
             end
             signature = sign(method, date, contentType, params[:resource], headers)
             response = @connection.request(params.merge(headers: {
@@ -179,22 +176,14 @@ module Fog
                                     '/'
                                   end
 
-          canonicalizedOSSHeaders = if headers
-                                      headers
-                                    else
-                                      ''
-                                    end
+          canonicalizedOSSHeaders = headers || ''
 
-          contentTypeStr = if contentType
-                             contentType
-                           else
-                             ''
-                           end
+          contentTypeStr = contentType || ''
 
           stringToSign = method + "\n" + contentmd5 + "\n" + contentTypeStr + "\n" + date + "\n" + canonicalizedOSSHeaders + canonicalizedResource
 
-          digVer =  OpenSSL::Digest.new('sha1')
-          digest =  OpenSSL::HMAC.digest(digVer, @aliyun_accesskey_secret, stringToSign)
+          digVer = OpenSSL::Digest.new('sha1')
+          digest = OpenSSL::HMAC.digest(digVer, @aliyun_accesskey_secret, stringToSign)
           signature = Base64.encode64(digest)
           signature[-1] = ''
 
@@ -204,11 +193,11 @@ module Fog
 
       class Mock
         def initialize(options = {})
-          @aliyun_oss_endpoint     = options[:aliyun_oss_endpoint]
-          @aliyun_region_id        = options[:aliyun_region_id]
-          @aliyun_accesskey_id     = options[:aliyun_accesskey_id]
+          @aliyun_oss_endpoint = options[:aliyun_oss_endpoint]
+          @aliyun_region_id = options[:aliyun_region_id]
+          @aliyun_accesskey_id = options[:aliyun_accesskey_id]
           @aliyun_accesskey_secret = options[:aliyun_accesskey_secret]
-          @aliyun_oss_bucket       = options[:aliyun_oss_bucket]
+          @aliyun_oss_bucket = options[:aliyun_oss_bucket]
 
           # missing_credentials = Array.new
           # missing_credentials << :aliyun_oss_endpoint unless @aliyun_oss_endpoint