fog 0.0.58 → 0.0.59

data/lib/fog/rackspace/requests/files/put_object.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Files
+module Fog
+  module Rackspace
+    module Files
+      class Real
 
         # Create a new object
         #
@@ -10,7 +9,7 @@ unless Fog.mocking?
         # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
         #
         def put_object(container, object, data)
-          data = parse_data(data)
+          data = Fog::Rackspace::Files.parse_data(data)
           response = storage_request(
             :body     => data[:body],
             :expects  => 201,
@@ -22,14 +21,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def put_object(container, object, data)
           raise MockNotImplemented.new("Contributions welcome!")
@@ -38,5 +31,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/create_image.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # Create an image from a running server
         #
@@ -34,14 +33,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def create_image(server_id, options = {})
           response = Excon::Response.new
@@ -57,8 +50,8 @@ else
             'updated'   => now,
           }
 
-          Fog::Rackspace::Servers.data[:last_modified][:images][data['id']] = now
-          Fog::Rackspace::Servers.data[:images][data['id']] = data
+          @data[:last_modified][:images][data['id']] = now
+          @data[:images][data['id']] = data
           response.body = { 'image' => data.reject {|key, value| !['id', 'name', 'serverId'].include?(key)} }
           response
         end
@@ -66,5 +59,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/create_server.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # Create a new server
         #
@@ -65,14 +64,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def create_server(flavor_id, image_id, name, options = {})
           response = Excon::Response.new
@@ -90,8 +83,8 @@ else
             'status'    => 'BUILD'
           }
           data['adminPass'] = "#{data['name']}password"
-          Fog::Rackspace::Servers.data[:last_modified][:servers][data['id']] = Time.now
-          Fog::Rackspace::Servers.data[:servers][data['id']] = data
+          @data[:last_modified][:servers][data['id']] = Time.now
+          @data[:servers][data['id']] = data
           response.body = { 'server' => data }
           response
         end
@@ -99,5 +92,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/delete_image.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # Delete an image
         #
@@ -18,14 +17,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def delete_image(image_id)
           response = Excon::Response.new
@@ -34,8 +27,8 @@ else
               response.status = 409
               raise(Excon::Errors.status_error({:expects => 202}, response))
             else
-              Fog::Rackspace::Servers.data[:last_modified][:images].delete(image_id)
-              Fog::Rackspace::Servers.data[:images].delete(image_id)
+              @data[:last_modified][:images].delete(image_id)
+              @data[:images].delete(image_id)
               response.status = 202
             end
           else
@@ -48,5 +41,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/delete_server.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # Delete an existing server
         #
@@ -18,14 +17,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def delete_server(server_id)
           response = Excon::Response.new
@@ -34,8 +27,8 @@ else
               response.status = 409
               raise(Excon::Errors.status_error({:expects => 202}, response))
             else
-              Fog::Rackspace::Servers.data[:last_modified][:servers].delete(server_id)
-              Fog::Rackspace::Servers.data[:servers].delete(server_id)
+              @data[:last_modified][:servers].delete(server_id)
+              @data[:servers].delete(server_id)
               response.status = 202
             end
           else
@@ -48,5 +41,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/get_flavor_details.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # Get details for flavor by id
         #
@@ -22,14 +21,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def get_flavor_details(flavor_id)
           raise MockNotImplemented.new("Contributions welcome!")
@@ -38,5 +31,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/get_server_details.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # Get details about a server
         #
@@ -33,14 +32,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def get_server_details(server_id)
           response = Excon::Response.new
@@ -57,5 +50,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/list_addresses.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # List all server addresses
         #
@@ -24,14 +23,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def list_addresses(server_id)
           response = Excon::Response.new
@@ -48,5 +41,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/list_flavors.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # List all flavors (IDs and names only)
         #
@@ -20,14 +19,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def list_flavors
           raise MockNotImplemented.new("Contributions welcome!")
@@ -36,5 +29,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/list_flavors_detail.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # List all flavors
         #
@@ -22,14 +21,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def list_flavors_detail
           raise MockNotImplemented.new("Contributions welcome!")
@@ -38,5 +31,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/list_images.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # List all images (IDs and names only)
         #
@@ -20,14 +19,8 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def list_images
           response = Excon::Response.new
@@ -44,5 +37,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/rackspace/requests/servers/list_images_detail.rb

@@ -1,8 +1,7 @@
-unless Fog.mocking?
-
-  module Fog
-    module Rackspace
-      class Servers
+module Fog
+  module Rackspace
+    module Servers
+      class Real
 
         # List all images
         #
@@ -23,23 +22,17 @@ unless Fog.mocking?
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module Rackspace
-      class Servers
+      class Mock
 
         def list_images_detail
           response = Excon::Response.new
 
-          images = Fog::Rackspace::Servers.data[:images].values
+          images = @data[:images].values
           for image in images
             case image['status']
             when 'SAVING'
-              if Time.now - Fog::Rackspace::Servers.data[:last_modified][:images][image['id']] > 2
+              if Time.now - @data[:last_modified][:images][image['id']] > 2
                 image['status'] = 'ACTIVE'
               end
             end
@@ -53,5 +46,4 @@ else
       end
     end
   end
-
 end