fog-aliyun 0.1.0 → 0.2.0

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

@@ -3,7 +3,7 @@ module Fog
     class Aliyun
       class Real
         def get_container(container, options = {})
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
 
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
@@ -12,57 +12,45 @@ module Fog
           maxKeys = options[:maxKeys]
           delimiter = '/'
 
-          path = ""
+          path = ''
 
-          if container == "" || container == "." || container == nil
-            prefix = nil
-          else
-            prefix = container+'/'
-          end
+          prefix = if container == '' || container == '.' || container.nil?
+                     nil
+                   else
+                     container + '/'
+                   end
 
           if prefix
-            path+="?prefix="+prefix
-            if marker
-              path+="&marker="+marker
-            end
-            if maxKeys
-              path+="&max-keys="+maxKeys
-            end
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
+            path += '?prefix=' + prefix
+            path += '&marker=' + marker if marker
+            path += '&max-keys=' + maxKeys if maxKeys
+            path += '&delimiter=' + delimiter if delimiter
           elsif marker
-            path+="?marker="+marker
-            if maxKeys
-              path+="&max-keys="+maxKeys
-            end
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
+            path += '?marker=' + marker
+            path += '&max-keys=' + maxKeys if maxKeys
+            path += '&delimiter=' + delimiter if delimiter
           elsif maxKeys
-            path+="?max-keys="+maxKeys
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
+            path += '?max-keys=' + maxKeys
+            path += '&delimiter=' + delimiter if delimiter
           elsif delimiter
-            path+="?delimiter="+delimiter
+            path += '?delimiter=' + delimiter
           end
 
           location = get_bucket_location(bucket)
-          endpoint = "http://"+location+".aliyuncs.com"
-          resource = bucket+'/'
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          resource = bucket + '/'
           ret = request(
-              :expects  => [200, 203, 400],
-              :method   => 'GET',
-              :path     => path,
-              :resource => resource,
-              :bucket => bucket
+            expects: [200, 203, 400],
+            method: 'GET',
+            path: path,
+            resource: resource,
+            bucket: bucket
           )
           xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)["CommonPrefixes"]
+          result = XmlSimple.xml_in(xml)['CommonPrefixes']
         end
       end
-      
+
       class Mock
         def get_container(container, options = {})
         end

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

@@ -12,7 +12,7 @@ module Fog
         # ==== Returns
         #
         def get_containers(options = {})
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
           prefix = options[:prefix]
@@ -20,50 +20,38 @@ module Fog
           maxKeys = options[:maxKeys]
           delimiter = '/'
 
-          path = ""
+          path = ''
           if prefix
-            path+="?prefix="+prefix
-            if marker
-              path+="&marker="+marker
-            end
-            if maxKeys
-              path+="&max-keys="+maxKeys
-            end
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
+            path += '?prefix=' + prefix
+            path += '&marker=' + marker if marker
+            path += '&max-keys=' + maxKeys if maxKeys
+            path += '&delimiter=' + delimiter if delimiter
 
           elsif marker
-            path+="?marker="+marker
-            if maxKeys
-              path+="&max-keys="+maxKeys
-            end
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
+            path += '?marker=' + marker
+            path += '&max-keys=' + maxKeys if maxKeys
+            path += '&delimiter=' + delimiter if delimiter
 
           elsif maxKeys
-            path+="?max-keys="+maxKeys
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
+            path += '?max-keys=' + maxKeys
+            path += '&delimiter=' + delimiter if delimiter
 
           elsif delimiter
-            path+="?delimiter="+delimiter
+            path += '?delimiter=' + delimiter
           end
 
           location = get_bucket_location(bucket)
-          endpoint = "http://"+location+".aliyuncs.com"
-          resource = bucket+'/'
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          resource = bucket + '/'
           ret = request(
-              :expects  => [200, 203, 400],
-              :method   => 'GET',
-              :path     => path,
-              :resource => resource,
-              :bucket => bucket
+            expects: [200, 203, 400],
+            method: 'GET',
+            path: path,
+            resource: resource,
+            bucket: bucket
           )
           xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)["CommonPrefixes"]
+          result = XmlSimple.xml_in(xml)['CommonPrefixes']
         end
       end
 

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

@@ -8,27 +8,27 @@ module Fog
         # * object<~String> - Name of object to look for
         #
         def get_object(object, range = nil, options = {})
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
           endpoint = options[:endpoint]
-          if (nil == endpoint)
+          if nil == endpoint
             location = get_bucket_location(bucket)
