fog 0.0.39 → 0.0.40

data/lib/fog/aws/models/ec2/volumes.rb

@@ -11,7 +11,7 @@ module Fog
       class Volumes < Fog::Collection
 
         attribute :volume_id
-        attribute :instance
+        attribute :server
 
         model Fog::AWS::EC2::Volume
 
@@ -31,8 +31,8 @@ module Fog
           data['volumeSet'].each do |volume|
             volumes << new(volume)
           end
-          if instance
-            volumes = volumes.select {|volume| volume.instance_id == instance.id}
+          if server
+            volumes = volumes.select {|volume| volume.instance_id == server.id}
           end
           self.replace(volumes)
         end
@@ -46,8 +46,8 @@ module Fog
         end
 
         def new(attributes = {})
-          if instance
-            super({ :instance => instance }.merge!(attributes))
+          if server
+            super({ :server => server }.merge!(attributes))
           else
             super
           end

data/lib/fog/aws/models/s3/{buckets.rb → directories.rb}

@@ -2,13 +2,13 @@ module Fog
   module AWS
     class S3
 
-      def buckets
-        Fog::AWS::S3::Buckets.new(:connection => self)
+      def directories
+        Fog::AWS::S3::Directories.new(:connection => self)
       end
 
-      class Buckets < Fog::Collection
+      class Directories < Fog::Collection
 
-        model Fog::AWS::S3::Bucket
+        model Fog::AWS::S3::Directory
 
         def all
           if @loaded
@@ -16,30 +16,33 @@ module Fog
           end
           @loaded = true
           data = connection.get_service.body
-          data['Buckets'].each do |bucket|
-            self << new(bucket)
+          data['Buckets'].each do |directory|
+            self << new(directory)
           end
           self
         end
 
         def get(name, options = {})
           remap_attributes(options, {
-            :max_keys     => 'max-keys',
+            :delimiter  => 'delimiter',
+            :marker     => 'marker',
+            :max_keys   => 'max-keys',
+            :prefix     => 'prefix'
           })
           data = connection.get_bucket(name, options).body
