fog-profitbricks 2.0.1 → 3.0.0

data/lib/fog/profitbricks/requests/compute/get_image.rb

@@ -42,22 +42,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-image]
         def get_image(image_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/images/#{image_id}?depth=5"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/images/#{image_id}?depth=5"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_image(image_id)
-          if img = self.data[:images]["items"].find {
-              |image| image["id"] == image_id
-          }
+          if img = data[:images]["items"].find do |image|
+            image["id"] == image_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Excon::Error::HTTPStatus, "The requested resource could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/get_ip_block.rb

@@ -29,22 +29,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-ip-block]
         def get_ip_block(ip_block_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/ipblocks/#{ip_block_id}?depth=5"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/ipblocks/#{ip_block_id}?depth=5"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_ip_block(ip_block_id)
-          if ip_block = self.data[:ip_blocks]['items'].find {
-              |ipb| ipb["id"] == ip_block_id
-          }
+          if ip_block = data[:ip_blocks]['items'].find do |ipb|
+            ipb["id"] == ip_block_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested IP Block could not be found")
+            raise Fog::Errors::NotFound, "The requested IP Block could not be found"
           end
 
           response        = Excon::Response.new
@@ -55,4 +53,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/profitbricks/requests/compute/get_lan.rb

@@ -90,23 +90,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-lan]
         def get_lan(datacenter_id, lan_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/datacenters/#{datacenter_id}/lans/#{lan_id}?depth=5"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/datacenters/#{datacenter_id}/lans/#{lan_id}?depth=5"
           )
-        rescue => error
-          puts error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_lan(datacenter_id, lan_id)
-          if lan = self.data[:lans]['items'].find {
-              |ln| ln["datacenter_id"] == datacenter_id && ln["id"] == lan_id
-          }
+          if lan = data[:lans]['items'].find do |ln|
+            ln["datacenter_id"] == datacenter_id && ln["id"] == lan_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested lan could not be found")
+            raise Fog::Errors::NotFound, "The requested lan could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/get_load_balanced_nic.rb

@@ -68,25 +68,29 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-load-balanced-nic]
         def get_load_balanced_nic(datacenter_id, load_balancer_id, nic_id)
           request(
-              :expects => [200],
-              :method  => 'GET',
-              :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics/#{nic_id}?depth=5"
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics/#{nic_id}?depth=5"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def get_load_balanced_nic(datacenter_id, load_balancer_id, nic_id)
-          if load_balancer = self.data[:load_balancers]['items'].find {
-              |lb| lb["datacenter_id"] == datacenter_id && lb["id"] == load_balancer_id
-          }
+        def get_load_balanced_nic(datacenter_id, load_balancer_id, _nic_id)
+          if load_balancer = data[:load_balancers]['items'].find do |lb|
+            lb["datacenter_id"] == datacenter_id && lb["id"] == load_balancer_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Fog::Errors::NotFound, "The requested resource could not be found"
           end
 
-          load_balanced_nic = load_balancer['entities'][:balancednics][0]
+          load_balanced_nic = nil
+
+          load_balanced_nic = if load_balancer['entities']
+                                load_balancer['entities']['balancednics']['items'][0]
+                              else
+                                load_balancer['balancednics']['items'][0]
+                              end
 
           response        = Excon::Response.new
           response.status = 200
@@ -96,4 +100,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/profitbricks/requests/compute/get_load_balancer.rb

@@ -87,22 +87,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-load-balancer]
         def get_load_balancer(datacenter_id, load_balancer_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}?depth=5"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}?depth=5"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_load_balancer(datacenter_id, load_balancer_id)
-          if load_balancer = self.data[:load_balancers]['items'].find {
-              |lb| lb["datacenter_id"] == datacenter_id && lb["id"] == load_balancer_id
-          }
+          if load_balancer = data[:load_balancers]['items'].find do |lb|
+            lb["datacenter_id"] == datacenter_id && lb["id"] == load_balancer_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Fog::Errors::NotFound, "The requested resource could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/get_location.rb

