fog-brightbox 0.16.0 → 1.1.0

data/lib/fog/brightbox/storage/authentication_request.rb

@@ -1,6 +1,6 @@
 module Fog
   module Brightbox
-    module Storage
+    class Storage
       class AuthenticationRequest
         attr_accessor :access_token, :management_url
         attr_accessor :user, :tenant

data/lib/fog/brightbox/storage/authentication_required.rb

@@ -1,6 +1,6 @@
 module Fog
   module Brightbox
-    module Storage
+    class Storage
       class AuthenticationRequired < Fog::Errors::Error
       end
     end

data/lib/fog/brightbox/storage/config.rb

@@ -2,7 +2,7 @@ require "delegate"
 
 module Fog
   module Brightbox
-    module Storage
+    class Storage
       class Config < SimpleDelegator
         def initialize(config)
           super

data/lib/fog/brightbox/storage/connection.rb

@@ -1,6 +1,6 @@
 module Fog
   module Brightbox
-    module Storage
+    class Storage
       class Connection < Fog::Core::Connection
         def initialize(config)
           @config = config
@@ -23,7 +23,7 @@ module Fog
           rescue Excon::Errors::Unauthorized => error
             raise AuthenticationRequired.slurp(error)
           rescue Excon::Errors::NotFound => error
-            raise Fog::Storage::Brightbox::NotFound.slurp(error)
+            raise Fog::Brightbox::Storage::NotFound.slurp(error)
           rescue Excon::Errors::HTTPStatusError => error
             raise error
           end

data/lib/fog/brightbox/storage/management_url_unknown.rb

@@ -1,6 +1,6 @@
 module Fog
   module Brightbox
-    module Storage
+    class Storage
       class ManagementUrlUnknown < Fog::Errors::Error
       end
     end

data/lib/fog/brightbox/storage/not_found.rb

@@ -0,0 +1,8 @@
+module Fog
+  module Brightbox
+    class Storage
+      class NotFound < Fog::Errors::Error
+      end
+    end
+  end
+end

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "0.16.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/fog/brightbox/compute/wrapped_request_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Fog::Compute::Brightbox do
+describe Fog::Brightbox::Compute do
   describe "#wrapped_request" do
     describe "when nested option passed as true" do
       before do
@@ -9,7 +9,7 @@ describe Fog::Compute::Brightbox do
           :brightbox_secret => "1234567890",
           :brightbox_access_token => "TESTVALUE"
         }
-        @service = Fog::Compute::Brightbox.new(@options)
+        @service = Fog::Brightbox::Compute.new(@options)
       end
 
       it "makes correct request" do
@@ -30,7 +30,7 @@ describe Fog::Compute::Brightbox do
           :brightbox_secret => "1234567890",
           :brightbox_access_token => "TESTVALUE"
         }
-        @service = Fog::Compute::Brightbox.new(@options)
+        @service = Fog::Brightbox::Compute.new(@options)
       end
 
       it "makes correct request" do
@@ -51,7 +51,7 @@ describe Fog::Compute::Brightbox do
           :brightbox_secret => "1234567890",
           :brightbox_access_token => "TESTVALUE"
         }
-        @service = Fog::Compute::Brightbox.new(@options)
+        @service = Fog::Brightbox::Compute.new(@options)
       end
 
       it "makes correct request" do

data/spec/fog/brightbox/config_spec.rb

@@ -220,7 +220,7 @@ describe Fog::Brightbox::Config do
       @options = {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "12345"
       }
       @config = Fog::Brightbox::Config.new(@options)
@@ -241,7 +241,7 @@ describe Fog::Brightbox::Config do
 
   describe "when setting management_url with URI" do
     it "sets it correctly" do
-      uri = URI.parse("https://example.com")
+      uri = URI.parse("https://example.test")
       @config = Fog::Brightbox::Config.new
       @config.storage_management_url = uri
       assert_equal @config.storage_management_url, uri
@@ -250,7 +250,7 @@ describe Fog::Brightbox::Config do
 
   describe "when setting management_url with String" do
     it "raises ArgumentError" do
-      uri = "http://example.com/wrong"
+      uri = "http://example.test/wrong"
       assert_raises(ArgumentError) { Fog::Brightbox::Config.new.storage_management_url = uri }
     end
   end

data/spec/fog/brightbox/link_helper_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Fog::Brightbox::LinkHelper do
   describe "when initialized with an RFC5988 value" do
     before do
-      @header = "<https://www.example.com/1.0/images/img-12345>; rel=snapshot"
+      @header = "<https://www.example.test/1.0/images/img-12345>; rel=snapshot"
       @helper = Fog::Brightbox::LinkHelper.new(@header)
     end
 

data/spec/fog/brightbox/storage/authentication_request_spec.rb

@@ -47,7 +47,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       stub_request(:get, "https://orbit.brightbox.com/v1").
         with(:headers => {
                "Host" => "orbit.brightbox.com:443",
-               "X-Auth-User" => "user@example.com",
+               "X-Auth-User" => "user@example.test",
                "X-Auth-Key" => "abcde"
              }).to_return(authorized_response)
     end
