fog 0.3.34 → 0.4.0

data/tests/helpers/formats_helper.rb

@@ -0,0 +1,68 @@
+# format related hackery
+# allows both true.is_a?(Fog::Boolean) and false.is_a?(Fog::Boolean)
+# allows both nil.is_a?(Fog::Nullable::String) and ''.is_a?(Fog::Nullable::String)
+module Fog
+  module Boolean; end
+  module Nullable
+    module Integer; end
+    module String; end
+  end
+end
+[FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)}
+[NilClass, String].each {|klass| klass.send(:include, Fog::Nullable::String)}
+[Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)}
+
+module Shindo
+  class Tests
+
+    def formats(format)
+      test('has proper format') do
+        formats_kernel(instance_eval(&Proc.new), format)
+      end
+    end
+
+    private
+
+    def formats_kernel(original_data, original_format, original = true)
+      valid = true
+      data = original_data.dup
+      format = original_format.dup
+      if format.is_a?(Array)
+        data   = {:element => data}
+        format = {:element => format}
+      end
+      for key, value in format
+        datum = data.delete(key)
+        format.delete(key)
+        case value
+        when Array
+          valid &&= datum.is_a?(Array)
+          if datum.is_a?(Array)
+            for element in datum
+              type = value.first
+              if type.is_a?(Hash)
+                valid &&= formats_kernel({:element => element}, {:element => type}, false)
+              else
+                valid &&= element.is_a?(type)
+              end
+            end
+          end
+        when Hash
+          valid &&= datum.is_a?(Hash)
+          valid &&= formats_kernel(datum, value, false)
+        else
+          p "#{key} => #{value}" unless datum.is_a?(value)
+          valid &&= datum.is_a?(value)
+        end
+      end
+      p data unless data.empty?
+      p format unless format.empty?
+      valid &&= data.empty? && format.empty?
+      if !valid && original
+        @message = "#{original_data.inspect} does not match #{original_format.inspect}"
+      end
+      valid
+    end
+
+  end
+end

data/tests/helpers/responds_to_helper.rb

@@ -0,0 +1,13 @@
+module Shindo
+  class Tests
+
+    def responds_to(method_names)
+      for method_name in [*method_names]
+        tests("#respond_to?(:#{method_name})").succeeds do
+          @instance.respond_to?(method_name)
+        end
+      end
+    end
+
+  end
+end

data/tests/helpers/succeeds_helper.rb

@@ -0,0 +1,12 @@
+module Shindo
+  class Tests
+
+    def succeeds
+      test('succeeds') do
+        instance_eval(&Proc.new)
+        true
+      end
+    end
+
+  end
+end

data/tests/storage/helper.rb

@@ -0,0 +1,16 @@
+def storage_providers
+  {
+    AWS       => {
+      :mocked => true
+    },
+    Google    => {
+      :mocked => true
+    },
+    Local     => {
+      :mocked => true
+    },
+    Rackspace => {
+      :mocked => false
+    }
+  }
+end

data/tests/storage/models/directories_tests.rb

@@ -0,0 +1,13 @@
+for provider, config in storage_providers
+
+  Shindo.tests("#{provider}::Storage | directories", [provider.to_s.downcase]) do
+
+    directory_attributes = {
+      :key => 'fogdirectoriestests',
+    }.merge!(config[:directory_attributes] || {})
+
+    collection_tests(provider[:storage].directories, directory_attributes, config[:mocked])
+
+  end
+
+end

data/tests/storage/models/directory_test.rb

@@ -0,0 +1,24 @@
+for provider, config in storage_providers
+
+  Shindo.tests("#{provider}::Storage | directory", [provider.to_s.downcase]) do
+
+    directory_attributes = {
+      :key => 'fogdirectorytests'
+    }.merge!(config[:directory_attributes] || {})
+
+    model_tests(provider[:storage].directory, directory_attributes, config[:mocked]) do
+
+      tests("#public=(true)").succeeds do
+        pending if Fog.mocking? && !config[:mocked]
+        @instance.public=(true)
+      end
+
+      if !Fog.mocking? || config[:mocked]
+        @instance.responds_to(:public_url)
+      end
+
+    end
+
+  end
+
+end

data/tests/storage/models/file_tests.rb

