fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/rackspace/queues.rb

@@ -0,0 +1,117 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace'))
+
+module Fog
+  module Rackspace
+    class Queues < Fog::Service
+      include Fog::Rackspace::Errors
+
+      class ServiceError < Fog::Rackspace::Errors::ServiceError; end
+      class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
+      class BadRequest < Fog::Rackspace::Errors::BadRequest; end
+      class MethodNotAllowed < Fog::Rackspace::Errors::BadRequest; end
+
+      requires :rackspace_api_key, :rackspace_username
+      recognizes :rackspace_auth_url
+      recognizes :rackspace_auth_token
+      recognizes :rackspace_region
+      recognizes :rackspace_queues_url
+      recognizes :rackspace_queues_client_id
+
+
+      model_path 'fog/rackspace/models/queues'
+      model :queue
+      collection :queues
+      model :message
+      collection :messages
+      model :claim
+      collection :claims
+
+      request_path 'fog/rackspace/requests/queues'
+      request :list_queues
+      request :get_queue
+      request :create_queue
+      request :delete_queue
+      request :get_queue_stats
+
+      request :list_messages
+      request :get_message
+      request :create_message
+      request :delete_message
+      request :create_claim
+      request :get_claim
+      request :update_claim
+      request :delete_claim
+
+      class Mock < Fog::Rackspace::Service
+        def request(params)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real < Fog::Rackspace::Service
+
+        def service_name
+          :cloudQueues
+        end
+
+        def region
+          @rackspace_region
+        end
+
+        def initialize(options = {})
+          @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_username = options[:rackspace_username]
+          @rackspace_queues_client_id = options[:rackspace_queues_client_id] || Fog::UUID.uuid
+          @rackspace_auth_url = options[:rackspace_auth_url]
+          @rackspace_must_reauthenticate = false
+          @connection_options = options[:connection_options] || {}
+          @rackspace_region = options[:rackspace_region] || :ord
+
+          unless v2_authentication?
+            raise Fog::Errors::NotImplemented.new("V2 authentication required for Queues")
+          end
+
+          authenticate
+
+          @persistent = options[:persistent] || false
+          @connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
+        end
+
+        def request(params, parse_json = true, &block)
+          super(params, parse_json, &block)
+        rescue Excon::Errors::NotFound => error
+          raise NotFound.slurp(error, self)
+        rescue Excon::Errors::BadRequest => error
+          raise BadRequest.slurp(error, self)
+        rescue Excon::Errors::InternalServerError => error
+          raise InternalServerError.slurp(error, self)
+        rescue Excon::Errors::MethodNotAllowed => error
+          raise MethodNotAllowed.slurp(error, self)
+        rescue Excon::Errors::HTTPStatusError => error
+          raise ServiceError.slurp(error, self)
+        end
+
+        def endpoint_uri(service_endpoint_url=nil)
+          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_queues_url)
+        end
+
+        def authenticate(options={})
+          super({
+            :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_username => @rackspace_username,
+            :rackspace_auth_url => @rackspace_auth_url,
+            :connection_options => @connection_options
+          })
+        end
+
+        def client_id
+          @rackspace_queues_client_id
+        end
+
+        def client_id=(client_id)
+          @rackspace_queues_client_id = client_id
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/auto_scale/resume_group_state.rb

@@ -4,12 +4,11 @@ module Fog
       class Real
 
         def resume_group_state(group_id)
-          Fog::Real.not_implemented
-          # request(
-          #   :expects => [204],
-          #   :method => 'POST',
-          #   :path => 'groups/#{group_id}/resume'
-          # )
+          request(
+            :expects => [204],
+            :method => 'POST',
+            :path => "groups/#{group_id}/resume"
+          )
         end
       end
 

data/lib/fog/rackspace/requests/block_storage/create_volume.rb

@@ -77,7 +77,7 @@ module Fog
               "availability_zone"   => "nova",
               "metadata"            => {},
             }
-            if options[:snapshot_id]
+            if snapshot_id = options[:snapshot_id]
               snapshot = self.data[:snapshots][snapshot_id]
               volume.merge!("size" => snapshot["size"])
             end

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

