fog-brightbox 0.6.1 → 0.7.0

data/lib/fog/brightbox/core.rb

@@ -1,12 +1,12 @@
-require 'fog/core'
-require 'fog/json'
-require 'fog/brightbox/config'
+require "fog/core"
+require "fog/json"
+require "fog/brightbox/config"
 
 module Fog
   module Brightbox
     extend Fog::Provider
 
-    service(:compute, 'Compute')
-    service(:storage, 'Storage')
+    service(:compute, "Compute")
+    service(:storage, "Storage")
   end
 end

data/lib/fog/brightbox/link_helper.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Brightbox
+    # Rough implementation to extract Brightbox identifiers from RFC5988 Link headers
+    #
+    # @see https://tools.ietf.org/html/rfc5988
+    #
+    class LinkHelper
+      # @param [String] header The value assigned to the Link header
+      def initialize(header)
+        @header = header
+        @parsed = false
+      end
+
+      def identifier
+        parse unless @parsed
+        uri.path.split("/")[3]
+      end
+
+      def uri
+        parse unless @parsed
+        URI.parse(@link)
+      end
+
+      private
+
+      def parse
+        match = @header.match(/\A<([^>]*)>/)
+        @link = match[1]
+        @parsed = true
+      end
+    end
+  end
+end

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

@@ -4,7 +4,6 @@ module Fog
   module Compute
     class Brightbox
       class Account < Fog::Brightbox::Model
-
         identity :id
         attribute :url
         attribute :resource_type

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

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/account'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/account"
 
 module Fog
   module Compute
     class Brightbox
-
       class Accounts < Fog::Collection
-
         model Fog::Compute::Brightbox::Account
 
         def all
@@ -21,9 +19,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

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

@@ -13,12 +13,12 @@ module Fog
         attribute :account_id
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
           options = {
             :name => name,
             :description => description,
             :permissions_group => permissions_group
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_api_client(options)
           merge_attributes(data)
           true

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

@@ -10,10 +10,10 @@ module Fog
         attribute :secret
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
           options = {
             :name => name
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_application(options)
           merge_attributes(data)
           true

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

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/application'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/application"
 
 module Fog
   module Compute
     class Brightbox
-
       class Applications < Fog::Collection
-
         model Fog::Compute::Brightbox::Application
 
         def all
@@ -20,9 +18,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

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

@@ -3,9 +3,7 @@ require "fog/brightbox/model"
 module Fog
   module Compute
     class Brightbox
-
       class CloudIp < Fog::Brightbox::Model
-
         identity :id
         attribute :url
         attribute :resource_type
@@ -60,9 +58,7 @@ module Fog
         def destination_id
           server_id || load_balancer || server_group || database_server || interface_id
         end
-
       end
-
     end
   end
 end

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

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/cloud_ip'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/cloud_ip"
 
 module Fog
   module Compute
     class Brightbox
-
       class CloudIps < Fog::Collection
-
         model Fog::Compute::Brightbox::CloudIp
 
         def all
@@ -26,9 +24,7 @@ module Fog
           data = service.create_cloud_ip
           new(data)
         end
-
       end
-
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Fog
   module Compute
     class Brightbox
       class Collaboration < Fog::Brightbox::Model
-        identity  :id
+        identity :id
         attribute :status
         attribute :email
         attribute :role
@@ -14,16 +14,16 @@ module Fog
         attribute :inviter
 
         def account_id
-          account['id'] || account[:id]
+          account["id"] || account[:id]
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if identity
 
           options = {
             :role => role,
             :email => email
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
 
           data = service.create_collaboration(options)
           merge_attributes(data)

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

@@ -5,7 +5,7 @@ module Fog
   module Compute
     class Brightbox
       class DatabaseServer < Fog::Brightbox::Model
-        include ResourceLocking
+        include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
         attribute :url
@@ -67,10 +67,17 @@ module Fog
           state == "active"
         end
 
-        def snapshot
+        def snapshot(return_snapshot = false)
           requires :identity
-          merge_attributes(service.snapshot_database_server(identity))
-          true
+
+          response, snapshot_id = service.snapshot_database_server(identity, :return_link => return_snapshot)
+          merge_attributes(response)
+
+          if return_snapshot
+            service.database_snapshots.get(snapshot_id)
+          else
+            true
+          end
         end
 
         def destroy

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

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/database_server'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/database_server"
 
 module Fog
   module Compute
     class Brightbox
-
       class DatabaseServers < Fog::Collection
-
         model Fog::Compute::Brightbox::DatabaseServer
 
         def all
@@ -20,9 +18,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Fog
   module Compute
     class Brightbox
       class DatabaseSnapshot < Fog::Brightbox::Model
-        include ResourceLocking
+        include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
         attribute :url

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/database_snapshot'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/database_snapshot"
 
 module Fog
   module Compute

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

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/database_type'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/database_type"
 
 module Fog
   module Compute
     class Brightbox
-
       class DatabaseTypes < Fog::Collection
-
         model Fog::Compute::Brightbox::DatabaseType
 
         def all

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

@@ -5,7 +5,6 @@ module Fog
     class Brightbox
       # @api private
       class Event < Fog::Brightbox::Model
-
         identity :id
         attribute :url
         attribute :resource_type
@@ -21,7 +20,6 @@ module Fog
         attribute :resource
         attribute :client
         attribute :user
-
       end
     end
   end

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

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/event'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/event"
 
 module Fog
   module Compute
     class Brightbox
-
       class Events < Fog::Collection
-
         model Fog::Compute::Brightbox::Event
 
         def all

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

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/firewall_policy'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/firewall_policy"
 
 module Fog
   module Compute
     class Brightbox
-
       class FirewallPolicies < Fog::Collection
-
         model Fog::Compute::Brightbox::FirewallPolicy
 
         def all
@@ -21,9 +19,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

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

@@ -4,7 +4,6 @@ module Fog
   module Compute
     class Brightbox
       class FirewallPolicy < Fog::Brightbox::Model
-
         identity :id
         attribute :url
         attribute :resource_type
@@ -20,12 +19,12 @@ module Fog
 
         # Sticking with existing Fog behaviour, save does not update but creates a new resource
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
           options = {
             :server_group => server_group_id,
             :name => name,
             :description => description
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_firewall_policy(options)
           merge_attributes(data)
           true

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

@@ -4,7 +4,6 @@ module Fog
   module Compute
     class Brightbox
       class FirewallRule < Fog::Brightbox::Model
-
         identity :id
         attribute :url
         attribute :resource_type
@@ -23,7 +22,7 @@ module Fog
 
         # Sticking with existing Fog behaviour, save does not update but creates a new resource
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
           requires :firewall_policy_id
           options = {
             :firewall_policy => firewall_policy_id,
@@ -34,7 +33,7 @@ module Fog
             :destination => destination,
             :destination_port => destination_port,
             :icmp_type_name => icmp_type_name
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_firewall_rule(options)
           merge_attributes(data)
           true

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

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/firewall_rule'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/firewall_rule"
 
 module Fog
   module Compute
     class Brightbox
-
       class FirewallRules < Fog::Collection
-
         model Fog::Compute::Brightbox::FirewallRule
 
         def get(identifier)
@@ -16,9 +14,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

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

@@ -4,7 +4,6 @@ module Fog
   module Compute
     class Brightbox
       class Flavor < Fog::Brightbox::Model
-
         identity :id
         attribute :url
         attribute :resource_type