@@ -0,0 +1,41 @@
+for provider, config in storage_providers
+
+  Shindo.tests("#{provider}::Storage | file", [provider.to_s.downcase]) do
+
+    file_attributes = {
+      :key => 'fog_file_tests',
+      :body => lorem_file,
+      :public => true
+    }.merge!(config[:file_attributes] || {})
+
+    if !Fog.mocking? || config[:mocked]
+
+      directory_attributes = {
+        :key => 'fogfilestests'
+      }.merge!(config[:directory_attributes] || {})
+
+      @directory = provider[:storage].directories.create(directory_attributes)
+
+      model_tests(@directory.files, file_attributes, config[:mocked]) do
+
+        responds_to(:public_url)
+
+        tests("#public=(true)").succeeds do
+          pending if Fog.mocking? && !config[:mocked]
+          @instance.public=(true)
+        end
+
+        test("@instance.public_url.nil? || Excon.get(@instance.public_url).body == lorem_file.read") do
+          pending if Fog.mocking?
+          @instance.public_url.nil? || Excon.get(@instance.public_url).body == lorem_file.read
+        end
+
+      end
+
+      @directory.destroy
+
+    end
+
+  end
+
+end

data/tests/storage/models/files_tests.rb

@@ -0,0 +1,26 @@
+for provider, config in storage_providers
+
+  Shindo.tests("#{provider}::Storage | files", [provider.to_s.downcase]) do
+
+    file_attributes = {
+      :key => 'fog_files_tests',
+      :body => lorem_file
+    }.merge!(config[:file_attributes] || {})
+
+    if !Fog.mocking? || config[:mocked]
+
+      directory_attributes = {
+        :key => 'fogfilestests'
+      }.merge!(config[:directory_attributes] || {})
+
+      @directory = provider.directories.create(directory_attributes)
+
+      collection_tests(@directory.files, file_attributes, config[:mocked])
+
+      @directory.destroy
+
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 34
-  version: 0.3.34
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -08:00
+date: 2011-01-05 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,12 +38,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 3
-        - 6
-        version: 0.3.6
+        - 7
+        version: 0.3.7
   type: :runtime
   name: excon
   prerelease: false
@@ -174,12 +174,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 0
         - 1
-        - 10
-        version: 0.1.10
+        - 12
+        version: 0.1.12
   type: :development
   name: shindo
   prerelease: false
@@ -203,9 +203,8 @@ files:
 - benchs/params.rb
 - benchs/parse_vs_push.rb
 - bin/fog
-- examples/bluebox_create.rb
-- examples/dns_methods.rb
-- examples/storage.rb
+- examples/dns_tests.rb
+- examples/storage_tests.rb
 - fog.gemspec
 - lib/fog.rb
 - lib/fog/aws.rb
@@ -234,6 +233,10 @@ files:
 - lib/fog/aws/models/compute/tags.rb
 - lib/fog/aws/models/compute/volume.rb
 - lib/fog/aws/models/compute/volumes.rb
+- lib/fog/aws/models/dns/record.rb
+- lib/fog/aws/models/dns/records.rb
+- lib/fog/aws/models/dns/zone.rb
+- lib/fog/aws/models/dns/zones.rb
 - lib/fog/aws/models/storage/directories.rb
 - lib/fog/aws/models/storage/directory.rb
 - lib/fog/aws/models/storage/file.rb
@@ -462,25 +465,31 @@ files:
 - lib/fog/brightbox/models/compute/flavors.rb
 - lib/fog/brightbox/models/compute/image.rb
 - lib/fog/brightbox/models/compute/images.rb
+- lib/fog/brightbox/models/compute/load_balancer.rb
+- lib/fog/brightbox/models/compute/load_balancers.rb
 - lib/fog/brightbox/models/compute/server.rb
 - lib/fog/brightbox/models/compute/servers.rb
 - lib/fog/brightbox/models/compute/user.rb
 - lib/fog/brightbox/models/compute/users.rb
 - lib/fog/brightbox/models/compute/zone.rb
 - lib/fog/brightbox/models/compute/zones.rb
+- lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb
 - lib/fog/brightbox/requests/compute/create_api_client.rb
 - lib/fog/brightbox/requests/compute/create_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/create_image.rb
+- lib/fog/brightbox/requests/compute/create_load_balancer.rb
 - lib/fog/brightbox/requests/compute/create_server.rb
 - lib/fog/brightbox/requests/compute/destroy_api_client.rb
 - lib/fog/brightbox/requests/compute/destroy_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/destroy_image.rb
