awsum 0.5 → 0.5.1

data/spec/fixtures/ec2/authorize_group_access.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DescribeSecurityGroupsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+    <requestId>26e2d0ad-6af4-40ff-bd0b-b7f7a4a26036</requestId>
+    <securityGroupInfo>
+        <item>
+            <ownerId>026338013131</ownerId>
+            <groupName>test-group</groupName>
+            <groupDescription>A test group</groupDescription>
+            <ipPermissions/>
+        </item>
+    </securityGroupInfo>
+</DescribeSecurityGroupsResponse>

data/spec/fixtures/ec2/create_security_group.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<CreateSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2008-12-01/">
-    <requestId>d11930fe-b8c5-461a-9259-c053a0c26fdf</requestId>
+<?xml version="1.0" encoding="UTF-8"?>
+<CreateSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+    <requestId>60be0979-1bb8-4e5a-9c6b-0b5d17b9d22b</requestId>
     <return>true</return>
 </CreateSecurityGroupResponse>

data/spec/fixtures/ec2/delete_security_group.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<DeleteSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2008-12-01/">
-    <requestId>0de0677e-dc68-40f8-bdf9-bc7063ee4a70</requestId>
+<?xml version="1.0" encoding="UTF-8"?>
+<DeleteSecurityGroupResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+    <requestId>37eaab54-074d-466d-a38e-0137d221c72d</requestId>
     <return>true</return>
 </DeleteSecurityGroupResponse>

data/spec/fixtures/ec2/purchase_reserved_instances_offering2.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PurchaseReservedInstancesOfferingResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+    <requestId>c9f3d2f8-cb9d-467f-9a4d-b3a682ad2460</requestId>
+    <reservedInstancesId>4357912c-baae-4f49-80bc-61fcb17c97d9</reservedInstancesId>
+</PurchaseReservedInstancesOfferingResponse>

data/spec/fixtures/ec2/tags.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DescribeTagsResponse xmlns="http://ec2.amazonaws.com/doc/2010-08-31/">
+    <requestId>ba2577eb-3227-46b7-b80c-df1353c320d1</requestId>
+    <tagSet>
+        <item>
+            <resourceId>ari-f9c22690</resourceId>
+            <resourceType>image</resourceType>
+            <key>name</key>
+            <value>Test</value>
+        </item>
+    </tagSet>
+</DescribeTagsResponse>

data/spec/lib/awsum/ec2/image_spec.rb

@@ -42,6 +42,66 @@ module Awsum
       end
     end
 
+    describe "retrieving a filtered list of images" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeImages.*Filter.1.Name=architecture.*Filter.1.Value.1=i386|, :body => fixture('ec2/images'), :status => 200)
+      end
+
+      let(:result) { ec2.images(:filter => {:architecture => 'i386'}) }
+
+      it "should return an array of images" do
+        result.first.should be_a(Awsum::Ec2::Image)
+      end
+    end
+
+    describe "retrieving a filtered list of images with a complicated filter" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeImages.*Filter.1.Name=tag%3AName.*Filter.1.Value.1=Test.*Filter.2.Name=image-type.*Filter.2.Value.1=machine.*Filter.2.Value.2=kernel.*Filter.2.Value.3=ramdisk.*Filter.3.Name=architecture.*Filter.3.Value.1=i386|, :body => fixture('ec2/images'), :status => 200)
+      end
+
+      let(:result) { ec2.images(:filter => {:architecture => 'i386', 'tag:Name' => 'Test', 'image-type' => ['machine', 'kernel', 'ramdisk']}) }
+
+      it "should return an array of images" do
+        result.first.should be_a(Awsum::Ec2::Image)
+      end
+    end
+
+    describe "retrieving a filtered list of images by tag" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeImages.*Filter.1.Name=tag%3Aname.*Filter.1.Value.1=Test|, :body => fixture('ec2/images'), :status => 200)
+      end
+
+      let(:result) { ec2.images(:tags => {:name => 'Test'}) }
+
+      it "should return an array of images" do
+        result.first.should be_a(Awsum::Ec2::Image)
+      end
+    end
+
+    describe "retrieving a filtered list of owned images" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeImages.*Filter.1.Name=architecture.*Filter.1.Value.1=i386.*Owner.1=self|, :body => fixture('ec2/images'), :status => 200)
+      end
+
+      let(:result) { ec2.my_images(:filter => {:architecture => 'i386'}) }
+
+      it "should return an array of images" do
+        result.first.should be_a(Awsum::Ec2::Image)
+      end
+    end
+
+    describe "retrieving a filtered list of owned images by tag" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeImages.*Filter.1.Name=tag%3Aname.*Filter.1.Value.1=Test.*Owner.1=self|, :body => fixture('ec2/images'), :status => 200)
+      end
+
+      let(:result) { ec2.my_images(:tags => {:name => 'Test'}) }
+
+      it "should return an array of images" do
+        result.first.should be_a(Awsum::Ec2::Image)
+      end
+    end
+
     describe "registering an image" do
       before do
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RegisterImage.*ImageLocation=s3.bucket.location|, :body => fixture('ec2/register_image'), :status => 200)