-            endpoint = "http://"+location+".aliyuncs.com"
+            endpoint = 'http://' + location + '.aliyuncs.com'
           end
-          resource = bucket+'/'+object
+          resource = bucket + '/' + object
           para = {
-            :expects  => [200, 206, 404],
-            :method   => 'GET',
-            :path     => object,
-            :bucket   => bucket,
-            :resource => resource,
-            :endpoint => endpoint
+            expects: [200, 206, 404],
+            method: 'GET',
+            path: object,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
           }
 
           if range
-            rangeStr = "bytes="+range
-            para[:headers] = {'Range' => rangeStr}
+            rangeStr = 'bytes=' + range
+            para[:headers] = { 'Range' => rangeStr }
           end
 
           response = request(para)

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

@@ -13,23 +13,23 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         def get_object_http_url_public(object, expires, options = {})
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
           acl = get_bucket_acl(bucket)
           location = get_bucket_location(bucket)
-          
-          if "private" == acl
+
+          if 'private' == acl
             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 or "public-read-write" == acl
-            url = "http://"+bucket+"."+location+".aliyuncs.com/"+object
+            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
+            url = 'http://' + bucket + '.' + location + '.aliyuncs.com/' + object
           else
-            url = "acl is wrong with value:"+acl
+            url = 'acl is wrong with value:' + acl
           end
         end
       end

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

@@ -13,23 +13,23 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         def get_object_https_url_public(object, expires, options = {})
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
           acl = get_bucket_acl(bucket)
           location = get_bucket_location(bucket)
-          
-          if "private" == acl
+
+          if 'private' == acl
             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 or "public-read-write" == acl
-            url = "https://"+bucket+"."+location+".aliyuncs.com/"+object
+            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
+            url = 'https://' + bucket + '.' + location + '.aliyuncs.com/' + object
           else
-            url = "acl is wrong with value:"+acl
+            url = 'acl is wrong with value:' + acl
           end
         end
       end

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

@@ -7,26 +7,26 @@ module Fog
         # ==== Parameters
         # * object<~String> - Name of object to look for
         #
-        def head_object(object, options={})
+        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
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          resource = bucket + '/' + object
           ret = request(
-            :expects  => [200, 404],
-            :method   => 'HEAD',
-            :path     => object,
-            :bucket   => bucket,
-            :resource => resource,
-            :endpoint => endpoint
+            expects: [200, 404],
+            method: 'HEAD',
+            path: object,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
           )
-          return ret
+          ret
         end
       end
 
       class Mock
-        def head_object(object, options={})
+        def head_object(object, options = {})
         end
       end
     end

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

@@ -1,47 +1,40 @@
-module Fog
-  module Storage
-    class Aliyun
-      class Real
-        def list_buckets(options={})
-          prefix = options[:prefix]
-          marker = options[:marker]
-          maxKeys = options[:maxKeys]
-          
-          path = ""
-          if prefix
-            path+="?prefix="+prefix
-            if marker
-              path+="&marker="+marker
-            end
-            if maxKeys
-              path+="&max-keys="+maxKeys
-            end
-            
-          elsif marker
-            path+="?marker="+marker
-            if maxKeys
-              path+="&max-keys="+maxKeys
-            end
-            
-          elsif maxKeys
-            path+="?max-keys="+maxKeys
-          end
-          
-          ret = request(
-                  :expects  => [200, 203],
-                  :method   => 'GET',
-                  :path     => path
-          )
-          xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)["Buckets"][0]
-        end
-        
-      end
-
-      class Mock
-        def list_buckets(options={})
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class Aliyun
+      class Real
+        def list_buckets(options = {})
+          prefix = options[:prefix]
+          marker = options[:marker]
+          maxKeys = options[:maxKeys]
+
+          path = ''
+          if prefix
+            path += '?prefix=' + prefix
+            path += '&marker=' + marker if marker
+            path += '&max-keys=' + maxKeys if maxKeys
+
+          elsif marker
+            path += '?marker=' + marker
+            path += '&max-keys=' + maxKeys if maxKeys
+
+          elsif maxKeys
+            path += '?max-keys=' + maxKeys
+          end
+
+          ret = request(
+            expects: [200, 203],
+            method: 'GET',
+            path: path
+          )
+          xml = ret.data[:body]
+          result = XmlSimple.xml_in(xml)['Buckets'][0]
+        end
+      end
+
+      class Mock
+        def list_buckets(options = {})
+        end
+      end
+    end
+  end
+end

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