+- lib/fog/brightbox/requests/compute/destroy_load_balancer.rb
 - lib/fog/brightbox/requests/compute/destroy_server.rb
 - lib/fog/brightbox/requests/compute/get_account.rb
 - lib/fog/brightbox/requests/compute/get_api_client.rb
 - lib/fog/brightbox/requests/compute/get_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/get_image.rb
 - lib/fog/brightbox/requests/compute/get_interface.rb
+- lib/fog/brightbox/requests/compute/get_load_balancer.rb
 - lib/fog/brightbox/requests/compute/get_server.rb
 - lib/fog/brightbox/requests/compute/get_server_type.rb
 - lib/fog/brightbox/requests/compute/get_user.rb
@@ -488,11 +497,13 @@ files:
 - lib/fog/brightbox/requests/compute/list_api_clients.rb
 - lib/fog/brightbox/requests/compute/list_cloud_ips.rb
 - lib/fog/brightbox/requests/compute/list_images.rb
+- lib/fog/brightbox/requests/compute/list_load_balancers.rb
 - lib/fog/brightbox/requests/compute/list_server_types.rb
 - lib/fog/brightbox/requests/compute/list_servers.rb
 - lib/fog/brightbox/requests/compute/list_users.rb
 - lib/fog/brightbox/requests/compute/list_zones.rb
 - lib/fog/brightbox/requests/compute/map_cloud_ip.rb
+- lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb
 - lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb
 - lib/fog/brightbox/requests/compute/resize_server.rb
 - lib/fog/brightbox/requests/compute/shutdown_server.rb
@@ -503,6 +514,7 @@ files:
 - lib/fog/brightbox/requests/compute/update_account.rb
 - lib/fog/brightbox/requests/compute/update_api_client.rb
 - lib/fog/brightbox/requests/compute/update_image.rb
+- lib/fog/brightbox/requests/compute/update_load_balancer.rb
 - lib/fog/brightbox/requests/compute/update_server.rb
 - lib/fog/brightbox/requests/compute/update_user.rb
 - lib/fog/core.rb
@@ -513,6 +525,7 @@ files:
 - lib/fog/core/connection.rb
 - lib/fog/core/credentials.rb
 - lib/fog/core/deprecation.rb
+- lib/fog/core/dns.rb
 - lib/fog/core/errors.rb
 - lib/fog/core/hmac.rb
 - lib/fog/core/mock.rb
@@ -575,6 +588,10 @@ files:
 - lib/fog/linode/bin.rb
 - lib/fog/linode/compute.rb
 - lib/fog/linode/dns.rb
+- lib/fog/linode/models/dns/record.rb
+- lib/fog/linode/models/dns/records.rb
+- lib/fog/linode/models/dns/zone.rb
+- lib/fog/linode/models/dns/zones.rb
 - lib/fog/linode/requests/compute/avail_datacenters.rb
 - lib/fog/linode/requests/compute/avail_distributions.rb
 - lib/fog/linode/requests/compute/avail_kernels.rb
@@ -671,6 +688,10 @@ files:
 - lib/fog/slicehost/models/compute/images.rb
 - lib/fog/slicehost/models/compute/server.rb
 - lib/fog/slicehost/models/compute/servers.rb
+- lib/fog/slicehost/models/dns/record.rb
+- lib/fog/slicehost/models/dns/records.rb
+- lib/fog/slicehost/models/dns/zone.rb
+- lib/fog/slicehost/models/dns/zones.rb
 - lib/fog/slicehost/parsers/compute/create_slice.rb
 - lib/fog/slicehost/parsers/compute/get_backups.rb
 - lib/fog/slicehost/parsers/compute/get_flavor.rb
@@ -881,15 +902,6 @@ files:
 - spec/aws/models/compute/snapshots_spec.rb
 - spec/aws/models/compute/volume_spec.rb
 - spec/aws/models/compute/volumes_spec.rb
-- spec/aws/requests/simpledb/batch_put_attributes_spec.rb
-- spec/aws/requests/simpledb/create_domain_spec.rb
-- spec/aws/requests/simpledb/delete_attributes_spec.rb
-- spec/aws/requests/simpledb/delete_domain_spec.rb
-- spec/aws/requests/simpledb/domain_metadata_spec.rb
-- spec/aws/requests/simpledb/get_attributes_spec.rb
-- spec/aws/requests/simpledb/list_domains_spec.rb
-- spec/aws/requests/simpledb/put_attributes_spec.rb
-- spec/aws/requests/simpledb/select_spec.rb
 - spec/spec_helper.rb
 - spec/vcloud/bin_spec.rb
 - spec/vcloud/models/vdc_spec.rb
