fog-brightbox 1.10.0 → 1.11.0

data/lib/fog/brightbox/models/compute/server.rb

@@ -54,16 +54,16 @@ module Fog
         end
 
         def zone_id
-          if t_zone_id = attributes[:zone_id]
-            t_zone_id
+          if attributes[:zone_id]
+            attributes[:zone_id]
           elsif zone
             zone[:id] || zone["id"]
           end
         end
 
         def flavor_id
-          if t_flavour_id = attributes[:flavor_id]
-            t_flavour_id
+          if attributes[:flavor_id]
+            attributes[:flavor_id]
           elsif server_type
             server_type[:id] || server_type["id"]
           end
@@ -79,7 +79,7 @@ module Fog
 
         def snapshot(return_snapshot = false)
           requires :identity
-          response, snapshot_id = service.snapshot_server(identity, :return_link => return_snapshot)
+          response, snapshot_id = service.snapshot_server(identity, return_link: return_snapshot)
 
           if return_snapshot
             service.images.get(snapshot_id)
@@ -184,32 +184,30 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
+          raise Fog::Errors::Error, "Resaving an existing object may create a duplicate" if persisted?
           requires :image_id
           options = {
-            :name => name,
-            :zone => zone_id,
-            :user_data => user_data,
-            :server_groups => server_groups
+            name: name,
+            zone: zone_id,
+            user_data: user_data,
+            server_groups: server_groups
           }.delete_if { |_k, v| v.nil? || v == "" }
 
-          options.merge!(:server_type => flavor_id) unless flavor_id.nil? || flavor_id == ""
-          options.merge!(:cloud_ip => cloud_ip) unless cloud_ip.nil? || cloud_ip == ""
-          options.merge!(:disk_encrypted => disk_encrypted) if disk_encrypted
+          options[:server_type] = flavor_id unless flavor_id.nil? || flavor_id == ""
+          options[:cloud_ip] = cloud_ip unless cloud_ip.nil? || cloud_ip == ""
+          options[:disk_encrypted] = disk_encrypted if disk_encrypted
 
           if volume_id
-            options.merge!(:volumes => [{ volume: volume_id }])
+            options[:volumes] = [{ volume: volume_id }]
           elsif volume_size
-            options.merge!(
-              volumes: [
-                {
-                  image: image_id,
-                  size: volume_size
-                }
-              ]
-            )
+            options[:volumes] = [
+              {
+                image: image_id,
+                size: volume_size
+              }
+            ]
           else
-            options.merge!(:image => image_id)
+            options[:image] = image_id
           end
 
           data = service.create_server(options)

data/lib/fog/brightbox/models/compute/server_group.rb