data/spec/lib/awsum/ec2/instance_spec.rb

@@ -18,6 +18,20 @@ module Awsum
       end
     end
 
+    describe "running an instance with a tag" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RunInstances.*ImageId=ari-f9c22690|, :body => fixture('ec2/run_instances'), :status => 200)
+
+        ec2.should_receive(:create_tags).with(['i-f92fa890'], :name => 'Test')
+      end
+
+      let(:result) { ec2.run_instances 'ari-f9c22690', :tags => {:name => 'Test'} }
+
+      it "should return an array of instances" do
+        result.first.should be_a(Awsum::Ec2::Instance)
+      end
+    end
+
     describe "retrieving a list of instances" do
       before do
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeInstances|, :body => fixture('ec2/run_instances'), :status => 200)
@@ -30,6 +44,30 @@ module Awsum
       end
     end
 
+    describe "retrieving a list of instances with a filter" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeInstances.*Filter.1.Name=architecture.*Filter.1.Value.1=i386|, :body => fixture('ec2/run_instances'), :status => 200)
+      end
+
+      let(:result) { ec2.instances(:filter => {:architecture => 'i386'}) }
+
+      it "should return an array of instances" do
+        result.first.should be_a(Awsum::Ec2::Instance)
+      end
+    end
+
+    describe "retrieving a list of instances by tag" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeInstances.*Filter.1.Name=tag%3Aname.*Filter.1.Value.1=Test|, :body => fixture('ec2/run_instances'), :status => 200)
+      end
+
+      let(:result) { ec2.instances(:tags => {:name => 'Test'}) }
+
+      it "should return an array of instances" do
+        result.first.should be_a(Awsum::Ec2::Instance)
+      end
+    end
+
     describe "retrieving a single instance" do
       before do
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeInstances.*InstanceId.1=i-3f1cc856|, :body => fixture('ec2/instance'), :status => 200)
@@ -90,7 +128,7 @@ module Awsum
 
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AttachVolume.*InstanceId=i-3f1cc856.*VolumeId=vol-44d6322d|, :body => fixture('ec2/attach_volume'), :status => 200)
 
-        instance.create_volume(10)
+        instance.create_volume(10, :device => '/dev/sdh')
       end
     end
 

data/spec/lib/awsum/ec2/parsers/instance_parser_spec.rb

@@ -24,7 +24,7 @@ module Awsum
         :type               => 'm1.small',
         :availability_zone  => 'us-east-1b',
         :launch_time        => Time.parse('2008-06-18T12:51:52.000Z'),
-        :state              => {:code => 0, :name => 'pending'}
+        :state              => Ec2::State.new(0, 'pending')
       }.each do |key, value|
         it "should have the correct #{key}" do
           instance.send(key).should == value
@@ -36,7 +36,8 @@ module Awsum
       let(:instance) { result[1] }
 
       it "should have the correct state" do
-        instance.state.should == {:code => 16, :name => 'running'}
+        instance.state.should == 16
+        instance.state.should == 'running'
       end
     end
   end
