fog-brightbox 1.10.0 → 1.12.0

data/spec/fog/compute/brightbox_spec.rb

@@ -4,20 +4,26 @@ describe Fog::Brightbox::Compute do
   describe "when global config is available" do
     before do
       @arguments = {
-        :brightbox_auth_url => "http://localhost",
-        :brightbox_api_url => "http://localhost",
-        :brightbox_client_id => "",
-        :brightbox_secret => "",
-        :brightbox_username => "",
-        :brightbox_password => "",
-        :brightbox_account => ""
+        brightbox_auth_url: "http://localhost",
+        brightbox_api_url: "http://localhost",
+        brightbox_client_id: "",
+        brightbox_secret: "",
+        brightbox_username: "",
+        brightbox_password: "",
+        brightbox_account: ""
       }
 
       @credential_guard = Minitest::Mock.new
+      # Stub for older versions of fog-core
       def @credential_guard.reject
         {}
       end
 
+      # Stub for newer versions of fog-core
+      def @credential_guard.select
+        {}
+      end
+
       Fog.stub :credentials, @credential_guard do
         @service = Fog::Brightbox::Compute.new(@arguments)
       end
@@ -49,8 +55,8 @@ describe Fog::Brightbox::Compute do
   describe "when created with a Config object" do
     it "does not error" do
       @options = {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "1234567890"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "1234567890"
       }
       @config = Fog::Brightbox::Config.new(@options)
       @service = Fog::Brightbox::Compute.new(@config)
@@ -59,7 +65,7 @@ describe Fog::Brightbox::Compute do
   end
 
   describe "when created with Config missing required settings" do
-    it "raises ArgumentError"do
+    it "raises ArgumentError" do
       @config = Fog::Brightbox::Config.new({})
       assert_raises ArgumentError do
         @service = Fog::Brightbox::Compute.new(@config)

data/spec/fog/storage/brightbox_spec.rb

@@ -19,8 +19,8 @@ describe Fog::Brightbox::Storage do
   describe "when created with a Config object" do
     let(:settings) do
       {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "1234567890"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "1234567890"
       }
     end
 
@@ -43,14 +43,14 @@ describe Fog::Brightbox::Storage do
   describe "when created with a viable config" do
     let(:settings) do
       {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "fdkls"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "fdkls"
       }
     end
 
     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)
     end
 
     it "requires a call to authenticate" do
@@ -70,14 +70,14 @@ describe Fog::Brightbox::Storage do
   describe "when created with bad credentials" do
     let(:settings) do
       {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "wrong"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "wrong"
       }
     end
 
     it "fails to authenticate" do
-      stub_request(:get, "https://orbit.brightbox.com/v1").
-        to_return(unauthorized_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1")
+        .to_return(unauthorized_response)
 
       assert_raises(Fog::Brightbox::Storage::AuthenticationRequired) { service.authenticate }
       assert_nil service.management_url
@@ -87,17 +87,17 @@ describe Fog::Brightbox::Storage do
   describe "when configured scoped to a specific account" do
     let(:settings) do
       {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "12345",
-        :brightbox_username => "user@example.test",
-        :brightbox_password => "abcde",
-        :brightbox_account => "acc-abcde"
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "12345",
+        brightbox_username: "user@example.test",
+        brightbox_password: "abcde",
+        brightbox_account: "acc-abcde"
       }
     end
 
     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)
     end
 
     it "uses the configured account" do
@@ -109,16 +109,16 @@ describe Fog::Brightbox::Storage do
   describe "when account is not configured" do
     let(:settings) do
       {
-        :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"
       }
     end
 
     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)
     end
 
     it "extracts the account from the management URL" do
@@ -130,10 +130,10 @@ describe Fog::Brightbox::Storage do
   describe "when configured with existing token" do
     let(:settings) do
       {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "12345",
-        :brightbox_access_token => "1234567890abcdefghijklmnopqrstuvwxyz",
-        :brightbox_refresh_token => "1234567890abcdefghijklmnopqrstuvwxyz"
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "12345",
+        brightbox_access_token: "1234567890abcdefghijklmnopqrstuvwxyz",
+        brightbox_refresh_token: "1234567890abcdefghijklmnopqrstuvwxyz"
       }
     end
 
