fog-aliyun 0.1.0 → 0.2.0

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

@@ -3,17 +3,16 @@ 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
@@ -39,20 +38,20 @@ module Fog
         def vswitches
           @vswitches ||= begin
             Fog::Compute::Aliyun::Vswitches.new(
-              :vpc     => self,
-              :service => service
+              vpc: self,
+              service: service
             )
           end
         end
 
         def vrouter
           requires :v_router_id
-          Fog::Compute::Aliyun::Vrouters.new(:service=>service).all('vRouterId'=>v_router_id)[0]
+          Fog::Compute::Aliyun::Vrouters.new(service: service).all('vRouterId' => v_router_id)[0]
         end
 
         def security_groups
           requires :id
-          Fog::Compute::Aliyun::SecurityGroups.new(:service=>service).all(:vpcId=>id)
+          Fog::Compute::Aliyun::SecurityGroups.new(service: service).all(vpcId: id)
         end
         # Create a vpc
         #
@@ -65,11 +64,11 @@ module Fog
         # As such, it yields an InvalidGroup.Duplicate exception if you attempt to save an existing vpc.
         #
 
-        def save(options={})
+        def save(options = {})
           requires :cidr_block
-          options[:name]=name if name
-          options[:description]=description if description
-          data = Fog::JSON.decode(service.create_vpc(cidr_block,options).body)
+          options[:name] = name if name
+          options[:description] = description if description
+          Fog::JSON.decode(service.create_vpc(cidr_block, options).body)
           true
         end
       end

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

@@ -5,7 +5,6 @@ module Fog
   module Compute
     class Aliyun
       class Vpcs < Fog::Collection
-
         model Fog::Compute::Aliyun::VPC
 
         # Creates a new VPC
@@ -16,7 +15,7 @@ module Fog
         #
         # Returns the details of the new VPC
         #
-        #>> Aliyun.vpcs.new
+        # >> Aliyun.vpcs.new
         # <Fog::Aliyun::VPC::VPC
         # id=nil,
         # state=nil,
@@ -35,7 +34,7 @@ module Fog
         #
         # Returns an array of all VPCs
         #
-        #>> Aliyun.vpcs.all
+        # >> Aliyun.vpcs.all
         # <Fog::Aliyun::VPC::VPCs
         # [
         # <Fog::Aliyun::VPC::VPC
@@ -49,7 +48,7 @@ module Fog
         def all(filters_arg = {})
           unless filters_arg.is_a?(Hash)
             Fog::Logger.warning("all with #{filters_arg.class} param is deprecated, use all('vpcId' => []) instead [light_black](#{caller.first})[/]")
-            filters_arg = {'vpcId' => [*filters_arg]}
+            filters_arg = { 'vpcId' => [*filters_arg] }
           end
           data = Fog::JSON.decode(service.list_vpcs(filters_arg).body)['Vpcs']['Vpc']
           load(data)
@@ -63,7 +62,7 @@ module Fog
         #
         # ==== Returns
         #
-        #>> Aliyun.vpcs.get("vpc-12345678")
+        # >> Aliyun.vpcs.get("vpc-12345678")
         # <Fog::Aliyun::Compute::VPC
         # id="vpc-12345678",
         # TODO
@@ -72,7 +71,7 @@ module Fog
 
         def get(vpcId)
           if vpcId
-            $vpc=self.class.new(:service => service).all('vpcId' => vpcId)[0]
+            $vpc = self.class.new(service: service).all('vpcId' => vpcId)[0]
           end
         end
       end

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

@@ -3,25 +3,25 @@ module Fog
   module Compute
     class Aliyun
       class VRouter < Fog::Model
-        identity :id,               :aliases => 'VRouterId'
+        identity :id,               aliases: 'VRouterId'
 
-        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 :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'
 
         def vpc
           requires :vpc_id
-          $vpc=Fog::Compute::Aliyun::Vpcs.new(:service=>service).all('vpcId'=>vpc_id)[0]
+          $vpc = Fog::Compute::Aliyun::Vpcs.new(service: service).all('vpcId' => vpc_id)[0]
         end
 
         def route_tables
           @route_tables ||= begin
             Fog::Compute::Aliyun::RouteTables.new(
-              :v_router => self,
-              :service  => service
+              v_router: self,
+              service: service
             )
           end
         end
