fog 0.1.5 → 0.1.6

data/lib/fog/aws/requests/s3/get_bucket_object_versions.rb

@@ -53,11 +53,6 @@ module Fog
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
-          query = ''
-          for key, value in options
-            query << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
-          end
-          query.chop!
           request({
             :expects  => 200,
             :headers  => {},
@@ -65,7 +60,7 @@ module Fog
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::AWS::S3::GetBucketObjectVersions.new,
-            :query    => query
+            :query    => {'versions' => nil}.merge!(options)
           })
         end
 

data/lib/fog/aws/requests/s3/get_bucket_versioning.rb

@@ -25,7 +25,7 @@ module Fog
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::AWS::S3::GetBucketVersioning.new,
-            :query      => 'versioning'
+            :query      => {'versioning' => nil}
           })
         end
 

data/lib/fog/aws/requests/s3/get_object.rb

@@ -33,7 +33,7 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           if version_id = options.delete('versionId')
-            query = CGI.escape(version_id)
+            query = {'versionId' => version_id}
           end
           headers = {}
           headers['If-Modified-Since'] = options['If-Modified-Since'].utc.strftime("%a, %d %b %Y %H:%M:%S +0000") if options['If-Modified-Since']

data/lib/fog/aws/requests/s3/get_object_acl.rb

@@ -34,9 +34,9 @@ module Fog
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          query = 'acl'
+          query = {'acl' => nil}
           if version_id = options.delete('versionId')
-            query << "&#{CGI.escape(version_id)}"
+            query['versionId'] = version_id
           end
           request({
             :expects    => 200,

data/lib/fog/aws/requests/s3/get_object_torrent.rb

@@ -37,7 +37,7 @@ module Fog
             :idempotent => true,
             :method     => 'GET',
             :path       => CGI.escape(object_name),
-            :query      => 'torrent'
+            :query      => {'torrent' => nil}
           })
         end
 

data/lib/fog/aws/requests/s3/get_request_payment.rb

@@ -20,7 +20,7 @@ module Fog
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::AWS::S3::GetRequestPayment.new,
-            :query    => 'requestPayment'
+            :query    => {'requestPayment' => nil}
           })
         end
 

data/lib/fog/aws/requests/s3/head_object.rb

@@ -32,7 +32,7 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           if version_id = options.delete('versionId')
-            query = CGI.escape(version_id)
+            query = {'versionId' => version_id}
           end
           headers = {}
           headers['If-Modified-Since'] = options['If-Modified-Since'].utc.strftime("%a, %d %b %Y %H:%M:%S +0000") if options['If-Modified-Since']

data/lib/fog/aws/requests/s3/put_bucket_acl.rb

@@ -62,7 +62,7 @@ DATA
             :headers  => {},
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'PUT',
-            :query    => 'acl'
+            :query    => {'acl' => nil}
           })
         end
 

data/lib/fog/aws/requests/s3/put_bucket_logging.rb

@@ -69,7 +69,7 @@ DATA
             :headers  => {},
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'PUT',
-            :query    => 'logging'
+            :query    => {'logging' => nil}
           })
         end
 

data/lib/fog/aws/requests/s3/put_bucket_versioning.rb

@@ -22,7 +22,7 @@ DATA
             :headers  => {},
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'PUT',
-            :query    => 'versioning'
+            :query    => {'versioning' => nil}
           })
         end
 

data/lib/fog/aws/requests/s3/put_object_url.rb

@@ -0,0 +1,54 @@
+module Fog
+  module AWS
+    module S3
+      class Real
+
+        # Get an expiring object url from S3 for putting an object
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - Name of bucket containing object
+        # * object_name<~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
+        #
+        def put_object_url(bucket_name, object_name, expires)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          url({
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'PUT',
+            :path     => CGI.escape(object_name)
+          }, expires)
+        end
+
+      end
+
+      class Mock
+
+        def put_object_url(bucket_name, object_name, expires)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          url({
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'PUT',
+            :path     => CGI.escape(object_name)
+          }, expires)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/s3/put_request_payment.rb