@@ -1,104 +1,91 @@
-module Fog
-  module Storage
-    class Aliyun
-      class Real
-        def list_objects(options={})
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          prefix = options[:prefix]
-          marker = options[:marker]
-          maxKeys = options[:maxKeys]
-          delimiter = options[:delimiter]
-          
-          path = ""
-          if prefix
-            path+="?prefix="+prefix
-            if marker
-              path+="&marker="+marker
-            end
-            if maxKeys
-              path+="&max-keys="+maxKeys
-            end
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
-            
-          elsif marker
-            path+="?marker="+marker
-            if maxKeys
-              path+="&max-keys="+maxKeys
-            end
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
-            
-          elsif maxKeys
-            path+="?max-keys="+maxKeys
-            if delimiter
-              path+="&delimiter="+delimiter
-            end
-          elsif delimiter
-              path+="?delimiter="+delimiter
-          end
-          
-          location = get_bucket_location(bucket)
-          endpoint = "http://"+location+".aliyuncs.com"
-          resource = bucket+'/'
-          ret = request(
-                  :expects  => [200, 203, 400],
-                  :method   => 'GET',
-                  :path     => path,
-                  :resource => resource,
-                  :bucket => bucket
-          )
-          xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)
-        end
-
-        def list_multipart_uploads(bucket, endpoint, options = {})
-          if (nil == endpoint)
-            location = get_bucket_location(bucket)
-            endpoint = "http://"+location+".aliyuncs.com"
-          end
-          path = "?uploads"
-          resource = bucket+'/'+path
-
-          ret = request(
-                  :expects  => 200,
-                  :method   => 'GET',
-                  :path     => path,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          uploadid = XmlSimple.xml_in(ret.data[:body])["Upload"]
-        end
-
-        def list_parts(bucket, object, endpoint, uploadid, options = {})
-          if (nil == endpoint)
-            location = get_bucket_location(bucket)
-            endpoint = "http://"+location+".aliyuncs.com"
-          end
-          path = object+"?uploadId="+uploadid
-          resource = bucket+'/'+path
-
-          ret = request(
-                  :expects  => 200,
-                  :method   => 'GET',
-                  :path     => path,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          parts = XmlSimple.xml_in(ret.data[:body])["Part"]
-        end
-        
-      end
-      
-      class Mock
-        def list_objects(options={})
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class Aliyun
+      class Real
+        def list_objects(options = {})
+          bucket = options[:bucket]
+          bucket ||= @aliyun_oss_bucket
+          prefix = options[:prefix]
+          marker = options[:marker]
+          maxKeys = options[:maxKeys]
+          delimiter = options[:delimiter]
+
+          path = ''
+          if prefix
+            path += '?prefix=' + prefix
+            path += '&marker=' + marker if marker
+            path += '&max-keys=' + maxKeys if maxKeys
+            path += '&delimiter=' + delimiter if delimiter
+
+          elsif marker
+            path += '?marker=' + marker
+            path += '&max-keys=' + maxKeys if maxKeys
+            path += '&delimiter=' + delimiter if delimiter
+
+          elsif maxKeys
+            path += '?max-keys=' + maxKeys
+            path += '&delimiter=' + delimiter if delimiter
+          elsif delimiter
+            path += '?delimiter=' + delimiter
+          end
+
+          location = get_bucket_location(bucket)
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          resource = bucket + '/'
+          ret = request(
+            expects: [200, 203, 400],
+            method: 'GET',
+            path: path,
+            resource: resource,
+            bucket: bucket
+          )
+          xml = ret.data[:body]
+          result = XmlSimple.xml_in(xml)
+        end
+
+        def list_multipart_uploads(bucket, endpoint, _options = {})
+          if nil == endpoint
+            location = get_bucket_location(bucket)
+            endpoint = 'http://' + location + '.aliyuncs.com'
+          end
+          path = '?uploads'
+          resource = bucket + '/' + path
+
+          ret = request(
+            expects: 200,
+            method: 'GET',
+            path: path,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          uploadid = XmlSimple.xml_in(ret.data[:body])['Upload']
+        end
+
+        def list_parts(bucket, object, endpoint, uploadid, _options = {})
+          if nil == endpoint
+            location = get_bucket_location(bucket)
+            endpoint = 'http://' + location + '.aliyuncs.com'
+          end
+          path = object + '?uploadId=' + uploadid
+          resource = bucket + '/' + path
+
+          ret = request(
+            expects: 200,
+            method: 'GET',
+            path: path,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          parts = XmlSimple.xml_in(ret.data[:body])['Part']
+        end
+      end
+
+      class Mock
+        def list_objects(options = {})
+        end
+      end
+    end
+  end
+end