@@ -149,11 +149,11 @@ describe Fog::Brightbox::Storage do
   describe "when configured with tokens and management_url" do
     let(:settings) do
       {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "12345",
-        :brightbox_access_token => "1234567890abcdefghijklmnopqrstuvwxyz",
-        :brightbox_refresh_token => "1234567890abcdefghijklmnopqrstuvwxyz",
-        :brightbox_storage_management_url => "https://files.gb2.brightbox.com/v1/acc-12345"
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "12345",
+        brightbox_access_token: "1234567890abcdefghijklmnopqrstuvwxyz",
+        brightbox_refresh_token: "1234567890abcdefghijklmnopqrstuvwxyz",
+        brightbox_storage_management_url: "https://files.gb2.brightbox.com/v1/acc-12345"
       }
     end
 
@@ -166,8 +166,8 @@ describe Fog::Brightbox::Storage do
     end
 
     it "keeps setting after authentication" 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)
       config.expire_tokens!
       service.authenticate
       assert_equal "https://files.gb2.brightbox.com/v1/acc-12345", service.management_url.to_s
@@ -177,22 +177,22 @@ describe Fog::Brightbox::Storage do
   describe "when configured with expired tokens" do
     let(:settings) do
       {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "12345",
-        :brightbox_access_token => "1234567890abcdefghijklmnopqrstuvwxyz",
-        :brightbox_refresh_token => "1234567890abcdefghijklmnopqrstuvwxyz",
-        :brightbox_storage_management_url => "https://files.gb2.brightbox.com/v1/acc-12345",
-        :brightbox_token_management => false
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "12345",
+        brightbox_access_token: "1234567890abcdefghijklmnopqrstuvwxyz",
+        brightbox_refresh_token: "1234567890abcdefghijklmnopqrstuvwxyz",
+        brightbox_storage_management_url: "https://files.gb2.brightbox.com/v1/acc-12345",
+        brightbox_token_management: false
       }
     end
 
     before do
       # Ongoing request but tokens are expired
-      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-        to_return(unauthorized_response)
+      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord")
+        .to_return(unauthorized_response)
     end
 
-    let(:params) { { :expects => [200], :path => "fnord" } }
+    let(:params) { { expects: [200], path: "fnord" } }
 
     it "raises Fog::Brightbox::Storage::AuthenticationRequired" do
       assert_raises(Fog::Brightbox::Storage::AuthenticationRequired) { service.request(params) }
@@ -202,35 +202,35 @@ describe Fog::Brightbox::Storage do
   describe "when configured with user details and expired tokens" do
     let(:settings) do
       {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "12345",
-        :brightbox_username => "user@example.test",
-        :brightbox_password => "12345",
-        :brightbox_access_token => "1234567890abcdefghijklmnopqrstuvwxyz",
-        :brightbox_refresh_token => "1234567890abcdefghijklmnopqrstuvwxyz",
-        :brightbox_storage_url => "https://files.gb2.brightbox.com",
-        :brightbox_storage_management_url => "https://files.gb2.brightbox.com/v1/acc-12345"
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "12345",
+        brightbox_username: "user@example.test",
+        brightbox_password: "12345",
+        brightbox_access_token: "1234567890abcdefghijklmnopqrstuvwxyz",
+        brightbox_refresh_token: "1234567890abcdefghijklmnopqrstuvwxyz",
+        brightbox_storage_url: "https://files.gb2.brightbox.com",
+        brightbox_storage_management_url: "https://files.gb2.brightbox.com/v1/acc-12345"
       }
     end
 
     before do
       # Ongoing request but tokens are expired
-      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-        with(:headers => { "X-Auth-Token" => "1234567890abcdefghijklmnopqrstuvwxyz" }).
-        to_return(unauthorized_response)
+      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord")
+        .with(headers: { "X-Auth-Token" => "1234567890abcdefghijklmnopqrstuvwxyz" })
+        .to_return(unauthorized_response)
 
       # The reauthentication