@@ -10,7 +10,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Image-d1e4957.html        
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Delete_Image-d1e4957.html
         def delete_image(image_id)
           request(
             :expects  => 204,

data/lib/fog/rackspace/requests/compute_v2/list_metadata.rb

@@ -13,7 +13,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Metadata-d1e5089.html       
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Metadata-d1e5089.html
         def list_metadata(collection, obj_id)
           request(
             :expects => [200, 203],

data/lib/fog/rackspace/requests/compute_v2/list_servers.rb

@@ -36,7 +36,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html       
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Servers-d1e2078.html
         def list_servers
           request(
             :expects => [200, 203, 300],

data/lib/fog/rackspace/requests/compute_v2/resize_server.rb

@@ -11,7 +11,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize.                
+        # @note All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert the resize.
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Revert_Resized_Server-d1e4024.html
         #
         # * Status Transition:

data/lib/fog/rackspace/requests/compute_v2/set_metadata.rb

@@ -14,7 +14,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Replace_Metadata-d1e5358.html      
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Replace_Metadata-d1e5358.html
         def set_metadata(collection, obj_id, metadata = {})
           request(
             :expects => [200, 203],

data/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb

@@ -15,7 +15,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Update_a_Metadata_Item-d1e5633.html       
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Create_or_Update_a_Metadata_Item-d1e5633.html
         def set_metadata_item(collection, obj_id, key, value)
           request(
             :expects => 200,

data/lib/fog/rackspace/requests/compute_v2/update_metadata.rb

@@ -14,7 +14,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Update_Metadata-d1e5208.html              
+        # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Update_Metadata-d1e5208.html
         def update_metadata(collection, obj_id, metadata = {})
           request(
             :expects => [200, 203],

data/lib/fog/rackspace/requests/databases/create_database.rb

@@ -6,8 +6,8 @@ module Fog
           data = {
             'databases' => [{
               'name' => name,
-              'character_set' => options[:character_set],
-              'collate' => options[:collate]
+              'character_set' => options[:character_set] || 'utf8',
+              'collate' => options[:collate] || 'utf8_general_ci'
             }]
           }
 

data/lib/fog/rackspace/requests/databases/create_instance.rb

@@ -9,7 +9,9 @@ module Fog
               'flavorRef' => flavor_id,
               'volume' => {
                 'size' => volume_size
-              }
+              },
+              'databases' => [
+              ]
             }
           }
 

data/lib/fog/rackspace/requests/databases/create_user.rb

@@ -7,7 +7,7 @@ module Fog
             'users' => [{
               'name' => name,
               'password' => password,
-              'databases' => options[:databases]
+              'databases' => options[:databases] || []
             }]
           }
 

data/lib/fog/rackspace/requests/monitoring/get_monitoring_zone.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Monitoring
+      class Real
+        def get_monitoring_zone by_id
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "monitoring_zones/#{by_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/monitoring/list_monitoring_zones.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Monitoring
+      class Real
+        def list_monitoring_zones
+          request(
+            :expects  => [200],
+            :method   => 'GET',
+            :path     => "monitoring_zones"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/create_claim.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def create_claim(queue_name, ttl, grace, options = {})
+          body = {
+            :ttl => ttl,
+            :grace => grace
+          }
+
+          query = {}
+          query[:limit] = options[:limit] if options.has_key? :limit
+          request(
+            :body => Fog::JSON.encode(body),
+            :expects => [200, 201, 204],
+            :method => 'POST',
+            :path => "queues/#{queue_name}/claims",
+            :query => query
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/create_message.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def create_message(client_id, queue_name, body, ttl)
+          data = [{
+            :ttl => ttl,
+            :body => body
+          }]
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => 201,
+            :method => 'POST',
+            :path => "queues/#{queue_name}/messages",
+            :headers => { 'Client-ID' => client_id }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/create_queue.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def create_queue(queue_name)
+          request(
+            :body => Fog::JSON.encode({}),
+            :expects => 201,
+            :method => 'PUT',
+            :path => "queues/#{queue_name}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/delete_claim.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def delete_claim(queue_name, claim_id)
+          request(
+            :expects => 204,
+            :method => 'DELETE',
+            :path => "queues/#{queue_name}/claims/#{claim_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/delete_message.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def delete_message(queue_name, message_id, options = {})
+          query = {}
+          query[:claim_id] = options[:claim_id] if options.has_key? :claim_id
+          request(
+            :expects => 204,
+            :method => 'DELETE',
+            :path => "queues/#{queue_name}/messages/#{message_id}",
+            :query => query
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/delete_queue.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def delete_queue(queue_name)
+          request(
+            :expects => 204,
+            :method => 'DELETE',
+            :path => "queues/#{queue_name}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/get_claim.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def get_claim(queue_name, claim_id)
+          request(
+            :expects => 200,
+            :method => 'GET',
+            :path => "queues/#{queue_name}/claims/#{claim_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/get_message.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def get_message(client_id, queue_name, message_id)
+          request(
+            :expects => 200,
+            :method => 'GET',
+            :path => "queues/#{queue_name}/messages/#{message_id}",
+            :headers => { 'Client-ID' => client_id }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/get_queue.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def get_queue(queue_name)
+          request(
+            :expects => [200, 204],
+            :method => 'GET',
+            :path => "queues/#{queue_name}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/get_queue_stats.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def get_queue_stats(queue_name)
+          request(
+            :expects => 200,
+            :method => 'GET',
+            :path => "queues/#{queue_name}/stats"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/list_messages.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def list_messages(client_id, queue_name, options = {})
+          request(
+            :expects => [200, 204],
+            :method => 'GET',
+            :path => "queues/#{queue_name}/messages",
+            :headers => { 'Client-ID' => client_id },
+            :query => options
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/list_queues.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def list_queues
+          request(
+            :expects => [200, 204],
+            :method => 'GET',
+            :path => 'queues'
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/queues/update_claim.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Rackspace
+    class Queues
+      class Real
+        def update_claim(queue_name, claim_id, ttl)
+          body = {
+            :ttl => ttl
+          }
+          request(
+            :body => Fog::JSON.encode(body),
+            :expects => 204,
+            :method => 'PATCH',
+            :path => "queues/#{queue_name}/claims/#{claim_id}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Storage
+    class Rackspace
+
+      class Real
+
+        # Get an expiring object http url from Cloud Files
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container containing object
+        # * object<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        # @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]
+        # ==== See Also
+        # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
+        def get_object_http_url(container, object, expires, options = {})
+          get_object_https_url(container, object, expires, options.merge(:scheme => 'http'))
+        end
+      end
+
+    end
+  end
+end

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

@@ -34,7 +34,8 @@ module Fog
           hmac = Fog::HMAC.new('sha1', @rackspace_temp_url_key)
           sig  = sig_to_hex(hmac.sign(string_to_sign))
 
-          "https://#{@uri.host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
+          scheme = options[:scheme] ? options[:scheme] : @uri.scheme
+          "#{scheme}://#{@uri.host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
         end
 
         private

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

@@ -5,11 +5,16 @@ module Fog
 
         # Create a new object
         #
+        # When passed a block, it will make a chunked request, calling
+        # the block for chunks until it returns an empty string.
+        # In this case the data parameter is ignored.
+        #
         # ==== Parameters
         # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
         # * object<~String> - Name for object
         # * data<~String|File> - data to upload
-        # * options<~Hash> - config headers for object. Defaults to {}.
+        # * options<~Hash> - config headers for object. Defaults to #{}.
+        # * block<~Proc> - chunker
         # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
         # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
         # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500

data/lib/fog/rackspace/service.rb

@@ -52,6 +52,10 @@ module Fog
         response
       end
 
+      def service_net?
+        false
+      end
+
       private
 
       def process_response(response)
@@ -79,7 +83,6 @@ module Fog
       def request_params(params)
         params.merge({
           :headers  => headers(params),
-          :host     => endpoint_uri.host,
           :path     => "#{endpoint_uri.path}/#{params[:path]}"
         })
       end
@@ -119,7 +122,7 @@ module Fog
       end
 
       def endpoint_uri_v2
-        @uri = @identity_service.service_catalog.get_endpoint(service_name, region)
+        @uri = @identity_service.service_catalog.get_endpoint(service_name, region, service_net?)
       end
 
       def auth_token
@@ -128,7 +131,12 @@ module Fog
 
       def select_options(keys)
         return nil unless @options && keys
-        @options.select {|k,v| keys.include?(k)}
+        selected = {}
+        keys.each do |k|
+          selected[k] = @options[k]
+        end
+
+        selected
       end
 
     end

data/lib/fog/rackspace/storage.rb

@@ -31,6 +31,7 @@ module Fog
       request :get_containers
       request :get_object
       request :get_object_https_url
+      request :get_object_http_url
       request :head_container
       request :head_containers
       request :head_object
@@ -190,10 +191,7 @@ module Fog
 
         def endpoint_uri(service_endpoint_url=nil)
           return @uri if @uri
-
-          @uri = super(@rackspace_storage_url || service_endpoint_url, :rackspace_storage_url)
-          @uri.host = "snet-#{@uri.host}" if service_net?
-          @uri
+          super(@rackspace_storage_url || service_endpoint_url, :rackspace_storage_url)
         end
 
         private