@@ -64,7 +65,7 @@ module Awsum
         :type               => 'm1.small',
         :availability_zone  => 'us-east-1b',
         :launch_time        => Time.parse('2009-01-11T13:09:01.000Z'),
-        :state              => {:code => 0, :name => 'pending'}
+        :state              => Ec2::State.new(0, 'pending')
       }.each do |key, value|
         it "should have the correct #{key}" do
           instance.send(key).should == value

data/spec/lib/awsum/ec2/parsers/tag_parser_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+module Awsum
+  describe Ec2::TagParser do
+    subject { Ec2.new('abc', 'xyz') }
+    let(:ec2) { subject }
+    let(:parser) { Awsum::Ec2::TagParser.new(ec2) }
+    let(:result) { parser.parse(fixture('ec2/tags')) }
+
+    it "should return an array of tags" do
+      result.should be_a(Array)
+    end
+
+    context "the first tag" do
+      let(:tag) { result.first }
+
+      {
+        :resource_id   => 'ari-f9c22690',
+        :resource_type => 'image',
+        :key           => 'name',
+        :value         => 'Test'
+      }.each do |key, value|
+        it "should have the correct #{key}" do
+          tag.send(key).should == value
+        end
+      end
+    end
+  end
+end

data/spec/lib/awsum/ec2/region_spec.rb

@@ -28,6 +28,26 @@ module Awsum
       it "should return a region" do
         result.should be_a(Awsum::Ec2::Region)
       end
