fog-aliyun 0.3.0 → 0.3.1

data/lib/fog/aliyun/models/compute/vpc.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'fog/core/model'
 module Fog
   module Compute
     class Aliyun
       class VPC < Fog::Model
-        identity  :id,                aliases: 'VpcId'
-        attribute :name,              aliases: 'VpcName'
-        attribute :state,             aliases: 'Status'
-        attribute :cidr_block,        aliases: 'CidrBlock'
-        attribute :v_switch_ids,      aliases: 'VSwitchIds'
-        attribute :description,       aliases: 'Description'
-        attribute :user_cidrs,        aliases: 'UserCidrs'
-        attribute :region_id,         aliases: 'RegionId'
-        attribute :v_router_id,       aliases: 'VRouterId'
-        attribute :create_at,         aliases: 'CreationTime'
+        identity :id, aliases: 'VpcId'
+        attribute :name, aliases: 'VpcName'
+        attribute :state, aliases: 'Status'
+        attribute :cidr_block, aliases: 'CidrBlock'
+        attribute :v_switch_ids, aliases: 'VSwitchIds'
+        attribute :description, aliases: 'Description'
+        attribute :user_cidrs, aliases: 'UserCidrs'
+        attribute :region_id, aliases: 'RegionId'
+        attribute :v_router_id, aliases: 'VRouterId'
+        attribute :create_at, aliases: 'CreationTime'
 
         def ready?
           requires :state

data/lib/fog/aliyun/models/compute/vpcs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fog/core/collection'
 require 'fog/aliyun/models/compute/vpc'
 
@@ -70,9 +72,7 @@ module Fog
         #
 
         def get(vpcId)
-          if vpcId
-            $vpc = self.class.new(service: service).all('vpcId' => vpcId)[0]
-          end
+          $vpc = self.class.new(service: service).all('vpcId' => vpcId)[0] if vpcId
         end
       end
     end

data/lib/fog/aliyun/models/compute/vrouter.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'fog/core/model'
 module Fog
   module Compute
     class Aliyun
       class VRouter < Fog::Model
-        identity :id,               aliases: 'VRouterId'
+        identity :id, aliases: 'VRouterId'
 
-        attribute :name,            aliases: 'VRouterName'
+        attribute :name, aliases: 'VRouterName'
         attribute :route_table_ids, aliases: 'RouteTableIds'
-        attribute :created_at,      aliases: 'CreationTime'
-        attribute :description,     aliases: 'Description'
-        attribute :region_id,       aliases: 'RegionId'
-        attribute :vpc_id,          aliases: 'VpcId'
+        attribute :created_at, aliases: 'CreationTime'
+        attribute :description, aliases: 'Description'
+        attribute :region_id, aliases: 'RegionId'
+        attribute :vpc_id, aliases: 'VpcId'
 
         def vpc
           requires :vpc_id

data/lib/fog/aliyun/models/compute/vrouters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fog/core/collection'
 require 'fog/aliyun/models/compute/vrouter'
 
@@ -51,9 +53,7 @@ module Fog
         #
 
         def get(vRouterId)
-          if vRouterId
-            self.class.new(service: service).all('vRouterId' => vRouterId)[0]
-          end
+          self.class.new(service: service).all('vRouterId' => vRouterId)[0] if vRouterId
         end
       end
     end

data/lib/fog/aliyun/models/compute/vswitch.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'fog/core/model'
 module Fog
   module Compute
     class Aliyun
       class Vswitch < Fog::Model
-        identity  :id,                  aliases: 'VSwitchId'
-        attribute :vpc_id,              aliases: 'VpcId'
-        attribute :zone_id,             aliases: 'ZoneId'
-        attribute :name,                aliases: 'VSwitchName'
-        attribute :available_ip_count,  aliases: 'AvailableIpAddressCount'
-        attribute :state,               aliases: 'Status'
-        attribute :cidr_block,          aliases: 'CidrBlock'
-        attribute :description,      aliases: 'Description'
-        attribute :region_id,        aliases: 'RegionId'
+        identity :id, aliases: 'VSwitchId'
+        attribute :vpc_id, aliases: 'VpcId'
+        attribute :zone_id, aliases: 'ZoneId'
+        attribute :name, aliases: 'VSwitchName'
+        attribute :available_ip_count, aliases: 'AvailableIpAddressCount'
+        attribute :state, aliases: 'Status'
+        attribute :cidr_block, aliases: 'CidrBlock'
+        attribute :description, aliases: 'Description'
+        attribute :region_id, aliases: 'RegionId'
         attribute :create_at, aliases: 'CreationTime'
         def initialize(attributes = {})
           super