@@ -30,6 +30,6 @@ module Fog
   end
 end
 
-# "VRouters"=>{"VRouter"=>[{"VRouterName"=>"", "RouteTableIds"=>{"RouteTableId"=>["vtb-2504onoxh"]}, 
-# "CreationTime"=>"2015-08-03T11:23:35Z", "Description"=>"", "RegionId"=>"cn-beijing", 
-# "VRouterId"=>"vrt-25azmd2wm", "VpcId"=>"vpc-25mj6mguq"}]}
+# "VRouters"=>{"VRouter"=>[{"VRouterName"=>"", "RouteTableIds"=>{"RouteTableId"=>["vtb-2504onoxh"]},
+# "CreationTime"=>"2015-08-03T11:23:35Z", "Description"=>"", "RegionId"=>"cn-beijing",
+# "VRouterId"=>"vrt-25azmd2wm", "VpcId"=>"vpc-25mj6mguq"}]}

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

@@ -5,7 +5,6 @@ module Fog
   module Compute
     class Aliyun
       class Vrouters < Fog::Collection
-
         model Fog::Compute::Aliyun::VRouter
 
         # Returns an array of all VPCs that have been created
@@ -16,7 +15,7 @@ module Fog
         #
         # Returns an array of all VPCs
         #
-        #>> Aliyun.vrouters.all
+        # >> Aliyun.vrouters.all
         # <Fog::Aliyun::Compute::VRouters
         # [
         # <Fog::Aliyun::Compute::VRouter
@@ -30,7 +29,7 @@ module Fog
         def all(filters_arg = {})
           unless filters_arg.is_a?(Hash)
             Fog::Logger.warning("all with #{filters_arg.class} param is deprecated, use all('vRouterId' => "") instead [light_black](#{caller.first})[/]")
-            filters_arg = {'vRouterId' => filters_arg}
+            filters_arg = { 'vRouterId' => filters_arg }
           end
           data = Fog::JSON.decode(service.list_vrouters(filters_arg).body)['VRouters']['VRouter']
           load(data)
@@ -44,7 +43,7 @@ module Fog
         #
         # ==== Returns
         #
-        #>> Aliyun.vpcs.get("vpc-12345678")
+        # >> Aliyun.vpcs.get("vpc-12345678")
         # <Fog::Aliyun::Compute::VPC
         # id="vpc-12345678",
         # TODO
@@ -53,7 +52,7 @@ module Fog
 
         def get(vRouterId)
           if vRouterId
-            self.class.new(:service => service).all('vRouterId' => vRouterId)[0]
+            self.class.new(service: service).all('vRouterId' => vRouterId)[0]
           end
         end
       end

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

@@ -3,17 +3,17 @@ 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'
-        attribute :create_at,    :aliases => 'CreationTime'
-        def initialize(attributes={})
+        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
         end
 
@@ -49,23 +49,21 @@ module Fog
         # As such, it yields an InvalidGroup.Duplicate exception if you attempt to save an existing vpc.
         #
 
-        def save(options={})
-          requires :vpc,:cidr_block
+        def save(options = {})
+          requires :vpc, :cidr_block
           options[:name] = name if name
-          options[:description]=description if description
-          data = Fog::JSON.decode(service.create_vswitch(vpc.id, cidr_block,options).body)
-
+          options[:description] = description if description
+          Fog::JSON.decode(service.create_vswitch(vpc.id, cidr_block, options).body)
           true
         end
 
         def vpc
           $vpc
         end
-        
-        def all()
-          data = Fog::JSON.decode(service.list_vswitchs(vpc_id).body)['VSwitches']['VSwitch']
-        end
 
+        def all
+          Fog::JSON.decode(service.list_vswitchs(vpc_id).body)['VSwitches']['VSwitch']
+        end
       end
     end
   end

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

@@ -17,7 +17,7 @@ module Fog
         #
         # Returns the details of the new VPC
         #
-        #>> Aliyun.vpcs.new
+        # >> Aliyun.vpcs.new
         # <Fog::Aliyun::VPC::VPC
         # id=nil,
         # state=nil,
@@ -26,7 +26,7 @@ module Fog
         # tags=nil
         # tenancy=nil
         # >
-        
+
         # Returns an array of all VPCs that have been created
         #
         # Aliyun.vpcs.all