@@ -943,110 +955,94 @@ files:
 - spec/vcloud/terremark/ecloud/requests/power_off_spec.rb
 - spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
 - spec/vcloud/vcloud_spec.rb
-- tests/aws/helper.rb
-- tests/aws/models/compute/flavors_tests.rb
-- tests/aws/models/compute/server_tests.rb
-- tests/aws/models/compute/servers_tests.rb
-- tests/aws/models/storage/directories_tests.rb
-- tests/aws/models/storage/directory_tests.rb
-- tests/aws/models/storage/file_tests.rb
-- tests/aws/models/storage/files_tests.rb
-- tests/aws/requests/compute/address_tests.rb
-- tests/aws/requests/compute/availability_zone_tests.rb
-- tests/aws/requests/compute/image_tests.rb
-- tests/aws/requests/compute/instance_tests.rb
-- tests/aws/requests/compute/key_pair_tests.rb
-- tests/aws/requests/compute/region_tests.rb
-- tests/aws/requests/compute/security_group_tests.rb
-- tests/aws/requests/compute/snapshot_tests.rb
-- tests/aws/requests/compute/tag_tests.rb
-- tests/aws/requests/compute/volume_tests.rb
-- tests/aws/requests/dns/dns_tests.rb
 - tests/aws/requests/iam/access_key_tests.rb
 - tests/aws/requests/iam/group_policy_tests.rb
 - tests/aws/requests/iam/group_tests.rb
+- tests/aws/requests/iam/helper.rb
 - tests/aws/requests/iam/user_policy_tests.rb
 - tests/aws/requests/iam/user_tests.rb
-- tests/aws/requests/storage/bucket_tests.rb
-- tests/aws/requests/storage/multipart_upload_tests.rb
-- tests/aws/requests/storage/object_tests.rb
-- tests/bluebox/helper.rb
-- tests/bluebox/models/compute/flavors_tests.rb
-- tests/bluebox/models/compute/server_tests.rb
-- tests/bluebox/models/compute/servers_tests.rb
-- tests/bluebox/requests/compute/block_tests.rb
-- tests/bluebox/requests/compute/product_tests.rb
-- tests/bluebox/requests/compute/template_tests.rb
-- tests/brightbox/helper.rb
-- tests/brightbox/models/compute/flavors_tests.rb
-- tests/brightbox/models/compute/server_tests.rb
-- tests/brightbox/models/compute/servers_tests.rb
-- tests/brightbox/requests/compute/account_tests.rb
-- tests/brightbox/requests/compute/api_client_tests.rb
-- tests/brightbox/requests/compute/cloud_ip_tests.rb
-- tests/brightbox/requests/compute/image_tests.rb
-- tests/brightbox/requests/compute/interface_tests.rb
-- tests/brightbox/requests/compute/server_tests.rb
-- tests/brightbox/requests/compute/server_type_tests.rb
-- tests/brightbox/requests/compute/user_tests.rb
-- tests/brightbox/requests/compute/zone_tests.rb
+- tests/aws/requests/simpledb/attributes_tests.rb
+- tests/aws/requests/simpledb/domain_tests.rb
+- tests/aws/requests/simpledb/helper.rb
+- tests/compute/helper.rb
+- tests/compute/models/flavors_tests.rb
+- tests/compute/models/server_tests.rb
+- tests/compute/models/servers_tests.rb
+- tests/compute/requests/aws/address_tests.rb
+- tests/compute/requests/aws/availability_zone_tests.rb
+- tests/compute/requests/aws/helper.rb
+- tests/compute/requests/aws/image_tests.rb
+- tests/compute/requests/aws/instance_tests.rb
+- tests/compute/requests/aws/key_pair_tests.rb
+- tests/compute/requests/aws/region_tests.rb
+- tests/compute/requests/aws/security_group_tests.rb
+- tests/compute/requests/aws/snapshot_tests.rb
+- tests/compute/requests/aws/tag_tests.rb
+- tests/compute/requests/aws/volume_tests.rb
+- tests/compute/requests/bluebox/block_tests.rb
+- tests/compute/requests/bluebox/helper.rb
+- tests/compute/requests/bluebox/product_tests.rb
+- tests/compute/requests/bluebox/template_tests.rb
+- tests/compute/requests/brightbox/account_tests.rb
+- tests/compute/requests/brightbox/api_client_tests.rb
+- tests/compute/requests/brightbox/cloud_ip_tests.rb
+- tests/compute/requests/brightbox/helper.rb
+- tests/compute/requests/brightbox/image_tests.rb
+- tests/compute/requests/brightbox/interface_tests.rb
+- tests/compute/requests/brightbox/load_balancer_tests.rb
+- tests/compute/requests/brightbox/server_tests.rb
+- tests/compute/requests/brightbox/server_type_tests.rb
+- tests/compute/requests/brightbox/user_tests.rb
+- tests/compute/requests/brightbox/zone_tests.rb
+- tests/compute/requests/go_grid/image_tests.rb
+- tests/compute/requests/linode/datacenter_tests.rb
+- tests/compute/requests/linode/distribution_tests.rb
+- tests/compute/requests/linode/helper.rb
+- tests/compute/requests/linode/linode_tests.rb
+- tests/compute/requests/linode/linodeplans_tests.rb
+- tests/compute/requests/rackspace/address_tests.rb
+- tests/compute/requests/rackspace/flavor_tests.rb
+- tests/compute/requests/rackspace/helper.rb
+- tests/compute/requests/rackspace/image_tests.rb
+- tests/compute/requests/rackspace/resize_tests.rb
+- tests/compute/requests/rackspace/server_tests.rb
+- tests/compute/requests/slicehost/backup_tests.rb
+- tests/compute/requests/slicehost/flavor_tests.rb
+- tests/compute/requests/slicehost/image_tests.rb
+- tests/compute/requests/slicehost/slice_tests.rb
 - tests/core/attribute_tests.rb