@@ -26,8 +26,8 @@ module Fog
 
         def save
           options = {
-            :name => name,
-            :description => description
+            name: name,
+            description: description
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_server_group(options)
           merge_attributes(data)
@@ -48,7 +48,7 @@ module Fog
         def add_servers(identifiers)
           requires :identity
           options = {
-            :servers => server_references(identifiers)
+            servers: server_references(identifiers)
           }
           data = service.add_servers_server_group identity, options
           merge_attributes data
@@ -61,7 +61,7 @@ module Fog
         def remove_servers(identifiers)
           requires :identity
           options = {
-            :servers => server_references(identifiers)
+            servers: server_references(identifiers)
           }
           data = service.remove_servers_server_group identity, options
           merge_attributes data
@@ -75,8 +75,8 @@ module Fog
         def move_servers(identifiers, destination_group_id)
           requires :identity
           options = {
-            :servers => server_references(identifiers),
-            :destination => destination_group_id
+            servers: server_references(identifiers),
+            destination: destination_group_id
           }
           data = service.move_servers_server_group identity, options
           merge_attributes data

data/lib/fog/brightbox/models/compute/user.rb

@@ -27,9 +27,9 @@ module Fog
           requires :identity
 
           options = {
-            :email_address => email_address,
-            :ssh_key => ssh_key,
-            :name => name
+            email_address: email_address,
+            ssh_key: ssh_key,
+            name: name
           }
 
           data = service.update_user(identity, options)

data/lib/fog/brightbox/models/compute/volume.rb

@@ -102,7 +102,7 @@ module Fog
 
           # The API requires the old "from" size to avoid acting on stale data
           # We can merge this and if the API rejects the request, the model was out of sync
-          options.merge!(:from => size)
+          options[:from] = size
 
           data = service.resize_volume(identity, options)
           merge_attributes(data)
@@ -112,29 +112,29 @@ module Fog
         def save
           if persisted?
             options = {
-              :delete_with_server => delete_with_server,
-              :description => description,
-              :name => name,
-              :serial => serial
+              delete_with_server: delete_with_server,
+              description: description,
+              name: name,
+              serial: serial
             }.delete_if { |_k, v| v.nil? || v == "" }
 
             data = service.update_volume(identity, options)
           else
-            raise Fog::Errors::Error.new("'image_id' and 'filesystem_type' are mutually exclusive") if image_id && filesystem_type
-            raise Fog::Errors::Error.new("'image_id' or 'filesystem_type' is required") unless image_id || filesystem_type
+            raise Fog::Errors::Error, "'image_id' and 'filesystem_type' are mutually exclusive" if image_id && filesystem_type
+            raise Fog::Errors::Error, "'image_id' or 'filesystem_type' is required" unless image_id || filesystem_type
 
             options = {
-              :delete_with_server => delete_with_server,
-              :description => description,
-              :encrypted => encrypted,
-              :filesystem_label => filesystem_label,
-              :filesystem_type => filesystem_type,
-              :name => name,
-              :serial => serial,
-              :size => size
+              delete_with_server: delete_with_server,
+              description: description,
+              encrypted: encrypted,
+              filesystem_label: filesystem_label,
+              filesystem_type: filesystem_type,
+              name: name,
+              serial: serial,
+              size: size
             }.delete_if { |_k, v| v.nil? || v == "" }
 
-            options.merge!(:image => image_id) unless image_id.nil? || image_id == ""
+            options[:image] = image_id unless image_id.nil? || image_id == ""
 
             data = service.create_volume(options)
           end

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

@@ -6,7 +6,7 @@ module Fog
       class Directories < Fog::Collection
         model Fog::Brightbox::Storage::Directory
 
-        HEADER_ATTRIBUTES = %w(X-Container-Bytes-Used X-Container-Object-Count X-Container-Read X-Container-Write)
+        HEADER_ATTRIBUTES = %w[X-Container-Bytes-Used X-Container-Object-Count X-Container-Read X-Container-Write].freeze
 
         def all
           data = service.get_containers.body
@@ -15,7 +15,7 @@ module Fog
 
         def get(key, options = {})
           data = service.get_container(key, options)
-          directory = new(:key => key)
+          directory = new(key: key)
           data.headers.each do |header, value|
             if HEADER_ATTRIBUTES.include?(header)
               directory.merge_attributes(header => value)

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

@@ -4,12 +4,12 @@ module Fog
   module Brightbox
     class Storage
       class Directory < Fog::Model
-        identity :key, :aliases => "name"
+        identity :key, aliases: "name"
 
-        attribute :bytes, :aliases => "X-Container-Bytes-Used"
-        attribute :count, :aliases => "X-Container-Object-Count"
-        attribute :read_permissions, :aliases => "X-Container-Read"
-        attribute :write_permissions, :aliases => "X-Container-Write"
+        attribute :bytes, aliases: "X-Container-Bytes-Used"
+        attribute :count, aliases: "X-Container-Object-Count"
+        attribute :read_permissions, aliases: "X-Container-Read"
+        attribute :write_permissions, aliases: "X-Container-Write"
 
         def destroy
           requires :key
@@ -22,8 +22,8 @@ module Fog
         def files
           @files ||= begin
             Fog::Brightbox::Storage::Files.new(
-              :directory    => self,
-              :service   => service
+              directory: self,
+              service: service
             )
           end
         end

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

@@ -2,15 +2,15 @@ module Fog
   module Brightbox
     class Storage
       class File < Fog::Model
-        identity :key,             :aliases => "name"
+        identity :key, aliases: "name"
 
-        attribute :content_length,  :aliases => %w(bytes Content-Length), :type => :integer
-        attribute :content_type,    :aliases => %w(content_type Content-Type)
-        attribute :content_disposition, :aliases => %w(content_disposition Content-Disposition)
-        attribute :etag,            :aliases => %w(hash Etag)
-        attribute :last_modified,   :aliases => %w(last_modified Last-Modified), :type => :time
-        attribute :access_control_allow_origin, :aliases => ["Access-Control-Allow-Origin"]
-        attribute :origin,          :aliases => ["Origin"]
+        attribute :content_length,  aliases: %w[bytes Content-Length], type: :integer
+        attribute :content_type,    aliases: %w[content_type Content-Type]
+        attribute :content_disposition, aliases: %w[content_disposition Content-Disposition]
+        attribute :etag,            aliases: %w[hash Etag]
+        attribute :last_modified,   aliases: %w[last_modified Last-Modified], type: :time
+        attribute :access_control_allow_origin, aliases: ["Access-Control-Allow-Origin"]
+        attribute :origin, aliases: ["Origin"]
 
         def body
           attributes[:body] ||= if last_modified
@@ -32,7 +32,7 @@ module Fog
           options["Access-Control-Allow-Origin"] ||= access_control_allow_origin if access_control_allow_origin
           options["Origin"] ||= origin if origin
           service.copy_object(directory.key, key, target_directory_key, target_file_key, 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
 
@@ -49,8 +49,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
@@ -133,7 +133,7 @@ module Fog
         def metadata_attributes
           if last_modified
             headers = service.head_object(directory.key, key).headers
-            headers.reject! { |k, _v| !metadata_attribute?(k) }
+            headers.select! { |k, _v| metadata_attribute?(k) }
           else
             {}
           end
@@ -148,7 +148,7 @@ module Fog
         end
 
         def update_attributes_from(data)
-          merge_attributes(data.headers.reject { |key, _value| %w(Content-Length Content-Type).include?(key) })
+          merge_attributes(data.headers.reject { |key, _value| %w[Content-Length Content-Type].include?(key) })
         end
       end
     end

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

@@ -25,14 +25,10 @@ module Fog
             directory.key,
             options
           )
-          if parent
-            load(parent.files.map { |file| file.attributes })
-          else
-            nil
-          end
+          load(parent.files.map(&:attributes)) if parent
         end
 
-        alias_method :each_file_this_page, :each
+        alias each_file_this_page each
         def each
           if !block_given?
             self
@@ -41,7 +37,7 @@ module Fog
 
             subset.each_file_this_page { |f| yield f }
             while subset.length == (subset.limit || 10_000)
-              subset = subset.all(:marker => subset.last.key)
+              subset = subset.all(marker: subset.last.key)
               subset.each_file_this_page { |f| yield f }
             end
 
@@ -53,9 +49,9 @@ module Fog
           requires :directory
           data = service.get_object(directory.key, key, &block)
           file_data = data.headers.merge(
-                                           :body => data.body,
-                                           :key  => key
-                                         )
+            body: data.body,
+            key: key
+          )
           new(file_data)
         rescue Fog::Brightbox::Storage::NotFound
           nil
