fog 1.12.1 → 1.13.0

data/lib/fog/rackspace/identity.rb

@@ -3,6 +3,7 @@ require 'fog/rackspace'
 module Fog
   module Rackspace
     class Identity < Fog::Service
+
       US_ENDPOINT = 'https://identity.api.rackspacecloud.com/v2.0'
       UK_ENDPOINT = 'https://lon.identity.api.rackspacecloud.com/v2.0'
 
@@ -33,7 +34,7 @@ module Fog
       request :update_user
       request :delete_user
 
-      class Mock
+      class Mock < Fog::Rackspace::Service
         attr_reader :service_catalog
         
         def request
@@ -41,7 +42,7 @@ module Fog
         end
       end
 
-      class Real
+      class Real < Fog::Rackspace::Service
         attr_reader :service_catalog, :auth_token
         
         def initialize(options={})
@@ -50,36 +51,19 @@ module Fog
           @rackspace_region = options[:rackspace_region]
           @rackspace_auth_url = options[:rackspace_auth_url] || US_ENDPOINT
 
-          uri = URI.parse(@rackspace_auth_url)
-          @host = uri.host
-          @path = uri.path
-          @port = uri.port
-          @scheme = uri.scheme
+          @uri = URI.parse(@rackspace_auth_url)
+          @host = @uri.host
+          @path = @uri.path
+          @port = @uri.port
+          @scheme = @uri.scheme
           @persistent = options[:persistent] || false
           @connection_options = options[:connection_options] || {}
-          @connection = Fog::Connection.new(uri.to_s, @persistent, @connection_options)
+          @connection = Fog::Connection.new(@uri.to_s, @persistent, @connection_options)
 
           authenticate
         end
         
-        def request(params)
-          begin
-            parameters = params.merge!({
-              :headers => {
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              },
-              :host => @host,
-              :path => "#{@path}/#{params[:path]}"
-            })
-            response = @connection.request(parameters)
-            response.body = Fog::JSON.decode(response.body) unless response.body.empty?
-            response
-          end
-        end
-        
-        def authenticate
+        def authenticate(options={})
           data = self.create_token(@rackspace_username, @rackspace_api_key).body
           @service_catalog = ServiceCatalog.from_response(self, data)
           @auth_token = data['access']['token']['id']

data/lib/fog/rackspace/load_balancers.rb

@@ -119,41 +119,25 @@ module Fog
           @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
         end
 