+
+      it "should work in block mode (with a supplied parameter)" do
+        FakeWeb.register_uri(:get, %r|https://eu-west-1\.ec2\.amazonaws\.com/?.*Action=DescribeAvailabilityZones|, :body => fixture('ec2/availability_zones'), :status => 200)
+
+        zones = ec2.region('eu-west-1') do |region|
+          region.availability_zones
+        end
+
+        zones.first.should be_a(Awsum::Ec2::AvailabilityZone)
+      end
+
+      it "should work in block mode (without a supplied parameter)" do
+        FakeWeb.register_uri(:get, %r|https://eu-west-1\.ec2\.amazonaws\.com/?.*Action=DescribeAvailabilityZones|, :body => fixture('ec2/availability_zones'), :status => 200)
+
+        zones = ec2.region('eu-west-1') do
+          availability_zones
+        end
+
+        zones.first.should be_a(Awsum::Ec2::AvailabilityZone)
+      end
     end
 
     describe "a region" do
@@ -46,7 +66,7 @@ module Awsum
       it "should work in block mode (with a supplied parameter)" do
         FakeWeb.register_uri(:get, %r|https://eu-west-1\.ec2\.amazonaws\.com/?.*Action=DescribeAvailabilityZones|, :body => fixture('ec2/availability_zones'), :status => 200)
 
-        zones = ec2.region('eu-west-1') do |region|
+        zones = region.use do |region|
           region.availability_zones
         end
 
@@ -56,13 +76,22 @@ module Awsum
       it "should work in block mode (without a supplied parameter)" do
         FakeWeb.register_uri(:get, %r|https://eu-west-1\.ec2\.amazonaws\.com/?.*Action=DescribeAvailabilityZones|, :body => fixture('ec2/availability_zones'), :status => 200)
 
-        zones = ec2.region('eu-west-1') do
+        zones = region.use do
           availability_zones
         end
 
         zones.first.should be_a(Awsum::Ec2::AvailabilityZone)
       end
 
+      it "should be able to set a region" do
+        FakeWeb.register_uri(:get, %r|https://eu-west-1\.ec2\.amazonaws\.com/?.*Action=DescribeAvailabilityZones|, :body => fixture('ec2/availability_zones'), :status => 200)
+
+        region.use
+        zones = ec2.availability_zones
+
+        zones.first.should be_a(Awsum::Ec2::AvailabilityZone)
+      end
+
       it "should receive ec2 methods (pass-through)" do
         FakeWeb.register_uri(:get, %r|https://eu-west-1\.ec2\.amazonaws\.com/?.*Action=RunInstances.*ImageId=9-123456789|, :body => fixture('ec2/run_instances'), :status => 200)
 

data/spec/lib/awsum/ec2/reserved_instance_spec.rb

@@ -8,29 +8,13 @@ module Awsum
 
     describe "purchasing a reserved instance" do
       before do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=PurchaseReservedInstancesOffering.*InstanceCount.1=1.*ReservedInstancesOfferingId.1=e5a2ff3b-f6eb-4b4e-83f8-b879d7060257|, :body => fixture('ec2/purchase_reserved_instances_offering'), :status => 200)
-
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeReservedInstances.*ReservedInstanceId.1=1ba8e2e3-e6f7-4ef5-8c6c-6c6e4fad0a56|, :body => fixture('ec2/reserved_instances'), :status => 200)
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=PurchaseReservedInstancesOffering.*InstanceCount=1.*ReservedInstancesOfferingId=e5a2ff3b-f6eb-4b4e-83f8-b879d7060257|, :body => fixture('ec2/purchase_reserved_instances_offering'), :status => 200)
       end
 
       let(:result) { ec2.purchase_reserved_instances_offering 'e5a2ff3b-f6eb-4b4e-83f8-b879d7060257' }
 
-      it "should return a reserverd instance" do
-        result.should be_a(Awsum::Ec2::ReservedInstance)
-      end
-    end
-
-    describe "purchasing multiple reserved instances" do
-      before do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=PurchaseReservedInstancesOffering.*InstanceCount.1=1.*InstanceCount.2=2.*ReservedInstancesOfferingId.1=e5a2ff3b-f6eb-4b4e-83f8-b879d7060257.*ReservedInstancesOfferingId.2=248e7b75-afbc-4724-82b2-d78353299433|, :body => fixture('ec2/purchase_reserved_instances_offering'), :status => 200)
-
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeReservedInstances.*ReservedInstanceId.1=1ba8e2e3-e6f7-4ef5-8c6c-6c6e4fad0a56|, :body => fixture('ec2/reserved_instances'), :status => 200)
-      end
-
-      let(:result) { ec2.purchase_reserved_instances_offering ['e5a2ff3b-f6eb-4b4e-83f8-b879d7060257', '248e7b75-afbc-4724-82b2-d78353299433'], [1, 2] }
-
-      it "should return an array of reserverd instances" do
-        result.first.should be_a(Awsum::Ec2::ReservedInstance)
+      it "should return an array of reserved instance ids" do
+        result.should == ['1ba8e2e3-e6f7-4ef5-8c6c-6c6e4fad0a56']
       end
     end
 

data/spec/lib/awsum/ec2/security_group_spec.rb

@@ -51,90 +51,156 @@ module Awsum
     end
 
     describe "authorizing group access" do
-      before do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=test.*SourceSecurityGroupName=default.*SourceSecurityGroupOwnerId=111111111111|, :body => fixture('ec2/delete_security_group'), :status => 200)
+      context "with a single option hash" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.Groups.1.GroupName=webservers.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.ToPort=80|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
+
+        it "should return true" do
+          ec2.authorize_security_group_ingress('test', {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :groups => [{:group_name => :webservers}]}).should be_true
+        end
       end
 
-      it "should return true" do
-        ec2.authorize_security_group_ingress('test', :source_security_group_name => 'default', :source_security_group_owner_id => '111111111111').should be_true
+      context "with an array of option hashes" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.Groups.1.GroupName=webservers.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.ToPort=80.*IpPermissions.2.FromPort=22.*IpPermissions.2.Groups.1.GroupName=webservers.*IpPermissions.2.Groups.2.GroupName=dbservers.*IpPermissions.2.IpProtocol=tcp.*IpPermissions.2.ToPort=22|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
+
+        it "should return true" do
+          ec2.authorize_security_group_ingress('test', [
+            {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :groups => [{:group_name => :webservers}]},
+            {:ip_protocol => :tcp, :from_port => 22, :to_port => 22, :groups => [{:group_name => :webservers}, {:group_name => :dbservers}]}
+          ]).should be_true
+        end
       end
     end
 
     describe "authorizing ip access" do