@@ -82,8 +78,8 @@ module Fog
           requires :directory
           data = service.head_object(directory.key, key)
           file_data = data.headers.merge(
-                                           :key => key
-                                         )
+            key: key
+          )
           new(file_data)
         rescue Fog::Brightbox::Storage::NotFound
           nil
@@ -91,7 +87,7 @@ module Fog
 
         def new(attributes = {})
           requires :directory
-          super({ :directory => directory }.merge!(attributes))
+          super({ directory: directory }.merge!(attributes))
         end
       end
     end

data/lib/fog/brightbox/oauth2.rb

@@ -25,11 +25,11 @@ module Fog
         if two_factor?
           # When 2FA opt-in is set, we can expect 401 responses as well
           response = connection.request(
-            :path => "/token",
-            :expects  => [200, 401],
-            :headers  => token_strategy.headers,
-            :method   => "POST",
-            :body     => Fog::JSON.encode(token_strategy.authorization_body_data)
+            path: "/token",
+            expects: [200, 401],
+            headers: token_strategy.headers,
+            method: "POST",
+            body: Fog::JSON.encode(token_strategy.authorization_body_data)
           )
 
           if response.status == 401 && response.headers[Fog::Brightbox::OAuth2::TWO_FACTOR_HEADER] == "required"
