fog-brightbox 0.6.1 → 0.7.0

data/lib/fog/brightbox/requests/compute/update_image.rb

@@ -24,7 +24,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/images/#{identifier}", [200], options)
         end
-
       end
     end
   end

data/lib/fog/brightbox/requests/compute/update_load_balancer.rb

@@ -25,7 +25,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/load_balancers/#{identifier}", [202], options)
         end
-
       end
     end
   end

data/lib/fog/brightbox/requests/compute/update_scoped_account.rb

@@ -24,7 +24,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/account", [200], options)
         end
-
       end
     end
   end

data/lib/fog/brightbox/requests/compute/update_server.rb

@@ -20,7 +20,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/servers/#{identifier}", [200], options)
         end
-
       end
     end
   end

data/lib/fog/brightbox/requests/compute/update_server_group.rb

@@ -19,7 +19,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/server_groups/#{identifier}", [202], options)
         end
-
       end
     end
   end

data/lib/fog/brightbox/requests/compute/update_user.rb

@@ -22,7 +22,6 @@ module Fog
           return nil if options.empty? || options.nil?
           wrapped_request("put", "/1.0/users/#{identifier}", [200], options)
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Copy object
         #
         # ==== Parameters
@@ -11,16 +10,15 @@ module Fog
         # * target_container_name<~String> - Name of bucket to create copy in
         # * target_object_name<~String> - Name for new copy of object
         # * options<~Hash> - Additional headers
-        def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options={})
-          headers = { 'X-Copy-From' => "/#{source_container_name}/#{source_object_name}" }.merge(options)
-          request({
-            :expects  => 201,
-            :headers  => headers,
-            :method   => 'PUT',
-            :path     => "#{Fog::Storage::Brightbox.escape(target_container_name)}/#{Fog::Storage::Brightbox.escape(target_object_name)}"
-          })
+        def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options = {})
+          headers = { "X-Copy-From" => "/#{source_container_name}/#{source_object_name}" }.merge(options)
+          request(
+                    :expects  => 201,
+                    :headers  => headers,
+                    :method   => "PUT",
+                    :path     => "#{Fog::Storage::Brightbox.escape(target_container_name)}/#{Fog::Storage::Brightbox.escape(target_object_name)}"
+                  )
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Delete an existing container
         #
         # ==== Parameters
@@ -11,11 +10,10 @@ module Fog
         def delete_container(name)
           request(
             :expects  => 204,
-            :method   => 'DELETE',
+            :method   => "DELETE",
             :path     => Fog::Storage::Brightbox.escape(name)
           )
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Deletes multiple objects or containers with a single request.
         #
         # To delete objects from a single container, +container+ may be provided
@@ -50,17 +49,16 @@ module Fog
           end.join("\n")
 
           response = request({
-            :expects  => 200,
-            :method   => 'DELETE',
-            :headers  => options.merge('Content-Type' => 'text/plain',
-                                       'Accept' => 'application/json'),
-            :body     => body,
-            :query    => { 'bulk-delete' => true }
-          }, false)
+                               :expects  => 200,
+                               :method   => "DELETE",
+                               :headers  => options.merge("Content-Type" => "text/plain",
+                                                          "Accept" => "application/json"),
+                               :body     => body,
+                               :query    => { "bulk-delete" => true }
+                             }, false)
           response.body = Fog::JSON.decode(response.body)
           response
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Delete an existing object
         #
         # ==== Parameters
@@ -12,11 +11,10 @@ module Fog
         def delete_object(container, object)
           request(
             :expects  => 204,
-            :method   => 'DELETE',
+            :method   => "DELETE",
             :path     => "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}"
           )
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Delete a static large object.
         #
         # Deletes the SLO manifest +object+ and all segments that it references.
@@ -26,17 +25,16 @@ module Fog
         # @see http://docs.brightbox.org/api/brightbox-object-storage/1.0/content/static-large-objects.html
         def delete_static_large_object(container, object, options = {})
           response = request({
-            :expects  => 200,
-            :method   => 'DELETE',
-            :headers  => options.merge('Content-Type' => 'text/plain',
-                                       'Accept' => 'application/json'),
-            :path     => "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}",
-            :query    => { 'multipart-manifest' => 'delete' }
-          }, false)
+                               :expects  => 200,
+                               :method   => "DELETE",
+                               :headers  => options.merge("Content-Type" => "text/plain",
+                                                          "Accept" => "application/json"),
+                               :path     => "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}",
+                               :query    => { "multipart-manifest" => "delete" }
+                             }, false)
           response.body = Fog::JSON.decode(response.body)
           response
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Get details for container and total bytes stored
         #
         # ==== Parameters
@@ -29,15 +28,14 @@ module Fog
         #       * 'last_modified'<~String> - Last modified timestamp
         #       * 'name'<~String> - Name of object
         def get_container(container, options = {})
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
           request(
             :expects  => 200,
-            :method   => 'GET',
+            :method   => "GET",
             :path     => Fog::Storage::Brightbox.escape(container),
-            :query    => {'format' => 'json'}.merge!(options)
+            :query    => { "format" => "json" }.merge!(options)
           )
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # List existing storage containers
         #
         # ==== Parameters