-      before do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*CidrIp=0.0.0.0%2F0.*FromPort=80.*GroupName=test.*IpProtocol=tcp.*ToPort=80|, :body => fixture('ec2/delete_security_group'), :status => 200)
-      end
+      context "with a single option hash" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.1.ToPort=80|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
 
-      it "should return true" do
-        ec2.authorize_security_group_ingress('test', :ip_protocol => 'tcp', :from_port => 80, :to_port => 80, :cidr_ip => '0.0.0.0/0').should be_true
+        it "should return true" do
+          ec2.authorize_security_group_ingress('test', [{:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]}])
+        end
       end
-    end
 
-    describe "sending ip authorization options to a user/group authorization request" do
-      it "should raise an error" do
-        expect { ec2.authorize_security_group_ingress('test', :ip_protocol => 'tcp', :from_port => 80, :to_port => 80, :cidr_ip => '0.0.0.0/0', :source_security_group_name => 'default') }.to raise_error
-      end
-    end
+      context "with an array of option hashes" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.1.ToPort=80.*IpPermissions.2.FromPort=22.*IpPermissions.2.IpProtocol=tcp.*IpPermissions.2.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.2.IpRanges.2.CidrIp=12.34.56.78%2F0.*IpPermissions.2.ToPort=22|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
 
-    describe "sending user/group options to a ip authorization request" do
-      it "should raise an error" do
-        expect { ec2.authorize_security_group_ingress('test', :source_security_group_name => 'default', :source_security_group_owner_id => '111111111111', :from_port => 80, :to_port => 80) }.to raise_error
+        it "should return true" do
+          ec2.authorize_security_group_ingress('test', [
+            {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]},
+            {:ip_protocol => :tcp, :from_port => 22, :to_port => 22, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}, {:cidr_ip => '12.34.56.78/0'}]}
+          ])
+        end
       end
     end
 
-    describe "sending all options to an authorization request" do
-      it "should raise an error" do
-        expect { ec2.authorize_security_group_ingress('test', :source_security_group_name => 'default', :source_security_group_owner_id => '111111111111', :ip_protocol => 'tcp', :from_port => 80, :to_port => 80, :cidr_ip => '0.0.0.0/0') }.to raise_error
-      end
-    end
+    describe "authorizing both group and ip access" do
+      context "with a single call" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.1.ToPort=80.*IpPermissions.2.FromPort=22.*IpPermissions.2.Groups.1.GroupName=webservers.*IpPermissions.2.IpProtocol=tcp.*IpPermissions.2.ToPort=22|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
 
-    describe "including a wrong protocol in an authorization request" do
-      it "should raise an error" do
-        expect { ec2.authorize_security_group_ingress('test', :ip_protocol => 'test', :from_port => 80, :to_port => 80, :cidr_ip => '0.0.0.0/0') }.to raise_error
+        it "should return true" do
+          ec2.authorize_security_group_ingress('test', [
+            {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]},
+            {:ip_protocol => :tcp, :from_port => 22, :to_port => 22, :groups => [{:group_name => 'webservers'}]}
+          ])
+        end
       end
     end
 
     describe "revoking group access" do
-      before do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=test.*SourceSecurityGroupName=default.*SourceSecurityGroupOwnerId=111111111111|, :body => fixture('ec2/delete_security_group'), :status => 200)
+      context "with a single option hash" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.Groups.1.GroupName=webservers.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.ToPort=80|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
+
+        it "should return true" do
+          ec2.revoke_security_group_ingress('test', {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :groups => [{:group_name => :webservers}]}).should be_true
+        end
       end
 
-      it "should return true" do
-        ec2.revoke_security_group_ingress('test', :source_security_group_name => 'default', :source_security_group_owner_id => '111111111111').should be_true
+      context "with an array of option hashes" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.Groups.1.GroupName=webservers.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.ToPort=80.*IpPermissions.2.FromPort=22.*IpPermissions.2.Groups.1.GroupName=webservers.*IpPermissions.2.Groups.2.GroupName=dbservers.*IpPermissions.2.IpProtocol=tcp.*IpPermissions.2.ToPort=22|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
+
+        it "should return true" do
+          ec2.revoke_security_group_ingress('test', [
+            {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :groups => [{:group_name => :webservers}]},
+            {:ip_protocol => :tcp, :from_port => 22, :to_port => 22, :groups => [{:group_name => :webservers}, {:group_name => :dbservers}]}
+          ]).should be_true
+        end
       end
     end
 
     describe "revoking ip access" do