@@ -56,7 +56,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       settings = {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde"
       }
       @config = Fog::Brightbox::Config.new(settings)
@@ -70,7 +70,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       stub_request(:get, "https://orbit.brightbox.com/v1").
         with(:headers => {
                "Host" => "orbit.brightbox.com:443",
-               "X-Auth-User" => "user@example.com",
+               "X-Auth-User" => "user@example.test",
                "X-Auth-Key" => "abcde"
              }).to_return(unauthorized_response)
     end
@@ -79,7 +79,7 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
       settings = {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
-        :brightbox_username => "user@example.com",
+        :brightbox_username => "user@example.test",
         :brightbox_password => "abcde"
       }
       @config = Fog::Brightbox::Config.new(settings)

data/spec/fog/brightbox/storage/connection_errors_spec.rb

@@ -22,7 +22,7 @@ describe Fog::Brightbox::Storage::Connection do
     401 => Fog::Brightbox::Storage::AuthenticationRequired,
     402 => Excon::Errors::PaymentRequired,
     403 => Excon::Errors::Forbidden,
-    404 => Fog::Storage::Brightbox::NotFound,
+    404 => Fog::Brightbox::Storage::NotFound,
     405 => Excon::Errors::MethodNotAllowed,
     406 => Excon::Errors::NotAcceptable,
     407 => Excon::Errors::ProxyAuthenticationRequired,

data/spec/fog/brightbox/storage/connection_spec.rb

@@ -95,14 +95,14 @@ describe Fog::Brightbox::Storage::Connection do
   end
 
   describe "when container is not found" do
-    it "raises Fog::Storage::Brightbox::NotFound" do
+    it "raises Fog::Brightbox::Storage::NotFound" do
       stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
         to_return(:status => 404,
                   :body => "<html><h1>Not Found</h1><p>The resource could not be found.</p></html>",
                   :headers => {
                     "Content-Type" => "text/html"
                   })
-      assert_raises(Fog::Storage::Brightbox::NotFound) { connection.request(params) }
+      assert_raises(Fog::Brightbox::Storage::NotFound) { connection.request(params) }
     end
   end
 

data/spec/fog/compute/brightbox/account_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/account"
 
-describe Fog::Compute::Brightbox::Account do
+describe Fog::Brightbox::Compute::Account do
   include ModelSetup
 
   subject { service.accounts.new }

data/spec/fog/compute/brightbox/api_client_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/api_client"
 
-describe Fog::Compute::Brightbox::ApiClient do
+describe Fog::Brightbox::Compute::ApiClient do
   include ModelSetup
 
   subject { service.api_clients.new }

data/spec/fog/compute/brightbox/application_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/application"
 
-describe Fog::Compute::Brightbox::Application do
+describe Fog::Brightbox::Compute::Application do
   include ModelSetup
 
   subject { service.applications.new }

data/spec/fog/compute/brightbox/cloud_ip_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/cloud_ip"
 
-describe Fog::Compute::Brightbox::CloudIp do
+describe Fog::Brightbox::Compute::CloudIp do
   include ModelSetup
 
   subject { service.cloud_ips.new }

data/spec/fog/compute/brightbox/collaboration_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/collaboration"
 
-describe Fog::Compute::Brightbox::Collaboration do
+describe Fog::Brightbox::Compute::Collaboration do
   include ModelSetup
 
   subject { service.collaborations.new }

data/spec/fog/compute/brightbox/database_server_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/database_server"
 
-describe Fog::Compute::Brightbox::DatabaseServer do
+describe Fog::Brightbox::Compute::DatabaseServer do
   include ModelSetup
   include SupportsResourceLocking
 
@@ -19,24 +19,20 @@ describe Fog::Compute::Brightbox::DatabaseServer do
     end
   end
 
-  describe "when snapshotting withi no options" do
+  describe "when snapshotting with no options" do
     it "returns the database server" do
-      skip if RUBY_VERSION < "1.9"
-
       stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot").
         with(:query => hash_including(:account_id),
              :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 202, :body => %q({"id": "dbs-12345"}), :headers => {})
 
-      @database_server = Fog::Compute::Brightbox::DatabaseServer.new(:service => service, :id => "dbs-12345")
+      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :id => "dbs-12345")
       assert @database_server.snapshot
     end
   end
 
   describe "when snapshotting with link option" do
     it "returns the new image" do
-      skip if RUBY_VERSION < "1.9"
-
       link = "<https://api.gb1.brightbox.com/1.0/database_snapshots/dbi-12345>; rel=snapshot"
 
       stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot").
@@ -47,8 +43,23 @@ describe Fog::Compute::Brightbox::DatabaseServer do
         with(:query => hash_including(:account_id),
              :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 200, :body => %q({"id": "dbs-12345"}))
