fog-brightbox 1.10.0 → 1.11.0

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

@@ -14,10 +14,10 @@ module Fog
         #     * 'X-Container-Bytes-Used'<~String>   - Bytes used
         def head_container(container)
           request(
-            :expects  => 204,
-            :method   => "HEAD",
-            :path     => Fog::Brightbox::Storage.escape(container),
-            :query    => { "format" => "json" }
+            expects: 204,
+            method: "HEAD",
+            path: Fog::Brightbox::Storage.escape(container),
+            query: { "format" => "json" }
           )
         end
       end

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

@@ -11,10 +11,10 @@ module Fog
         #     * 'X-Account-Bytes-Used'<~String> - Bytes used
         def head_containers
           request(
-            :expects  => 204,
-            :method   => "HEAD",
-            :path     => "",
-            :query    => { "format" => "json" }
+            expects: 204,
+            method: "HEAD",
+            path: "",
+            query: { "format" => "json" }
           )
         end
       end

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

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

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

@@ -22,9 +22,9 @@ module Fog
         # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Set_Account_Metadata-d1a4460.html
         def post_set_meta_temp_url_key(key)
           request(
-            :expects  => [201, 202, 204],
-            :method   => "POST",
-            :headers  => { "X-Account-Meta-Temp-Url-Key" => key }
+            expects: [201, 202, 204],
+            method: "POST",
+            headers: { "X-Account-Meta-Temp-Url-Key" => key }
           )
         end
       end

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

@@ -13,10 +13,10 @@ module Fog
           headers["X-Container-Write"] ||= options.delete(:write_permissions)
 
           request(
-            :expects  => [201, 202],
-            :method   => "PUT",
-            :path     => Fog::Brightbox::Storage.escape(name),
-            :headers  => headers
+            expects: [201, 202],
+            method: "PUT",
+            path: Fog::Brightbox::Storage.escape(name),
+            headers: headers
           )
         end
       end

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

@@ -29,10 +29,10 @@ module Fog
           path = "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
           headers = { "X-Object-Manifest" => path }.merge(options)
           request(
-            :expects  => 201,
-            :headers  => headers,
-            :method   => "PUT",
-            :path     => path
+            expects: 201,
+            headers: headers,
+            method: "PUT",
+            path: path
           )
         end
       end

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

@@ -17,20 +17,20 @@ module Fog
         #
         def put_object(container, object, data, options = {}, &block)
           if block_given?
-            params = { :request_block => block }
+            params = { request_block: block }
             headers = options
           else
             data = Fog::Storage.parse_data(data)
             headers = data[:headers].merge!(options)
-            params = { :body => data[:body] }
+            params = { body: data[:body] }
           end
 
           params.merge!(
-            :expects    => 201,
-            :idempotent => !params[:request_block],
-            :headers    => headers,
-            :method     => "PUT",
-            :path       => "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
+            expects: 201,
+            idempotent: !params[:request_block],
+            headers: headers,
+            method: "PUT",
+            path: "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}"
           )
 
           request(params)

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

@@ -41,12 +41,12 @@ module Fog
         # @see http://docs.brightbox.org/api/brightbox-object-storage/1.0/content/static-large-objects.html
         def put_static_obj_manifest(container, object, segments, options = {})
           request(
-            :expects  => 201,
-            :method   => "PUT",
-            :headers  => options,
-            :body     => Fog::JSON.encode(segments),
-            :path     => "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}",
-            :query    => { "multipart-manifest" => "put" }
+            expects: 201,
+            method: "PUT",
+            headers: options,
+            body: Fog::JSON.encode(segments),
+            path: "#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object)}",
+            query: { "multipart-manifest" => "put" }
           )
         end
       end

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

@@ -25,10 +25,10 @@ module Fog
           authentication_url = URI.parse(@config.storage_url.to_s)
           connection = Fog::Core::Connection.new(authentication_url.to_s)
           request_settings = {
-            :expects => [200, 204],
-            :headers => auth_headers,
-            :method => "GET",
-            :path => "v1"
+            expects: [200, 204],
+            headers: auth_headers,
+            method: "GET",
+            path: "v1"
           }
           connection.request(request_settings)
         end

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

