fog 0.4.1 → 0.5.0

data/lib/fog/storage/local.rb

@@ -28,6 +28,7 @@ module Fog
         def initialize(options={})
           Fog::Mock.not_implemented
 
+          require 'mime/types'
           unless options.delete(:provider)
             location = caller.first
             warning = "[yellow][WARN] Fog::Local::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Local') instead[/]"
@@ -58,6 +59,7 @@ module Fog
             Formatador.display_line(warning)
           end
 
+          require 'mime/types'
           @local_root = ::File.expand_path(options[:local_root])
         end
 

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

@@ -15,7 +15,7 @@ module Fog
         attribute :cache_control,       :aliases => 'Cache-Control'
         attribute :content_disposition, :aliases => 'Content-Disposition'
         attribute :content_encoding,    :aliases => 'Content-Encoding'
-        attribute :content_length,      :aliases => ['Content-Length', 'Size']
+        attribute :content_length,      :aliases => ['Content-Length', 'Size'], :type => :integer
         attribute :content_md5,         :aliases => 'Content-MD5'
         attribute :content_type,        :aliases => 'Content-Type'
         attribute :etag,                :aliases => ['Etag', 'ETag']

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

@@ -14,7 +14,7 @@ module Fog
         attribute :cache_control,       :aliases => 'Cache-Control'
         attribute :content_disposition, :aliases => 'Content-Disposition'
         attribute :content_encoding,    :aliases => 'Content-Encoding'
-        attribute :content_length,      :aliases => ['Content-Length', 'Size']
+        attribute :content_length,      :aliases => ['Content-Length', 'Size'], :type => :integer
         attribute :content_md5,         :aliases => 'Content-MD5'
         attribute :content_type,        :aliases => 'Content-Type'
         attribute :etag,                :aliases => ['Etag', 'ETag']

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

@@ -8,7 +8,7 @@ module Fog
 
         identity  :key,             :aliases => 'Key'
 
-        attribute :content_length,  :aliases => 'Content-Length'
+        attribute :content_length,  :aliases => 'Content-Length', :type => :integer
         # attribute :content_type,    :aliases => 'Content-Type'
         attribute :last_modified,   :aliases => 'Last-Modified'
 
@@ -24,6 +24,14 @@ module Fog
           attributes[:body] = new_body
         end
 
+        def content_type
+          @content_type ||= begin
+            unless (mime_types = ::MIME::Types.of(key)).empty?
+              mime_types.first.content_type
+            end
+          end
+        end
+
         def directory
           @directory
         end

data/lib/fog/storage/requests/aws/put_bucket.rb

@@ -44,13 +44,13 @@ DATA
       class Mock # :nodoc:all
 
         def put_bucket(bucket_name, options = {})
-          if options['x-amz-acl']
-            unless ['private', 'public-read', 'public-read-write', 'authenticated-read']
-              raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
-            else
-              @data[:acls][:bucket][bucket_name] = self.class.acls(options['x-amz-acl'])
-            end
+          acl = options['x-amz-acl'] || 'private'
+          if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
+            raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
+          else
+            @data[:acls][:bucket][bucket_name] = self.class.acls(acl)
           end
