fog-brightbox 1.10.0 → 1.11.0

data/spec/fog/brightbox/oauth2/grant_type_strategy_spec.rb

@@ -8,11 +8,11 @@ describe Fog::Brightbox::OAuth2::RefreshTokenStrategy do
     @strategy = Fog::Brightbox::OAuth2::GrantTypeStrategy.new(@credentials)
   end
 
-  it "tests #respond_to?(:authorization_body_data) returns true"  do
+  it "tests #respond_to?(:authorization_body_data) returns true" do
     assert @strategy.respond_to?(:authorization_body_data)
   end
 
-  it "tests #respond_to?(:headers) returns true"  do
+  it "tests #respond_to?(:headers) returns true" do
     assert @strategy.respond_to?(:headers)
   end
 

data/spec/fog/brightbox/oauth2/refresh_token_strategy_spec.rb

@@ -5,16 +5,16 @@ describe Fog::Brightbox::OAuth2::RefreshTokenStrategy do
     @client_id = "app-12345"
     @client_secret = "__mashed_keys_123__"
     @refresh_token = "ab4b39dddf909"
-    options = { :refresh_token => @refresh_token }
+    options = { refresh_token: @refresh_token }
     @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret, options)
     @strategy = Fog::Brightbox::OAuth2::RefreshTokenStrategy.new(@credentials)
   end
 
-  it "tests #respond_to?(:authorization_body_data) returns true"  do
+  it "tests #respond_to?(:authorization_body_data) returns true" do
     assert @strategy.respond_to?(:authorization_body_data)
   end
 
-  it "tests #respond_to?(:headers) returns true"  do
+  it "tests #respond_to?(:headers) returns true" do
     assert @strategy.respond_to?(:headers)
   end
 

data/spec/fog/brightbox/oauth2/user_credentials_strategy_spec.rb

@@ -8,19 +8,19 @@ describe Fog::Brightbox::OAuth2::UserCredentialsStrategy do
     @password      = "__mushed_keys_321__"
 
     options = {
-      :username => @username,
-      :password => @password
+      username: @username,
+      password: @password
     }
 
     @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret, options)
     @strategy = Fog::Brightbox::OAuth2::UserCredentialsStrategy.new(@credentials)
   end
 
-  it "tests #respond_to?(:authorization_body_data) returns true"  do
+  it "tests #respond_to?(:authorization_body_data) returns true" do
     assert @strategy.respond_to?(:authorization_body_data)
   end
 
-  it "tests #respond_to?(:headers) returns true"  do
+  it "tests #respond_to?(:headers) returns true" do
     assert @strategy.respond_to?(:headers)
   end
 

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

@@ -5,12 +5,12 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
 
   describe "when initialised with blank config" do
     before do
