fog 0.0.29 → 0.0.30

data/lib/fog/rackspace/models/servers/server.rb

@@ -4,8 +4,9 @@ module Fog
 
       class Server < Fog::Model
 
+        identity :id
+
         attribute :admin_pass,  'adminPass'
-        attribute :id
         attribute :name
         attribute :image_id,    'imageId'
         attribute :flavor_id,   'flavorId'
@@ -21,11 +22,6 @@ module Fog
           true
         end
 
-        def reload
-          new_attributes = servers.get(@id).body['server']
-          merge_attributes(new_attributes)
-        end
-
         def save
           options = { 'metadata' => @metadata, 'name' => @name, 'personality' => @personality }
           options = options.reject {|key, value| value.nil?}
@@ -34,16 +30,6 @@ module Fog
           true
         end
 
-        def servers
-          @servers
-        end
-
-        private
-
-        def servers=(new_servers)
-          @servers = new_servers
-        end
-
       end
 
     end

data/lib/fog/rackspace/models/servers/servers.rb

@@ -8,43 +8,28 @@ module Fog
 
       class Servers < Fog::Collection
 
+        model Fog::Rackspace::Servers::Server
+
         def all
-          data = connection.list_servers_details.body
+          data = connection.list_servers_detail.body
           servers = Fog::Rackspace::Servers::Servers.new({
             :connection => connection
           })
           for server in data['servers']
             servers << Fog::Rackspace::Servers::Server.new({
-              :connection => connection,
-              :servers    => servers
+              :collection => servers,
+              :connection => connection
             }.merge!(server))
           end
           servers
         end
 
-        def create(attributes = {})
-          server = new(attributes)
-          server.save
-          server
-        end
-
         def get(id)
           connection.get_server_details(id)
-        rescue Fog::Errors::NotFound
+        rescue Excon::Errors::NotFound
           nil
         end
 
-        def new(attributes = {})
-          Fog::Rackspace::Servers::Server.new({
-            :connection => connection,
-            :servers    => self
-          }.merge!(attributes))
-        end
-
-        def reload
-          get(id)
-        end
-
       end
 
     end

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

@@ -0,0 +1,38 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Files
+
+        # Delete an existing container
+        #
+        # ==== Parameters
+        # * name<~String> - Name of container to delete
+        #
+        def delete_container(name)
+          response = storage_request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => CGI.escape(name)
+          )
+          response
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def delete_container
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,39 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Files
+
+        # Delete an existing container
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container to delete
+        # * object<~String> - Name of object to delete
+        #
+        def delete_object(container, object)
+          response = storage_request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"
+          )
+          response
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def delete_object
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,61 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Files
+
+        # List number of containers and total bytes stored
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container to retrieve info for
+        # * options<~String>:
+        #   * 'limit'<~String> - Maximum number of objects to return
+        #   * 'marker'<~String> - Only return objects whose name is greater than marker
+        #   * 'prefix'<~String> - Limits results to those starting with prefix
+        #   * 'path'<~String> - Return objects nested in the pseudo path
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * headers<~Hash>:
+        #     * 'X-Account-Container-Count'<~String> - Count of containers
+        #     * 'X-Account-Bytes-Used'<~String> - Bytes used
+        #   * body<~Array>:
+        #     * item<~Hash>:
+        #       * 'bytes'<~String> - Size of object
+        #       * 'content_type'<~String> Content-Type of object
+        #       * 'hash'<~String> - Hash of object (etag?)
+        #       * 'last_modified'<~String> - Last modified timestamp
+        #       * 'name'<~String> - Name of object
+        def get_container(container, options = {})
+          query = ''
+          for key, value in options.merge!({ 'format' => 'json' })
+            query << "#{key}=#{value}&"
+          end
+          query.chop!
+          response = storage_request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => container,
+            :query    => query
+          )
+          response
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def get_flavors
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -12,7 +12,7 @@ unless Fog.mocking?
         #   * 'marker'<~String> - Only return objects with name greater than this value
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Array>:
         #     * container<~Hash>:
         #       * 'bytes'<~Integer>: - Number of bytes used by container