-      before do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*CidrIp=0.0.0.0%2F0.*FromPort=80.*GroupName=test.*IpProtocol=tcp.*ToPort=80|, :body => fixture('ec2/delete_security_group'), :status => 200)
+      context "with a single option hash" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.1.ToPort=80|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
+
+        it "should return true" do
+          ec2.revoke_security_group_ingress('test', [{:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]}])
+        end
       end
 
-      it "should return true" do
-        ec2.revoke_security_group_ingress('test', :ip_protocol => 'tcp', :from_port => 80, :to_port => 80, :cidr_ip => '0.0.0.0/0').should be_true
+      context "with an array of option hashes" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.1.ToPort=80.*IpPermissions.2.FromPort=22.*IpPermissions.2.IpProtocol=tcp.*IpPermissions.2.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.2.IpRanges.2.CidrIp=12.34.56.78%2F0.*IpPermissions.2.ToPort=22|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
+
+        it "should return true" do
+          ec2.revoke_security_group_ingress('test', [
+            {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]},
+            {:ip_protocol => :tcp, :from_port => 22, :to_port => 22, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}, {:cidr_ip => '12.34.56.78/0'}]}
+          ])
+        end
       end
     end
 
-    describe "sending ip revokation options to a user/group authorization request" do
+    describe "revoking both group and ip access" do
+      context "with a single call" do
+        before do
+          FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=test.*IpPermissions.1.FromPort=80.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.1.ToPort=80.*IpPermissions.2.FromPort=22.*IpPermissions.2.Groups.1.GroupName=webservers.*IpPermissions.2.IpProtocol=tcp.*IpPermissions.2.ToPort=22|, :body => fixture('ec2/authorize_group_access'), :status => 200)
+        end
+
+        it "should return true" do
+          ec2.revoke_security_group_ingress('test', [
+            {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]},
+            {:ip_protocol => :tcp, :from_port => 22, :to_port => 22, :groups => [{:group_name => 'webservers'}]}
+          ])
+        end
+      end
+    end
+
+    describe "sending both ip and user/group options to an authorization request" do
       it "should raise an error" do
-        expect { ec2.revoke_security_group_ingress('test', :ip_protocol => 'tcp', :from_port => 80, :to_port => 80, :cidr_ip => '0.0.0.0/0', :source_security_group_name => 'default') }.to raise_error
+        expect { ec2.authorize_security_group_ingress('test', [{:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}], :groups => [{:group_name => :webservers}]}]) }.to raise_error(ArgumentError)
       end
     end
 
-    describe "sending user/group options to a ip revokation request" do
+    describe "including a wrong protocol in an authorization request" do
       it "should raise an error" do
-        expect { ec2.revoke_security_group_ingress('test', :source_security_group_name => 'default', :source_security_group_owner_id => '111111111111', :from_port => 80, :to_port => 80) }.to raise_error
+        expect { ec2.authorize_security_group_ingress('test', [{:ip_protocol => :test, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]}]) }.to raise_error(ArgumentError)
       end
     end
 
-    describe "sending all options to an revokation request" do
+    describe "sending both ip and user/group options to a revokation request" do
       it "should raise an error" do
-        expect { ec2.revoke_security_group_ingress('test', :source_security_group_name => 'default', :source_security_group_owner_id => '111111111111', :ip_protocol => 'tcp', :from_port => 80, :to_port => 80, :cidr_ip => '0.0.0.0/0') }.to raise_error
+        expect { ec2.authorize_security_group_ingress('test', [{:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}], :groups => [{:group_name => :webservers}]}]) }.to raise_error(ArgumentError)
       end
     end
 
-    describe "including a wrong protocol in an revokation request" do
+    describe "including a wrong protocol in a revokation request" do
       it "should raise an error" do