@@ -35,7 +35,7 @@ module Fog
         #
         # Returns an array of all VPCs
         #
-        #>> Aliyun.vpcs.all
+        # >> Aliyun.vpcs.all
         # <Fog::Aliyun::VPC::VPCs
         # filters={}
         # [
@@ -47,7 +47,7 @@ module Fog
         # >
         #
 
-        def all(options={})
+        def all(options = {})
           requires :vpc
           data = Fog::JSON.decode(service.list_vswitchs(vpc.id, options).body)['VSwitches']['VSwitch']
           load(data)
@@ -61,7 +61,7 @@ module Fog
         #
         # ==== Returns
         #
-        #>> Aliyun.vpcs.get("vpc-12345678")
+        # >> Aliyun.vpcs.get("vpc-12345678")
         # <Fog::Aliyun::Compute::VPC
         # id="vpc-12345678",
         # TODO
@@ -71,7 +71,7 @@ module Fog
         def get(vswitchId)
           requires :vpc
           if vswitchId
-            self.class.new(:service => service,:vpc=>vpc).all(:vSwitchId=>vswitchId)[0]
+            self.class.new(service: service, vpc: vpc).all(vSwitchId: vswitchId)[0]
           end
         end
       end

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

@@ -8,33 +8,27 @@ module Fog
         model Fog::Storage::Aliyun::Directory
 
         def all
-          containers = service.get_containers()
-          if nil == containers
-            return nil
-          end
-          data = Array.new
+          containers = service.get_containers
+          return nil if nil == containers
+          data = []
           i = 0
           containers.each do |entry|
-            key = entry["Prefix"][0]
+            key = entry['Prefix'][0]
             key[-1] = ''
-            data[i] = {:key=>key}
-            i = i + 1
+            data[i] = { key: key }
+            i += 1
           end
 
           load(data)
         end
 
         def get(key, options = {})
-          if key != nil && key != "" && key != '.'
-            dir = key+'/'
+          if !key.nil? && key != '' && key != '.'
+            dir = key + '/'
             ret = service.head_object(dir, options)
-            if ret.data[:status] == 200
-              new(:key => key)
-            else
-              nil
-            end
+            new(key: key) if ret.data[:status] == 200
           else
-            new(:key => "")
+            new(key: '')
           end
         rescue Fog::Storage::Aliyun::NotFound
           nil

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

@@ -5,21 +5,21 @@ module Fog
   module Storage
     class Aliyun
       class Directory < Fog::Model
-        identity  :key
+        identity :key
 
         def destroy
           requires :key
-          prefix = key+'/'
-          ret = service.list_objects(:prefix=>prefix)["Contents"]
-          
+          prefix = key + '/'
+          ret = service.list_objects(prefix: prefix)['Contents']
+
           if ret.nil?
-            puts " Not found: Direction not exist!"
+            puts ' Not found: Direction not exist!'
             false
           elsif ret.size == 1
             service.delete_container(key)
             true
           else
-            raise Fog::Storage::Aliyun::Error, " Forbidden: Direction not empty!"
+            raise Fog::Storage::Aliyun::Error, ' Forbidden: Direction not empty!'
             false
           end
         end
@@ -27,8 +27,8 @@ module Fog
         def files
           @files ||= begin
             Fog::Storage::Aliyun::Files.new(
-              :directory    => self,
-              :service   => service
+              directory: self,
+              service: service
             )
           end
         end

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

@@ -4,23 +4,23 @@ 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'
-        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'
+        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'
 
         def body
           attributes[:body] ||= if last_modified
-            collection.get(identity).body
-          else
-            ''
+                                  collection.get(identity).body
+                                else
+                                  ''
           end
         end
 
@@ -28,34 +28,32 @@ module Fog
           attributes[:body] = new_body
         end
 
-        def directory
-          @directory
-        end
+        attr_reader :directory
 
-        def copy(target_directory_key, target_file_key, options={})
+        def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
-          if directory.key == ""
-            source_object = key
-          else
-            source_object = directory.key+"/"+key
-          end
-          if target_directory_key == ""
+          source_object = if directory.key == ''
+                            key
+                          else
+                            directory.key + '/' + key
+                          end
+          if target_directory_key == ''
             target_object = target_file_key
           else
-            target_object = target_directory_key+"/"+target_file_key
+            target_object = 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 = service.directories.new(key: target_directory_key)
           target_directory.files.get(target_file_key)
         end
 
         def destroy
           requires :directory, :key