-      stub_request(:get, "https://orbit.brightbox.com/v1").
-        with(:headers => {
-               "Host" => "orbit.brightbox.com:443",
-               "X-Auth-User" => "",
-               "X-Auth-Key" => ""
-             }).to_return(bad_url_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1")
+        .with(headers: {
+                "Host" => "orbit.brightbox.com:443",
+                "X-Auth-User" => "",
+                "X-Auth-Key" => ""
+              }).to_return(bad_url_response)
     end
 
     it "raises error" do
@@ -23,18 +23,18 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
 
   describe "when initialised with API client details" do
     before do
-      stub_request(:get, "https://orbit.brightbox.com/v1").
-        with(:headers => {
-               "Host" => "orbit.brightbox.com:443",
-               "X-Auth-User" => "cli-12345",
-               "X-Auth-Key" => "12345"
-             }).to_return(authorized_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1")
+        .with(headers: {
+                "Host" => "orbit.brightbox.com:443",
+                "X-Auth-User" => "cli-12345",
+                "X-Auth-Key" => "12345"
+              }).to_return(authorized_response)
     end
 
     it "authenticates correctly" do
       settings = {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "12345"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "12345"
       }
       @config = Fog::Brightbox::Config.new(settings)
       @request = Fog::Brightbox::Storage::AuthenticationRequest.new(@config)
@@ -44,20 +44,20 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
 
   describe "when initialised with user details" do
     before do
-      stub_request(:get, "https://orbit.brightbox.com/v1").
-        with(:headers => {
-               "Host" => "orbit.brightbox.com:443",
-               "X-Auth-User" => "user@example.test",
-               "X-Auth-Key" => "abcde"
-             }).to_return(authorized_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1")
+        .with(headers: {
+                "Host" => "orbit.brightbox.com:443",
+                "X-Auth-User" => "user@example.test",
+                "X-Auth-Key" => "abcde"
+              }).to_return(authorized_response)
     end
 
     it "authenticates correctly" do
       settings = {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "12345",
-        :brightbox_username => "user@example.test",
-        :brightbox_password => "abcde"
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "12345",
+        brightbox_username: "user@example.test",
+        brightbox_password: "abcde"
       }
       @config = Fog::Brightbox::Config.new(settings)
       @request = Fog::Brightbox::Storage::AuthenticationRequest.new(@config)
@@ -67,20 +67,20 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
 
   describe "when initialised with bad user details" do
     before do
-      stub_request(:get, "https://orbit.brightbox.com/v1").
-        with(:headers => {
-               "Host" => "orbit.brightbox.com:443",
-               "X-Auth-User" => "user@example.test",
-               "X-Auth-Key" => "abcde"
-             }).to_return(unauthorized_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1")
+        .with(headers: {
+                "Host" => "orbit.brightbox.com:443",
+                "X-Auth-User" => "user@example.test",
+                "X-Auth-Key" => "abcde"
+              }).to_return(unauthorized_response)
     end
 
     it "raises error" do
       settings = {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "12345",
-        :brightbox_username => "user@example.test",
-        :brightbox_password => "abcde"
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "12345",
+        brightbox_username: "user@example.test",
+        brightbox_password: "abcde"
       }
       @config = Fog::Brightbox::Config.new(settings)
       @request = Fog::Brightbox::Storage::AuthenticationRequest.new(@config)

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

@@ -5,8 +5,8 @@ describe Fog::Brightbox::Storage::Config do
   describe "when required arguments are included" do
     it "nothing is raised" do
       settings = {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "1234567890"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "1234567890"
       }
       config = Fog::Brightbox::Config.new(settings)
       Fog::Brightbox::Storage::Config.new(config)
@@ -17,7 +17,7 @@ describe Fog::Brightbox::Storage::Config do
   describe "when client_id is not in configuration" do
     it "raises ArgumentError" do
       settings = {
-        :brightbox_secret => "1234567890"
+        brightbox_secret: "1234567890"
       }
       config = Fog::Brightbox::Config.new(settings)
       assert_raises ArgumentError do
@@ -29,7 +29,7 @@ describe Fog::Brightbox::Storage::Config do
   describe "when client_secret is not in configuration" do
     it "raises ArgumentError" do
       settings = {
-        :brightbox_client_id => "cli-12345"
+        brightbox_client_id: "cli-12345"
       }
       config = Fog::Brightbox::Config.new(settings)
       assert_raises ArgumentError do

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

@@ -6,13 +6,13 @@ describe Fog::Brightbox::Storage::Connection do
   let(:config) { Fog::Brightbox::Config.new(settings) }
   let(:connection) { Fog::Brightbox::Storage::Connection.new(config) }
   let(:params) do
-    { :path => "fnord", :expects => [200] }
+    { path: "fnord", expects: [200] }
   end
   let(:settings) do
     {
-      :brightbox_client_id => "app-12345",
-      :brightbox_secret => "1234567890",
-      :brightbox_storage_management_url => "https://files.gb2.brightbox.com/v1/acc-12345"
+      brightbox_client_id: "app-12345",
+      brightbox_secret: "1234567890",
+      brightbox_storage_management_url: "https://files.gb2.brightbox.com/v1/acc-12345"
     }
   end
   let(:valid_auth_token) { "01234567890abcdefghijklmnopqrstuvwxyz" }
@@ -45,8 +45,8 @@ describe Fog::Brightbox::Storage::Connection do
   }.each do |status, error|
     describe "when request responds with #{status}" do
       it "raises #{error}" do
-        stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-          to_return(:status => status)
+        stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord")
+          .to_return(status: status)
         assert_raises(error) { connection.request(params) }
       end
     end

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

@@ -6,13 +6,13 @@ describe Fog::Brightbox::Storage::Connection do
   let(:config) { Fog::Brightbox::Config.new(settings) }
   let(:connection) { Fog::Brightbox::Storage::Connection.new(config) }
   let(:params) do
-    { :path => "fnord", :expects => [200] }
+    { path: "fnord", expects: [200] }
   end
   let(:settings) do
     {
-      :brightbox_client_id => "app-12345",
-      :brightbox_secret => "1234567890",
-      :brightbox_storage_management_url => "https://files.gb2.brightbox.com/v1/acc-12345"
+      brightbox_client_id: "app-12345",
+      brightbox_secret: "1234567890",
+      brightbox_storage_management_url: "https://files.gb2.brightbox.com/v1/acc-12345"
     }
   end
   let(:valid_auth_token) { "01234567890abcdefghijklmnopqrstuvwxyz" }
@@ -20,8 +20,8 @@ describe Fog::Brightbox::Storage::Connection do
   describe "when management URL is not available" do
     let(:settings) do
       {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "1234567890"
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "1234567890"
       }
     end
 
@@ -42,14 +42,14 @@ describe Fog::Brightbox::Storage::Connection do
     let(:params) { {} }
 
     before do
-      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345").
-        with(:headers => {
-               "Accept" => "application/json",
-               "Content-Type" => "application/json",
-               "X-Auth-Token" => valid_auth_token
-             }).to_return(:status => 200, :body => "{}", :headers => {
-                            "Content-Type" => "application/json"
-                          })
+      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345")
+        .with(headers: {
+                "Accept" => "application/json",
+                "Content-Type" => "application/json",
+                "X-Auth-Token" => valid_auth_token
+              }).to_return(status: 200, body: "{}", headers: {
+                             "Content-Type" => "application/json"
+                           })
     end
 
     it "completes successfully" do
@@ -62,14 +62,14 @@ describe Fog::Brightbox::Storage::Connection do
 
   describe "when request should succeed" do
     before do
-      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-        with(:headers => {
-               "Accept" => "application/json",
-               "Content-Type" => "application/json",
-               "X-Auth-Token" => valid_auth_token
-             }).to_return(:status => 200, :body => "{}", :headers => {
-                            "Content-Type" => "application/json"
-                          })
+      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord")
+        .with(headers: {
+                "Accept" => "application/json",
+                "Content-Type" => "application/json",
+                "X-Auth-Token" => valid_auth_token
+              }).to_return(status: 200, body: "{}", headers: {
+                             "Content-Type" => "application/json"
+                           })
     end
 
     it "completes successfully" do
@@ -82,12 +82,12 @@ describe Fog::Brightbox::Storage::Connection do
 
   describe "when custom headers are passed" do
     let(:params) do
-      { :headers => { "X-Test" => "present" }, :path => "fnord" }
+      { headers: { "X-Test" => "present" }, path: "fnord" }
     end
 
     it "completes successfully" do
-      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-        with(:headers => { "X-Test" => "present" }).to_return(:status => 200)
+      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord")
+        .with(headers: { "X-Test" => "present" }).to_return(status: 200)
 
       connection.request(params)
       pass
@@ -96,24 +96,24 @@ describe Fog::Brightbox::Storage::Connection do
 
   describe "when container is not found" 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"
-                  })
+      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::Brightbox::Storage::NotFound) { connection.request(params) }
     end
   end
 
   describe "when request is not authenticated" do
     it "raises Fog::Brightbox::Storage::AuthenticationRequired" do