-- tests/go_grid/helper.rb
-- tests/go_grid/requests/compute/image_tests.rb
-- tests/google/models/storage/directories_tests.rb
-- tests/google/models/storage/directory_tests.rb
-- tests/google/models/storage/file_tests.rb
-- tests/google/models/storage/files_tests.rb
-- tests/google/requests/storage/bucket_tests.rb
-- tests/google/requests/storage/object_tests.rb
+- tests/dns/helper.rb
+- tests/dns/models/record_tests.rb
+- tests/dns/models/records_tests.rb
+- tests/dns/models/zone_tests.rb
+- tests/dns/models/zones_tests.rb
+- tests/dns/requests/aws/dns_tests.rb
+- tests/dns/requests/linode/dns_tests.rb
+- tests/dns/requests/slicehost/dns_tests.rb
+- tests/dns/requests/zerigo/dns_tests.rb
 - tests/helper.rb
-- tests/helper_tests.rb
-- tests/helpers/collection_tests.rb
-- tests/helpers/compute/flavors_tests.rb
-- tests/helpers/compute/server_tests.rb
-- tests/helpers/compute/servers_tests.rb
-- tests/helpers/model_tests.rb
-- tests/helpers/storage/directories_tests.rb
-- tests/helpers/storage/directory_tests.rb
-- tests/helpers/storage/file_tests.rb
-- tests/helpers/storage/files_tests.rb
-- tests/linode/helper.rb
-- tests/linode/requests/compute/datacenter_tests.rb
-- tests/linode/requests/compute/distribution_tests.rb
-- tests/linode/requests/compute/linode_tests.rb
-- tests/linode/requests/compute/linodeplans_tests.rb
-- tests/linode/requests/dns/dns_tests.rb
-- tests/local/models/storage/directories_tests.rb
-- tests/local/models/storage/directory_tests.rb
-- tests/local/models/storage/file_tests.rb
-- tests/local/models/storage/files_tests.rb
+- tests/helpers/collection_helper.rb
+- tests/helpers/compute/flavors_helper.rb
+- tests/helpers/compute/server_helper.rb
+- tests/helpers/compute/servers_helper.rb
+- tests/helpers/formats_helper.rb
+- tests/helpers/formats_helper_tests.rb
+- tests/helpers/model_helper.rb
+- tests/helpers/responds_to_helper.rb
+- tests/helpers/succeeds_helper.rb
 - tests/lorem.txt