@@ -20,19 +20,17 @@ unless Fog.mocking?
         #       * 'name'<~String>: - Name of container
         def get_containers(options = {})
           options = { 'format' => 'json' }.merge!(options)
-          query = []
+          query = ''
           for key, value in options
-            query << "#{key}=#{CGI.escape(value)}"
+            query << "#{key}=#{CGI.escape(value)}&"
           end
+          query.chop!
           response = storage_request(
             :expects  => [200, 204],
             :method   => 'GET',
             :path     => '',
-            :query    => query.join('&')
+            :query    => query
           )
-          if response.status == 204
-            response.body = []
-          end
           response
         end
 

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

@@ -0,0 +1,44 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Files
+
+        # List number of objects and total bytes stored
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container to retrieve info for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * headers<~Hash>:
+        #     * 'X-Container-Object-Count'<~String> - Count of containers
+        #     * 'X-Container-Bytes-Used'<~String>   - Bytes used
+        def head_container(container)
+          response = storage_request(
+            :expects  => 204,
+            :method   => 'HEAD',
+            :path     => container,
+            :query    => 'format=json'
+          )
+          response
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def get_flavors
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List number of containers and total bytes stored
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * headers<~Hash>:
         #     * 'X-Account-Container-Count'<~String> - Count of containers
         #     * 'X-Account-Bytes-Used'<~String> - Bytes used

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

@@ -0,0 +1,38 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Files
+
+        # Create a new container
+        #
+        # ==== Parameters
+        # * name<~String> - Name for container, should be < 256 bytes and must not contain '/'
+        #
+        def put_container(name)
+          response = storage_request(
+            :expects  => [201, 202],
+            :method   => 'PUT',
+            :path     => CGI.escape(name)
+          )
+          response
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def put_container
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,41 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Files
+
+        # Create a new object
+        #
+        # ==== Parameters
+        # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
+        #
+        def put_object(container, object, data)
+          data = parse_data(data)
+          response = storage_request(
+            :body     => data[:body],
+            :expects  => 201,
+            :headers  => data[:headers],
+            :method   => 'PUT',
+            :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"
+          )
+          response
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def put_container
+        end
+
+      end
+    end
+  end
+
+end

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

@@ -10,6 +10,12 @@ unless Fog.mocking?
         # * server_id<~Integer> - Id of server to create image from
         # * options<~Hash> - Name
         #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * 'image'<~Hash>:
+        #     * 'id'<~Integer> - Id of image
+        #     * 'name'<~String> - Name of image
+        #     * 'serverId'<~Integer> - Id of server
         def create_image(server_id, options = {})
           data = {
             'image' => {

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

@@ -19,7 +19,7 @@ unless Fog.mocking?
         #       * 'path'<~String> - Path to file (255 bytes total of path strings)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'server'<~Hash>:
         #     * 'addresses'<~Hash>:
@@ -74,7 +74,26 @@ else
     module Rackspace
       class Servers
 
-        def create_server
+        def create_server(flavor_id, image_id, options = {})
+          response = Fog::Response.new
+          response.status = 202
+
+          data = {
+            'addresses' => { 'private' => ['0.0.0.0'], 'public' => ['0.0.0.0'] },
+            'flavorId'  => flavor_id,
+            'id'        => 123456,
+            'imageId'   => image_id,
+            'hostId'    => "123456789ABCDEF01234567890ABCDEF",
+            'metadata'  => options[:metadata] || {},
+            'progress'  => 0,
+            'status'    => 'BUILD'
+          }
+          data['name'] = "slice#{data[:id]}"
+          data['adminPass'] = "#{data['name']}password"
+          Fog::Rackspace::Servers.data[:last_modified][data['id']] = Time.now
+          Fog::Rackspace::Servers.data[:servers][data['id']] = data
+          response.body = { 'server' => data }
+          response
         end
 
       end