lib/fog/aliyun/requests/storage/get_container.rb in fog-aliyun-0.1.0 vs lib/fog/aliyun/requests/storage/get_container.rb in fog-aliyun-0.2.0

@@ -1,69 +1,57 @@
 module Fog
   module Storage
     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
 
           marker = options[:marker]
           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
       end
     end