-      @database_server = Fog::Compute::Brightbox::DatabaseServer.new(:service => service, :id => "dbs-12345")
-      assert_kind_of Fog::Compute::Brightbox::DatabaseSnapshot, @database_server.snapshot(true)
+      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :id => "dbs-12345")
+      assert_kind_of Fog::Brightbox::Compute::DatabaseSnapshot, @database_server.snapshot(true)
+    end
+  end
+
+  describe "when building from a snapshot" do
+    it "returns the new SQL instance" do
+      stub_request(:post, "http://localhost/1.0/database_servers").
+        with(:query => hash_including(:account_id),
+             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" },
+             :body => hash_including(:snapshot => "dbi-lv426")).
+        to_return(:status => 202, :body => %q({"id": "dbs-12345"}))
+
+      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :snapshot_id => "dbi-lv426")
+      @database_server.save
+      assert_kind_of Fog::Brightbox::Compute::DatabaseServer, @database_server
+      assert_equal "dbs-12345", @database_server.id
     end
   end
 end

data/spec/fog/compute/brightbox/database_snapshot_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/database_snapshot"
 
-describe Fog::Compute::Brightbox::DatabaseSnapshot do
+describe Fog::Brightbox::Compute::DatabaseSnapshot do
   include ModelSetup
   include SupportsResourceLocking
 

data/spec/fog/compute/brightbox/database_type_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/database_type"
 
-describe Fog::Compute::Brightbox::DatabaseType do
+describe Fog::Brightbox::Compute::DatabaseType do
   include ModelSetup
 
   subject { service.database_types.new }

data/spec/fog/compute/brightbox/event_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/event"
 
-describe Fog::Compute::Brightbox::Event do
+describe Fog::Brightbox::Compute::Event do
   include ModelSetup
 
   subject { service.events.new }

data/spec/fog/compute/brightbox/firewall_policy_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/firewall_policy"
 
-describe Fog::Compute::Brightbox::FirewallPolicy do
+describe Fog::Brightbox::Compute::FirewallPolicy do
   include ModelSetup
 
   subject { service.firewall_policies.new }

data/spec/fog/compute/brightbox/flavor_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/flavor"
 
-describe Fog::Compute::Brightbox::Flavor do
+describe Fog::Brightbox::Compute::Flavor do
   include ModelSetup
 
   subject { service.flavors.new }

data/spec/fog/compute/brightbox/image_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/image"
 
-describe Fog::Compute::Brightbox::Image do
+describe Fog::Brightbox::Compute::Image do
   include ModelSetup
   include SupportsResourceLocking
 

data/spec/fog/compute/brightbox/load_balancer_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/load_balancer"
 
-describe Fog::Compute::Brightbox::LoadBalancer do
+describe Fog::Brightbox::Compute::LoadBalancer do
   include ModelSetup
   include SupportsResourceLocking
 

data/spec/fog/compute/brightbox/server_group_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/server_group"
 
-describe Fog::Compute::Brightbox::ServerGroup do
+describe Fog::Brightbox::Compute::ServerGroup do
   include ModelSetup
 
   subject { service.server_groups.new }

data/spec/fog/compute/brightbox/server_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/server"
 
-describe Fog::Compute::Brightbox::Server do
+describe Fog::Brightbox::Compute::Server do
   include ModelSetup
   include SupportsResourceLocking
 
@@ -21,22 +21,18 @@ describe Fog::Compute::Brightbox::Server do
 
   describe "when snapshotting withi no options" do
     it "returns the server" do
-      skip if RUBY_VERSION < "1.9"
-
       stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot").
         with(:query => hash_including(:account_id),
              :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 202, :body => %q({"id": "srv-12345"}), :headers => {})
 
-      @server = Fog::Compute::Brightbox::Server.new(:service => service, :id => "srv-12345")
+      @server = Fog::Brightbox::Compute::Server.new(:service => service, :id => "srv-12345")
       assert_kind_of Hash, @server.snapshot
     end
   end
 
   describe "when snapshotting with link option" do
     it "returns the new image" do
-      skip if RUBY_VERSION < "1.9"
-
       link = "<https://api.gb1.brightbox.com/1.0/images/img-12345>; rel=snapshot"
 
       stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot").
@@ -47,8 +43,8 @@ describe Fog::Compute::Brightbox::Server do
         with(:query => hash_including(:account_id),
              :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
         to_return(:status => 200, :body => %q({"id": "img-12345"}))
-      @server = Fog::Compute::Brightbox::Server.new(:service => service, :id => "srv-12345")
-      assert_kind_of Fog::Compute::Brightbox::Image, @server.snapshot(true)
+      @server = Fog::Brightbox::Compute::Server.new(:service => service, :id => "srv-12345")
+      assert_kind_of Fog::Brightbox::Compute::Image, @server.snapshot(true)
     end
   end
 end

data/spec/fog/compute/brightbox/user_collaboration_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "fog/brightbox/models/compute/user_collaboration"
 
-describe Fog::Compute::Brightbox::UserCollaboration do
+describe Fog::Brightbox::Compute::UserCollaboration do
   include ModelSetup
 
   subject { service.user_collaborations.new }