fog-brightbox 0.6.1 → 0.7.0

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Create a new dynamic large object manifest
         #
         # Creates an object with a +X-Object-Manifest+ header that specifies the common prefix ("<container>/<prefix>")
@@ -28,15 +27,14 @@ module Fog
         # @see http://docs.brightbox.org/api/brightbox-object-storage/1.0/content/dynamic-large-object-creation.html
         def put_dynamic_obj_manifest(container, object, options = {})
           path = "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}"
-          headers = {'X-Object-Manifest' => path}.merge(options)
+          headers = { "X-Object-Manifest" => path }.merge(options)
           request(
             :expects  => 201,
             :headers  => headers,
-            :method   => 'PUT',
+            :method   => "PUT",
             :path     => path
           )
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Create a new object
         #
         # When passed a block, it will make a chunked request, calling
@@ -30,7 +29,7 @@ module Fog
             :expects    => 201,
             :idempotent => !params[:request_block],
             :headers    => headers,
-            :method     => 'PUT',
+            :method     => "PUT",
             :path       => "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}"
           )
 

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

@@ -2,14 +2,12 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Create a new dynamic large object manifest
         #
         # This is an alias for {#put_dynamic_obj_manifest} for backward compatibility.
         def put_object_manifest(container, object, options = {})
           put_dynamic_obj_manifest(container, object, options)
         end
-
       end
     end
   end

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

@@ -2,7 +2,6 @@ module Fog
   module Storage
     class Brightbox
       class Real
-
         # Create a new static large object manifest.
         #
         # A static large object is similar to a dynamic large object. Whereas a GET for a dynamic large object manifest
@@ -43,14 +42,13 @@ module Fog
         def put_static_obj_manifest(container, object, segments, options = {})
           request(
             :expects  => 201,
-            :method   => 'PUT',
+            :method   => "PUT",
             :headers  => options,
             :body     => Fog::JSON.encode(segments),
             :path     => "#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object)}",
-            :query    => { 'multipart-manifest' => 'put' }
+            :query    => { "multipart-manifest" => "put" }
           )
         end
-
       end
     end
   end

data/lib/fog/brightbox/storage.rb

@@ -7,19 +7,18 @@ require "fog/brightbox/storage/connection"
 module Fog
   module Storage
     class Brightbox < Fog::Service
-
-      requires   :brightbox_client_id,
-                 :brightbox_secret
+      requires :brightbox_client_id,
+               :brightbox_secret
       recognizes :persistent, :brightbox_service_name,
                  :brightbox_storage_url,
                  :brightbox_service_type, :brightbox_tenant,
                  :brightbox_region, :brightbox_temp_url_key
 
       model_path "fog/brightbox/models/storage"
-      model       :directory
-      collection  :directories
-      model       :file
-      collection  :files
+      model :directory
+      collection :directories
+      model :file
+      collection :files
 
       request_path "fog/brightbox/requests/storage"
       request :copy_object
@@ -43,7 +42,7 @@ module Fog
       request :put_static_obj_manifest
 
       class Mock
-        def initialize(options={})
+        def initialize(_options = {})
         end
       end
 
@@ -92,25 +91,23 @@ module Fog
         end
 
         def request(params, parse_json = true)
-          begin
-            authenticate if @config.must_authenticate?
-            connection.request(params, parse_json)
-          rescue Fog::Brightbox::Storage::AuthenticationRequired => error
-            if @config.managed_tokens?
-              @config.expire_tokens!
-              authenticate
-              retry
-            else # bad credentials
-              raise error
-            end
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Storage::Brightbox::NotFound.slurp(error)
-            else
-              error
-            end
+          authenticate if @config.must_authenticate?
+          connection.request(params, parse_json)
+        rescue Fog::Brightbox::Storage::AuthenticationRequired => error
+          if @config.managed_tokens?
+            @config.expire_tokens!
+            authenticate
+            retry
+          else # bad credentials
+            raise error
           end
+        rescue Excon::Errors::HTTPStatusError => error
+          raise case error
+                when Excon::Errors::NotFound
+                  Fog::Storage::Brightbox::NotFound.slurp(error)
+                else
+                  error
+                end
         end
 
         def authenticate
@@ -126,7 +123,7 @@ module Fog
           end
         end
 
-        # @param [URI] uri A URI object to extract the account from
+        # @param [URI] url A URI object to extract the account from
         # @return [String] The account
         def extract_account_from_url(url)
           url.path.split("/")[2]
@@ -156,9 +153,9 @@ module Fog
       end
 
       # CGI.escape, but without special treatment on spaces