-        def request(params)
-          #TODO - Unify code with other rackspace services
-          begin
-            response = @connection.request(params.merge!({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => auth_token
-              }.merge!(params[:headers] || {}),
-              :host     => endpoint_uri.host,
-              :path     => "#{endpoint_uri.path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp(error, region)
-          rescue Excon::Errors::BadRequest => error
-            raise BadRequest.slurp error
-          rescue Excon::Errors::InternalServerError => error
-            raise InternalServerError.slurp error
-          rescue Excon::Errors::HTTPStatusError => error
-            raise ServiceError.slurp error
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
+        def request(params, parse_json = true, &block)
+          super(params, parse_json, &block)
+        rescue Excon::Errors::NotFound => error
+          raise NotFound.slurp(error, region)
+        rescue Excon::Errors::BadRequest => error
+          raise BadRequest.slurp error
+        rescue Excon::Errors::InternalServerError => error
+          raise InternalServerError.slurp error
+        rescue Excon::Errors::HTTPStatusError => error
+          raise ServiceError.slurp error
         end
 
-        def authenticate
-          options = {
+        def authenticate(options={})
+          super({
             :rackspace_api_key => @rackspace_api_key,
             :rackspace_username => @rackspace_username,
             :rackspace_auth_url => @rackspace_auth_url,
             :connection_options => @connection_options
-          }
-          super(options)
+          })
         end
 
         def service_name

data/lib/fog/rackspace/mock_data.rb

@@ -14,7 +14,7 @@ module Fog
             network_id = Fog::Rackspace::MockData.uuid
 
             flavor = {
-              "OS-FLV-DISABLED:disabled" => false,
+              "OS-FLV-EXT-DATA:ephemeral" => 4,
               "disk"  => 20,
               "id"    => flavor_id,
               "links" => [
@@ -89,8 +89,8 @@ module Fog
             }
 
             #Block Storage
-            volume_type1_id = Fog::Mock.random_numbers(3).to_i
-            volume_type2_id = Fog::Mock.random_numbers(3).to_i
+            volume_type1_id = Fog::Mock.random_numbers(3).to_s
+            volume_type2_id = Fog::Mock.random_numbers(3).to_s
 
             volume_type1 = {
               "id" => volume_type1_id,

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

@@ -65,7 +65,7 @@ module Fog
           true
         end
 
-        def save
+        def save(options = {})
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :flavor_id, :image_id
           options = {

data/lib/fog/rackspace/models/dns/zones.rb

@@ -6,6 +6,8 @@ module Fog
     class Rackspace
       class Zones < Fog::Collection
 
+        attribute :total_entries, :aliases => "totalEntries"
+
         model Fog::DNS::Rackspace::Zone
 
         # List all domains. Return by default a maximum of 100 items
@@ -15,32 +17,27 @@ module Fog
         # @option options [Integer] :offset starting offset of records to return
         def all(options={})
           clear
-          data = service.list_domains(options).body['domains']
-          load(data)
+          body = service.list_domains(options).body
+          merge_attributes(body)
+
+          load(body['domains'])
         end
         
         alias :each_zone_this_page :each
         def each
-          if !block_given?
-            self
-          else
-            body = service.list_domains.body
-            subset = dup.all
-
-            subset.each_zone_this_page {|f| yield f}
-            if body.has_key?('links')
-              while !body['links'].select{|l| l['rel'] == 'next'}.empty?
-                url = body['links'].select{|l| l['rel'] == 'next'}.first['href']
-                query = url.match(/\?(.+)/)
-                parsed = CGI.parse($1)
-                
-                body = service.list_domains(:offset => parsed['offset'], :limit => parsed['limit']).body
-                subset = dup.all(:offset => parsed['offset'], :limit => parsed['limit'])
-                subset.each_zone_this_page {|f| yield f}
-              end
-            end
-            self
+          return self unless block_given?
+
+          params = { :limit => 100} # prime loop (100 Records is default page size for Rackspace Cloud)
+          while params
+            body = service.list_domains(params).body
+            subset = dup.load(body["domains"])
+            self.merge_attributes(body)
+
+            params = next_params(body)
+
+            subset.each_zone_this_page {|zone| yield zone}
           end
+          self
         end
 
         def get(zone_id)
@@ -56,7 +53,23 @@ module Fog
         rescue Fog::Rackspace::Errors::ServiceUnavailable
           nil
         end
+
+        private
+        def next_params(body)
+          # return if we don't have any links
+          return nil unless body && body['links']
+
+          #return if links don't contain a href for the next page
+          next_link = body['links'].find {|h| h['rel'] == 'next'}
+          return nil unless next_link && next_link['href']
+
+          url = next_link['href']
+          uri = URI.parse url
+          return nil unless uri.query
+          CGI.parse uri.query
+        end
       end
+
     end
   end
 end

data/lib/fog/rackspace/models/identity/users.rb

@@ -18,7 +18,7 @@ module Fog
           new(data)
         rescue Excon::Errors::NotFound
           nil
-        rescue Excon::Errors::NotAuthorized
+        rescue Excon::Errors::Unauthorized
           nil
         end
 
@@ -27,7 +27,7 @@ module Fog
           new(data)
         rescue Excon::Errors::NotFound
           nil
-        rescue Excon::Errors::NotAuthorized
+        rescue Excon::Errors::Unauthorized
           nil
         end
       end

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

@@ -227,6 +227,7 @@ module Fog
           options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin
           options['Origin'] = origin if origin
           options['Content-Disposition'] = content_disposition if content_disposition
+          options['Etag'] = etag if etag
           options.merge!(metadata.to_headers)
 
           data = service.put_object(directory.key, key, body, options)

data/lib/fog/rackspace/requests/dns/list_domains.rb

@@ -5,8 +5,8 @@ module Fog
         def list_domains(options={})
 
           path = 'domains'
-          if !options.empty?
-            path = path + '?' + array_to_query_string(options)
+          unless options.empty?
+            path += "?#{array_to_query_string(options)}"
           end
 
           request(

data/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb

@@ -0,0 +1,75 @@
+module Fog
+  module Storage
+    class Rackspace
+      class Real
+
+        # Deletes multiple objects or containers with a single request.
+        #
+        # To delete objects from a single container, +container+ may be provided
+        # and +object_names+ should be an Array of object names within the container.
+        #
+        # To delete objects from multiple containers or delete containers,
+        # +container+ should be +nil+ and all +object_names+ should be prefixed with a container name.
+        #
+        # Containers must be empty when deleted. +object_names+ are processed in the order given,
+        # so objects within a container should be listed first to empty the container.
+        #
+        # Up to 10,000 objects may be deleted in a single request.
+        # The server will respond with +200 OK+ for all requests.
+        # +response.body+ must be inspected for actual results.
+        #
+        # @example Delete objects from a container
+        #   object_names = ['object', 'another/object']
+        #   conn.delete_multiple_objects('my_container', object_names)
+        #
+        # @example Delete objects from multiple containers
+        #   object_names = ['container_a/object', 'container_b/object']
+        #   conn.delete_multiple_objects(nil, object_names)
+        #
+        # @example Delete a container and all it's objects
+        #   object_names = ['my_container/object_a', 'my_container/object_b', 'my_container']
+        #   conn.delete_multiple_objects(nil, object_names)
+        #
+        # @param container [String,nil] Name of container.
+        # @param object_names [Array<String>] Object names to be deleted.
+        # @param options [Hash] Additional request headers.
+        #
+        # @return [Excon::Response]
+        #   * body [Hash] - Results of the operation.
+        #     * "Number Not Found" [Integer] - Number of missing objects or containers.
+        #     * "Response Status" [String] - Response code for the subrequest of the last failed operation.
+        #     * "Errors" [Array<object_name, response_status>]
+        #       * object_name [String] - Object that generated an error when the delete was attempted.
+        #       * response_status [String] - Response status from the subrequest for object_name.
+        #     * "Number Deleted" [Integer] - Number of objects or containers deleted.
+        #     * "Response Body" [String] - Response body for "Response Status".
+        #
+        # @raise [Fog::Storage::Rackspace::NotFound] HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @raise [Excon::Errors::Unauthorized] HTTP 401
+        #
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Bulk_Delete-d1e2338.html
+        def delete_multiple_objects(container, object_names, options = {})
+          body = object_names.map do |name|
+            object_name = container ? "#{ container }/#{ name }" : name
+            URI.encode(object_name)
+          end.join("\n")
+
+          response = request({
+            :expects  => 200,
+            :method   => 'DELETE',
+            :headers  => options.merge('Content-Type' => 'text/plain',
+                                       'Accept' => 'application/json'),
+            :body     => body,
+            :query    => { 'bulk-delete' => true }
+          }, false)
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/storage/delete_static_large_object.rb

@@ -0,0 +1,50 @@
+module Fog
+  module Storage
+    class Rackspace
+      class Real
+
+        # Delete a static large object.
+        #
+        # Deletes the SLO manifest +object+ and all segments that it references.
+        # The server will respond with +200 OK+ for all requests.
+        # +response.body+ must be inspected for actual results.
+        #
+        # @param container [String] Name of container.
+        # @param object [String] Name of the SLO manifest object.
+        # @param options [Hash] Additional request headers.
+        #
+        # @return [Excon::Response]
+        #   * body [Hash] - Results of the operation.
+        #     * "Number Not Found" [Integer] - Number of missing segments.
+        #     * "Response Status" [String] - Response code for the subrequest of the last failed operation.
+        #     * "Errors" [Array<object_name, response_status>]
+        #       * object_name [String] - Object that generated an error when the delete was attempted.
+        #       * response_status [String] - Response status from the subrequest for object_name.
+        #     * "Number Deleted" [Integer] - Number of segments deleted.
+        #     * "Response Body" [String] - Response body for Response Status.
+        #
+        # @raise [Fog::Storage::Rackspace::NotFound] HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @raise [Excon::Errors::Unauthorized] HTTP 401
+        #
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Deleting_a_Large_Object-d1e2228.html
+        def delete_static_large_object(container, object, options = {})
+          response = request({
+            :expects  => 200,
+            :method   => 'DELETE',
+            :headers  => options.merge('Content-Type' => 'text/plain',
+                                       'Accept' => 'application/json'),
+            :path     => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}",
+            :query    => { 'multipart-manifest' => 'delete' }
+          }, false)
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/rackspace/requests/storage/get_object.rb

@@ -23,7 +23,9 @@ module Fog
             :expects  => 200,
             :method   => 'GET',
             :path     => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
-          }), false)
+          }),
+          false,
+          &block)
         end
 
       end

