fog-brightbox 0.6.1 → 0.7.0

data/lib/fog/brightbox/models/compute/flavors.rb

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/flavor'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/flavor"
 
 module Fog
   module Compute
     class Brightbox
-
       class Flavors < Fog::Collection
-
         model Fog::Compute::Brightbox::Flavor
 
         def all
@@ -20,9 +18,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/compute/image.rb

@@ -5,7 +5,7 @@ module Fog
   module Compute
     class Brightbox
       class Image < Fog::Brightbox::Model
-        include ResourceLocking
+        include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
         attribute :url
@@ -40,7 +40,7 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
           requires :source, :arch
           options = {
             :source => source,
@@ -48,7 +48,7 @@ module Fog
             :name => name,
             :username => username,
             :description => description
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_image(options)
           merge_attributes(data)
           true

data/lib/fog/brightbox/models/compute/images.rb

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/image'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/image"
 
 module Fog
   module Compute
     class Brightbox
-
       class Images < Fog::Collection
-
         model Fog::Compute::Brightbox::Image
 
         def all
@@ -20,9 +18,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/compute/load_balancer.rb

@@ -5,7 +5,7 @@ module Fog
   module Compute
     class Brightbox
       class LoadBalancer < Fog::Brightbox::Model
-        include ResourceLocking
+        include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
         attribute :url
@@ -42,11 +42,11 @@ module Fog
         attribute :cloud_ip
 
         def ready?
-          status == 'active'
+          status == "active"
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
           requires :nodes, :listeners, :healthcheck
           options = {
             :nodes => nodes,
@@ -58,7 +58,7 @@ module Fog
             :certificate_pem => certificate_pem,
             :certificate_private_key => certificate_private_key,
             :sslv3 => ssl3?
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_load_balancer(options)
           merge_attributes(data)
           true
@@ -103,7 +103,7 @@ module Fog
         end
 
         def ssl3?
-          !! attributes[:certificate_enable_ssl3]
+          !!attributes[:certificate_enable_ssl3]
         end
 
         private

data/lib/fog/brightbox/models/compute/load_balancers.rb

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/load_balancer'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/load_balancer"
 
 module Fog
   module Compute
     class Brightbox
-
       class LoadBalancers < Fog::Collection
-
         model Fog::Compute::Brightbox::LoadBalancer
 
         def all
@@ -20,9 +18,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/compute/server.rb

@@ -6,14 +6,14 @@ module Fog
     class Brightbox
       class Server < Fog::Compute::Server
         include Fog::Brightbox::ModelHelper
-        include ResourceLocking
+        include Fog::Brightbox::Compute::ResourceLocking
 
-        identity  :id
+        identity :id
         attribute :resource_type
         attribute :url
 
         attribute :name
-        attribute :state,       :aliases => 'status'
+        attribute :state,       :aliases => "status"
 
         attribute :hostname
         attribute :fqdn
@@ -49,7 +49,7 @@ module Fog
           if t_zone_id = attributes[:zone_id]
             t_zone_id
           elsif zone
-            zone[:id] || zone['id']
+            zone[:id] || zone["id"]
           end
         end
 
@@ -57,7 +57,7 @@ module Fog
           if t_flavour_id = attributes[:flavor_id]
             t_flavour_id
           elsif server_type
-            server_type[:id] || server_type['id']
+            server_type[:id] || server_type["id"]
           end
         end
 
@@ -69,9 +69,15 @@ module Fog
           attributes[:flavor_id] = incoming_flavour_id
         end
 
-        def snapshot
+        def snapshot(return_snapshot = false)
           requires :identity
-          service.snapshot_server(identity)
+          response, snapshot_id = service.snapshot_server(identity, :return_link => return_snapshot)
+
+          if return_snapshot
+            service.images.get(snapshot_id)
+          else
+            response
+          end
         end
 
         # Issues a hard reset to the server (or an OS level reboot command)
@@ -170,7 +176,7 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
           requires :image_id
           options = {
             :image => image_id,
@@ -178,7 +184,7 @@ module Fog
             :zone => zone_id,
             :user_data => user_data,
             :server_groups => server_groups
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
 
           options.merge!(:server_type => flavor_id) unless flavor_id.nil? || flavor_id == ""
 

data/lib/fog/brightbox/models/compute/server_group.rb

@@ -22,7 +22,7 @@ module Fog
           options = {
             :name => name,
             :description => description
-          }.delete_if { |k, v| v.nil? || v == "" }
+          }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_server_group(options)
           merge_attributes(data)
           true

data/lib/fog/brightbox/models/compute/server_groups.rb

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/server_group'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/server_group"
 
 module Fog
   module Compute
     class Brightbox
-
       class ServerGroups < Fog::Collection
-
         model Fog::Compute::Brightbox::ServerGroup
 
         def all
@@ -21,9 +19,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/compute/servers.rb

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/server'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/server"
 
 module Fog
   module Compute
     class Brightbox
-
       class Servers < Fog::Collection
-
         model Fog::Compute::Brightbox::Server
 
         def all
@@ -53,9 +51,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/compute/user.rb

@@ -4,7 +4,6 @@ module Fog
   module Compute
     class Brightbox
       class User < Fog::Brightbox::Model
-
         identity :id
         attribute :resource_type
         attribute :url

data/lib/fog/brightbox/models/compute/user_collaboration.rb

@@ -4,7 +4,7 @@ module Fog
   module Compute
     class Brightbox
       class UserCollaboration < Fog::Brightbox::Model
-        identity  :id
+        identity :id
         attribute :status
         attribute :email
         attribute :role
@@ -14,7 +14,7 @@ module Fog
         attribute :inviter
 
         def account_id
-          account['id'] || account[:id]
+          account["id"] || account[:id]
         end
 
         def accept
@@ -37,7 +37,6 @@ module Fog
           merge_attributes(data)
           true
         end
-
       end
     end
   end

data/lib/fog/brightbox/models/compute/users.rb

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/user'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/user"
 
 module Fog
   module Compute
     class Brightbox
-
       class Users < Fog::Collection
-
         model Fog::Compute::Brightbox::User
 
         def all
@@ -21,7 +19,6 @@ module Fog
           nil
         end
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/compute/zones.rb

@@ -1,12 +1,10 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/compute/zone'
+require "fog/core/collection"
+require "fog/brightbox/models/compute/zone"
 
 module Fog
   module Compute
     class Brightbox
-
       class Zones < Fog::Collection
-
         model Fog::Compute::Brightbox::Zone
 
         def all
@@ -21,9 +19,7 @@ module Fog
         rescue Excon::Errors::NotFound
           nil
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/storage/directories.rb

@@ -1,18 +1,13 @@
-require 'fog/core/collection'
-require 'fog/brightbox/models/storage/directory'
+require "fog/core/collection"
+require "fog/brightbox/models/storage/directory"
 
 module Fog
   module Storage
     class Brightbox
-
       class Directories < Fog::Collection
-
         model Fog::Storage::Brightbox::Directory
 
-        HEADER_ATTRIBUTES = [
-          'X-Container-Bytes-Used', 'X-Container-Object-Count', 'X-Container-Read',
-          'X-Container-Write'
-        ]
+        HEADER_ATTRIBUTES = %w(X-Container-Bytes-Used X-Container-Object-Count X-Container-Read X-Container-Write)
 
         def all
           data = service.get_containers.body
@@ -22,9 +17,9 @@ module Fog
         def get(key, options = {})
           data = service.get_container(key, options)
           directory = new(:key => key)
-          for key, value in data.headers
-            if HEADER_ATTRIBUTES.include?(key)
-              directory.merge_attributes(key => value)
+          data.headers.each do |header, value|
+            if HEADER_ATTRIBUTES.include?(header)
+              directory.merge_attributes(header => value)
             end
           end
           directory.files.merge_attributes(options)
@@ -37,9 +32,7 @@ module Fog
         rescue Fog::Storage::Brightbox::NotFound
           nil
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/storage/directory.rb

@@ -5,7 +5,7 @@ module Fog
   module Storage
     class Brightbox
       class Directory < Fog::Model
-        identity  :key, :aliases => "name"
+        identity :key, :aliases => "name"
 
         attribute :bytes, :aliases => "X-Container-Bytes-Used"
         attribute :count, :aliases => "X-Container-Object-Count"
@@ -29,20 +29,18 @@ module Fog
           end
         end
 
-        def public=(new_public)
-          @public = new_public
-        end
+        attr_writer :public
 
         def public_url
-          #raise NotImplementedError
+          # raise NotImplementedError
           ""
         end
 
         def save
           requires :key
           options = {
-            'read_permissions' => read_permissions,
-            'write_permissions' => write_permissions
+            "read_permissions" => read_permissions,
+            "write_permissions" => write_permissions
           }
           service.put_container(key, options)
           true

data/lib/fog/brightbox/models/storage/file.rb

@@ -1,42 +1,38 @@
-require 'fog/core/model'
+require "fog/core/model"
 
 module Fog
   module Storage
     class Brightbox
-
       class File < Fog::Model
+        identity :key,             :aliases => "name"
 
-        identity  :key,             :aliases => 'name'
-
-        attribute :content_length,  :aliases => ['bytes', 'Content-Length'], :type => :integer
-        attribute :content_type,    :aliases => ['content_type', 'Content-Type']
-        attribute :content_disposition, :aliases => ['content_disposition', 'Content-Disposition']
-        attribute :etag,            :aliases => ['hash', 'Etag']
-        attribute :last_modified,   :aliases => ['last_modified', 'Last-Modified'], :type => :time
-        attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin']
-        attribute :origin,          :aliases => ['Origin']
+        attribute :content_length,  :aliases => %w(bytes Content-Length), :type => :integer
+        attribute :content_type,    :aliases => %w(content_type Content-Type)
+        attribute :content_disposition, :aliases => %w(content_disposition Content-Disposition)
+        attribute :etag,            :aliases => %w(hash Etag)
+        attribute :last_modified,   :aliases => %w(last_modified Last-Modified), :type => :time
+        attribute :access_control_allow_origin, :aliases => ["Access-Control-Allow-Origin"]
+        attribute :origin,          :aliases => ["Origin"]
 
         def body
           attributes[:body] ||= if last_modified
-            collection.get(identity).body
-          else
-            ''
-          end
+                                  collection.get(identity).body
+                                else
+                                  ""
+                                end
         end
 
         def body=(new_body)
           attributes[:body] = new_body
         end
 
-        def directory
-          @directory
-        end
+        attr_reader :directory
 
-        def copy(target_directory_key, target_file_key, options={})
+        def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
-          options['Content-Type'] ||= content_type if content_type
-          options['Access-Control-Allow-Origin'] ||= access_control_allow_origin if access_control_allow_origin
-          options['Origin'] ||= origin if origin
+          options["Content-Type"] ||= content_type if content_type
+          options["Access-Control-Allow-Origin"] ||= access_control_allow_origin if access_control_allow_origin
+          options["Origin"] ||= origin if origin
           service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
           target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
@@ -55,8 +51,8 @@ module Fog
         def owner=(new_owner)
           if new_owner
             attributes[:owner] = {
-              :display_name => new_owner['DisplayName'],
-              :id           => new_owner['ID']
+              :display_name => new_owner["DisplayName"],
+              :id           => new_owner["ID"]
             }
           end
         end
@@ -75,21 +71,20 @@ module Fog
         #
         def url(expires, options = {})
           requires :directory, :key
-          self.service.create_temp_url(directory.key, key, expires, "GET", options)
+          service.create_temp_url(directory.key, key, expires, "GET", options)
         end
 
         def public_url
           requires :key
-          self.collection.get_url(self.key)
+          collection.get_url(key)
         end
 
-
         def save(options = {})
           requires :body, :directory, :key
-          options['Content-Type'] = content_type if content_type
-          options['Content-Disposition'] = content_disposition if content_disposition
-          options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin
-          options['Origin'] = origin if origin
+          options["Content-Type"] = content_type if content_type
+          options["Content-Disposition"] = content_disposition if content_disposition
+          options["Access-Control-Allow-Origin"] = access_control_allow_origin if access_control_allow_origin
+          options["Origin"] = origin if origin
           options.merge!(metadata_to_headers)
 
           data = service.put_object(directory.key, key, body, options)
@@ -103,46 +98,44 @@ module Fog
 
         private
 
-        def directory=(new_directory)
-          @directory = new_directory
-        end
+        attr_writer :directory
 
         def refresh_metadata
-          metadata.reject! {|k, v| v.nil? }
+          metadata.reject! { |_k, v| v.nil? }
         end
 
         def headers_to_metadata
           key_map = key_mapping
-          Hash[metadata_attributes.map {|k, v| [key_map[k], v] }]
+          Hash[metadata_attributes.map { |k, v| [key_map[k], v] }]
         end
 
         def key_mapping
           key_map = metadata_attributes
-          key_map.each_pair {|k, v| key_map[k] = header_to_key(k)}
+          key_map.each_pair { |k, _v| key_map[k] = header_to_key(k) }
         end
 
         def header_to_key(opt)
-          opt.gsub(metadata_prefix, '').split('-').map {|k| k[0, 1].downcase + k[1..-1]}.join('_').to_sym
+          opt.gsub(metadata_prefix, "").split("-").map { |k| k[0, 1].downcase + k[1..-1] }.join("_").to_sym
         end
 
         def metadata_to_headers
           header_map = header_mapping
-          Hash[metadata.map {|k, v| [header_map[k], v] }]
+          Hash[metadata.map { |k, v| [header_map[k], v] }]
         end
 
         def header_mapping
           header_map = metadata.dup
-          header_map.each_pair {|k, v| header_map[k] = key_to_header(k)}
+          header_map.each_pair { |k, _v| header_map[k] = key_to_header(k) }
         end
 
         def key_to_header(key)
-          metadata_prefix + key.to_s.split(/[-_]/).map(&:capitalize).join('-')
+          metadata_prefix + key.to_s.split(/[-_]/).map(&:capitalize).join("-")
         end
 
         def metadata_attributes
           if last_modified
-            headers = service.head_object(directory.key, self.key).headers
-            headers.reject! {|k, v| !metadata_attribute?(k)}
+            headers = service.head_object(directory.key, key).headers
+            headers.reject! { |k, _v| !metadata_attribute?(k) }
           else
             {}
           end
@@ -157,10 +150,9 @@ module Fog
         end
 
         def update_attributes_from(data)
-          merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
+          merge_attributes(data.headers.reject { |key, _value| %w(Content-Length Content-Type).include?(key) })
         end
       end
-
     end
   end
 end