@@ -21,7 +21,7 @@ DATA
             :headers  => {},
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'PUT',
-            :query    => "requestPayment"
+            :query    => {'requestPayment' => nil}
           })
         end
 

data/lib/fog/aws/s3.rb

@@ -39,6 +39,7 @@ module Fog
           require 'fog/aws/requests/s3/put_bucket_logging'
           require 'fog/aws/requests/s3/put_bucket_versioning'
           require 'fog/aws/requests/s3/put_object'
+          require 'fog/aws/requests/s3/put_object_url'
           require 'fog/aws/requests/s3/put_request_payment'
           @required = true
         end
@@ -207,9 +208,13 @@ DATA
             canonical_resource << "#{CGI.escape(subdomain).downcase}/"
           end
           canonical_resource << "#{params[:path]}"
-          if ['acl', 'location', 'logging', 'requestPayment', 'torrent', 'versioning'].include?(params[:query])
-            canonical_resource << "?#{params[:query]}"
+          canonical_resource << '?'
+          for key in params[:query].keys
+            if ['acl', 'location', 'logging', 'requestPayment', 'torrent', 'versions', 'versioning'].include?(key)
+              canonical_resource << "#{key}&"
+            end
           end
+          canonical_resource.chop!
           string_to_sign << "#{canonical_resource}"
 
           hmac = @hmac.update(string_to_sign)

data/lib/fog/bin.rb

@@ -5,7 +5,7 @@ module Fog
 
     def services
       services = []
-      [::AWS, ::Local, ::Rackspace, ::Slicehost, ::Terremark, ::Vcloud].each do |service|
+      [::AWS, ::Local, ::Rackspace, ::Slicehost, ::Terremark, ::Vcloud, ::Bluebox].each do |service|
         if service.initialized?
           services << service
         end

data/lib/fog/bluebox.rb

@@ -0,0 +1,100 @@
+module Fog
+  module Bluebox
+
+    class Error < Fog::Errors::Error; end
+    class NotFound < Fog::Errors::NotFound; end
+
+    def self.new(options={})
+
+      unless @required
+        require 'fog/bluebox/models/flavor'
+        require 'fog/bluebox/models/flavors'
+        require 'fog/bluebox/models/images'
+        require 'fog/bluebox/models/server'
+        require 'fog/bluebox/models/servers'
+        require 'fog/bluebox/requests/create_block'
+        require 'fog/bluebox/requests/destroy_block'
+        require 'fog/bluebox/requests/get_block'
+        require 'fog/bluebox/requests/get_blocks'
+        require 'fog/bluebox/requests/get_product'
+        require 'fog/bluebox/requests/get_products'
+        require 'fog/bluebox/requests/get_template'
+        require 'fog/bluebox/requests/get_templates'
+        require 'fog/bluebox/requests/reboot_block'
+        @required = true
+      end
+
+      unless options[:bluebox_api_key]
+        raise ArgumentError.new('bluebox_api_key is required to access Blue Box')
+      end
+      unless options[:bluebox_customer_id]
+        raise ArgumentError.new('bluebox_customer_id is required to access Blue Box')
+      end
+      if Fog.mocking?
+        Fog::Bluebox::Mock.new(options)
+      else
+        Fog::Bluebox::Real.new(options)
+      end
+    end
+
+    def self.reset_data(keys=Mock.data.keys)
+      Mock.reset_data(keys)
+    end
+
+    class Mock
+
+      def self.data
+        @data ||= Hash.new do |hash, key|
+          hash[key] = {}
+        end
+      end
+
+      def self.reset_data(keys=data.keys)
+        for key in [*keys]
+          data.delete(key)
+        end
+      end
+
+      def initialize(options={})
+        @bluebox_api_key = options[:bluebox_api_key]
+        @data = self.class.data[@bluebox_api_key]
+      end
+
+    end
+
+    class Real
+
+      def initialize(options={})
+        @bluebox_api_key      = options[:bluebox_api_key]
+        @bluebox_customer_id  = options[:bluebox_customer_id]
+        @host   = options[:bluebox_host]    || "boxpanel.blueboxgrp.com"
+        @port   = options[:bluebox_port]    || 443
+        @scheme = options[:bluebox_scheme]  || 'https'
+      end
+
+      def request(params)
+        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
+        params[:headers] ||= {}
+        params[:headers].merge!({
+          'Authorization' => "Basic #{Base64.encode64([@bluebox_customer_id, @bluebox_api_key].join(':')).delete("\r\n")}"
+        })
+
+        begin
+          response = @connection.request(params.merge!({:host => @host}))
+        rescue Excon::Errors::Error => error
+          case error
+          when Excon::Errors::NotFound
+            raise Fog::Bluebox::NotFound
+          else
+            raise error
+          end
+        end
+        unless response.body.empty?
+          response.body = JSON.parse(response.body)
+        end
+        response
+      end
+
+    end
+  end
+end