-          if directory.key == ""
-            object = key
-          else
-            object = directory.key+"/"+key
-          end
+          object = if directory.key == ''
+                     key
+                   else
+                     directory.key + '/' + key
+                   end
           service.delete_object(object)
           true
         end
@@ -67,8 +65,8 @@ module Fog
         def owner=(new_owner)
           if new_owner
             attributes[:owner] = {
-              :display_name => new_owner['DisplayName'],
-              :id           => new_owner['ID']
+              display_name: new_owner['DisplayName'],
+              id: new_owner['ID']
             }
           end
         end
@@ -87,32 +85,30 @@ module Fog
         #
         def url(expires, options = {})
           requires :directory, :key
-          if directory.key == ""
-            object = key
-          else
-            object = directory.key+"/"+key
-          end
-          self.service.get_object_http_url_public(object, expires, options)
+          object = if directory.key == ''
+                     key
+                   else
+                     directory.key + '/' + key
+                   end
+          service.get_object_http_url_public(object, expires, options)
         end
 
         def public_url
           requires :key
-          self.collection.get_url(self.key)
+          collection.get_url(key)
         end
 
         def save(options = {})
           requires :body, :directory, :key
           options['Content-Type'] = content_type if content_type
           options['Content-Disposition'] = content_disposition if content_disposition
-          options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin
-          options['Origin'] = origin if origin
           options.merge!(metadata_to_headers)
 
-          if directory.key == ""
-            object = key
-          else
-            object = directory.key+"/"+key
-          end
+          object = if directory.key == ''
+                     key
+                   else
+                     directory.key + '/' + key
+                   end
           if body.is_a?(::File)
             data = service.put_object(object, body, options).data
           elsif body.is_a?(String)
@@ -130,36 +126,34 @@ module Fog
 
         private
 
-        def directory=(new_directory)
-          @directory = new_directory
-        end
+        attr_writer :directory
 
         def refresh_metadata
-          metadata.reject! {|k, v| v.nil? }
+          metadata.reject! { |_k, v| v.nil? }
         end
 
         def headers_to_metadata
           key_map = key_mapping
-          Hash[metadata_attributes.map {|k, v| [key_map[k], v] }]
+          Hash[metadata_attributes.map { |k, v| [key_map[k], v] }]
         end
 
         def key_mapping
           key_map = metadata_attributes
-          key_map.each_pair {|k, v| key_map[k] = header_to_key(k)}
+          key_map.each_pair { |k, _v| key_map[k] = header_to_key(k) }
         end
 
         def header_to_key(opt)
-          opt.gsub(metadata_prefix, '').split('-').map {|k| k[0, 1].downcase + k[1..-1]}.join('_').to_sym
+          opt.gsub(metadata_prefix, '').split('-').map { |k| k[0, 1].downcase + k[1..-1] }.join('_').to_sym
         end
 
         def metadata_to_headers
           header_map = header_mapping
-          Hash[metadata.map {|k, v| [header_map[k], v] }]
+          Hash[metadata.map { |k, v| [header_map[k], v] }]
         end
 
         def header_mapping
           header_map = metadata.dup
-          header_map.each_pair {|k, v| header_map[k] = key_to_header(k)}
+          header_map.each_pair { |k, _v| header_map[k] = key_to_header(k) }
         end
 
         def key_to_header(key)
@@ -168,14 +162,14 @@ module Fog
 
         def metadata_attributes
           if last_modified
-            if directory.key == ""
-              object = key
-            else
-              object = directory.key+"/"+key
-            end
+            object = if directory.key == ''
+                       key
+                     else
+                       directory.key + '/' + key
+                     end
 
             headers = service.head_object(object).data[:headers]
-            headers.reject! {|k, v| !metadata_attribute?(k)}
+            headers.reject! { |k, _v| !metadata_attribute?(k) }
           else
             {}
           end
@@ -186,11 +180,11 @@ module Fog
         end
 
         def metadata_prefix
-          "X-Object-Meta-"
+          'X-Object-Meta-'
         end
 
         def update_attributes_from(data)
-          merge_attributes(data[:headers].reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
+          merge_attributes(data[:headers].reject { |key, _value| ['Content-Length', 'Content-Type'].include?(key) })
         end
       end
     end