@@ -16,8 +16,8 @@ module Fog
           begin
             raise ArgumentError if params.nil?
             request_params = params.merge(
-              :headers => request_headers(params),
-              :path => path_in_params(params)
+              headers: request_headers(params),
+              path: path_in_params(params)
             )
             response = @connection.request(request_params)
           rescue Excon::Errors::Unauthorized => error

data/lib/fog/brightbox/storage.rb

@@ -44,17 +44,16 @@ module Fog
       request :put_static_obj_manifest
 
       class Mock
-        def initialize(_options = {})
-        end
+        def initialize(_options = {}); end
       end
 
       class Real
         def initialize(config)
-          if config.respond_to?(:config_service?) && config.config_service?
-            @config = config
-          else
-            @config = Fog::Brightbox::Config.new(config)
-          end
+          @config = if config.respond_to?(:config_service?) && config.config_service?
+                      config
+                    else
+                      Fog::Brightbox::Config.new(config)
+                    end
           @config = Fog::Brightbox::Storage::Config.new(@config)
 
           @temp_url_key = @config.storage_temp_key
@@ -152,9 +151,9 @@ module Fog
           raise ArgumentError, "Storage must be instantiated with the :brightbox_temp_url_key option" if @config.storage_temp_key.nil?
 
           # POST not allowed
-          allowed_methods = %w(GET PUT HEAD)
+          allowed_methods = %w[GET PUT HEAD]
           unless allowed_methods.include?(method)
-            raise ArgumentError.new("Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(", ")}")
+            raise ArgumentError, "Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(', ')}"
           end
 
           if management_url.nil?
@@ -168,7 +167,7 @@ module Fog
           destination_url.scheme = options[:scheme] if options[:scheme]
           destination_url.port = options[:port] if options[:port]
 
-          object_path_escaped = "#{object_path}/#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object, "/")}"
+          object_path_escaped = "#{object_path}/#{Fog::Brightbox::Storage.escape(container)}/#{Fog::Brightbox::Storage.escape(object, '/')}"
           object_path_unescaped = "#{object_path}/#{Fog::Brightbox::Storage.escape(container)}/#{object}"
 
           expiry_timestamp = expires_at.to_i
@@ -178,18 +177,18 @@ module Fog
           sig = sig_to_hex(hmac.sign(string_to_sign))
 
           destination_url.path = object_path_escaped
-          destination_url.query = URI.encode_www_form(:temp_url_sig => sig, :temp_url_expires => expiry_timestamp)
+          destination_url.query = URI.encode_www_form(temp_url_sig: sig, temp_url_expires: expiry_timestamp)
           destination_url.to_s
         end
 
         private
 
         def sig_to_hex(str)
-          str.unpack("C*").map { |c|
+          str.unpack("C*").map do |c|
             c.to_s(16)
-          }.map { |h|
+          end.map do |h|
             h.size == 1 ? "0#{h}" : h
-          }.join
+          end.join
         end
 
         def update_config_from_auth_response(response)

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "1.10.0"
+    VERSION = "1.11.0".freeze
   end
 end

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

@@ -4,8 +4,8 @@ describe Fog::Brightbox::Compute::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::Compute::Config.new(config)
@@ -16,7 +16,7 @@ describe Fog::Brightbox::Compute::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
@@ -28,7 +28,7 @@ describe Fog::Brightbox::Compute::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/compute/get_access_token_spec.rb

@@ -238,7 +238,7 @@ describe Fog::Brightbox::Compute, "#get_access_token" do
   # @param auth_correct [Boolean] Treat username/password as correct
   # @param two_factor_user [Boolean] Is user protected by 2FA on server
   # @param otp_sent [Boolean] Is an OTP sent in the request?