+
           response = Excon::Response.new
           response.status = 200
           bucket = {

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

@@ -47,14 +47,14 @@ module Fog
       class Mock # :nodoc:all
 
         def put_object(bucket_name, object_name, data, options = {})
-          if options['x-amz-acl']
-            unless ['private', 'public-read', 'public-read-write', 'authenticated-read']
-              raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
-            else
-              @data[:acls][:object][bucket_name] ||= {}
-              @data[:acls][:object][bucket_name][object_name] = self.class.acls(options['x-amz-acl'])
-            end
+          acl = options['x-amz-acl'] || 'private'
+          if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
+            raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
+          else
+            @data[:acls][:object][bucket_name] ||= {}
+            @data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
           end
+
           data = parse_data(data)
           unless data[:body].is_a?(String)
             data[:body] = data[:body].read

data/lib/fog/storage/requests/google/put_bucket.rb

@@ -40,12 +40,11 @@ DATA
       class Mock
 
         def put_bucket(bucket_name, options = {})
-          if options['x-goog-acl']
-            unless ['private', 'public-read', 'public-read-write', 'authenticated-read']
-              raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
-            else
-              @data[:acls][:bucket][bucket_name] = self.class.acls(options['x-goog-acl'])
-            end
+          acl = options['x-goog-acl'] || 'private'
+          if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
+            raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
+          else
+            @data[:acls][:bucket][bucket_name] = self.class.acls(options[acl])
           end
           response = Excon::Response.new
           response.status = 200

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

@@ -42,14 +42,14 @@ module Fog
       class Mock
 
         def put_object(bucket_name, object_name, data, options = {})
-          if options['x-goog-acl']
-            unless ['private', 'public-read', 'public-read-write', 'authenticated-read']
-              raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
-            else
-              @data[:acls][:object][bucket_name] ||= {}
-              @data[:acls][:object][bucket_name][object_name] = self.class.acls(options['x-goog-acl'])
-            end
+          acl = options['x-goog-acl'] || 'private'
+          if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
+            raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
+          else
+            @data[:acls][:object][bucket_name] ||= {}
+            @data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
           end
+
           data = parse_data(data)
           unless data[:body].is_a?(String)
             data[:body] = data[:body].read

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

@@ -29,6 +29,7 @@ module Fog
         #       * 'last_modified'<~String> - Last modified timestamp
         #       * 'name'<~String> - Name of object
         def get_container(container, options = {})
+          options = options.reject {|key, value| value.nil?}
           response = request(
             :expects  => 200,
             :method   => 'GET',

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

@@ -18,6 +18,7 @@ module Fog
         #       * 'count'<~Integer>: - Number of items in container
         #       * 'name'<~String>: - Name of container
         def get_containers(options = {})
+          options = options.reject {|key, value| value.nil?}
           response = request(
             :expects  => [200, 204],
             :method   => 'GET',

data/tests/aws/requests/ses/helper.rb

@@ -0,0 +1,15 @@
+class AWS
+
+  module SES
+
+    module Formats
+
+      BASIC = {
+        'ResponseMetadata' => {'RequestId' => String}
+      }
+
+    end
+
+  end
+
+end

data/tests/aws/requests/ses/verified_email_address_tests.rb

@@ -0,0 +1,27 @@
+Shindo.tests('AWS::SES | verified email address requests', ['aws', 'ses']) do
+
+  tests('success') do
+
+    tests("#verify_email_address('test@example.com')").formats(AWS::SES::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:ses].verify_email_address('test@example.com').body
+    end
+
+    tests("#list_verified_email_addresses").formats(AWS::SES::Formats::BASIC.merge('VerifiedEmailAddresses' => [String])) do
+      pending if Fog.mocking?
+      AWS[:ses].list_verified_email_addresses.body
+    end
+
+    # email won't be there to delete, but succeeds regardless
+    tests("#delete_verified_email_address('test@example.com')").formats(AWS::SES::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:ses].delete_verified_email_address('notaanemail@example.com').body
+    end
+
+  end
+
+  tests('failure') do
+
+  end
+
+end

data/tests/compute/requests/terremark_ecloud/catalog_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('TerremarkEcloud::Compute | catalog requests', ['terremark_ecloud']) do
+Shindo.tests('TerremarkEcloud::Compute | catalog requests', ['terremarkecloud']) do
 
   @catalog_format = {
     'name' => String,

data/tests/compute/requests/terremark_ecloud/network_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('TerremarkEcloud::Compute | network requests', ['terremark_ecloud']) do
+Shindo.tests('TerremarkEcloud::Compute | network requests', ['terremarkecloud']) do
 
   @network_format = {
     'Configuration' => {

data/tests/compute/requests/terremark_ecloud/organization_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('TerremarkEcloud::Compute | organization requests', ['terremark_ecloud']) do
+Shindo.tests('TerremarkEcloud::Compute | organization requests', ['terremarkecloud']) do
 
   @organization_format = {
     'name'  => String,

data/tests/compute/requests/terremark_ecloud/vdc_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('TerremarkEcloud::Compute | vdc requests', ['terremark_ecloud']) do
+Shindo.tests('TerremarkEcloud::Compute | vdc requests', ['terremarkecloud']) do
 
   @vdc_format = {
     'AvailableNetworks' => [{

data/tests/helper.rb

@@ -2,48 +2,16 @@ $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[ .. lib
 require 'fog'
 require 'fog/bin'
 
-# Use so you can run in mock mode from the command line
-#
-# FOG_MOCK=true fog
+require File.join(File.dirname(__FILE__), 'helpers', 'mock_helper')
 
-if ENV["FOG_MOCK"] == "true"
-  Fog.mock!
-end
-
-# if in mocked mode, fill in some fake credentials for us
-if Fog.mock?
-  Fog.instance_variable_set(:@credentials, {
-    :aws_access_key_id                => 'aws_access_key_id',
-    :aws_secret_access_key            => 'aws_secret_access_key',
-    :bluebox_api_key                  => 'bluebox_api_key',
-    :bluebox_customer_id              => 'bluebox_customer_id',
-    :brightbox_client_id              => 'brightbox_client_id',
-    :brightbox_secret                 => 'brightbox_secret',
-    :go_grid_api_key                  => 'go_grid_api_key',
-    :go_grid_shared_secret            => 'go_grid_shared_secret',
-    :google_storage_access_key_id     => 'google_storage_access_key_id',
-    :google_storage_secret_access_key => 'google_storage_secret_access_key',
-    :linode_api_key                   => 'linode_api_key',
-    :new_servers_password             => 'new_servers_password',
-    :new_servers_username             => 'new_servers_username',
-#    :public_key_path                  => '~/.ssh/id_rsa.pub',
-#    :private_key_path                 => '~/.ssh/id_rsa',
-    :rackspace_api_key                => 'rackspace_api_key',
-    :rackspace_username               => 'rackspace_username',
-    :slicehost_password               => 'slicehost_password',
-    :zerigo_email                     => 'zerigo_email',
-    :zerigo_token                     => 'zerigo_token'
-  })
+def lorem_file
+  File.open(File.dirname(__FILE__) + '/lorem.txt', 'r')
 end
 
 # check to see which credentials are available and add others to the skipped tags list
-all_providers = ['aws', 'bluebox', 'brightbox', 'gogrid', 'google', 'linode', 'local', 'newservers', 'rackspace', 'slicehost', 'zerigo']
+all_providers = ['aws', 'bluebox', 'brightbox', 'gogrid', 'google', 'linode', 'local', 'newservers', 'rackspace', 'slicehost', 'terremarkecloud', 'zerigo']
 available_providers = Fog.providers.map {|provider| provider.to_s.downcase}
 for provider in (all_providers - available_providers)
   Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")
   Thread.current[:tags] << ('-' << provider)
 end
-
-def lorem_file
-  File.open(File.dirname(__FILE__) + '/lorem.txt', 'r')
-end

data/tests/helpers/mock_helper.rb

@@ -0,0 +1,33 @@
+# Use so you can run in mock mode from the command line
+#
+# FOG_MOCK=true fog
+
+if ENV["FOG_MOCK"] == "true"
+  Fog.mock!
+end
+
+# if in mocked mode, fill in some fake credentials for us
+if Fog.mock?
+  Fog.instance_variable_set(:@credentials, {
+    :aws_access_key_id                => 'aws_access_key_id',
+    :aws_secret_access_key            => 'aws_secret_access_key',
+    :bluebox_api_key                  => 'bluebox_api_key',
+    :bluebox_customer_id              => 'bluebox_customer_id',
+    :brightbox_client_id              => 'brightbox_client_id',
+    :brightbox_secret                 => 'brightbox_secret',
+    :go_grid_api_key                  => 'go_grid_api_key',
+    :go_grid_shared_secret            => 'go_grid_shared_secret',
+    :google_storage_access_key_id     => 'google_storage_access_key_id',
+    :google_storage_secret_access_key => 'google_storage_secret_access_key',
+    :linode_api_key                   => 'linode_api_key',
+    :new_servers_password             => 'new_servers_password',
+    :new_servers_username             => 'new_servers_username',
+#    :public_key_path                  => '~/.ssh/id_rsa.pub',
+#    :private_key_path                 => '~/.ssh/id_rsa',
+    :rackspace_api_key                => 'rackspace_api_key',
+    :rackspace_username               => 'rackspace_username',
+    :slicehost_password               => 'slicehost_password',
+    :zerigo_email                     => 'zerigo_email',
+    :zerigo_token                     => 'zerigo_token'
+  })
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -08:00
+date: 2011-01-27 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,12 +174,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 12
-        version: 0.1.12
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
   name: shindo
   prerelease: false
@@ -226,6 +226,13 @@ files:
 - lib/fog/aws/parsers/iam/list_groups.rb
 - lib/fog/aws/parsers/iam/list_policies.rb
 - lib/fog/aws/parsers/iam/list_users.rb
+- lib/fog/aws/parsers/ses/delete_verified_email_address.rb
+- lib/fog/aws/parsers/ses/get_send_quota.rb
+- lib/fog/aws/parsers/ses/get_send_statistics.rb
+- lib/fog/aws/parsers/ses/list_verified_email_addresses.rb
+- lib/fog/aws/parsers/ses/send_email.rb
+- lib/fog/aws/parsers/ses/send_raw_email.rb
+- lib/fog/aws/parsers/ses/verify_email_address.rb
 - lib/fog/aws/parsers/simpledb/basic.rb
 - lib/fog/aws/parsers/simpledb/domain_metadata.rb
 - lib/fog/aws/parsers/simpledb/get_attributes.rb
@@ -258,6 +265,13 @@ files:
 - lib/fog/aws/requests/iam/put_user_policy.rb
 - lib/fog/aws/requests/iam/remove_user_from_group.rb
 - lib/fog/aws/requests/iam/update_access_key.rb
+- lib/fog/aws/requests/ses/delete_verified_email_address.rb
+- lib/fog/aws/requests/ses/get_send_quota.rb
+- lib/fog/aws/requests/ses/get_send_statistics.rb
+- lib/fog/aws/requests/ses/list_verified_email_addresses.rb
+- lib/fog/aws/requests/ses/send_email.rb
+- lib/fog/aws/requests/ses/send_raw_email.rb
+- lib/fog/aws/requests/ses/verify_email_address.rb
 - lib/fog/aws/requests/simpledb/batch_put_attributes.rb
 - lib/fog/aws/requests/simpledb/create_domain.rb
 - lib/fog/aws/requests/simpledb/delete_attributes.rb
@@ -267,6 +281,7 @@ files:
 - lib/fog/aws/requests/simpledb/list_domains.rb
 - lib/fog/aws/requests/simpledb/put_attributes.rb
 - lib/fog/aws/requests/simpledb/select.rb
+- lib/fog/aws/ses.rb
 - lib/fog/aws/simpledb.rb
 - lib/fog/bin.rb
 - lib/fog/bin/aws.rb
@@ -375,6 +390,7 @@ files:
 - lib/fog/compute/parsers/aws/describe_key_pairs.rb
 - lib/fog/compute/parsers/aws/describe_regions.rb
 - lib/fog/compute/parsers/aws/describe_reserved_instances.rb
+- lib/fog/compute/parsers/aws/describe_reserved_instances_offerings.rb
 - lib/fog/compute/parsers/aws/describe_security_groups.rb
 - lib/fog/compute/parsers/aws/describe_snapshots.rb
 - lib/fog/compute/parsers/aws/describe_tags.rb
@@ -426,6 +442,7 @@ files:
 - lib/fog/compute/requests/aws/describe_key_pairs.rb
 - lib/fog/compute/requests/aws/describe_regions.rb
 - lib/fog/compute/requests/aws/describe_reserved_instances.rb
+- lib/fog/compute/requests/aws/describe_reserved_instances_offerings.rb
 - lib/fog/compute/requests/aws/describe_security_groups.rb
 - lib/fog/compute/requests/aws/describe_snapshots.rb
 - lib/fog/compute/requests/aws/describe_tags.rb
@@ -977,6 +994,8 @@ files:
 - tests/aws/requests/iam/helper.rb
 - tests/aws/requests/iam/user_policy_tests.rb
 - tests/aws/requests/iam/user_tests.rb
+- tests/aws/requests/ses/helper.rb
+- tests/aws/requests/ses/verified_email_address_tests.rb
 - tests/aws/requests/simpledb/attributes_tests.rb
 - tests/aws/requests/simpledb/domain_tests.rb
 - tests/aws/requests/simpledb/helper.rb
@@ -1048,6 +1067,7 @@ files:
 - tests/helpers/compute/servers_helper.rb
 - tests/helpers/formats_helper.rb
 - tests/helpers/formats_helper_tests.rb
+- tests/helpers/mock_helper.rb
 - tests/helpers/model_helper.rb
 - tests/helpers/responds_to_helper.rb
 - tests/helpers/succeeds_helper.rb
@@ -1169,6 +1189,8 @@ test_files:
 - tests/aws/requests/iam/helper.rb
 - tests/aws/requests/iam/user_policy_tests.rb
 - tests/aws/requests/iam/user_tests.rb
+- tests/aws/requests/ses/helper.rb
+- tests/aws/requests/ses/verified_email_address_tests.rb
 - tests/aws/requests/simpledb/attributes_tests.rb
 - tests/aws/requests/simpledb/domain_tests.rb
 - tests/aws/requests/simpledb/helper.rb
@@ -1240,6 +1262,7 @@ test_files:
 - tests/helpers/compute/servers_helper.rb
 - tests/helpers/formats_helper.rb
 - tests/helpers/formats_helper_tests.rb
+- tests/helpers/mock_helper.rb
 - tests/helpers/model_helper.rb
 - tests/helpers/responds_to_helper.rb
 - tests/helpers/succeeds_helper.rb