fog-aliyun 0.1.0 → 0.2.0

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

@@ -11,30 +11,27 @@ module Fog
         # * target_object<~String> - Name for new copy of object
         # * options<~Hash> - Additional headers options={}
         def copy_object(source_bucket, source_object, target_bucket, target_object, options = {})
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
           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,
-            :method   => 'PUT',
-            :path     => target_object,
-            :bucket   => target_bucket,
-            :resource => resource,
-            :endpoint => endpoint
-          })
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          resource = target_bucket + '/' + target_object
+          request(expects: [200, 203],
+                  headers: headers,
+                  method: 'PUT',
+                  path: target_object,
+                  bucket: target_bucket,
+                  resource: resource,
+                  endpoint: endpoint)
         end
       end
-      
+
       class Mock
         def copy_object(source_bucket, source_object, target_bucket, target_object)
-          
         end
       end
     end

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

@@ -1,30 +1,30 @@
-module Fog
-  module Storage
-    class Aliyun
-      class Real
-        # Delete an existing bucket
-        #
-        # ==== Parameters
-        # * 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
-          )
-        end
-      end
-      
-      class Mock
-        def delete_bucket(bucket)
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class Aliyun
+      class Real
+        # Delete an existing bucket
+        #
+        # ==== Parameters
+        # * 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
+          )
+        end
+      end
+
+      class Mock
+        def delete_bucket(bucket)
+        end
+      end
+    end
+  end
+end

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

@@ -8,29 +8,26 @@ module Fog
         # * container<~String> - Name of container to delete
         # * options
         #
-        def delete_container(container, options={})
-
+        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
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          object = container + '/'
+          resource = bucket + '/' + object
 
           request(
-              :expects  => 204,
-              :method   => 'DELETE',
-              :path     => object,
-              :bucket   => bucket,
-              :resource => resource,
-              :endpoint => endpoint
+            expects: 204,
+            method: 'DELETE',
+            path: object,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
           )
         end
       end
       class Mock
-        
-        def delete_container(container, options={})
-
+        def delete_container(container, options = {})
         end
       end
     end

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

@@ -7,45 +7,43 @@ module Fog
         # ==== Parameters
         # * object<~String> - Name of object to delete
         #
-        def delete_object(object, options={})
+        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
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          resource = bucket + '/' + object
           request(
-            :expects  => 204,
-            :method   => 'DELETE',
-            :path     => object,
-            :bucket   => bucket,
-            :resource => resource,
-            :endpoint => endpoint
+            expects: 204,
+            method: 'DELETE',
+            path: object,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
           )
         end
-        
 
         def abort_multipart_upload(bucket, object, endpoint, uploadid)
-          if (nil == endpoint)
+          if nil == endpoint
             location = get_bucket_location(bucket)
-            endpoint = "http://"+location+".aliyuncs.com"
+            endpoint = 'http://' + location + '.aliyuncs.com'
           end
-          path = object+"?uploadId="+uploadid
-          resource = bucket+'/'+path
+          path = object + '?uploadId=' + uploadid
+          resource = bucket + '/' + path
 
           ret = request(
-                  :expects  => 204,
-                  :method   => 'DELETE',
-                  :path     => path,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
+            expects: 204,
+            method: 'DELETE',
+            path: path,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
           )
-
         end
       end
 
       class Mock
-        def delete_object(object, options={})
+        def delete_object(object, options = {})
         end
       end
     end

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

