@@ -142,7 +142,7 @@ module EC2 raise ArgumentError, "No ':public_ip' provided" if options[:public_ip].nil? || options[:public_ip].empty? - params = options[:public_ip] + params = { "PublicIp" => options[:public_ip] } return response_generator(:action => "DisassociateAddress", :params => params) lib/EC2/elastic_ips.rb @@ -12,7 +12,7 @@ module EC2 #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 2 - TINY = 9 + TINY = 10 STRING = [MAJOR, MINOR, TINY].join('.') end end lib/EC2/version.rb @@ -121,7 +121,7 @@ context "EC2 elastic IP addresses " do specify "should be able to be disassociated with an instance with disassociate_address" do - @ec2.stubs(:make_request).with('DisassociateAddress', "67.202.55.255"). + @ec2.stubs(:make_request).with('DisassociateAddress', {'PublicIp' => '67.202.55.255'}). returns stub(:body => @disassociate_address_response_body, :is_a? => true) @ec2.disassociate_address( :public_ip => "67.202.55.255" ).should.be.an.instance_of EC2::Response @@ -132,7 +132,7 @@ context "EC2 elastic IP addresses " do specify "method disassociate_address should reject bad arguments" do - @ec2.stubs(:make_request).with('DisassociateAddress', "67.202.55.255"). + @ec2.stubs(:make_request).with('DisassociateAddress', {'PublicIp' => '67.202.55.255'}). returns stub(:body => @disassociate_address_response_body, :is_a? => true) lambda { @ec2.disassociate_address( :public_ip => "67.202.55.255" ) }.should.not.raise(EC2::ArgumentError) test/test_EC2_elastic_ips.rb @@ -16,7 +16,7 @@ context "The EC2 Gem " do setup do @major = 0 @minor = 2 - @tiny = 9 + @tiny = 10 @string = [@major, @minor, @tiny].join('.') end test/test_EC2_version.rb a5a88323acfddcc232be10914a477520fef8c6f9 7edbfa6f77b7d6e951f353dbe883135ea0f723c2 Glenn Rempe glenn@rempe.us http://github.com/grempe/amazon-ec2/commit/aa67f72328649e12e72f2821c29bf5a1ee6b999f aa67f72328649e12e72f2821c29bf5a1ee6b999f 2008-04-25T09:28:13-07:00 2008-04-25T09:28:13-07:00 Merge branch 'master' of git@github.com:grempe/amazon-ec2 34a8593fb786fdc2759091017683b0b70512231e Glenn Rempe glenn@rempe.us