@@ -18,15 +17,14 @@ module Fog
         #       * 'count'<~Integer>: - Number of items in container
         #       * 'name'<~String>: - Name of container
         def get_containers(options = {})
-          options = options.reject {|key, value| value.nil?}
+          options = options.reject { |_key, value| value.nil? }
           request(
             :expects  => [200, 204],
-            :method   => 'GET',
-            :path     => '',
-            :query    => {'format' => 'json'}.merge!(options)
+            :method   => "GET",
+            :path     => "",
+            :query    => { "format" => "json" }.merge!(options)
           )
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Get details for object
         #
         # ==== Parameters
@@ -12,7 +11,7 @@ module Fog
         def get_object(container, object, &block)
           params = {
             :expects  => 200,
-            :method   => 'GET',
+            :method   => "GET",
             :path     => "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}"
           }
 
@@ -22,7 +21,6 @@ module Fog
 
           request(params, false)
         end
-
       end
     end
   end

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

@@ -1,9 +1,7 @@
 module Fog
   module Storage
     class Brightbox
-
       class Real
-
         # Get an expiring object https url from Cloud Files
         #
         # ==== Parameters
@@ -35,24 +33,23 @@ module Fog
         # ==== See Also
         # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
         def create_temp_url(container, object, expires, method, options = {})
-          raise ArgumentError, "Insufficient parameters specified." unless (container && object && expires && method)
+          raise ArgumentError, "Insufficient parameters specified." unless container && object && expires && method
           raise ArgumentError, "Storage must be instantiated with the :brightbox_temp_url_key option" if @brightbox_temp_url_key.nil?
 
           scheme = options[:scheme] || @scheme
 
           # 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.new("Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(", ")}")
           end
 
-
           expires        = expires.to_i
-          object_path_escaped   = "#{@path}/#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object,"/")}"
+          object_path_escaped   = "#{@path}/#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object, "/")}"
           object_path_unescaped = "#{@path}/#{Fog::Storage::Brightbox.escape(container)}/#{object}"
           string_to_sign = "#{method}\n#{expires}\n#{object_path_unescaped}"
 
-          hmac = Fog::HMAC.new('sha1', @brightbox_temp_url_key)
+          hmac = Fog::HMAC.new("sha1", @brightbox_temp_url_key)
           sig  = sig_to_hex(hmac.sign(string_to_sign))
 
           temp_url_options = {
@@ -77,9 +74,7 @@ module Fog
             h.size == 1 ? "0#{h}" : h
           }.join
         end
-
       end
-
     end
   end
 end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # List number of objects and total bytes stored
         #
         # ==== Parameters
@@ -16,12 +15,11 @@ module Fog
         def head_container(container)
           request(
             :expects  => 204,
-            :method   => 'HEAD',
+            :method   => "HEAD",
             :path     => Fog::Storage::Brightbox.escape(container),
-            :query    => {'format' => 'json'}
+            :query    => { "format" => "json" }
           )
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # List number of containers and total bytes stored
         #
         # ==== Returns
@@ -13,12 +12,11 @@ module Fog
         def head_containers
           request(
             :expects  => 204,
-            :method   => 'HEAD',
-            :path     => '',
-            :query    => {'format' => 'json'}
+            :method   => "HEAD",
+            :path     => "",
+            :query    => { "format" => "json" }
           )
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Get headers for object
         #
         # ==== Parameters
@@ -11,12 +10,11 @@ module Fog
         #
         def head_object(container, object)
           request({
-            :expects  => 200,
-            :method   => 'HEAD',
-            :path     => "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}"
-          }, false)
+                    :expects  => 200,
+                    :method   => "HEAD",
+                    :path     => "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}"
+                  }, false)
         end
-
       end
     end
   end

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

@@ -1,9 +1,7 @@
 module Fog
   module Storage
     class Brightbox
-
       class Real
-
         # Set the account wide Temp URL Key. This is a secret key that's
         # used to generate signed expiring URLs.
         #
@@ -25,13 +23,11 @@ module Fog
         def post_set_meta_temp_url_key(key)
           request(
             :expects  => [201, 202, 204],
-            :method   => 'POST',
-            :headers  => {'X-Account-Meta-Temp-Url-Key' => key}
+            :method   => "POST",
+            :headers  => { "X-Account-Meta-Temp-Url-Key" => key }
           )
         end
-
       end
-
     end
   end
 end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Create a new container
         #
         # ==== Parameters
@@ -10,17 +9,16 @@ module Fog
         #
         def put_container(name, options = {})
           headers = options[:headers] || {}
-          headers['X-Container-Read'] ||= options.delete(:read_permissions)
-          headers['X-Container-Write'] ||= options.delete(:write_permissions)
+          headers["X-Container-Read"] ||= options.delete(:read_permissions)
+          headers["X-Container-Write"] ||= options.delete(:write_permissions)
 
           request(
             :expects  => [201, 202],
-            :method   => 'PUT',
+            :method   => "PUT",
             :path     => Fog::Storage::Brightbox.escape(name),
             :headers  => headers
           )
         end
-
       end
     end
   end