fog-aws 3.1.0 → 3.2.0

data/tests/requests/compute/security_group_tests.rb

@@ -318,11 +318,11 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     @security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_security_group')
     @other_security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_other_security_group')
 
-    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::Compute::AWS::Error) do
+    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_security_group(@security_group.name, @security_group.description)
     end
 
-    tests("#authorize_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#authorize_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].authorize_security_group_ingress(
         'not_a_group_name',
         {
@@ -333,7 +333,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       )
     end
 
-    tests("#authorize_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#authorize_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].authorize_security_group_ingress(
         'not_a_group_name',
         {
@@ -347,7 +347,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]}).body
     end
 
-    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").raises(Fog::Compute::AWS::Error) do
+    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})
     end
 
@@ -355,7 +355,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => @other_security_group.name}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]}).body
     end
 
-    tests("#delete_security_group('#{@other_security_group.name}')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('#{@other_security_group.name}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].delete_security_group(@other_security_group.name)
     end
 
@@ -374,16 +374,16 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     ]
 
     broken_params.each do |broken_params_item|
-      tests("#authorize_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#authorize_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', broken_params_item)
       end
 
-      tests("#revoke_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#revoke_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].revoke_security_group_ingress('fog_security_group', broken_params_item)
       end
     end
 
-    tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
         {
@@ -394,7 +394,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       )
     end
 
-    tests("#revoke_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#revoke_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
         {
@@ -404,13 +404,13 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       )
     end
 
-    tests("#delete_security_group('not_a_group_name')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_security_group('not_a_group_name')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_security_group('not_a_group_name')
     end
 
     @rds_security_group = Fog::AWS[:rds].security_groups.create(:id => "rdsgroup", :description => 'fog rds test')
 
-    tests("#delete_security_group('when authorized to an rds firewall')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('when authorized to an rds firewall')").raises(Fog::AWS::Compute::Error) do
       @rds_security_group.authorize_ec2_security_group(@security_group.name)
       Fog::Compute[:aws].delete_security_group(@security_group.name)
     end
@@ -420,7 +420,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     @security_group.destroy
     @other_security_group.destroy
 
-    tests("#delete_security_group('default')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('default')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].delete_security_group('default')
     end
 
@@ -432,11 +432,11 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
                     ]
 
     broken_params.each do |list_elem|
-      tests("#authorize_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#authorize_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].authorize_security_group_ingress(list_elem[0], list_elem[1])
       end
 
-      tests("#revoke_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#revoke_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].revoke_security_group_ingress(list_elem[0], list_elem[1])
       end
     end

data/tests/requests/compute/snapshot_tests.rb

@@ -66,7 +66,7 @@ Shindo.tests('Fog::Compute[:aws] | snapshot requests', ['aws']) do
   end
   tests('failure') do
 
-    tests("#delete_snapshot('snap-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_snapshot('snap-00000000')
     end
 

data/tests/requests/compute/spot_datafeed_subscription_tests.rb

@@ -38,7 +38,7 @@ Shindo.tests('Fog::Compute[:aws] | spot datafeed subscription requests', ['aws']
   tests('failure') do
     pending if Fog.mocking?
 
-    tests("#describe_spot_datafeed_subscription").raises(Fog::Compute::AWS::NotFound) do
+    tests("#describe_spot_datafeed_subscription").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].describe_spot_datafeed_subscription
     end
   end

data/tests/requests/compute/subnet_tests.rb

@@ -67,17 +67,17 @@ Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
   end
 
   tests('failure') do
-    tests("#create_subnet('vpc-00000000', '10.0.10.0/16')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_subnet('vpc-00000000', '10.0.10.0/16')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_subnet('vpc-00000000', '10.0.10.0/16')
     end
 
-    tests("#create_subnet('#{@vpc_id}', '10.0.9.16/28')").raises(Fog::Compute::AWS::Error) do
+    tests("#create_subnet('#{@vpc_id}', '10.0.9.16/28')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.9.16/28')
     end
 
     # Attempt to create two subnets with conflicting CIDRs in the same VPC
     tests("#create_subnet('#{@vpc_id}', '10.0.10.0/24'); " \
-      "#create_subnet('#{@vpc_id}', '10.0.10.64/26'); ").raises(::Fog::Compute::AWS::Error) do
+      "#create_subnet('#{@vpc_id}', '10.0.10.64/26'); ").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.10.0/24')
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.10.64/26')
     end

data/tests/requests/compute/tag_tests.rb

@@ -1,5 +1,5 @@
 Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
 
   @tags_format = {
     'tagSet'    => [{
@@ -18,7 +18,7 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
 
   tests('success') do
     if Fog.mocking?
-      @other_account = Fog::Compute::AWS.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
+      @other_account = Fog::AWS::Compute.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
       @image_id = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body['imageId']
     end
 
@@ -97,5 +97,5 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
       Fog::Compute[:aws].create_tags('vpc-123', 'type' => 'bad_resource_id')
     end
   end
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
 end

data/tests/requests/compute/volume_tests.rb

@@ -207,52 +207,52 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
   tests('failure') do
     @volume = Fog::Compute[:aws].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
 
-    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
     end
 
-    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
     end
 
-    tests("#detach_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#detach_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].detach_volume('vol-00000000')
     end
 
-    tests("#modify_volume_attribute('vol-00000000', true)").raises(Fog::Compute::AWS::NotFound) do
+    tests("#modify_volume_attribute('vol-00000000', true)").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].modify_volume_attribute('vol-00000000', true)
     end
 
-    tests("#detach_volume('#{@volume.identity}')").raises(Fog::Compute::AWS::Error) do
+    tests("#detach_volume('#{@volume.identity}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].detach_volume(@volume.identity)
     end
 
-    tests("#delete_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_volume('vol-00000000')
     end
 
     # Iops required
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1')").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1')
     end
 
     # size too small for iops
-    tests("#create_volume('#{@server.availability_zone}', 9, 'VolumeType' => 'io1', 'Iops' => 100)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 9, 'VolumeType' => 'io1', 'Iops' => 100)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 9, 'VolumeType' => 'io1', 'Iops' => 100)
     end
 
     # iops:size ratio too big
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 301)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 301)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 301)
     end
 
     # iops invalid value (lower than 100)
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 99)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 99)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 99)
     end
 
     # iops invalid value (greater than 4000)
-    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 4001)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 4001)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 4001)
     end
 

data/tests/requests/compute/vpc_tests.rb

@@ -104,11 +104,11 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
       Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsHostnames').body["enableDnsHostnames"]
     end
 
-    tests("#modify_vpc_attribute('#{@vpc_id}')").raises(Fog::Compute::AWS::Error) do
+    tests("#modify_vpc_attribute('#{@vpc_id}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].modify_vpc_attribute(@vpc_id).body
     end
 
-    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true})").raises(Fog::Compute::AWS::Error) do
+    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true})").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true}).body
     end
 
@@ -211,6 +211,6 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
     # Clean up
     Fog::Compute[:aws].delete_tags(@another_vpc.id, test_tags)
     @another_vpc.destroy
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
   end
 end

data/tests/requests/dns/change_resource_record_sets_tests.rb

@@ -1,8 +1,8 @@
 Shindo.tests('Fog::DNS[:aws] | change_resource_record_sets', ['aws', 'dns']) do
   tests('success') do
     test('#elb_hosted_zone_mapping from DNS name') do
-      zone_id = Fog::DNS::AWS.hosted_zone_for_alias_target('arbitrary-sub-domain.eu-west-1.elb.amazonaws.com')
-      zone_id == Fog::DNS::AWS.elb_hosted_zone_mapping['eu-west-1']
+      zone_id = Fog::AWS::DNS.hosted_zone_for_alias_target('arbitrary-sub-domain.eu-west-1.elb.amazonaws.com')
+      zone_id == Fog::AWS::DNS.elb_hosted_zone_mapping['eu-west-1']
     end
   end
 
@@ -18,7 +18,7 @@ Shindo.tests('Fog::DNS[:aws] | change_resource_record_sets', ['aws', 'dns']) do
         }]
 
     version = '2013-04-01'