@@ -1,148 +1,141 @@
-module Fog
-  module Storage
-    class Aliyun
-      class Real
-        def get_bucket(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = "http://"+location+".aliyuncs.com"
-          resource = bucket+'/'
-          ret = request(
-                  :expects  => [200, 203],
-                  :method   => 'GET',
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)
-        end
-        
-        def get_bucket_location(bucket)
-          attribute = '?location'
-          resource = bucket+'/'+attribute
-          ret = request(
-                  :expects  => [200, 203],
-                  :method   => 'GET',
-                  :path     => attribute,
-                  :bucket   => bucket,
-                  :resource => resource
-          )
-          location = XmlSimple.xml_in(ret.data[:body])
-        end
-	
-        def get_bucket_acl(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = "http://"+location+".aliyuncs.com"
-          attribute = '?acl'
-          resource = bucket+'/'+attribute
-          ret = request(
-                  :expects  => [200, 203],
-                  :method   => 'GET',
-                  :path     => attribute,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          acl = 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(
-                  :expects  => [200, 203, 404],
-                  :method   => 'GET',
-                  :path     => attribute,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          if 404 != ret.data[:status]
-            cors = XmlSimple.xml_in(ret.data[:body])["CORSRule"][0]
-          else
-            nil
-          end
-        end
-
-        def get_bucket_lifecycle(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = "http://"+location+".aliyuncs.com"
-          attribute = '?lifecycle'
-          resource = bucket+'/'+attribute
-          ret = request(
-                  :expects  => [200, 203, 404],
-                  :method   => 'GET',
-                  :path     => attribute,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          if 404 != ret.data[:status]
-            lifecycle = XmlSimple.xml_in(ret.data[:body])["Rule"][0]
-          else
-            nil
-          end
-        end
-        
-        def get_bucket_logging(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = "http://"+location+".aliyuncs.com"
-          attribute = '?logging'
-          resource = bucket+'/'+attribute
-          ret = request(
-                  :expects  => [200, 203],
-                  :method   => 'GET',
-                  :path     => attribute,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          logging = 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(
-                  :expects  => [200, 203],
-                  :method   => 'GET',
-                  :path     => attribute,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          referer = 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(
-                  :expects  => [200, 203, 404],
-                  :method   => 'GET',
-                  :path     => attribute,
-                  :bucket   => bucket,
-                  :resource => resource,
-                  :endpoint => endpoint
-          )
-          if 404 != ret.data[:status]
-            website = XmlSimple.xml_in(ret.data[:body])
-          else
-            nil
-          end
-        end
-        
-      end
-      class Mock
-        def get_bucket(bucket)
-        end
-      end
-    end
-  end
-end
+module Fog
+  module Storage
+    class Aliyun
+      class Real
+        def get_bucket(bucket)
+          location = get_bucket_location(bucket)
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          resource = bucket + '/'
+          ret = request(
+            expects: [200, 203],
+            method: 'GET',
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          xml = ret.data[:body]
+          result = XmlSimple.xml_in(xml)
+        end
+
+        def get_bucket_location(bucket)
+          attribute = '?location'
+          resource = bucket + '/' + attribute
+          ret = request(
+            expects: [200, 203],
+            method: 'GET',
+            path: attribute,
+            bucket: bucket,
+            resource: resource
+          )
+          location = XmlSimple.xml_in(ret.data[:body])
+        end
+
+        def get_bucket_acl(bucket)
+          location = get_bucket_location(bucket)
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          attribute = '?acl'
+          resource = bucket + '/' + attribute
+          ret = request(
+            expects: [200, 203],
+            method: 'GET',
+            path: attribute,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          acl = 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(
+            expects: [200, 203, 404],
+            method: 'GET',
+            path: attribute,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          if 404 != ret.data[:status]
+            cors = XmlSimple.xml_in(ret.data[:body])['CORSRule'][0]
+          end
+        end
+
+        def get_bucket_lifecycle(bucket)
+          location = get_bucket_location(bucket)
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          attribute = '?lifecycle'
+          resource = bucket + '/' + attribute
+          ret = request(
+            expects: [200, 203, 404],
+            method: 'GET',
+            path: attribute,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          if 404 != ret.data[:status]
+            lifecycle = XmlSimple.xml_in(ret.data[:body])['Rule'][0]
+          end
+        end
+
+        def get_bucket_logging(bucket)
+          location = get_bucket_location(bucket)
+          endpoint = 'http://' + location + '.aliyuncs.com'
+          attribute = '?logging'
+          resource = bucket + '/' + attribute
+          ret = request(
+            expects: [200, 203],
+            method: 'GET',
+            path: attribute,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          logging = 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(
+            expects: [200, 203],
+            method: 'GET',
+            path: attribute,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          referer = 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(
+            expects: [200, 203, 404],
+            method: 'GET',
+            path: attribute,
+            bucket: bucket,
+            resource: resource,
+            endpoint: endpoint
+          )
+          if 404 != ret.data[:status]
+            website = XmlSimple.xml_in(ret.data[:body])
+          end
+        end
+      end
+      class Mock
+        def get_bucket(bucket)
+        end
+      end
+    end
+  end
+end