-      def self.escape(str,extra_exclude_chars = "")
+      def self.escape(str, extra_exclude_chars = "")
         str.gsub(/([^a-zA-Z0-9_.-#{extra_exclude_chars}]+)/) do
-          "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
+          "%" + Regexp.last_match[1].unpack("H2" * Regexp.last_match[1].bytesize).join("%").upcase
         end
       end
     end

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

@@ -8,20 +8,20 @@ module Fog
         def initialize(config)
           @config = config
 
-          unless management_url
-            raise ManagementUrlUnknown
-          else
+          if management_url
             @connection = super(management_url.to_s, persistent?, connection_options)
+          else
+            raise ManagementUrlUnknown
           end
         end
 
         def request(params, parse_json = true)
           begin
             raise ArgumentError if params.nil?
-            request_params = params.merge({
-              :headers => request_headers(params),
-              :path => path_in_params(params)
-            })
+            request_params = params.merge(
+                                            :headers => request_headers(params),
+                                            :path => path_in_params(params)
+                                          )
             response = @connection.request(request_params)
           rescue Excon::Errors::Unauthorized => error
             raise AuthenticationRequired.slurp(error)
@@ -58,9 +58,9 @@ module Fog
         end
 
         def authenticated_headers
-          default_headers.merge({
-            "X-Auth-Token" => @config.latest_access_token
-          })
+          default_headers.merge(
+                                  "X-Auth-Token" => @config.latest_access_token
+                                )
         end
 
         def default_headers

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

data/spec/fog/brightbox/link_helper_spec.rb

@@ -0,0 +1,18 @@
+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"
+      @helper = Fog::Brightbox::LinkHelper.new(@header)
+    end
+
+    it "can return identifier" do
+      assert_equal "img-12345", @helper.identifier
+    end
+
+    it "can return URI" do
+      assert_kind_of URI, @helper.uri
+    end
+  end
+end

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

@@ -9,10 +9,10 @@ describe Fog::Brightbox::Storage::AuthenticationRequest 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)
+               "Host" => "orbit.brightbox.com:443",
+               "X-Auth-User" => "",
+               "X-Auth-Key" => ""
+             }).to_return(bad_url_response)
     end
 
     it "raises error" do
@@ -27,10 +27,10 @@ describe Fog::Brightbox::Storage::AuthenticationRequest 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)
+               "Host" => "orbit.brightbox.com:443",
+               "X-Auth-User" => "cli-12345",
+               "X-Auth-Key" => "12345"
+             }).to_return(authorized_response)
     end
 
     it "authenticates correctly" do
@@ -48,10 +48,10 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
     before do
       stub_request(:get, "https://orbit.brightbox.com/v1").
         with(:headers => {
-          "Host" => "orbit.brightbox.com:443",
-          "X-Auth-User" => "user@example.com",
-          "X-Auth-Key" => "abcde"
-      }).to_return(authorized_response)
+               "Host" => "orbit.brightbox.com:443",
+               "X-Auth-User" => "user@example.com",
+               "X-Auth-Key" => "abcde"
+             }).to_return(authorized_response)
     end
 
     it "authenticates correctly" do
@@ -71,10 +71,10 @@ describe Fog::Brightbox::Storage::AuthenticationRequest do
     before do
       stub_request(:get, "https://orbit.brightbox.com/v1").
         with(:headers => {
-          "Host" => "orbit.brightbox.com:443",
-          "X-Auth-User" => "user@example.com",
-          "X-Auth-Key" => "abcde"
-      }).to_return(unauthorized_response)
+               "Host" => "orbit.brightbox.com:443",
+               "X-Auth-User" => "user@example.com",
+               "X-Auth-Key" => "abcde"
+             }).to_return(unauthorized_response)
     end
 
     it "raises error" do

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

@@ -44,12 +44,12 @@ describe Fog::Brightbox::Storage::Connection do
     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"
-      })
+               "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
@@ -64,12 +64,12 @@ describe Fog::Brightbox::Storage::Connection 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"
-      })
+               "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

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

@@ -18,4 +18,35 @@ describe Fog::Compute::Brightbox::DatabaseServer do
       assert_equal "database_server", subject.resource_name
     end
   end
+
+  describe "when snapshotting withi 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?account_id=").
+        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        to_return(:status => 202, :body => %q({"id": "dbs-12345"}), :headers => {})
+
+      @database_server = Fog::Compute::Brightbox::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").
+        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        to_return(:status => 202, :body => "{}", :headers => { "Link" => link })
+
+      stub_request(:get, "http://localhost/1.0/database_snapshots/dbi-12345?account_id=").
+        with(:headers => { "Authorization" => "OAuth 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)
+    end
+  end
 end

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

@@ -18,4 +18,35 @@ describe Fog::Compute::Brightbox::Server do
       assert_equal "server", subject.resource_name
     end
   end
+
+  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?account_id=").
+        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        to_return(:status => 202, :body => %q({"id": "srv-12345"}), :headers => {})
+
+      @server = Fog::Compute::Brightbox::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").
+        with(:headers => { "Authorization" => "OAuth FAKECACHEDTOKEN" }).
+        to_return(:status => 202, :body => "{}", :headers => { "Link" => link })
+
+      stub_request(:get, "http://localhost/1.0/images/img-12345?account_id=").
+        with(:headers => { "Authorization" => "OAuth 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)
+    end
+  end
 end

data/spec/fog/storage/brightbox_spec.rb

@@ -150,7 +150,7 @@ describe Fog::Storage::Brightbox 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",
@@ -178,7 +178,7 @@ describe Fog::Storage::Brightbox do
 
   describe "when configured with expired tokens" do
     let(:settings) do
-       {
+      {
         :brightbox_client_id => "app-12345",
         :brightbox_secret => "12345",
         :brightbox_access_token => "1234567890abcdefghijklmnopqrstuvwxyz",
@@ -203,7 +203,7 @@ describe Fog::Storage::Brightbox 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.com",