@@ -20,22 +20,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-location]
         def get_location(location_id)
           request(
-              :expects => [200],
-              :method  => 'GET',
-              :path    => "/locations/#{location_id}?depth=5"
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/locations/#{location_id}?depth=5"
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
         def get_location(location_id)
-          if loc = self.data[:locations]["items"].find {
-              |location| location["id"] == location_id
-          }
+          if loc = data[:locations]['items'].find do |lo|
+            lo["id"] == location_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Excon::Error::HTTPStatus, "The requested resource could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/get_nic.rb

@@ -68,23 +68,20 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-a-nic]
         def get_nic(datacenter_id, server_id, nic_id)
           request(
-              :expects => [200],
-              :method  => "GET",
-              :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}?depth=5"
+            :expects => [200],
+            :method  => "GET",
+            :path    => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}?depth=5"
           )
-        rescue => error
-          puts error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def get_nic(datacenter_id, server_id, nic_id)
-          if nic = self.data[:nics]['items'].find {
-              |nic| nic["id"] == nic_id
-          }
+        def get_nic(_datacenter_id, _server_id, nic_id)
+          if nic = data[:nics]['items'].find do |nic|
+            nic["id"] == nic_id
+          end
           else
-            raise Fog::Errors::NotFound.new("The requested resource could not be found")
+            raise Fog::Errors::NotFound, "The requested resource could not be found"
           end
 
           response        = Excon::Response.new

data/lib/fog/profitbricks/requests/compute/get_request.rb

@@ -1,61 +1,59 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Retrieves the attributes of a specific request
-                #
-                # ==== Parameters
-                # * request_id<~String>   - The requests's unique identifier
-                #
-                # ==== Returns
-                # * response<~Excon::Response>:
-                #   * body<~Hash>:
-                #     * id<~String> 		  - The resource's unique identifier
-                #     * type<~String>		  - The type of the resource
-                #     * href<~String>		  - URL to the object’s representation (absolute path)
-                #     * metadata<~Hash>   - A hash containing the resource's metadata
-                #       * createdDate<~String>  - The date the resource was created
-                #       * createdBy<~String>		- The user who created the resource
-                #       * etag<~String>				  - The etag for the resource
-                #       * requestStatus<~Hash>	- A hash containing the request status data
-                #         * id<~String>     - The resource's unique identifier
-                #         * type<~String>   - The type of the resource
-                #         * href<~String>   - URL to the object’s representation (absolute path)
-                #     * properties<~Hash> - A hash containing the resource's properties
-                #       * method<~String>   - The HTTP method used
-                #       * headers<~Hash>    - A hash containing the request headers
-                #         * connection<~String>
-                #         * host<~String>
-                #         * x-forwarded-for<~String>
-                #         * content-length<~String>
-                #         * x-reseller<~String>
-                #         * x-forwarded-host<~String>
-                #         * user-agent<~String>
-                #         * x-forwarded-server<~String>
-                #       * body<~String>   - The body of the request
-                #       * url<~String>    - The targeted URL of the request
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-request]
-                def get_request(request_id)
-                    request(
-                        :expects => [200],
-                        :method  => 'GET',
-                        :path    => "/requests/#{request_id}"
-                    )
-                rescue => error
-                  Fog::Errors::NotFound.new(error)
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        # Retrieves the attributes of a specific request
+        #
+        # ==== Parameters
+        # * request_id<~String>   - The requests's unique identifier
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * id<~String> 		  - The resource's unique identifier
+        #     * type<~String>		  - The type of the resource
+        #     * href<~String>		  - URL to the object’s representation (absolute path)
+        #     * metadata<~Hash>   - A hash containing the resource's metadata
+        #       * createdDate<~String>  - The date the resource was created
+        #       * createdBy<~String>		- The user who created the resource
+        #       * etag<~String>				  - The etag for the resource
+        #       * requestStatus<~Hash>	- A hash containing the request status data
+        #         * id<~String>     - The resource's unique identifier
+        #         * type<~String>   - The type of the resource
+        #         * href<~String>   - URL to the object’s representation (absolute path)
+        #     * properties<~Hash> - A hash containing the resource's properties
+        #       * method<~String>   - The HTTP method used
+        #       * headers<~Hash>    - A hash containing the request headers
+        #         * connection<~String>
+        #         * host<~String>
+        #         * x-forwarded-for<~String>
+        #         * content-length<~String>
+        #         * x-reseller<~String>
+        #         * x-forwarded-host<~String>
+        #         * user-agent<~String>
+        #         * x-forwarded-server<~String>
+        #       * body<~String>   - The body of the request
+        #       * url<~String>    - The targeted URL of the request
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-request]
+        def get_request(request_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/requests/#{request_id}"
+          )
+        end
+      end
 