data/lib/fog/aliyun/models/compute/vswitches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fog/core/collection'
 require 'fog/aliyun/models/compute/vswitch'
 
@@ -70,9 +72,7 @@ module Fog
 
         def get(vswitchId)
           requires :vpc
-          if vswitchId
-            self.class.new(service: service, vpc: vpc).all(vSwitchId: vswitchId)[0]
-          end
+          self.class.new(service: service, vpc: vpc).all(vSwitchId: vswitchId)[0] if vswitchId
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fog/core/collection'
 require 'fog/aliyun/models/storage/directory'
 
@@ -9,7 +11,7 @@ module Fog
 
         def all
           containers = service.get_containers
-          return nil if nil == containers
+          return nil if containers.nil?
           data = []
           i = 0
           containers.each do |entry|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fog/core/model'
 require 'fog/aliyun/models/storage/files'
 

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

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'fog/core/model'
 
 module Fog
   module Storage
     class Aliyun
       class File < Fog::Model
-        identity  :key,                 aliases: 'name'
-        attribute :date,                aliases: 'Date'
-        attribute :content_length,      aliases: 'Content-Length', type: :integer
-        attribute :content_type,        aliases: 'Content-Type'
-        attribute :connection,          aliases: 'Connection'
+        identity :key, aliases: 'name'
+        attribute :date, aliases: 'Date'
+        attribute :content_length, aliases: 'Content-Length', type: :integer
+        attribute :content_type, aliases: 'Content-Type'
+        attribute :connection, aliases: 'Connection'
         attribute :content_disposition, aliases: 'Content-Disposition'
-        attribute :etag,                aliases: 'Etag'
-        attribute :last_modified,       aliases: 'Last-Modified', type: :time
-        attribute :accept_ranges,       aliases: 'Accept-Ranges'
-        attribute :server,              aliases: 'Server'
-        attribute :object_type,         aliases: 'x-oss-object-type'
+        attribute :etag, aliases: 'Etag'
+        attribute :last_modified, aliases: 'Last-Modified', type: :time
+        attribute :accept_ranges, aliases: 'Accept-Ranges'
+        attribute :server, aliases: 'Server'
+        attribute :object_type, aliases: 'x-oss-object-type'
 
         def body
           attributes[:body] ||= if last_modified
@@ -37,11 +39,11 @@ module Fog
                           else
                             directory.key + '/' + key
                           end
-          if target_directory_key == ''
-            target_object = target_file_key
-          else
-            target_object = target_directory_key + '/' + target_file_key
-          end
+          target_object = if target_directory_key == ''
+                            target_file_key
+                          else
+                            target_directory_key + '/' + target_file_key
+                          end
           service.copy_object(nil, source_object, nil, target_object, options)
           target_directory = service.directories.new(key: target_directory_key)
           target_directory.files.get(target_file_key)
@@ -169,7 +171,7 @@ module Fog
                      end
 
             headers = service.head_object(object).data[:headers]
-            headers.reject! { |k, _v| !metadata_attribute?(k) }
+            headers.select! { |k, _v| metadata_attribute?(k) }
           else
             {}
           end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fog/core/collection'
 require 'fog/aliyun/models/storage/file'
 
@@ -15,11 +17,9 @@ module Fog
 
         def all(_options = {})
           requires :directory
-          if directory.key != '' && directory.key != '.' && !directory.key.nil?
-            prefix = directory.key + '/'
-          end
+          prefix = directory.key + '/' if directory.key != '' && directory.key != '.' && !directory.key.nil?
           files = service.list_objects(prefix: prefix)['Contents']
-          return if nil == files
+          return if files.nil?
           data = []
           i = 0
           files.each do |file|
@@ -27,9 +27,7 @@ module Fog
             content_length = file['Size'][0].to_i
             key = file['Key'][0]
             lastModified = file['LastModified'][0]