-      stub_request(:get, "https://files.gb2.brightbox.com/v1").
-        with(:headers => { "X-Auth-User" => "user@example.test", "X-Auth-Key" => "12345" }).
-        to_return(authorized_response)
+      stub_request(:get, "https://files.gb2.brightbox.com/v1")
+        .with(headers: { "X-Auth-User" => "user@example.test", "X-Auth-Key" => "12345" })
+        .to_return(authorized_response)
 
       # Repeated request
-      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord").
-        with(:headers => { "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890" }).
-        to_return(:status => 200)
+      stub_request(:get, "https://files.gb2.brightbox.com/v1/acc-12345/fnord")
+        .with(headers: { "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890" })
+        .to_return(status: 200)
     end
 
-    let(:params) { { :expects => [200], :path => "fnord" } }
+    let(:params) { { expects: [200], path: "fnord" } }
 
     it "authenticates again and retries" do
       service.request(params)
@@ -241,23 +241,23 @@ describe Fog::Brightbox::Storage do
   describe "when configured with client credentials" do
     let(:settings) do
       {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "12345"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "12345"
       }
     end
 
     before do
       # Initial authentication
-      stub_request(:get, "https://orbit.brightbox.com/v1").
-        with(:headers => { "X-Auth-Key" => "12345", "X-Auth-User" => "cli-12345" }).
-        to_return(authorized_response)
+      stub_request(:get, "https://orbit.brightbox.com/v1")
+        .with(headers: { "X-Auth-Key" => "12345", "X-Auth-User" => "cli-12345" })
+        .to_return(authorized_response)
 
-      stub_request(:get, "https://orbit.brightbox.com/v1/acc-12345/fnord").
-        with(:headers => { "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890" }).
-        to_return(:status => 200)
+      stub_request(:get, "https://orbit.brightbox.com/v1/acc-12345/fnord")
+        .with(headers: { "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890" })
+        .to_return(status: 200)
     end
 
-    let(:params) { { :expects => [200], :path => "fnord" } }
+    let(:params) { { expects: [200], path: "fnord" } }
 
     it "authenticates again and retries" do
       service.request(params)
@@ -268,8 +268,8 @@ describe Fog::Brightbox::Storage do
   describe "when not initialised with temporary URL key" do
     let(:settings) do
       {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "12345"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "12345"
       }
     end
 
@@ -286,10 +286,10 @@ describe Fog::Brightbox::Storage do
     let(:temp_url_key) { "1234567890" }
     let(:settings) do
       {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "12345",
-        :brightbox_storage_management_url => "https://example.brightbox.com",
-        :brightbox_temp_url_key => temp_url_key
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "12345",
+        brightbox_storage_management_url: "https://example.brightbox.com",
+        brightbox_temp_url_key: temp_url_key
       }
     end
     let(:container) { "container" }
@@ -303,17 +303,17 @@ describe Fog::Brightbox::Storage do
 
     it "can generate temporary HTTPS URLs" do
       assert_equal "https://example.brightbox.com/container/file.ext?temp_url_sig=86dcfd2cf9d501936abab2badc152e90d6b3b133&temp_url_expires=1325376000",
-        service.create_temp_url(container, object, expiry_time, request_method, :scheme => "https")
+                   service.create_temp_url(container, object, expiry_time, request_method, scheme: "https")
     end
 
     it "can generate temporary HTTP URLs" do
       assert_equal "http://example.brightbox.com/container/file.ext?temp_url_sig=86dcfd2cf9d501936abab2badc152e90d6b3b133&temp_url_expires=1325376000",
-        service.create_temp_url(container, object, expiry_time, request_method, :scheme => "http")
+                   service.create_temp_url(container, object, expiry_time, request_method, scheme: "http")
     end
 
     it "can generate temporary HTTP URLs on non standard ports" do
       assert_equal "http://example.brightbox.com:401/container/file.ext?temp_url_sig=86dcfd2cf9d501936abab2badc152e90d6b3b133&temp_url_expires=1325376000",
-        service.create_temp_url(container, object, expiry_time, request_method, :scheme => "http", :port => 401)
+                   service.create_temp_url(container, object, expiry_time, request_method, scheme: "http", port: 401)
     end
   end
 