-            class Mock
-              def get_request(request_id)
-                response        = Excon::Response.new
-                response.status = 200
-                response.body   = self.data[:requests]['items'][0]
+      class Mock
+        def get_request(_request_id)
+          response        = Excon::Response.new
+          response.status = 200
+          response.body   = data[:requests]['items'][0]
 
-                response
-                end
-            end
-        end
+          response
+          end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/requests/compute/get_request_status.rb

@@ -1,50 +1,48 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Retrieves the status of the request
-                #
-                # ==== Parameters
-                # * request_id<~String>   - The requests's unique identifier
-                #
-                # ==== Returns
-                # * response<~Excon::Response>:
-                #   * body<~Hash>:
-                #     * id<~String> 		  - The resource's unique identifier
-                #     * type<~String>		  - The type of the resource
-                #     * href<~String>		  - URL to the object’s representation (absolute path)
-                #     * metadata<~Hash>   - A hash containing the resource's metadata
-                #       * status<~String>     - The status of the entire request, e.g. RUNNING
-                #       * message<~String>    - The request message
-                #       * etag<~String>       - The etag for the resource
-                #       * targets<~Array>	    - The request status targets represented as a collection
-                #         * target<~Hash>   - A hash containing individual target attributes
-                #           * id<~String>     - The resource's unique identifier
-                #           * type<~String>   - The type of the resource
-                #           * href<~String>   - URL to the object’s representation (absolute path)
-                #         * status<~String> - Status of individual items within the request, e.g. DONE
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-request-status]
-                def get_request_status(request_id)
-                    request(
-                        :expects => [200],
-                        :method  => 'GET',
-                        :path    => "/requests/#{request_id}/status"
-                    )
-                rescue => error
-                  Fog::Errors::NotFound.new(error)
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        # Retrieves the status of the request
+        #
+        # ==== Parameters
+        # * request_id<~String>   - The requests's unique identifier
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * id<~String> 		  - The resource's unique identifier
+        #     * type<~String>		  - The type of the resource
+        #     * href<~String>		  - URL to the object’s representation (absolute path)
+        #     * metadata<~Hash>   - A hash containing the resource's metadata
+        #       * status<~String>     - The status of the entire request, e.g. RUNNING
+        #       * message<~String>    - The request message
+        #       * etag<~String>       - The etag for the resource
+        #       * targets<~Array>	    - The request status targets represented as a collection
+        #         * target<~Hash>   - A hash containing individual target attributes
+        #           * id<~String>     - The resource's unique identifier
+        #           * type<~String>   - The type of the resource
+        #           * href<~String>   - URL to the object’s representation (absolute path)
+        #         * status<~String> - Status of individual items within the request, e.g. DONE
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#get-request-status]
+        def get_request_status(request_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "/requests/#{request_id}/status"
+          )
+        end
+      end
 
-            class Mock
-              def get_request_status(request_id)
-                response        = Excon::Response.new
-                response.status = 200
-                response.body   = self.data[:request_status]
+      class Mock
+        def get_request_status(_request_id)
+          response        = Excon::Response.new
+          response.status = 200
+          response.body   = data[:request_status]
 
-                response
-                end
-            end
-        end
+          response
+          end
+      end
     end
-end
+  end
+end