data/lib/fog/bluebox/bin.rb

@@ -0,0 +1,43 @@
+module Bluebox
+  class << self
+
+    if Fog.credentials[:bluebox_api_key]
+
+      def initialized?
+        true
+      end
+
+      def [](service)
+        @@connections ||= Hash.new do |hash, key|
+          credentials = Fog.credentials.reject do |k,v|
+            ![:bluebox_api_key, :bluebox_customer_id].include?(k)
+          end
+          hash[key] = case key
+          when :blocks
+            Fog::Bluebox.new(credentials)
+          end
+        end
+        @@connections[service]
+      end
+
+      def flavors
+        self[:blocks].flavors
+      end
+
+      def images
+        self[:blocks].images
+      end
+
+      def servers
+        self[:blocks].servers
+      end
+
+    else
+
+      def initialized?
+        false
+      end
+
+    end
+  end
+end

data/lib/fog/bluebox/models/flavor.rb

@@ -0,0 +1,43 @@
+require 'fog/model'
+
+module Fog
+  module Bluebox
+
+    class Flavor < Fog::Model
+
+      identity :id
+
+      attribute :name
+      attribute :cost
+      attribute :description
+
+      def bits
+        # 64
+        raise StandardError.new("Figure me out!?!")
+      end
+
+      def cores
+        # # 2 quad-cores >= 2Ghz = 8 cores
+        # 8 * case ram
+        # when 256
+        #   1/64.0
+        # when 512
+        #   1/32.0
+        # when 1024
+        #   1/16.0
+        # when 2048
+        #   1/8.0
+        # when 4096
+        #   1/4.0
+        # when 8192
+        #   1/2.0
+        # when 15872
+        #   1
+        # end
+        raise StandardError.new("Figure me out!?!")
+      end
+
+    end
+
+  end
+end

data/lib/fog/bluebox/models/flavors.rb

@@ -0,0 +1,38 @@
+require 'fog/collection'
+require 'fog/bluebox/models/flavor'
+
+module Fog
+  module Bluebox
+
+    class Mock
+      def flavors
+        Fog::Bluebox::Flavors.new(:connection => self)
+      end
+    end
+
+    class Real
+      def flavors
+        Fog::Bluebox::Flavors.new(:connection => self)
+      end
+    end
+
+    class Flavors < Fog::Collection
+
+      model Fog::Bluebox::Flavor
+
+      def all
+        data = connection.get_products.body
+        load(data)
+      end
+
+      def get(product_id)
+        response = connection.get_product(product_id)
+        new(response.body)
+      rescue Fog::Bluebox::NotFound
+        nil
+      end
+
+    end
+
+  end
+end

data/lib/fog/bluebox/models/image.rb

@@ -0,0 +1,17 @@
+require 'fog/model'
+
+module Fog
+  module Bluebox
+
+    class Image < Fog::Model
+
+      identity :id
+
+      attribute :description
+      attribute :public
+      attribute :created_at, 'created'
+
+    end
+
+  end
+end