-  def stub_authentication_request(auth_correct:,
+  def stub_authentication_request(auth_correct: true,
                                   two_factor_user: false,
                                   otp_sent: nil)
 
@@ -247,7 +247,7 @@ describe Fog::Brightbox::Compute, "#get_access_token" do
     request = {
       headers: {
         "Authorization" => "Basic YXBwLTEyMzQ1OjEyMzQ1Njc4OTA=",
-        "Content-Type" => "application/json",
+        "Content-Type" => "application/json"
       },
       body: {
         grant_type: "password",
@@ -271,32 +271,32 @@ describe Fog::Brightbox::Compute, "#get_access_token" do
     # * User does use 2FA and FAILS to send OTP
     #
     response = if two_factor_user && !otp_sent
-      # OTP required header
-      {
-        status: 401,
-        headers: {
-          "X-Brightbox-OTP" => "required"
-        },
-        body: { error: "invalid_client" }.to_json
-      }
-    elsif !auth_correct
-      # No OTP header
-      {
-        status: 401,
-        headers: {},
-        body: { error: "invalid_client" }.to_json
-      }
-    else
-      {
-        status: 200,
-        headers: {},
-        body: {
-          access_token: @new_access_token,
-          refresh_token: @new_refresh_token,
-          expires_in: 7200
-        }.to_json
-      }
-    end
+                 # OTP required header
+                 {
+                   status: 401,
+                   headers: {
+                     "X-Brightbox-OTP" => "required"
+                   },
+                   body: { error: "invalid_client" }.to_json
+                 }
+               elsif !auth_correct
+                 # No OTP header
+                 {
+                   status: 401,
+                   headers: {},
+                   body: { error: "invalid_client" }.to_json
+                 }
+               else
+                 {
+                   status: 200,
+                   headers: {},
+                   body: {
+                     access_token: @new_access_token,
+                     refresh_token: @new_refresh_token,
+                     expires_in: 7200
+                   }.to_json
+                 }
+               end
 
     stub_request(:post, "https://api.gb1.brightbox.com/token")
       .with(request)

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

@@ -5,20 +5,20 @@ describe Fog::Brightbox::Compute do
     describe "when nested option passed as true" do
       before do
         @options = {
-          :brightbox_client_id => "cli-12345",
-          :brightbox_secret => "1234567890",
-          :brightbox_access_token => "TESTVALUE"
+          brightbox_client_id: "cli-12345",
+          brightbox_secret: "1234567890",
+          brightbox_access_token: "TESTVALUE"
         }
         @service = Fog::Brightbox::Compute.new(@options)
       end
 
       it "makes correct request" do
-        stub_request(:get, "https://api.gb1.brightbox.com/1.0/accounts").
-          with(:headers => {'Authorization'=>'Bearer TESTVALUE'},
-               :query => { :nested => "true" }).
-          to_return(:status => 200, :body => "", :headers => {})
+        stub_request(:get, "https://api.gb1.brightbox.com/1.0/accounts")
+          .with(headers: { "Authorization" => "Bearer TESTVALUE" },
+                query: { nested: "true" })
+          .to_return(status: 200, body: "", headers: {})
 
-        @service.wrapped_request("get", "/1.0/accounts", [200], :nested => "true")
+        @service.wrapped_request("get", "/1.0/accounts", [200], nested: "true")
         pass
       end
     end
@@ -26,20 +26,20 @@ describe Fog::Brightbox::Compute do
     describe "when nested option passed as false" do
       before do
         @options = {
-          :brightbox_client_id => "cli-12345",
-          :brightbox_secret => "1234567890",
-          :brightbox_access_token => "TESTVALUE"
+          brightbox_client_id: "cli-12345",
+          brightbox_secret: "1234567890",
+          brightbox_access_token: "TESTVALUE"
         }
         @service = Fog::Brightbox::Compute.new(@options)
       end
 
       it "makes correct request" do
-        stub_request(:get, "https://api.gb1.brightbox.com/1.0/accounts").
-          with(:headers => {'Authorization'=>'Bearer TESTVALUE'},
-               :query => { :nested => "false" }).
-          to_return(:status => 200, :body => "", :headers => {})
+        stub_request(:get, "https://api.gb1.brightbox.com/1.0/accounts")
+          .with(headers: { "Authorization" => "Bearer TESTVALUE" },
+                query: { nested: "false" })
+          .to_return(status: 200, body: "", headers: {})
 
-        @service.wrapped_request("get", "/1.0/accounts", [200], :nested => "false")
+        @service.wrapped_request("get", "/1.0/accounts", [200], nested: "false")
         pass
       end
     end
@@ -47,18 +47,18 @@ describe Fog::Brightbox::Compute do
     describe "when nested option not passed" do
       before do
         @options = {
-          :brightbox_client_id => "cli-12345",
-          :brightbox_secret => "1234567890",
-          :brightbox_access_token => "TESTVALUE"
+          brightbox_client_id: "cli-12345",
+          brightbox_secret: "1234567890",
+          brightbox_access_token: "TESTVALUE"
         }
         @service = Fog::Brightbox::Compute.new(@options)
       end
 
       it "makes correct request" do
-        stub_request(:get, "https://api.gb1.brightbox.com/1.0/accounts").
-          with(:headers => {'Authorization'=>'Bearer TESTVALUE'},
-               :query => {}).
-          to_return(:status => 200, :body => "", :headers => {})
+        stub_request(:get, "https://api.gb1.brightbox.com/1.0/accounts")
+          .with(headers: { "Authorization" => "Bearer TESTVALUE" },
+                query: {})
+          .to_return(status: 200, body: "", headers: {})
 
         @service.wrapped_request("get", "/1.0/accounts", [200])
         pass

data/spec/fog/brightbox/config_spec.rb

@@ -16,7 +16,7 @@ describe Fog::Brightbox::Config do
   describe "when created with a Hash" do
     it "does not error" do
       @options = {
-        :brightbox_client_id => "cli-12345"
+        brightbox_client_id: "cli-12345"
       }
       @config = Fog::Brightbox::Config.new(@options)
       assert_instance_of Fog::Brightbox::Config, @config
@@ -25,7 +25,7 @@ describe Fog::Brightbox::Config do
 
   describe "when auth url options was passed" do
     it "returns the setting" do
-      @options = { :brightbox_auth_url => "https://api.gb1.brightbox.com" }
+      @options = { brightbox_auth_url: "https://api.gb1.brightbox.com" }
       @config = Fog::Brightbox::Config.new(@options)
       assert_instance_of URI::HTTPS, @config.auth_url
     end
@@ -41,7 +41,7 @@ describe Fog::Brightbox::Config do
 
   describe "when compute url options was passed" do
     it "returns the setting" do
-      @options = { :brightbox_api_url => "https://api.gb1.brightbox.com" }
+      @options = { brightbox_api_url: "https://api.gb1.brightbox.com" }
       @config = Fog::Brightbox::Config.new(@options)
       assert_instance_of URI::HTTPS, @config.compute_url
       assert_equal @config.compute_url, @config.api_url
@@ -59,7 +59,7 @@ describe Fog::Brightbox::Config do
 
   describe "when client id is passed" do
     it "returns the settings" do
-      @options = { :brightbox_client_id => "cli-12345" }
+      @options = { brightbox_client_id: "cli-12345" }
       @config = Fog::Brightbox::Config.new(@options)
       assert_equal "cli-12345", @config.client_id
     end
@@ -67,7 +67,7 @@ describe Fog::Brightbox::Config do
 
   describe "when client secret is passed" do
     it "returns the settings" do
-      @options = { :brightbox_secret => "secret" }
+      @options = { brightbox_secret: "secret" }
       @config = Fog::Brightbox::Config.new(@options)
       assert_equal "secret", @config.client_secret
     end
@@ -75,7 +75,7 @@ describe Fog::Brightbox::Config do
 
   describe "when username is passed" do
     it "returns the settings" do
-      @options = { :brightbox_username => "usr-12345" }
+      @options = { brightbox_username: "usr-12345" }
       @config = Fog::Brightbox::Config.new(@options)
       assert_equal "usr-12345", @config.username
     end
@@ -83,7 +83,7 @@ describe Fog::Brightbox::Config do
 
   describe "when password is passed" do
     it "returns the settings" do
-      @options = { :brightbox_password => "password" }
+      @options = { brightbox_password: "password" }
       @config = Fog::Brightbox::Config.new(@options)
       assert_equal "password", @config.password
     end
@@ -91,7 +91,7 @@ describe Fog::Brightbox::Config do
 
   describe "when account is passed" do
     it "returns the settings" do
-      @options = { :brightbox_account => "acc-12345" }
+      @options = { brightbox_account: "acc-12345" }
       @config = Fog::Brightbox::Config.new(@options)
       assert_equal "acc-12345", @config.account
     end
@@ -99,7 +99,7 @@ describe Fog::Brightbox::Config do
 
   describe "when account was passed but changed" do
     it "returns the new account" do
-      @options = { :brightbox_account => "acc-12345" }
+      @options = { brightbox_account: "acc-12345" }
       @config = Fog::Brightbox::Config.new(@options)
       @config.change_account("acc-abcde")
       assert_equal "acc-abcde", @config.account
@@ -108,7 +108,7 @@ describe Fog::Brightbox::Config do
 
   describe "when account was passed, changed and reset" do
     it "returns the original account" do
-      @options = { :brightbox_account => "acc-12345" }
+      @options = { brightbox_account: "acc-12345" }
       @config = Fog::Brightbox::Config.new(@options)
       @config.change_account("acc-abcde")
       @config.reset_account
@@ -119,12 +119,12 @@ describe Fog::Brightbox::Config do
   describe "when connection options are passed" do
     it "returns the settings" do
       @connection_settings = {
-        :headers => {
+        headers: {
           "Content-Type" => "application/json"
         }
       }
       @options = {
-        :connection_options => @connection_settings
+        connection_options: @connection_settings
       }
       @config = Fog::Brightbox::Config.new(@options)
       assert_equal @connection_settings, @config.connection_options
@@ -140,7 +140,7 @@ describe Fog::Brightbox::Config do
 
   describe "when persistent connection is requested" do
     it "returns true for the setting" do
-      @options = { :persistent => true }
+      @options = { persistent: true }
       @config = Fog::Brightbox::Config.new(@options)
       assert @config.connection_persistent?
     end
@@ -158,8 +158,8 @@ describe Fog::Brightbox::Config do
       @access_token = "1234567890abcdefghijklmnopqrstuvwxyz"
       @refresh_token = "1234567890abcdefghijklmnopqrstuvwxyz"
       @options = {
-        :brightbox_access_token => @access_token,
-        :brightbox_refresh_token => @refresh_token
+        brightbox_access_token: @access_token,
+        brightbox_refresh_token: @refresh_token
       }
       @config = Fog::Brightbox::Config.new(@options)
     end
@@ -194,7 +194,7 @@ describe Fog::Brightbox::Config do
 
   describe "when token management setting is disabled" do
     it "returns false" do
-      @options = { :brightbox_token_management => false }
+      @options = { brightbox_token_management: false }
       @config = Fog::Brightbox::Config.new(@options)
       refute @config.managed_tokens?
     end
@@ -202,7 +202,7 @@ describe Fog::Brightbox::Config do
 
   describe "when a default server image is configured" do
     it "returns the configured setting" do
-      @options = { :brightbox_default_image => "img-12345" }
+      @options = { brightbox_default_image: "img-12345" }
       @config = Fog::Brightbox::Config.new(@options)
       assert_equal "img-12345", @config.default_image_id
     end
@@ -218,10 +218,10 @@ describe Fog::Brightbox::Config do
   describe "when username and password are given" do
     it "user_credentials? returns true" do
       @options = {
-        :brightbox_client_id => "app-12345",
-        :brightbox_secret => "12345",
-        :brightbox_username => "user@example.test",
-        :brightbox_password => "12345"
+        brightbox_client_id: "app-12345",
+        brightbox_secret: "12345",
+        brightbox_username: "user@example.test",
+        brightbox_password: "12345"
       }
       @config = Fog::Brightbox::Config.new(@options)
       assert @config.user_credentials?
@@ -231,8 +231,8 @@ describe Fog::Brightbox::Config do
   describe "when no username is given" do
     it "user_credentials? returns false" do
       @options = {
-        :brightbox_client_id => "cli-12345",
-        :brightbox_secret => "12345"
+        brightbox_client_id: "cli-12345",
+        brightbox_secret: "12345"
       }
       @config = Fog::Brightbox::Config.new(@options)
       refute @config.user_credentials?

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

@@ -8,11 +8,11 @@ describe Fog::Brightbox::OAuth2::ClientCredentialsStrategy do
     @strategy = Fog::Brightbox::OAuth2::ClientCredentialsStrategy.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/credential_set_spec.rb

@@ -35,7 +35,7 @@ describe Fog::Brightbox::OAuth2::CredentialSet do
 
   describe "when using user credentials" do
     before do
-      options = { :username => @username, :password => @password }
+      options = { username: @username, password: @password }
       @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret, options)
     end
 
@@ -59,10 +59,10 @@ describe Fog::Brightbox::OAuth2::CredentialSet do
   describe "when using refresh token" do
     before do
       options = {
-        :username => @username,
-        :access_token => @access_token,
-        :refresh_token => @refresh_token,
-        :expires_in => @expires_in
+        username: @username,
+        access_token: @access_token,
+        refresh_token: @refresh_token,
+        expires_in: @expires_in
       }
       @credentials = Fog::Brightbox::OAuth2::CredentialSet.new(@client_id, @client_secret, options)
     end