-          bucket = new(:name => data['Name'])
+          directory = new(:name => data['Name'])
           options = {}
           for key, value in data
             if ['Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(key)
               options[key] = value
             end
           end
-          bucket.objects.merge_attributes(options)
-          bucket.objects.instance_variable_set(:@loaded, true)
-          data['Contents'].each do |object|
-            bucket.objects << bucket.objects.new(object)
+          directory.files.merge_attributes(options)
+          directory.files.instance_variable_set(:@loaded, true)
+          data['Contents'].each do |file|
+            directory.files << directory.files.new(file)
           end
-          bucket
+          directory
         rescue Excon::Errors::NotFound
           nil
         end

data/lib/fog/aws/models/s3/{bucket.rb → directory.rb}

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class S3
 
-      class Bucket < Fog::Model
+      class Directory < Fog::Model
 
         identity  :name,          'Name'
 
@@ -10,7 +10,6 @@ module Fog
 
         def destroy
           requires :name
-
           connection.delete_bucket(@name)
           true
         rescue Excon::Errors::NotFound
@@ -19,7 +18,6 @@ module Fog
 
         def location
           requires :name
-
           data = connection.get_bucket_location(@name)
           data.body['LocationConstraint']
         end
@@ -28,10 +26,10 @@ module Fog
           @location = new_location
         end
 
-        def objects
-          @objects ||= begin
-            Fog::AWS::S3::Objects.new(
-              :bucket       => self,
+        def files
+          @files ||= begin
+            Fog::AWS::S3::Files.new(
+              :directory    => self,
               :connection   => connection
             )
           end
@@ -39,21 +37,18 @@ module Fog
 
         def payer
           requires :name
-
           data = connection.get_request_payment(@name)
           data.body['Payer']
         end
 
         def payer=(new_payer)
           requires :name
-
           connection.put_request_payment(@name, new_payer)
           @payer = new_payer
         end
 
         def save
           requires :name
-
           options = {}
           if @location
             options['LocationConstraint'] = @location

data/lib/fog/aws/models/s3/{object.rb → file.rb}

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class S3
 
-      class Object < Fog::Model
+      class File < Fog::Model
 
         identity  :key,             'Key'
 
@@ -15,30 +15,28 @@ module Fog
         attribute :size,            'Size'
         attribute :storage_class,   'StorageClass'
 
-        def bucket
-          @bucket
+        def directory
+          @directory
         end
 
-        def copy(target_bucket_name, target_object_key)
-          requires :bucket, :key
-
-          data = connection.copy_object(bucket.name, @key, target_bucket_name, target_object_key).body
-          target_bucket = connection.buckets.new(:name => target_bucket_name)
-          target_object = target_bucket.objects.new(attributes.merge!(:key => target_object_key))
+        def copy(target_directory_name, target_file_key)
+          requires :directory, :key
+          data = connection.copy_object(directory.name, @key, target_directory_name, target_file_key).body
+          target_directory = connection.directories.new(:name => target_directory_name)
+          target_file = target_directory.files.new(attributes.merge!(:key => target_file_key))
           copy_data = {}
           for key, value in data
             if ['ETag', 'LastModified'].include?(key)
               copy_data[key] = value
             end
           end
-          target_object.merge_attributes(copy_data)
-          target_object
+          target_file.merge_attributes(copy_data)
+          target_file
         end
 
         def destroy
-          requires :bucket, :key
-
-          connection.delete_object(bucket.name, @key)
+          requires :directory, :key
+          connection.delete_object(directory.name, @key)
           true
         end
 
@@ -52,16 +50,16 @@ module Fog
         end
 
         def save(options = {})
-          requires :body, :bucket, :key
-          data = connection.put_object(bucket.name, @key, @body, options)
+          requires :body, :directory, :key
+          data = connection.put_object(directory.name, @key, @body, options)
           @etag = data.headers['ETag']
           true
         end
 
         private
 
-        def bucket=(new_bucket)
-          @bucket = new_bucket
+        def directory=(new_directory)
+          @directory = new_directory
         end
 
       end

data/lib/fog/aws/models/s3/{objects.rb → files.rb}

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class S3
 
-      class Objects < Fog::Collection
+      class Files < Fog::Collection
 
         attribute :delimiter,     'Delimiter'
         attribute :is_truncated,  'IsTruncated'
@@ -10,7 +10,7 @@ module Fog
         attribute :max_keys,      'MaxKeys'
         attribute :prefix,        'Prefix'
 
-        model Fog::AWS::S3::Object
+        model Fog::AWS::S3::File
 
         def all(options = {})
           merge_attributes(options)
@@ -18,19 +18,19 @@ module Fog
             clear
           end
           @loaded = true
-          collection = bucket.collection.get(
-            bucket.name,
+          collection = directory.collection.get(
+            directory.name,
             options
           )
           if collection
-            self.replace(collection.objects)
+            self.replace(collection.files)
           else
             nil
           end
         end
 
-        def bucket
-          @bucket
+        def directory
+          @directory
         end
 
         def get(key, options = {}, &block)
@@ -40,48 +40,48 @@ module Fog
             'max-keys'    => @max_keys,
             'prefix'      => @prefix
           }.merge!(options)
-          data = connection.get_object(bucket.name, key, options, &block)
-          object_data = {
+          data = connection.get_object(directory.name, key, options, &block)
+          file_data = {
             :body => data.body,
             :key  => key
           }
           for key, value in data.headers
             if ['Content-Length', 'Content-Type', 'ETag', 'Last-Modified'].include?(key)
-              object_data[key] = value
+              file_data[key] = value
             end
           end
-          new(object_data)
+          new(file_data)
         rescue Excon::Errors::NotFound
           nil
         end
 
         def get_url(key, expires)
-          connection.get_object_url(bucket.name, key, expires)
+          connection.get_object_url(directory.name, key, expires)
         end
 
         def head(key, options = {})
-          data = connection.head_object(bucket.name, key, options)
-          object_data = {
+          data = connection.head_object(directory.name, key, options)
+          file_data = {
             :key => key
           }
           for key, value in data.headers
             if ['Content-Length', 'Content-Type', 'ETag', 'Last-Modified'].include?(key)
-              object_data[key] = value
+              file_data[key] = value
             end
           end
-          new(object_data)
+          new(file_data)
         rescue Excon::Errors::NotFound
           nil
         end
 
         def new(attributes = {})
-          super({ :bucket => bucket }.merge!(attributes))
+          super({ :directory => directory }.merge!(attributes))
         end
 
         private
 
-        def bucket=(new_bucket)
-          @bucket = new_bucket
+        def directory=(new_directory)
+          @directory = new_directory
         end
 
       end

data/lib/fog/aws/requests/ec2/run_instances.rb

@@ -23,7 +23,7 @@ unless Fog.mocking?
         #   * 'Encoding'<~String> - ?
         #   * 'groupId'<~String> - Name of security group for instances
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
-        #     in ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge']
+        #     in ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.2xlarge', 'm2.4xlarge']
         #     default is 'm1.small'
         #   * 'KernelId'<~String> - Id of kernel with which to launch
         #   * 'KeyName'<~String> - Name of a keypair to add to booting instances

data/lib/fog/aws/s3.rb

@@ -12,10 +12,10 @@ module Fog
       end
 
       def self.reload
-        load "fog/aws/models/s3/bucket.rb"
-        load "fog/aws/models/s3/buckets.rb"
-        load "fog/aws/models/s3/object.rb"
-        load "fog/aws/models/s3/objects.rb"
+        load "fog/aws/models/s3/directory.rb"
+        load "fog/aws/models/s3/directories.rb"
+        load "fog/aws/models/s3/file.rb"
+        load "fog/aws/models/s3/files.rb"
 
         load "fog/aws/parsers/s3/copy_object.rb"
         load "fog/aws/parsers/s3/get_bucket.rb"
@@ -80,12 +80,12 @@ module Fog
           metadata[:body] = data
           metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
         else
-          filename = File.basename(data.path)
+          filename = ::File.basename(data.path)
           unless (mime_types = MIME::Types.of(filename)).empty?
             metadata[:headers]['Content-Type'] = mime_types.first.content_type
           end
           metadata[:body] = data.read
-          metadata[:headers]['Content-Length'] = File.size(data.path).to_s
+          metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
         end
         # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
         metadata

data/lib/fog/rackspace/files.rb

@@ -26,7 +26,6 @@ module Fog
         @storage_path   = storage_uri.path
         @storage_port   = storage_uri.port
         @storage_scheme = storage_uri.scheme
-        @connection = Fog::Connection.new("#{@storage_scheme}://#{@storage_host}:#{@storage_port}")
       end
 
       def parse_data(data)
@@ -51,10 +50,12 @@ module Fog
       end
 
       def cdn_request(params)
-        response = @connection.request({
+        @cdn_connection = Fog::Connection.new("#{@cdn_scheme}://#{@cdn_host}:#{@cdn_port}")
+        response = @cdn_connection.request({
           :body     => params[:body],
           :expects  => params[:expects],
           :headers  => {
+            'Content-Type' => 'application/json',
             'X-Auth-Token' => @auth_token
           }.merge!(params[:headers] || {}),
           :host     => @cdn_host,
@@ -69,10 +70,12 @@ module Fog
       end
 
       def storage_request(params)
-        response = @connection.request({
+        @storage_connection = Fog::Connection.new("#{@storage_scheme}://#{@storage_host}:#{@storage_port}")
+        response = @storage_connection.request({
           :body     => params[:body],
           :expects  => params[:expects],
           :headers  => {
+            'Content-Type' => 'application/json',
             'X-Auth-Token' => @auth_token
           }.merge!(params[:headers] || {}),
           :host     => @storage_host,

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

@@ -6,11 +6,36 @@ module Fog
 
         identity :id
 
+        attribute :bits
+        attribute :cores
         attribute :disk
-        attribute :id
         attribute :name
         attribute :ram
 
+        def bits
+          64
+        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
+        end
+
       end
 
     end

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

@@ -7,8 +7,8 @@ module Fog
         identity :id
 
         attribute :name
-        attribute :created
-        attribute :updated
+        attribute :created_at,  'created'
+        attribute :updated_at,  'updated'
         attribute :status
         attribute :server_id,   'serverId'
 
@@ -28,7 +28,7 @@ module Fog
         def save
           requires :server_id
 
-          data = connection.create_server(@server_id)
+          data = connection.create_image(@server_id, 'name' => name)
           merge_attributes(data.body['image'])
           true
         end