Merge pull request #1547 from ehowe/master

[ecloud] Cleaning up bad code

lib/fog/ecloud/models/compute/detached_disks.rb

@@ -17,11 +17,7 @@ module Fog
 
         def get(uri)
           data = service.get_detached_disk(uri).body
-          if data == ""
+          new(data)
-            new({})
-          else
-            new(data)
-          end
         rescue Fog::Errors::NotFound
           nil
         end

lib/fog/ecloud/models/compute/internet_services.rb

@@ -20,11 +20,7 @@ module Fog
 
         def get(uri)
           data = service.get_internet_service(uri).body
-          if data == ""
+          new(data)
-            new({})
-          else
-            new(data)
-          end
         rescue Fog::Errors::NotFound
           nil
         end

lib/fog/ecloud/models/compute/nodes.rb

@@ -20,11 +20,7 @@ module Fog
 
         def get(uri)
           data = service.get_node(uri).body
-          if data == ""
+          new(data)
-            new({})
-          else
-            new(data)
-          end
         rescue Fog::Errors::NotFound
           nil
         end

lib/fog/ecloud/models/compute/public_ips.rb

@@ -17,11 +17,7 @@ module Fog
 
         def get(uri)
           data = service.get_public_ip(uri).body
-          if data == ""
+          new(data)
-            new({})
-          else
-            new(data)
-          end
         rescue Fog::Errors::NotFound
           nil
         end

lib/fog/ecloud/models/compute/servers.rb

@@ -23,12 +23,8 @@ module Fog
 
         def get(uri)
           data = service.get_server(uri).body
-          if data == ""
+          new(data)
-            new({})
+        rescue Fog::Errors::NotFound
-          else
-            new(data)
-          end
-        rescue Excon::Errors::NotFound
           nil
         end
 

lib/fog/ecloud/requests/compute/get_detached_disk.rb

@@ -12,7 +12,7 @@ module Fog
 
           if detached_disk
             response(:body => Fog::Ecloud.slice(detached_disk, :id, :compute_pool_id))
-          else response(:status => 404) # ?
+          else raise Fog::Errors::NotFound
           end
         end
       end

lib/fog/ecloud/requests/compute/get_internet_service.rb

@@ -14,7 +14,7 @@ module Fog
 
           if internet_service
             response(:body => Fog::Ecloud.slice(internet_service, :id, :public_ip))
-          else response(:status => 404) # ?
+          else raise Fog::Errors::NotFound
           end
         end
       end

lib/fog/ecloud/requests/compute/get_node.rb

@@ -13,7 +13,7 @@ module Fog
 
           if node_service
             response(:body => Fog::Ecloud.slice(node_service, :id, :internet_service_id))
-          else response(:status => 404) # ?
+          else raise Fog::Errors::NotFound
           end
         end
       end

lib/fog/ecloud/requests/compute/get_public_ip.rb

@@ -12,7 +12,7 @@ module Fog
 
           if public_ip
             response(:body => Fog::Ecloud.slice(public_ip, :id, :environment_id))
-          else response(:status => 404) # ?
+          else raise Fog::Errors::NotFound
           end
         end
       end

lib/fog/ecloud/requests/compute/get_server.rb

@@ -13,7 +13,7 @@ module Fog
           server = self.data[:servers][server_id]
           if server
             response(:body => Fog::Ecloud.slice(server, :id, :compute_pool_id))
-          else response(:status => 404) # ?
+          else raise Fog::Errors::NotFound
           end
         end
       end