@@ -42,11 +42,11 @@ module Fog
         else
           # Use classic behaviour and return Excon::
           connection.request(
-            :path => "/token",
-            :expects  => 200,
-            :headers  => token_strategy.headers,
-            :method   => "POST",
-            :body     => Fog::JSON.encode(token_strategy.authorization_body_data)
+            path: "/token",
+            expects: 200,
+            headers: token_strategy.headers,
+            method: "POST",
+            body: Fog::JSON.encode(token_strategy.authorization_body_data)
           )
         end
       end
@@ -154,7 +154,7 @@ module Fog
       class ClientCredentialsStrategy < GrantTypeStrategy
         def authorization_body_data
           {
-            "grant_type" => "client_credentials",
+            "grant_type" => "client_credentials"
           }
         end
       end

data/lib/fog/brightbox/requests/compute/list_accounts.rb

@@ -10,7 +10,7 @@ module Fog
         # @see https://api.gb1.brightbox.com/1.0/#account_list_accounts
         #
         def list_accounts(options = {})
-          options.merge!(:nested => "false") unless options.key?(:nested)
+          options[:nested] = "false" unless options.key?(:nested)
           wrapped_request("get", "/1.0/accounts", [200], options)
         end
       end

data/lib/fog/brightbox/requests/compute/reset_database_server.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # Reset a database server restarting the DBMS.
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
+        #
+        def reset_database_server(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("post", "/1.0/database_servers/#{identifier}/reset", [202], options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/resize_database_server.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # Resize a database server, increasing resources available to the DBMS.
+        #
+        # A `reset` may be required for the DBMS to pick up changes.
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        # @option options [String] :new_type New Database type to use
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
+        #
+        def resize_database_server(identifier, options)
+          return nil if identifier.nil? || identifier == ""
+          return nil if options.empty? || options.nil?
+          wrapped_request("post", "/1.0/database_servers/#{identifier}/resize", [202], options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/snapshot_database_server.rb

@@ -22,7 +22,7 @@ module Fog
 
           if options[:return_link]
             request_parameters = {
-              :method => method, :path => path, :expects => expected
+              method: method, path: path, expects: expected
             }
             response = request(request_parameters)
             data = Fog::JSON.decode(response.body)

data/lib/fog/brightbox/requests/compute/snapshot_server.rb

@@ -22,7 +22,7 @@ module Fog
 
           if options[:return_link]
             request_parameters = {
-              :method => method, :path => path, :expects => expected
+              method: method, path: path, expects: expected
             }
             response = request(request_parameters)
             data = Fog::JSON.decode(response.body)

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

@@ -13,11 +13,11 @@ module Fog
         def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options = {})
           headers = { "X-Copy-From" => "/#{source_container_name}/#{source_object_name}" }.merge(options)
           request(
-                    :expects  => 201,
-                    :headers  => headers,
-                    :method   => "PUT",
-                    :path     => "#{Fog::Brightbox::Storage.escape(target_container_name)}/#{Fog::Brightbox::Storage.escape(target_object_name)}"
-                  )
+            expects: 201,
+            headers: headers,
+            method: "PUT",
+            path: "#{Fog::Brightbox::Storage.escape(target_container_name)}/#{Fog::Brightbox::Storage.escape(target_object_name)}"
+          )
         end
       end
     end

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

@@ -9,9 +9,9 @@ module Fog
         #
         def delete_container(name)
           request(
-            :expects  => 204,
-            :method   => "DELETE",
-            :path     => Fog::Brightbox::Storage.escape(name)
+            expects: 204,
+            method: "DELETE",
+            path: Fog::Brightbox::Storage.escape(name)
           )
         end
       end

data/lib/fog/brightbox/requests/storage/delete_multiple_objects.rb

@@ -44,17 +44,17 @@ module Fog
         #     * "Response Body" [String] - Response body for "Response Status".
         def delete_multiple_objects(container, object_names, options = {})
           body = object_names.map do |name|
-            object_name = container ? "#{ container }/#{ name }" : name
+            object_name = container ? "#{container}/#{name}" : name
             URI.encode(object_name)
           end.join("\n")
 
           response = request({
-                               :expects  => 200,
-                               :method   => "DELETE",
-                               :headers  => options.merge("Content-Type" => "text/plain",
-                                                          "Accept" => "application/json"),
-                               :body     => body,
-                               :query    => { "bulk-delete" => true }
+                               expects: 200,
+                               method: "DELETE",
+                               headers: options.merge("Content-Type" => "text/plain",
+                                                      "Accept" => "application/json"),
+                               body: body,
+                               query: { "bulk-delete" => true }
                              }, false)
           response.body = Fog::JSON.decode(response.body)
           response

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

@@ -10,9 +10,9 @@ module Fog
         #
         def delete_object(container, object)
           request(
-            :expects  => 204,
-            :method   => "DELETE",
-            :path     => "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
+            expects: 204,
+            method: "DELETE",
+            path: "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
           )
         end
       end

data/lib/fog/brightbox/requests/storage/delete_static_large_object.rb

@@ -25,12 +25,12 @@ module Fog
         # @see http://docs.brightbox.org/api/brightbox-object-storage/1.0/content/static-large-objects.html
         def delete_static_large_object(container, object, options = {})
           response = request({
-                               :expects  => 200,
-                               :method   => "DELETE",
-                               :headers  => options.merge("Content-Type" => "text/plain",
-                                                          "Accept" => "application/json"),
-                               :path     => "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}",
-                               :query    => { "multipart-manifest" => "delete" }
+                               expects: 200,
+                               method: "DELETE",
+                               headers: options.merge("Content-Type" => "text/plain",
+                                                      "Accept" => "application/json"),
+                               path: "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}",
+                               query: { "multipart-manifest" => "delete" }
                              }, false)
           response.body = Fog::JSON.decode(response.body)
           response

data/lib/fog/brightbox/requests/storage/get_container.rb

@@ -30,10 +30,10 @@ module Fog
         def get_container(container, options = {})
           options = options.reject { |_key, value| value.nil? }
           request(
-            :expects  => 200,
-            :method   => "GET",
-            :path     => Fog::Brightbox::Storage.escape(container),
-            :query    => { "format" => "json" }.merge!(options)
+            expects: 200,
+            method: "GET",
+            path: Fog::Brightbox::Storage.escape(container),
+            query: { "format" => "json" }.merge!(options)
           )
         end
       end

data/lib/fog/brightbox/requests/storage/get_containers.rb

@@ -19,10 +19,10 @@ module Fog
         def get_containers(options = {})
           options = options.reject { |_key, value| value.nil? }
           request(
-            :expects  => [200, 204],
-            :method   => "GET",
-            :path     => "",
-            :query    => { "format" => "json" }.merge!(options)
+            expects: [200, 204],
+            method: "GET",
+            path: "",
+            query: { "format" => "json" }.merge!(options)
           )
         end
       end

data/lib/fog/brightbox/requests/storage/get_object.rb

@@ -10,14 +10,12 @@ module Fog
         #
         def get_object(container, object, &block)
           params = {
-            :expects  => 200,
-            :method   => "GET",
-            :path     => "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
+            expects: 200,
+            method: "GET",
+            path: "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
           }
 
-          if block_given?
-            params[:response_block] = block
-          end
+          params[:response_block] = block if block_given?
 
           request(params, false)
         end

data/lib/fog/brightbox/requests/storage/get_object_http_url.rb

@@ -13,7 +13,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         def get_object_http_url(container, object, expires, options = {})
-          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "http"))
+          create_temp_url(container, object, expires, "GET", options.merge(scheme: "http"))
         end
       end
     end

data/lib/fog/brightbox/requests/storage/get_object_https_url.rb

@@ -13,7 +13,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         def get_object_https_url(container, object, expires, options = {})
-          create_temp_url(container, object, expires, "GET", options.merge(:scheme => "https"))
+          create_temp_url(container, object, expires, "GET", options.merge(scheme: "https"))
         end
       end
     end