data/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Storage
+    class Rackspace
+      class Real
+
+        # Create a new dynamic large object manifest
+        #
+        # Creates an object with a +X-Object-Manifest+ header that specifies the common prefix ("<container>/<prefix>")
+        # for all uploaded segments. Retrieving the manifest object streams all segments matching this prefix.
+        # Segments must sort in the order they should be concatenated. Note that any future objects stored in the container
+        # along with the segments that match the prefix will be included when retrieving the manifest object.
+        #
+        # All segments must be stored in the same container, but may be in a different container than the manifest object.
+        # The default +X-Object-Manifest+ header is set to "+container+/+object+", but may be overridden in +options+
+        # to specify the prefix and/or the container where segments were stored.
+        # If overridden, names should be CGI escaped (excluding spaces) if needed (see {Fog::Rackspace.escape}).
+        #
+        # @param container [String] Name for container where +object+ will be stored. Should be < 256 bytes and must not contain '/'
+        # @param object [String] Name for manifest object.
+        # @param options [Hash] Config headers for +object+.
+        # @option options [String] 'X-Object-Manifest' ("container/object") "<container>/<prefix>" for segment objects.
+        #
+        # @raise [Fog::Storage::Rackspace::NotFound] HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @raise [Excon::Errors::Unauthorized]
+        #
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Large_Object_Creation-d1e2019.html
+        def put_dynamic_obj_manifest(container, object, options = {})
+          path = "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"
+          headers = {'X-Object-Manifest' => path}.merge(options)
+          request(
+            :expects  => 201,
+            :headers  => headers,
+            :method   => 'PUT',
+            :path     => path
+          )
+        end
+
+      end
+    end
+  end
+end