-    result = Fog::DNS::AWS.change_resource_record_sets_data('zone_id123', change_batch, version)
+    result = Fog::AWS::DNS.change_resource_record_sets_data('zone_id123', change_batch, version)
     doc = Nokogiri::XML(result)
 
     returns("https://route53.amazonaws.com/doc/#{version}/") { doc.namespaces['xmlns'] }

data/tests/requests/storage/acl_utils_tests.rb

@@ -1,44 +1,44 @@
 require 'fog/aws/requests/storage/acl_utils'
 
-Shindo.tests('Fog::Storage::AWS | ACL utils', ["aws"]) do
+Shindo.tests('Fog::AWS::Storage | ACL utils', ["aws"]) do
   tests(".hash_to_acl") do
     tests(".hash_to_acl({}) at xpath //AccessControlPolicy").returns("", "has an empty AccessControlPolicy") do
-      xml = Fog::Storage::AWS.hash_to_acl({})
+      xml = Fog::AWS::Storage.hash_to_acl({})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy").first.content.chomp
     end
 
     tests(".hash_to_acl({}) at xpath //AccessControlPolicy/Owner").returns(nil, "does not have an Owner element") do
-      xml = Fog::Storage::AWS.hash_to_acl({})
+      xml = Fog::AWS::Storage.hash_to_acl({})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner").first
     end
 
     tests(".hash_to_acl('Owner' => {}) at xpath //AccessControlPolicy/Owner").returns(nil, "does not have an Owner element") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner").first
     end
 
     tests(".hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'}) at xpath //AccessControlPolicy/Owner/ID").returns("abcdef0123456789", "returns the Owner ID") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/ID").first.content
     end
 
     tests(".hash_to_acl('Owner' => {'DisplayName' => 'bob'}) at xpath //AccessControlPolicy/Owner/ID").returns(nil, "does not have an Owner ID element") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/ID").first
     end
 
     tests(".hash_to_acl('Owner' => {'DisplayName' => 'bob'}) at xpath //AccessControlPolicy/Owner/DisplayName").returns("bob", "returns the Owner DisplayName") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/DisplayName").first.content
     end
 
     tests(".hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'}) at xpath //AccessControlPolicy/Owner/DisplayName").returns(nil, "does not have an Owner DisplayName element") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/DisplayName").first
     end
 
     tests(".hash_to_acl({}) at xpath //AccessControlPolicy/AccessControlList").returns(nil, "has no AccessControlList") do