-- tests/rackspace/helper.rb
-- tests/rackspace/models/compute/flavors_tests.rb
-- tests/rackspace/models/compute/server_tests.rb
-- tests/rackspace/models/compute/servers_tests.rb
-- tests/rackspace/models/storage/directories_tests.rb
-- tests/rackspace/models/storage/directory_tests.rb
-- tests/rackspace/models/storage/file_tests.rb
-- tests/rackspace/models/storage/files_tests.rb
-- tests/rackspace/requests/compute/address_tests.rb
-- tests/rackspace/requests/compute/flavor_tests.rb
-- tests/rackspace/requests/compute/image_tests.rb
-- tests/rackspace/requests/compute/resize_tests.rb
-- tests/rackspace/requests/compute/server_tests.rb
-- tests/rackspace/requests/storage/container_tests.rb
-- tests/rackspace/requests/storage/object_tests.rb
-- tests/slicehost/helper.rb
-- tests/slicehost/models/compute/flavors_tests.rb
-- tests/slicehost/models/compute/server_tests.rb
-- tests/slicehost/models/compute/servers_tests.rb
-- tests/slicehost/requests/compute/backup_tests.rb
-- tests/slicehost/requests/compute/flavor_tests.rb
-- tests/slicehost/requests/compute/image_tests.rb
-- tests/slicehost/requests/compute/slice_tests.rb
-- tests/slicehost/requests/dns_tests/dns_tests.rb
-- tests/zerigo/helper.rb
-- tests/zerigo/requests/dns/dns_tests.rb
+- tests/storage/helper.rb
+- tests/storage/models/directories_tests.rb
+- tests/storage/models/directory_test.rb
+- tests/storage/models/file_tests.rb
+- tests/storage/models/files_tests.rb
+- tests/storage/requests/aws/bucket_tests.rb
+- tests/storage/requests/aws/multipart_upload_tests.rb
+- tests/storage/requests/aws/object_tests.rb
+- tests/storage/requests/google/bucket_tests.rb
+- tests/storage/requests/google/object_tests.rb
+- tests/storage/requests/rackspace/container_tests.rb
+- tests/storage/requests/rackspace/object_tests.rb
 has_rdoc: true
 homepage: http://github.com/geemus/fog
 licenses: []
@@ -1093,15 +1089,6 @@ test_files:
 - spec/aws/models/compute/snapshots_spec.rb
 - spec/aws/models/compute/volume_spec.rb
 - spec/aws/models/compute/volumes_spec.rb
-- spec/aws/requests/simpledb/batch_put_attributes_spec.rb
-- spec/aws/requests/simpledb/create_domain_spec.rb
-- spec/aws/requests/simpledb/delete_attributes_spec.rb
-- spec/aws/requests/simpledb/delete_domain_spec.rb
-- spec/aws/requests/simpledb/domain_metadata_spec.rb
-- spec/aws/requests/simpledb/get_attributes_spec.rb
-- spec/aws/requests/simpledb/list_domains_spec.rb
-- spec/aws/requests/simpledb/put_attributes_spec.rb
-- spec/aws/requests/simpledb/select_spec.rb
 - spec/spec_helper.rb
 - spec/vcloud/bin_spec.rb
 - spec/vcloud/models/vdc_spec.rb
@@ -1155,107 +1142,91 @@ test_files:
 - spec/vcloud/terremark/ecloud/requests/power_off_spec.rb
 - spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
 - spec/vcloud/vcloud_spec.rb
-- tests/aws/helper.rb
-- tests/aws/models/compute/flavors_tests.rb
-- tests/aws/models/compute/server_tests.rb
-- tests/aws/models/compute/servers_tests.rb
-- tests/aws/models/storage/directories_tests.rb
-- tests/aws/models/storage/directory_tests.rb
-- tests/aws/models/storage/file_tests.rb
-- tests/aws/models/storage/files_tests.rb
-- tests/aws/requests/compute/address_tests.rb
-- tests/aws/requests/compute/availability_zone_tests.rb
-- tests/aws/requests/compute/image_tests.rb
-- tests/aws/requests/compute/instance_tests.rb
-- tests/aws/requests/compute/key_pair_tests.rb
-- tests/aws/requests/compute/region_tests.rb
-- tests/aws/requests/compute/security_group_tests.rb
-- tests/aws/requests/compute/snapshot_tests.rb
-- tests/aws/requests/compute/tag_tests.rb
-- tests/aws/requests/compute/volume_tests.rb
-- tests/aws/requests/dns/dns_tests.rb
 - tests/aws/requests/iam/access_key_tests.rb
 - tests/aws/requests/iam/group_policy_tests.rb
 - tests/aws/requests/iam/group_tests.rb
+- tests/aws/requests/iam/helper.rb
 - tests/aws/requests/iam/user_policy_tests.rb
 - tests/aws/requests/iam/user_tests.rb
