Use #has_key? instead of #keys.include?

Author: Edward Muller

lib/fog/aws/requests/sqs/change_message_visibility.rb

@@ -34,7 +34,7 @@ def change_message_visibility(queue_url, receipt_handle, visibility_timeout)
           Excon::Response.new.tap do |response|
             if (queue = data[:queues][queue_url])
               message_id, _ = queue[:receipt_handles].find { |message_id, receipts|
-                receipts.keys.include?(receipt_handle)
+                receipts.has_key?(receipt_handle)
               }
 
               if message_id

lib/fog/aws/requests/sqs/delete_message.rb

@@ -32,7 +32,7 @@ def delete_message(queue_url, receipt_handle)
           Excon::Response.new.tap do |response|
             if (queue = data[:queues][queue_url])
               message_id, _ = queue[:receipt_handles].find { |msg_id, receipts|
-                receipts.keys.include?(receipt_handle)
+                receipts.has_key?(receipt_handle)
               }
 
               if message_id

lib/fog/ecloud/requests/compute/add_backup_internet_service.rb

@@ -7,7 +7,7 @@ def validate_backup_internet_service_data(service_data, configure=false)
           if configure
             required_opts + [ :id, :href, :timeout ]
           end
-          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+          unless required_opts.all? { |opt| service_data.has_key?(opt) }
             raise ArgumentError.new("Required Backup Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
           end
         end

lib/fog/ecloud/requests/compute/add_internet_service.rb

@@ -15,7 +15,7 @@ def validate_internet_service_monitor(monitor)
                             [:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
                           end
 
-          unless required_opts.all? { |opt| monitor.keys.include?(opt) && monitor[opt] }
+          unless required_opts.all? { |opt| monitor.has_key?(opt) && monitor[opt] }
             raise ArgumentError.new("Required Monitor data missing: #{(required_opts - monitor.keys).map(&:inspect).join(", ")}")
           end
 
@@ -36,7 +36,7 @@ def validate_internet_service_data(service_data, configure=false)
           if configure
             required_opts + [ :id, :href, :timeout ]
           end
-          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+          unless required_opts.all? { |opt| service_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
           end
         end

lib/fog/ecloud/requests/compute/add_node.rb

@@ -20,7 +20,7 @@ def validate_node_data(node_data, configure=false)
           if configure
             valid_opts.delete_if { |opt| ![:name, :enabled, :description].include?(opt) }
           end
-          unless valid_opts.all? { |opt| node_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| node_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - node_data.keys).map(&:inspect).join(", ")}")
           end
         end

lib/fog/ecloud/requests/compute/clone_vapp.rb

@@ -5,7 +5,7 @@ class Real
 
         def validate_clone_vapp_options(options)
           valid_opts = [:name, :poweron]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
         end

lib/fog/ecloud/requests/compute/configure_internet_service.rb

@@ -6,7 +6,7 @@ module Shared
 
         def validate_public_ip_address_data(ip_address_data)
           valid_opts = [:name, :href, :id]
-          unless valid_opts.all? { |opt| ip_address_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| ip_address_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(valid_opts - ip_address_data.keys).map(&:inspect).join(", ")}")
           end
         end

lib/fog/ecloud/requests/compute/configure_network.rb

@@ -5,7 +5,7 @@ class Real
 
         def validate_network_data(network_data, configure=false)
           valid_opts = [:id, :href, :name, :rnat, :address, :broadcast, :gateway]
-          unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
           end
         end

lib/fog/ecloud/requests/compute/configure_network_ip.rb

@@ -6,7 +6,7 @@ module Shared
 
         def validate_network_ip_data(network_ip_data)
           valid_opts = [:id, :href, :name, :status, :server, :rnat]
-          unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
           end
         end

lib/fog/ecloud/requests/compute/configure_vapp.rb

@@ -6,7 +6,7 @@ module Shared
 
         def validate_vapp_data(vapp_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
             raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
           end
         end