-      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-        to_return(:status => 401,
-                  :body => "Authentication required",
-                  :headers => {
-                    "Content-Type" => "text/plain"
-                  })
+      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord")
+        .to_return(status: 401,
+                   body: "Authentication required",
+                   headers: {
+                     "Content-Type" => "text/plain"
+                   })
       assert_raises(Fog::Brightbox::Storage::AuthenticationRequired) { connection.request(params) }
     end
   end

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

@@ -11,19 +11,19 @@ describe Fog::Brightbox::Storage::Directory do
   describe ".create" do
     let(:settings) do
       {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "fdkls"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "fdkls"
       }
     end
     let(:read_permissions) { ".r:*" }
     let(:write_permissions) { "*:*" }
 
     before do
-      stub_request(:get, "https://orbit.brightbox.com/v1").
-        to_return(authorized_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1")
+        .to_return(authorized_response)
 
-      stub_request(:put, "https://orbit.brightbox.com/v1/acc-12345/container-name").
-        to_return(status: 201)
+      stub_request(:put, "https://orbit.brightbox.com/v1/acc-12345/container-name")
+        .to_return(status: 201)
     end
 
     it do

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

@@ -7,9 +7,9 @@ describe Fog::Brightbox::Storage::Files do
   describe "#get_url" do
     before do
       @options = {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "1234567890",
-        :brightbox_storage_management_url => "https://management.url/v1/acc-12345"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "1234567890",
+        brightbox_storage_management_url: "https://management.url/v1/acc-12345"
       }
       @service = Fog::Brightbox::Storage.new(@options)
     end
@@ -61,8 +61,8 @@ describe Fog::Brightbox::Storage::Files do
     describe "when no management URL" do
       before do
         @options = {
-          :brightbox_client_id => "cli-12345",
-          :brightbox_secret => "1234567890"
+          brightbox_client_id: "cli-12345",
+          brightbox_secret: "1234567890"
         }
         @service = Fog::Brightbox::Storage.new(@options)
       end

data/spec/fog/brightbox/storage_spec.rb

@@ -5,9 +5,9 @@ describe Fog::Brightbox::Storage do
   describe "when passed in configuration" do
     before do
       @options = {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "1234567890",
-        :brightbox_storage_management_url => "https://management.url/v1/acc-12345"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "1234567890",
+        brightbox_storage_management_url: "https://management.url/v1/acc-12345"
       }
       @service = Fog::Brightbox::Storage.new(@options)
     end
@@ -21,8 +21,8 @@ describe Fog::Brightbox::Storage do
   describe "when unavailable" do
     before do
       @options = {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "1234567890"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "1234567890"
       }
       @service = Fog::Brightbox::Storage.new(@options)
     end

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

@@ -21,12 +21,12 @@ describe Fog::Brightbox::Compute::DatabaseServer do
 
   describe "when snapshotting with no options" do
     it "returns the database server" do
-      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 => {})
+      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: '{"id": "dbs-12345"}', headers: {})
 
-      @database_server = Fog::Brightbox::Compute::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
@@ -35,28 +35,28 @@ describe Fog::Brightbox::Compute::DatabaseServer do
     it "returns the new image" do
       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").
-        with(:headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 202, :body => "{}", :headers => { "Link" => link })
+      stub_request(:post, "http://localhost/1.0/database_servers/dbs-12345/snapshot")
+        .with(headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 202, body: "{}", headers: { "Link" => link })
 
-      stub_request(:get, "http://localhost/1.0/database_snapshots/dbi-12345").
-        with(:query => hash_including(:account_id),
-             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN" }).
-        to_return(:status => 200, :body => %q({"id": "dbs-12345"}))
-      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :id => "dbs-12345")
+      stub_request(:get, "http://localhost/1.0/database_snapshots/dbi-12345")
+        .with(query: hash_including(:account_id),
+              headers: { "Authorization" => "Bearer FAKECACHEDTOKEN" })
+        .to_return(status: 200, body: '{"id": "dbs-12345"}')
+      @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"}))
+      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: '{"id": "dbs-12345"}')
 
-      @database_server = Fog::Brightbox::Compute::DatabaseServer.new(:service => service, :snapshot_id => "dbi-lv426")
+      @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