-- tests/aws/requests/storage/bucket_tests.rb
-- tests/aws/requests/storage/multipart_upload_tests.rb
-- tests/aws/requests/storage/object_tests.rb
-- tests/bluebox/helper.rb
-- tests/bluebox/models/compute/flavors_tests.rb
-- tests/bluebox/models/compute/server_tests.rb
-- tests/bluebox/models/compute/servers_tests.rb
-- tests/bluebox/requests/compute/block_tests.rb
-- tests/bluebox/requests/compute/product_tests.rb
-- tests/bluebox/requests/compute/template_tests.rb
-- tests/brightbox/helper.rb
-- tests/brightbox/models/compute/flavors_tests.rb
-- tests/brightbox/models/compute/server_tests.rb
-- tests/brightbox/models/compute/servers_tests.rb
-- tests/brightbox/requests/compute/account_tests.rb
-- tests/brightbox/requests/compute/api_client_tests.rb
-- tests/brightbox/requests/compute/cloud_ip_tests.rb
-- tests/brightbox/requests/compute/image_tests.rb
-- tests/brightbox/requests/compute/interface_tests.rb
-- tests/brightbox/requests/compute/server_tests.rb
-- tests/brightbox/requests/compute/server_type_tests.rb
-- tests/brightbox/requests/compute/user_tests.rb
-- tests/brightbox/requests/compute/zone_tests.rb
+- tests/aws/requests/simpledb/attributes_tests.rb
+- tests/aws/requests/simpledb/domain_tests.rb
+- tests/aws/requests/simpledb/helper.rb
+- tests/compute/helper.rb
+- tests/compute/models/flavors_tests.rb
+- tests/compute/models/server_tests.rb
+- tests/compute/models/servers_tests.rb
+- tests/compute/requests/aws/address_tests.rb
+- tests/compute/requests/aws/availability_zone_tests.rb
+- tests/compute/requests/aws/helper.rb
+- tests/compute/requests/aws/image_tests.rb
+- tests/compute/requests/aws/instance_tests.rb
+- tests/compute/requests/aws/key_pair_tests.rb
+- tests/compute/requests/aws/region_tests.rb
+- tests/compute/requests/aws/security_group_tests.rb
+- tests/compute/requests/aws/snapshot_tests.rb
+- tests/compute/requests/aws/tag_tests.rb
+- tests/compute/requests/aws/volume_tests.rb
+- tests/compute/requests/bluebox/block_tests.rb
+- tests/compute/requests/bluebox/helper.rb
+- tests/compute/requests/bluebox/product_tests.rb
+- tests/compute/requests/bluebox/template_tests.rb
+- tests/compute/requests/brightbox/account_tests.rb
+- tests/compute/requests/brightbox/api_client_tests.rb
+- tests/compute/requests/brightbox/cloud_ip_tests.rb
+- tests/compute/requests/brightbox/helper.rb
+- tests/compute/requests/brightbox/image_tests.rb
+- tests/compute/requests/brightbox/interface_tests.rb
+- tests/compute/requests/brightbox/load_balancer_tests.rb
+- tests/compute/requests/brightbox/server_tests.rb
+- tests/compute/requests/brightbox/server_type_tests.rb
+- tests/compute/requests/brightbox/user_tests.rb
+- tests/compute/requests/brightbox/zone_tests.rb
+- tests/compute/requests/go_grid/image_tests.rb
+- tests/compute/requests/linode/datacenter_tests.rb
+- tests/compute/requests/linode/distribution_tests.rb
+- tests/compute/requests/linode/helper.rb
+- tests/compute/requests/linode/linode_tests.rb
+- tests/compute/requests/linode/linodeplans_tests.rb
+- tests/compute/requests/rackspace/address_tests.rb
+- tests/compute/requests/rackspace/flavor_tests.rb
+- tests/compute/requests/rackspace/helper.rb
+- tests/compute/requests/rackspace/image_tests.rb
+- tests/compute/requests/rackspace/resize_tests.rb
+- tests/compute/requests/rackspace/server_tests.rb
+- tests/compute/requests/slicehost/backup_tests.rb
+- tests/compute/requests/slicehost/flavor_tests.rb
+- tests/compute/requests/slicehost/image_tests.rb
+- tests/compute/requests/slicehost/slice_tests.rb
 - tests/core/attribute_tests.rb