@@ -321,9 +321,9 @@ describe Fog::Brightbox::Storage do
     let(:temp_url_key) { "1234567890" }
     let(:settings) do
       {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "12345",
-        :brightbox_temp_url_key => temp_url_key
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "12345",
+        brightbox_temp_url_key: temp_url_key
       }
     end
     let(:container) { "container" }
@@ -333,7 +333,7 @@ describe Fog::Brightbox::Storage do
 
     it "raises an error" do
       assert_raises Fog::Brightbox::Storage::ManagementUrlUnknown do
-        service.create_temp_url(container, object, expiry_time, request_method, :scheme => "https")
+        service.create_temp_url(container, object, expiry_time, request_method, scheme: "https")
       end
     end
   end

data/spec/model_setup.rb

@@ -3,15 +3,15 @@ module ModelSetup
     base.class_eval do
       let(:configuration) do
         {
-          :brightbox_auth_url => "http://localhost",
-          :brightbox_api_url => "http://localhost",
-          :brightbox_client_id => "",
-          :brightbox_secret => "",
-          :brightbox_username => "",
-          :brightbox_password => "",
-          :brightbox_account => "",
-          :brightbox_default_image => "img-test",
-          :brightbox_access_token => "FAKECACHEDTOKEN"
+          brightbox_auth_url: "http://localhost",
+          brightbox_api_url: "http://localhost",
+          brightbox_client_id: "",
+          brightbox_secret: "",
+          brightbox_username: "",
+          brightbox_password: "",
+          brightbox_account: "",
+          brightbox_default_image: "img-test",
+          brightbox_access_token: "FAKECACHEDTOKEN"
         }
       end
 

data/spec/stock_storage_responses.rb

@@ -1,9 +1,9 @@
 module StockStorageResponses
   def authorized_response
     {
-      :status => 200,
-      :body => "Authenticated",
-      :headers => {
+      status: 200,
+      body: "Authenticated",
+      headers: {
         "X-Storage-Url" => "https://orbit.brightbox.com/v1/acc-12345",
         "X-Storage-Token" => "abcdefghijklmnopqrstuvwxyz1234567890",
         "X-Auth-Token" => "abcdefghijklmnopqrstuvwxyz1234567890",
@@ -14,9 +14,9 @@ module StockStorageResponses
 
   def unauthorized_response
     {
-      :status => 401,
-      :body => "<html><h1>Unauthorized</h1><p>This server could not verify that you are authorized to access the document you requested.</p></html>",
-      :headers => {
+      status: 401,
+      body: "<html><h1>Unauthorized</h1><p>This server could not verify that you are authorized to access the document you requested.</p></html>",
+      headers: {
         "Content-Length" => 131,
         "Content-Type" => "text/html; charset=UTF-8"
       }
@@ -25,9 +25,9 @@ module StockStorageResponses
 
   def bad_url_response
     {
-      :status => 412,
-      :body => "Bad URL",
-      :headers => {
+      status: 412,
+      body: "Bad URL",
+      headers: {
         "Content-Length" => 7,
         "Content-Type" => "text/html; charset=UTF-8"
       }

data/spec/supports_resource_locking.rb

@@ -16,9 +16,9 @@ module SupportsResourceLocking
       def test_lock_makes_request
         subject.id = "tst-12345"
 
-        stub_request(:put, "http://localhost/1.0/#{collection_name}/tst-12345/lock_resource").
-          with(:query => hash_including(:account_id)).
-          to_return(:status => 200, :body => "{}", :headers => {})
+        stub_request(:put, "http://localhost/1.0/#{collection_name}/tst-12345/lock_resource")
+          .with(query: hash_including(:account_id))
+          .to_return(status: 200, body: "{}", headers: {})
 
         subject.lock!
       end
@@ -30,9 +30,9 @@ module SupportsResourceLocking
       def test_unlock_makes_request
         subject.id = "tst-12345"
 
-        stub_request(:put, "http://localhost/1.0/#{collection_name}/tst-12345/unlock_resource").
-          with(:query => hash_including(:account_id)).
-          to_return(:status => 200, :body => "{}", :headers => {})
+        stub_request(:put, "http://localhost/1.0/#{collection_name}/tst-12345/unlock_resource")
+          .with(query: hash_including(:account_id))
+          .to_return(status: 200, body: "{}", headers: {})
 
         subject.unlock!
       end