-      xml = Fog::Storage::AWS.hash_to_acl({})
+      xml = Fog::AWS::Storage.hash_to_acl({})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlPolicy").first
     end
 
@@ -55,22 +55,22 @@ Shindo.tests('Fog::Storage::AWS | ACL utils', ["aws"]) do
     }
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("CanonicalUser", "has an xsi:type of CanonicalUser") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/ID").returns("abcdef0123456789", "returns the Grantee ID") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/ID").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/DisplayName").returns("bob", "returns the Grantee DisplayName") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/DisplayName").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("READ", "returns the Grantee Permission") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
     end
 
@@ -86,17 +86,17 @@ Shindo.tests('Fog::Storage::AWS | ACL utils', ["aws"]) do
     }
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("AmazonCustomerByEmail", "has an xsi:type of AmazonCustomerByEmail") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").returns("user@example.com", "returns the Grantee EmailAddress") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("FULL_CONTROL", "returns the Grantee Permission") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
     end
 
@@ -112,17 +112,17 @@ Shindo.tests('Fog::Storage::AWS | ACL utils', ["aws"]) do
     }
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("Group", "has an xsi:type of Group") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/URI").returns("http://acs.amazonaws.com/groups/global/AllUsers", "returns the Grantee URI") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/URI").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("WRITE", "returns the Grantee Permission") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
     end
 
@@ -151,22 +151,22 @@ Shindo.tests('Fog::Storage::AWS | ACL utils', ["aws"]) do
     }
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant").returns(3, "has three elements") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant").size
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/ID").returns("abcdef0123456789", "returns the first Grant's Grantee ID") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/ID").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").returns("user@example.com", "returns the second Grant's Grantee EmailAddress") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/URI").returns("http://acs.amazonaws.com/groups/global/AllUsers", "returns the third Grant's Grantee URI") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/URI").first.content
     end
   end
@@ -203,7 +203,7 @@ XML
         "Permission" => "FULL_CONTROL"
       }]
     }, 'returns hash of ACL XML') do
-      Fog::Storage::AWS.acl_to_hash(acl_xml)
+      Fog::AWS::Storage.acl_to_hash(acl_xml)
     end
   end
 end

data/tests/requests/storage/cors_utils_tests.rb

@@ -1,14 +1,14 @@
 require 'fog/aws/requests/storage/cors_utils'
 
-Shindo.tests('Fog::Storage::AWS | CORS utils', ["aws"]) do
+Shindo.tests('Fog::AWS::Storage | CORS utils', ["aws"]) do
   tests(".hash_to_cors") do
     tests(".hash_to_cors({}) at xpath //CORSConfiguration").returns("", "has an empty CORSConfiguration") do
-      xml = Fog::Storage::AWS.hash_to_cors({})
+      xml = Fog::AWS::Storage.hash_to_cors({})
       Nokogiri::XML(xml).xpath("//CORSConfiguration").first.content.chomp
     end
 
     tests(".hash_to_cors({}) at xpath //CORSConfiguration/CORSRule").returns(nil, "has no CORSRules") do
-      xml = Fog::Storage::AWS.hash_to_cors({})
+      xml = Fog::AWS::Storage.hash_to_cors({})
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule").first
     end
 
@@ -26,52 +26,52 @@ Shindo.tests('Fog::Storage::AWS | CORS utils', ["aws"]) do
     }
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedOrigin").returns("origin_123", "returns the CORSRule AllowedOrigin") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedOrigin")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedOrigin").returns("origin_456", "returns the CORSRule AllowedOrigin") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedOrigin")[1].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedMethod").returns("GET", "returns the CORSRule AllowedMethod") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedMethod")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedMethod").returns("POST", "returns the CORSRule AllowedMethod") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedMethod")[1].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedHeader").returns("Accept", "returns the CORSRule AllowedHeader") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedHeader")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedHeader").returns("Content-Type", "returns the CORSRule AllowedHeader") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedHeader")[1].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ID").returns("blah-888", "returns the CORSRule ID") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ID")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/MaxAgeSeconds").returns("2500", "returns the CORSRule MaxAgeSeconds") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/MaxAgeSeconds")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ExposeHeader").returns("x-some-header", "returns the CORSRule ExposeHeader") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ExposeHeader")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ExposeHeader").returns("x-other-header", "returns the CORSRule ExposeHeader") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ExposeHeader")[1].content
     end
   end
@@ -102,7 +102,7 @@ XML
         "ExposeHeader" => ["x-amz-server-side-encryption", "x-amz-balls"]
       }]
     }, 'returns hash of CORS XML') do
-      Fog::Storage::AWS.cors_to_hash(cors_xml)
+      Fog::AWS::Storage.cors_to_hash(cors_xml)
     end
   end
 end