-        expect { ec2.revoke_security_group_ingress('test', :ip_protocol => 'test', :from_port => 80, :to_port => 80, :cidr_ip => '0.0.0.0/0') }.to raise_error
+        expect { ec2.authorize_security_group_ingress('test', [{:ip_protocol => :test, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]}]) }.to raise_error(ArgumentError)
       end
     end
 
@@ -146,27 +212,33 @@ module Awsum
       let(:security_group) { ec2.security_group('default') }
 
       it "should be able to authorize a group" do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=default.*SourceSecurityGroupName=test.*SourceSecurityGroupOwnerId=111111111111|, :body => fixture('ec2/delete_security_group'), :status => 200)
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=default.*IpPermissions.1.FromPort=80.*IpPermissions.1.Groups.1.GroupName=webservers.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.ToPort=80|, :body => fixture('ec2/authorize_group_access'), :status => 200)
 
-        security_group.authorize_group('test', '111111111111').should be_true
+        security_group.authorize({:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :groups => [{:group_name => :webservers}]}).should be_true
       end
 
       it "should be able to authorize ip access" do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*CidrIp=0.0.0.0%2F0.*FromPort=80.*GroupName=default.*IpProtocol=tcp.*ToPort=80|, :body => fixture('ec2/delete_security_group'), :status => 200)
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=AuthorizeSecurityGroupIngress.*GroupName=default.*IpPermissions.1.FromPort=80.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.1.ToPort=80.*IpPermissions.2.FromPort=22.*IpPermissions.2.IpProtocol=tcp.*IpPermissions.2.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.2.IpRanges.2.CidrIp=12.34.56.78%2F0.*IpPermissions.2.ToPort=22|, :body => fixture('ec2/authorize_group_access'), :status => 200)
 
-        security_group.authorize_ip(80, 80, 'tcp', '0.0.0.0/0').should be_true
+        security_group.authorize([
+          {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]},
+          {:ip_protocol => :tcp, :from_port => 22, :to_port => 22, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}, {:cidr_ip => '12.34.56.78/0'}]}
+        ])
       end
 
       it "should be able to revoke a group" do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=default.*SourceSecurityGroupName=test.*SourceSecurityGroupOwnerId=111111111111|, :body => fixture('ec2/delete_security_group'), :status => 200)
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=default.*IpPermissions.1.FromPort=80.*IpPermissions.1.Groups.1.GroupName=webservers.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.ToPort=80.*IpPermissions.2.FromPort=22.*IpPermissions.2.Groups.1.GroupName=webservers.*IpPermissions.2.Groups.2.GroupName=dbservers.*IpPermissions.2.IpProtocol=tcp.*IpPermissions.2.ToPort=22|, :body => fixture('ec2/authorize_group_access'), :status => 200)
 
-        security_group.revoke_group('test', '111111111111').should be_true
+        security_group.revoke([
+          {:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :groups => [{:group_name => :webservers}]},
+          {:ip_protocol => :tcp, :from_port => 22, :to_port => 22, :groups => [{:group_name => :webservers}, {:group_name => :dbservers}]}
+        ]).should be_true
       end
 
-      it "should be able to authorize ip access" do
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*CidrIp=0.0.0.0%2F0.*FromPort=80.*GroupName=default.*IpProtocol=tcp.*ToPort=80|, :body => fixture('ec2/delete_security_group'), :status => 200)
+      it "should be able to revoke ip access" do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=RevokeSecurityGroupIngress.*GroupName=default.*IpPermissions.1.FromPort=80.*IpPermissions.1.IpProtocol=tcp.*IpPermissions.1.IpRanges.1.CidrIp=12.23.34.45%2F0.*IpPermissions.1.ToPort=80|, :body => fixture('ec2/authorize_group_access'), :status => 200)
 
-        security_group.revoke_ip(80, 80, 'tcp', '0.0.0.0/0').should be_true
+        security_group.revoke([{:ip_protocol => :tcp, :from_port => 80, :to_port => 80, :ip_ranges => [{:cidr_ip => '12.23.34.45/0'}]}])
       end
 
       it "should be able to delete itself" do