-- tests/go_grid/helper.rb
-- tests/go_grid/requests/compute/image_tests.rb
-- tests/google/models/storage/directories_tests.rb
-- tests/google/models/storage/directory_tests.rb
-- tests/google/models/storage/file_tests.rb
-- tests/google/models/storage/files_tests.rb
-- tests/google/requests/storage/bucket_tests.rb
-- tests/google/requests/storage/object_tests.rb
+- tests/dns/helper.rb
+- tests/dns/models/record_tests.rb
+- tests/dns/models/records_tests.rb
+- tests/dns/models/zone_tests.rb
+- tests/dns/models/zones_tests.rb
+- tests/dns/requests/aws/dns_tests.rb
+- tests/dns/requests/linode/dns_tests.rb
+- tests/dns/requests/slicehost/dns_tests.rb
+- tests/dns/requests/zerigo/dns_tests.rb
 - tests/helper.rb
-- tests/helper_tests.rb
-- tests/helpers/collection_tests.rb
-- tests/helpers/compute/flavors_tests.rb
-- tests/helpers/compute/server_tests.rb
-- tests/helpers/compute/servers_tests.rb
-- tests/helpers/model_tests.rb
-- tests/helpers/storage/directories_tests.rb
-- tests/helpers/storage/directory_tests.rb
-- tests/helpers/storage/file_tests.rb
-- tests/helpers/storage/files_tests.rb
-- tests/linode/helper.rb
-- tests/linode/requests/compute/datacenter_tests.rb
-- tests/linode/requests/compute/distribution_tests.rb
-- tests/linode/requests/compute/linode_tests.rb
-- tests/linode/requests/compute/linodeplans_tests.rb
-- tests/linode/requests/dns/dns_tests.rb
-- tests/local/models/storage/directories_tests.rb
-- tests/local/models/storage/directory_tests.rb
-- tests/local/models/storage/file_tests.rb
-- tests/local/models/storage/files_tests.rb
+- tests/helpers/collection_helper.rb
+- tests/helpers/compute/flavors_helper.rb
+- tests/helpers/compute/server_helper.rb
+- tests/helpers/compute/servers_helper.rb
+- tests/helpers/formats_helper.rb
+- tests/helpers/formats_helper_tests.rb
+- tests/helpers/model_helper.rb
+- tests/helpers/responds_to_helper.rb
+- tests/helpers/succeeds_helper.rb
 - tests/lorem.txt
-- tests/rackspace/helper.rb
-- tests/rackspace/models/compute/flavors_tests.rb
-- tests/rackspace/models/compute/server_tests.rb
-- tests/rackspace/models/compute/servers_tests.rb
-- tests/rackspace/models/storage/directories_tests.rb
-- tests/rackspace/models/storage/directory_tests.rb
-- tests/rackspace/models/storage/file_tests.rb
-- tests/rackspace/models/storage/files_tests.rb
-- tests/rackspace/requests/compute/address_tests.rb
-- tests/rackspace/requests/compute/flavor_tests.rb
-- tests/rackspace/requests/compute/image_tests.rb
-- tests/rackspace/requests/compute/resize_tests.rb
-- tests/rackspace/requests/compute/server_tests.rb
-- tests/rackspace/requests/storage/container_tests.rb
-- tests/rackspace/requests/storage/object_tests.rb
-- tests/slicehost/helper.rb
-- tests/slicehost/models/compute/flavors_tests.rb
-- tests/slicehost/models/compute/server_tests.rb
-- tests/slicehost/models/compute/servers_tests.rb
-- tests/slicehost/requests/compute/backup_tests.rb
-- tests/slicehost/requests/compute/flavor_tests.rb
-- tests/slicehost/requests/compute/image_tests.rb
-- tests/slicehost/requests/compute/slice_tests.rb
-- tests/slicehost/requests/dns_tests/dns_tests.rb
-- tests/zerigo/helper.rb
-- tests/zerigo/requests/dns/dns_tests.rb
+- tests/storage/helper.rb
+- tests/storage/models/directories_tests.rb
+- tests/storage/models/directory_test.rb
+- tests/storage/models/file_tests.rb
+- tests/storage/models/files_tests.rb
+- tests/storage/requests/aws/bucket_tests.rb
+- tests/storage/requests/aws/multipart_upload_tests.rb
+- tests/storage/requests/aws/object_tests.rb
+- tests/storage/requests/google/bucket_tests.rb
+- tests/storage/requests/google/object_tests.rb
+- tests/storage/requests/rackspace/container_tests.rb
+- tests/storage/requests/rackspace/object_tests.rb