-            last_modified = if !lastModified.nil? && lastModified != ''
-                              Time.parse(lastModified).localtime
-                            end
+            last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
             type = file['Type'][0]
             data[i] = { content_length: content_length,
                         key: key,
@@ -67,13 +65,13 @@ module Fog
                      directory.key + '/' + key
                    end
           begin
-          data = service.get_object(object)
-          rescue => error
+            data = service.get_object(object)
+          rescue StandardError => error
             case error.response.body
-              when /<Code>NoSuchKey<\/Code>/
-                nil
-              else
-                raise(error)
+            when /<Code>NoSuchKey<\/Code>/
+              nil
+            else
+              raise(error)
             end
           end
 
@@ -96,9 +94,7 @@ module Fog
           end
 
           lastModified = data[:headers]['Last-Modified']
-          last_modified = if !lastModified.nil? && lastModified != ''
-                            Time.parse(lastModified).localtime
-                          end
+          last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
 
           date = data[:headers]['Date']
           date = (Time.parse(date).localtime if !date.nil? && date != '')
@@ -159,9 +155,7 @@ module Fog
                    end
           data = service.head_object(object).data
           lastModified = data[:headers]['Last-Modified']
-          last_modified = if !lastModified.nil? && lastModified != ''
-                            Time.parse(lastModified).localtime
-                          end
+          last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
 
           date = data[:headers]['Date']
           date = (Time.parse(date).localtime if !date.nil? && date != '')

data/lib/fog/aliyun/requests/compute/allocate_eip_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -35,7 +37,7 @@ module Fog
           end
 
           _InternetChargeType = options[:internet_charge_type]
-          _InternetChargeType = 'PayByTraffic' unless _InternetChargeType
+          _InternetChargeType ||= 'PayByTraffic'
           _parameters['InternetChargeType'] = _InternetChargeType
           _pathURL += '&InternetChargeType=' + _InternetChargeType
 
@@ -49,6 +51,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
+    end
+  end
 end

data/lib/fog/aliyun/requests/compute/allocate_public_ip_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -34,6 +36,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
+    end
+  end
 end

data/lib/fog/aliyun/requests/compute/associate_eip_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -44,6 +46,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
+    end
+  end
 end

data/lib/fog/aliyun/requests/compute/attach_disk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -17,12 +19,12 @@ module Fog
         #
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/disk&attachdisk]
         def attach_disk(instanceId, diskId, options = {})
-          action   = 'AttachDisk'
+          action = 'AttachDisk'
           sigNonce = randonStr
-          time     = Time.new.utc
+          time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['InstanceId'] = instanceId
           pathUrl += '&InstanceId='
@@ -33,9 +35,9 @@ module Fog
           pathUrl += diskId
 
           deleteWithInstance = options[:deleteWithInstance]
-          device             = options[:device]
+          device = options[:device]
 
-          deleteWithInstance = 'true' unless deleteWithInstance
+          deleteWithInstance ||= 'true'
 
           parameters['DeleteWithInstance'] = deleteWithInstance
           pathUrl += '&DeleteWithInstance='

data/lib/fog/aliyun/requests/compute/create_disk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -19,12 +21,12 @@ module Fog
         #
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/disk&createdisk]
         def create_disk(size, options = {})
-          action   = 'CreateDisk'
+          action = 'CreateDisk'
           sigNonce = randonStr
-          time     = Time.new.utc
+          time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['ZoneId'] = @aliyun_zone_id
           pathUrl += '&ZoneId='
@@ -34,8 +36,8 @@ module Fog
           pathUrl += '&Size='
           pathUrl += size
 
-          name  = options[:name]
-          desc  = options[:description]
+          name = options[:name]
+          desc = options[:description]
           category = options[:category]
 
           if name
@@ -84,12 +86,12 @@ module Fog
         #
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/disk&createdisk]
         def create_disk_by_snapshot(snapshotId, options = {})
-          action   = 'CreateDisk'
+          action = 'CreateDisk'
           sigNonce = randonStr
-          time     = Time.new.utc
+          time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['ZoneId'] = @aliyun_zone_id
           pathUrl += '&ZoneId='
@@ -99,8 +101,8 @@ module Fog
           pathUrl += '&SnapshotId='
           pathUrl += snapshotId
 
-          name  = options[:name]
-          desc  = options[:description]
+          name = options[:name]
+          desc = options[:description]
           category = options[:category]
 
           if name
@@ -132,6 +134,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end