From 39caa9ff150a7be67c134fd562865309c7ef9a5a Mon Sep 17 00:00:00 2001
From: Wesley Beary <wbeary@engineyard.com>
Date: Sat, 26 Sep 2009 19:42:08 -0700
Subject: [PATCH] more consistent collection building

---
 lib/fog/aws/models/ec2/addresses.rb       |  7 +++----
 lib/fog/aws/models/ec2/instances.rb       |  7 +++----
 lib/fog/aws/models/ec2/key_pairs.rb       |  7 +++----
 lib/fog/aws/models/ec2/security_groups.rb |  7 +++----
 lib/fog/aws/models/ec2/snapshots.rb       | 10 +++++-----
 lib/fog/aws/models/ec2/volumes.rb         |  7 +++----
 6 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/lib/fog/aws/models/ec2/addresses.rb b/lib/fog/aws/models/ec2/addresses.rb
index 9b100a728..ef51e113c 100644
--- a/lib/fog/aws/models/ec2/addresses.rb
+++ b/lib/fog/aws/models/ec2/addresses.rb
@@ -12,10 +12,9 @@ module Fog
 
         def all(public_ip = [])
           data = connection.describe_addresses(public_ip).body
-          addresses = Fog::AWS::EC2::Addresses.new(
-            :connection => connection,
-            :public_ip  => public_ip
-          )
+          addresses = Fog::AWS::EC2::Addresses.new({
+            :connection => connection
+          }.merge!(attributes))
           data['addressesSet'].each do |address|
             addresses << Fog::AWS::EC2::Address.new({
               :addresses  => self,
diff --git a/lib/fog/aws/models/ec2/instances.rb b/lib/fog/aws/models/ec2/instances.rb
index aaca69520..cecef4c17 100644
--- a/lib/fog/aws/models/ec2/instances.rb
+++ b/lib/fog/aws/models/ec2/instances.rb
@@ -12,10 +12,9 @@ module Fog
 
         def all(instance_id = [])
           data = connection.describe_instances(instance_id)
-          instances = Fog::AWS::EC2::Instances.new(
-            :connection   => connection,
-            :instance_id  => instance_id
-          )
+          instances = Fog::AWS::EC2::Instances.new({
+            :connection   => connection
+          }.merge!(attributes))
           data['instancesSet'].each do |instance|
             instances << Fog::AWS::EC2::Instances.new({
               :connection => connection,
diff --git a/lib/fog/aws/models/ec2/key_pairs.rb b/lib/fog/aws/models/ec2/key_pairs.rb
index 2bbfb0a1d..40bbbabe4 100644
--- a/lib/fog/aws/models/ec2/key_pairs.rb
+++ b/lib/fog/aws/models/ec2/key_pairs.rb
@@ -12,10 +12,9 @@ module Fog
 
         def all(key_name = [])
           data = connection.describe_key_pairs(key_name).body
-          key_pairs = Fog::AWS::EC2::KeyPairs.new(
-            :connection => connection,
-            :key_name   => key_name
-          )
+          key_pairs = Fog::AWS::EC2::KeyPairs.new({
+            :connection => connection
+          }.merge!(attributes))
           data['keySet'].each do |key|
             key_pairs << Fog::AWS::EC2::KeyPair.new({
               :connection => connection,
diff --git a/lib/fog/aws/models/ec2/security_groups.rb b/lib/fog/aws/models/ec2/security_groups.rb
index 8458290bd..e7aba4a12 100644
--- a/lib/fog/aws/models/ec2/security_groups.rb
+++ b/lib/fog/aws/models/ec2/security_groups.rb
@@ -12,10 +12,9 @@ module Fog
 
         def all(group_name = [])
           data = connection.describe_security_groups(group_name)
-          security_groups = Fog::AWS::EC2::SecurityGroups.new(
-            :connection => connection,
-            :group_name => group_name
-          )
+          security_groups = Fog::AWS::EC2::SecurityGroups.new({
+            :connection => connection
+          }.merge!(attributes))
           data['securityGroupInfo'].each do |security_group|
             security_groups << Fog::AWS::EC2::SecurityGroup.new({
               :connection       => connection,
diff --git a/lib/fog/aws/models/ec2/snapshots.rb b/lib/fog/aws/models/ec2/snapshots.rb
index e88d8f3dd..274001ff6 100644
--- a/lib/fog/aws/models/ec2/snapshots.rb
+++ b/lib/fog/aws/models/ec2/snapshots.rb
@@ -9,13 +9,13 @@ module Fog
       class Snapshots < Fog::Collection
 
         attribute :snapshot_id
+        attribute :volume_id
 
         def all(snapshot_id = [])
-          data = connection.describe_snapshots(snapshot_id)
-          snapshots = Fog::AWS::EC2::Snapshots.new(
-            :connection   => connection,
-            :snapshot_id  => snapshot_id
-          )
+          data = connection.describe_snapshots(snapshot_id).body
+          snapshots = Fog::AWS::EC2::Snapshots.new({
+            :connection   => connection
+          }.merge!(attributes))
           data['snapshotSet'].each do |snapshot|
             snapshots << Fog::AWS::EC2::Snapshot.new({
               :connection => connection,
diff --git a/lib/fog/aws/models/ec2/volumes.rb b/lib/fog/aws/models/ec2/volumes.rb
index ce23e15cf..90b95be51 100644
--- a/lib/fog/aws/models/ec2/volumes.rb
+++ b/lib/fog/aws/models/ec2/volumes.rb
@@ -12,10 +12,9 @@ module Fog
 
         def all(volume_id = [])
           data = connection.describe_volumes(volume_id).body
-          volumes = Fog::AWS::EC2::Volumes.new(
-            :connection => connection,
-            :volume_id  => volume_id
-          )
+          volumes = Fog::AWS::EC2::Volumes.new({
+            :connection => connection
+          }.merge!(attributes))
           data['volumeSet'].each do |volume|
             volumes << Fog::AWS::EC2::Volume.new({
               :connection => connection,