RubyGems - aws-sdk - Versions diffs - 1.2.5 → 1.2.6 - Mend

aws-sdk 1.2.5 → 1.2.6

Files changed (278) hide show

data/NOTICE.txt +1 -1
data/lib/aws-sdk.rb +1 -1
data/lib/aws.rb +1 -1
data/lib/aws/api_config/EC2-2011-02-28.yml +1 -1
data/lib/aws/api_config/ELB-2011-08-15.yml +1 -1
data/lib/aws/api_config/IAM-2010-07-15.yml +1 -1
data/lib/aws/api_config/SNS-2010-03-31.yml +1 -1
data/lib/aws/api_config/{SQS-2009-02-01.yml → SQS-2011-10-01.yml} +117 -3
data/lib/aws/api_config/STS-2011-06-15.yml +1 -1
data/lib/aws/api_config/SimpleDB-2009-04-15.yml +1 -1
data/lib/aws/api_config/SimpleEmailService-2010-12-01.yml +1 -1
data/lib/aws/core.rb +4 -3
data/lib/aws/core/api_config.rb +1 -1
data/lib/aws/core/async_handle.rb +1 -1
data/lib/aws/core/authorize_v2.rb +1 -1
data/lib/aws/core/authorize_v3.rb +1 -1
data/lib/aws/core/authorize_with_session_token.rb +1 -1
data/lib/aws/core/autoloader.rb +1 -1
data/lib/aws/core/cacheable.rb +1 -1
data/lib/aws/core/client.rb +1 -1
data/lib/aws/core/client_logging.rb +7 -5
data/lib/aws/core/collection.rb +1 -1
data/lib/aws/core/collection/batchable.rb +1 -1
data/lib/aws/core/collection/limitable.rb +1 -1
data/lib/aws/core/collection/simple.rb +1 -1
data/lib/aws/core/configuration.rb +1 -1
data/lib/aws/core/configured_client_methods.rb +1 -1
data/lib/aws/core/configured_grammars.rb +1 -1
data/lib/aws/core/configured_option_grammars.rb +1 -1
data/lib/aws/core/configured_xml_grammars.rb +1 -1
data/lib/aws/core/default_signer.rb +1 -1
data/lib/aws/core/http/curb_handler.rb +1 -1
data/lib/aws/core/http/handler.rb +1 -1
data/lib/aws/core/http/httparty_handler.rb +1 -1
data/lib/aws/core/http/net_http_handler.rb +1 -1
data/lib/aws/core/http/request.rb +5 -14
data/lib/aws/core/http/response.rb +1 -1
data/lib/aws/core/ignore_result_element.rb +1 -1
data/lib/aws/core/indifferent_hash.rb +1 -1
data/lib/aws/core/inflection.rb +1 -1
data/lib/aws/core/lazy_error_classes.rb +1 -1
data/lib/aws/core/meta_utils.rb +1 -1
data/lib/aws/core/model.rb +1 -1
data/lib/aws/core/naming.rb +1 -1
data/lib/aws/core/option_grammar.rb +81 -1
data/lib/aws/core/page_result.rb +1 -1
data/lib/aws/core/policy.rb +1 -1
data/lib/aws/core/resource.rb +1 -1
data/lib/aws/core/resource_cache.rb +1 -1
data/lib/aws/core/response.rb +1 -1
data/lib/aws/core/response_cache.rb +1 -1
data/lib/aws/core/service_interface.rb +1 -1
data/lib/aws/core/uri_escape.rb +1 -1
data/lib/aws/core/xml_grammar.rb +1 -1
data/lib/aws/ec2.rb +1 -1
data/lib/aws/ec2/attachment.rb +1 -1
data/lib/aws/ec2/attachment_collection.rb +1 -1
data/lib/aws/ec2/availability_zone.rb +1 -1
data/lib/aws/ec2/availability_zone_collection.rb +1 -1
data/lib/aws/ec2/block_device_mappings.rb +1 -1
data/lib/aws/ec2/client.rb +1 -1
data/lib/aws/ec2/client/xml.rb +1 -1
data/lib/aws/ec2/collection.rb +1 -1
data/lib/aws/ec2/config.rb +1 -1
data/lib/aws/ec2/config_transform.rb +1 -1
data/lib/aws/ec2/elastic_ip.rb +1 -1
data/lib/aws/ec2/elastic_ip_collection.rb +1 -1
data/lib/aws/ec2/errors.rb +1 -1
data/lib/aws/ec2/filtered_collection.rb +1 -1
data/lib/aws/ec2/has_permissions.rb +1 -1
data/lib/aws/ec2/image.rb +1 -1
data/lib/aws/ec2/image_collection.rb +1 -1
data/lib/aws/ec2/instance.rb +2 -1
data/lib/aws/ec2/instance_collection.rb +1 -1
data/lib/aws/ec2/key_pair.rb +1 -1
data/lib/aws/ec2/key_pair_collection.rb +1 -1
data/lib/aws/ec2/permission_collection.rb +1 -1
data/lib/aws/ec2/region.rb +1 -1
data/lib/aws/ec2/region_collection.rb +1 -1
data/lib/aws/ec2/request.rb +1 -1
data/lib/aws/ec2/reserved_instances.rb +1 -1
data/lib/aws/ec2/reserved_instances_collection.rb +1 -1
data/lib/aws/ec2/reserved_instances_offering.rb +1 -1
data/lib/aws/ec2/reserved_instances_offering_collection.rb +1 -1
data/lib/aws/ec2/resource.rb +1 -1
data/lib/aws/ec2/resource_tag_collection.rb +1 -1
data/lib/aws/ec2/security_group.rb +2 -2
data/lib/aws/ec2/security_group/egress_ip_permission_collection.rb +1 -1
data/lib/aws/ec2/security_group/ingress_ip_permission_collection.rb +1 -1
data/lib/aws/ec2/security_group/ip_permission.rb +1 -1
data/lib/aws/ec2/security_group_collection.rb +1 -1
data/lib/aws/ec2/snapshot.rb +1 -1
data/lib/aws/ec2/snapshot_collection.rb +1 -1
data/lib/aws/ec2/tag.rb +1 -1
data/lib/aws/ec2/tag_collection.rb +1 -1
data/lib/aws/ec2/tagged_collection.rb +1 -1
data/lib/aws/ec2/tagged_item.rb +1 -1
data/lib/aws/ec2/volume.rb +1 -1
data/lib/aws/ec2/volume_collection.rb +1 -1
data/lib/aws/elb.rb +1 -1
data/lib/aws/elb/availability_zone_collection.rb +1 -1
data/lib/aws/elb/backend_server_policy_collection.rb +1 -1
data/lib/aws/elb/client.rb +1 -1
data/lib/aws/elb/client/xml.rb +1 -1
data/lib/aws/elb/config.rb +1 -1
data/lib/aws/elb/errors.rb +1 -1
data/lib/aws/elb/instance_collection.rb +1 -1
data/lib/aws/elb/listener.rb +1 -1
data/lib/aws/elb/listener_collection.rb +1 -1
data/lib/aws/elb/listener_opts.rb +1 -1
data/lib/aws/elb/listener_spec.rb +1 -1
data/lib/aws/elb/load_balancer.rb +1 -1
data/lib/aws/elb/load_balancer_collection.rb +1 -1
data/lib/aws/elb/load_balancer_policy.rb +1 -1
data/lib/aws/elb/load_balancer_policy_collection.rb +1 -1
data/lib/aws/elb/request.rb +1 -1
data/lib/aws/errors.rb +1 -1
data/lib/aws/iam.rb +1 -1
data/lib/aws/iam/access_key.rb +1 -1
data/lib/aws/iam/access_key_collection.rb +1 -1
data/lib/aws/iam/account_alias_collection.rb +1 -1
data/lib/aws/iam/client.rb +1 -1
data/lib/aws/iam/client/xml.rb +1 -1
data/lib/aws/iam/collection.rb +1 -1
data/lib/aws/iam/config.rb +1 -1
data/lib/aws/iam/errors.rb +1 -1
data/lib/aws/iam/group.rb +1 -1
data/lib/aws/iam/group_collection.rb +1 -1
data/lib/aws/iam/group_policy_collection.rb +1 -1
data/lib/aws/iam/group_user_collection.rb +1 -1
data/lib/aws/iam/login_profile.rb +1 -1
data/lib/aws/iam/mfa_device.rb +1 -1
data/lib/aws/iam/mfa_device_collection.rb +1 -1
data/lib/aws/iam/policy.rb +1 -1
data/lib/aws/iam/policy_collection.rb +1 -1
data/lib/aws/iam/request.rb +1 -1
data/lib/aws/iam/resource.rb +1 -1
data/lib/aws/iam/server_certificate.rb +1 -1
data/lib/aws/iam/server_certificate_collection.rb +1 -1
data/lib/aws/iam/signing_certificate.rb +1 -1
data/lib/aws/iam/signing_certificate_collection.rb +1 -1
data/lib/aws/iam/user.rb +1 -1
data/lib/aws/iam/user_collection.rb +1 -1
data/lib/aws/iam/user_group_collection.rb +1 -1
data/lib/aws/iam/user_policy.rb +1 -1
data/lib/aws/iam/user_policy_collection.rb +1 -1
data/lib/aws/rails.rb +1 -1
data/lib/aws/record.rb +1 -1
data/lib/aws/record/attribute.rb +1 -1
data/lib/aws/record/attribute_macros.rb +1 -1
data/lib/aws/record/attributes/boolean.rb +1 -1
data/lib/aws/record/attributes/date.rb +1 -1
data/lib/aws/record/attributes/datetime.rb +1 -1
data/lib/aws/record/attributes/float.rb +1 -1
data/lib/aws/record/attributes/integer.rb +1 -1
data/lib/aws/record/attributes/sortable_float.rb +1 -1
data/lib/aws/record/attributes/sortable_integer.rb +1 -1
data/lib/aws/record/attributes/string.rb +1 -1
data/lib/aws/record/base.rb +1 -1
data/lib/aws/record/conversion.rb +1 -1
data/lib/aws/record/dirty_tracking.rb +1 -1
data/lib/aws/record/errors.rb +1 -1
data/lib/aws/record/exceptions.rb +1 -1
data/lib/aws/record/finder_methods.rb +1 -1
data/lib/aws/record/naming.rb +1 -1
data/lib/aws/record/optimistic_locking.rb +1 -1
data/lib/aws/record/scope.rb +1 -1
data/lib/aws/record/scopes.rb +1 -1
data/lib/aws/record/validations.rb +1 -1
data/lib/aws/record/validator.rb +1 -1
data/lib/aws/record/validators/acceptance.rb +1 -1
data/lib/aws/record/validators/block.rb +1 -1
data/lib/aws/record/validators/confirmation.rb +1 -1
data/lib/aws/record/validators/count.rb +1 -1
data/lib/aws/record/validators/exclusion.rb +1 -1
data/lib/aws/record/validators/format.rb +1 -1
data/lib/aws/record/validators/inclusion.rb +1 -1
data/lib/aws/record/validators/length.rb +1 -1
data/lib/aws/record/validators/method.rb +1 -1
data/lib/aws/record/validators/numericality.rb +1 -1
data/lib/aws/record/validators/presence.rb +1 -1
data/lib/aws/s3.rb +1 -1
data/lib/aws/s3/access_control_list.rb +1 -1
data/lib/aws/s3/acl_object.rb +1 -1
data/lib/aws/s3/bucket.rb +1 -1
data/lib/aws/s3/bucket_collection.rb +1 -1
data/lib/aws/s3/bucket_version_collection.rb +1 -1
data/lib/aws/s3/client.rb +1 -1
data/lib/aws/s3/client/xml.rb +1 -1
data/lib/aws/s3/config.rb +1 -1
data/lib/aws/s3/data_options.rb +1 -1
data/lib/aws/s3/errors.rb +1 -1
data/lib/aws/s3/multipart_upload.rb +1 -1
data/lib/aws/s3/multipart_upload_collection.rb +1 -1
data/lib/aws/s3/object_collection.rb +1 -1
data/lib/aws/s3/object_metadata.rb +1 -1
data/lib/aws/s3/object_upload_collection.rb +1 -1
data/lib/aws/s3/object_version.rb +1 -1
data/lib/aws/s3/object_version_collection.rb +1 -1
data/lib/aws/s3/paginated_collection.rb +1 -1
data/lib/aws/s3/policy.rb +1 -1
data/lib/aws/s3/prefix_and_delimiter_collection.rb +1 -1
data/lib/aws/s3/prefixed_collection.rb +1 -1
data/lib/aws/s3/presigned_post.rb +1 -1
data/lib/aws/s3/request.rb +1 -1
data/lib/aws/s3/s3_object.rb +1 -1
data/lib/aws/s3/tree.rb +1 -1
data/lib/aws/s3/tree/branch_node.rb +1 -1
data/lib/aws/s3/tree/child_collection.rb +1 -1
data/lib/aws/s3/tree/leaf_node.rb +1 -1
data/lib/aws/s3/tree/node.rb +1 -1
data/lib/aws/s3/tree/parent.rb +1 -1
data/lib/aws/s3/uploaded_part.rb +1 -1
data/lib/aws/s3/uploaded_part_collection.rb +1 -1
data/lib/aws/simple_db.rb +1 -1
data/lib/aws/simple_db/attribute.rb +1 -1
data/lib/aws/simple_db/attribute_collection.rb +1 -1
data/lib/aws/simple_db/client.rb +1 -1
data/lib/aws/simple_db/client/options.rb +1 -1
data/lib/aws/simple_db/client/xml.rb +1 -1
data/lib/aws/simple_db/config.rb +1 -1
data/lib/aws/simple_db/consistent_read_option.rb +1 -1
data/lib/aws/simple_db/delete_attributes.rb +1 -1
data/lib/aws/simple_db/domain.rb +1 -1
data/lib/aws/simple_db/domain_collection.rb +1 -1
data/lib/aws/simple_db/domain_metadata.rb +1 -1
data/lib/aws/simple_db/errors.rb +1 -1
data/lib/aws/simple_db/expect_condition_option.rb +1 -1
data/lib/aws/simple_db/item.rb +1 -1
data/lib/aws/simple_db/item_collection.rb +1 -1
data/lib/aws/simple_db/item_data.rb +1 -1
data/lib/aws/simple_db/put_attributes.rb +1 -1
data/lib/aws/simple_db/request.rb +1 -1
data/lib/aws/simple_email_service.rb +1 -1
data/lib/aws/simple_email_service/client.rb +1 -1
data/lib/aws/simple_email_service/client/xml.rb +1 -1
data/lib/aws/simple_email_service/config.rb +1 -1
data/lib/aws/simple_email_service/email_address_collection.rb +1 -1
data/lib/aws/simple_email_service/errors.rb +1 -1
data/lib/aws/simple_email_service/quotas.rb +1 -1
data/lib/aws/simple_email_service/request.rb +1 -1
data/lib/aws/sns.rb +1 -1
data/lib/aws/sns/client.rb +1 -1
data/lib/aws/sns/client/xml.rb +1 -1
data/lib/aws/sns/config.rb +1 -1
data/lib/aws/sns/errors.rb +1 -1
data/lib/aws/sns/policy.rb +1 -1
data/lib/aws/sns/request.rb +1 -1
data/lib/aws/sns/subscription.rb +1 -1
data/lib/aws/sns/subscription_collection.rb +1 -1
data/lib/aws/sns/topic.rb +1 -1
data/lib/aws/sns/topic_collection.rb +1 -1
data/lib/aws/sns/topic_subscription_collection.rb +1 -1
data/lib/aws/sqs.rb +1 -1
data/lib/aws/sqs/client.rb +2 -2
data/lib/aws/sqs/client/xml.rb +1 -1
data/lib/aws/sqs/config.rb +1 -1
data/lib/aws/sqs/errors.rb +78 -2
data/lib/aws/sqs/policy.rb +1 -1
data/lib/aws/sqs/queue.rb +230 -5
data/lib/aws/sqs/queue_collection.rb +84 -18
data/lib/aws/sqs/received_message.rb +2 -3
data/lib/aws/sqs/received_sns_message.rb +1 -1
data/lib/aws/sqs/request.rb +1 -1
data/lib/aws/sts.rb +1 -1
data/lib/aws/sts/client.rb +1 -1
data/lib/aws/sts/client/xml.rb +1 -1
data/lib/aws/sts/config.rb +1 -1
data/lib/aws/sts/errors.rb +1 -1
data/lib/aws/sts/federated_session.rb +1 -1
data/lib/aws/sts/policy.rb +1 -1
data/lib/aws/sts/request.rb +1 -1
data/lib/aws/sts/session.rb +1 -1
data/lib/net/http/connection_pool.rb +1 -1
data/lib/net/http/connection_pool/connection.rb +1 -1
data/lib/net/http/connection_pool/session.rb +1 -1
data/rails/init.rb +1 -1
metadata +17 -44

data/lib/aws/simple_db/client.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/client/options.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/client/xml.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/config.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/consistent_read_option.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/delete_attributes.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/domain.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/domain_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/domain_metadata.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/errors.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/expect_condition_option.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/item.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/item_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/item_data.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/put_attributes.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_db/request.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_email_service.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_email_service/client.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_email_service/client/xml.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_email_service/config.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_email_service/email_address_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_email_service/errors.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_email_service/quotas.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/simple_email_service/request.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/client.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/client/xml.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/config.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/errors.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/policy.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/request.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/subscription.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/subscription_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/topic.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/topic_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sns/topic_subscription_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sqs.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sqs/client.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -23,7 +23,7 @@ module AWS
       include Core::ConfiguredClientMethods
-      API_VERSION = '2009-02-01'
+      API_VERSION = '2011-10-01'
       # @private
       REQUEST_CLASS = SQS::Request

data/lib/aws/sqs/client/xml.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sqs/config.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sqs/errors.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -14,17 +14,93 @@
 module AWS
   class SQS
-    # @private
     module Errors
+      # @private
       BASE_ERROR_GRAMMAR = Client::XML::BaseError
       include Core::LazyErrorClasses
+      # @private
       def self.error_class(code)
         super(code.sub(/^AWS\.SimpleQueueService\./, ''))
       end
+      # Raised when one or more messages fail to delete during a
+      # batch delete operation.
+      #
+      # See {#failures} for a complete list of failures.
+      #
+      class BatchDeleteError < StandardError
+        def initialize failures
+          @failures = failures
+          super("Failed to delete #{failures.size} messages")
+        end
+        # @return [Array<Hash>] Returns a list of hashes.  Each hash
+        #   contains information about one message that failed to delete.
+        #   Hash keys include:
+        #
+        #   * +:error_code+
+        #   * +:error_message+
+        #   * +:sender_fault+
+        #   * +:receipt_handle+
+        #
+        attr_reader :failures
+      end
+      # Raised from a batch change message visibility call when one or more
+      # of the updates fail.
+      #
+      # See {#failures} for a complete list of failures.
+      #
+      class BatchChangeVisibilityError < StandardError
+        def initialize failures
+          @failures = failures
+          super("Failed to change visibility for #{failures.size} messages")
+        end
+        # @return [Array<Hash>] Returns a list of hashes.  Each hash
+        #   contains information about one message that failed to change
+        #   visibility. Hash keys include:
+        #
+        #   * +:error_code+
+        #   * +:error_message+
+        #   * +:sender_fault+
+        #   * +:receipt_handle+
+        #
+        attr_reader :failures
+      end
+      class BatchSendError < StandardError
+        def initialize sent, failures
+          @sent = sent
+          @failures = failures
+          super("Failed to send #{failures.size} messages")
+        end
+        # @return [Array<SentMessage>] Returns a list of {SentMessage}
+        #   objects.
+        attr_reader :sent
+        # @return [Array<Hash>] Returns a list of hashes.  Each hash
+        #   contains information about one message that failed to change
+        #   visibility. Hash keys include:
+        #
+        #   * +:error_code+
+        #   * +:error_message+
+        #   * +:sender_fault+
+        #   * +:receipt_handle+
+        #
+        attr_reader :failures
+      end
     end
   end
 end

data/lib/aws/sqs/policy.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/sqs/queue.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -91,14 +91,30 @@ module AWS
       #   * #xE000 to #xFFFD
       #   * #x10000 to #x10FFFF
       #
+      # @param [Hash] options
+      #
+      # @option options [Integer] :delay_seconds The number of seconds to
+      #   delay the message. The message will become available for
+      #   processing after the delay time has passed.
+      #   If you don't specify a value, the default value for the
+      #   queue applies.  Should be from 0 to 900 (15 mins).
+      #
       # @return [SentMessage] An object containing information about
       #   the message that was sent.
-      def send_message(body)
-        resp = client.send_message(:queue_url => url, :message_body => body)
+      #
+      def send_message body, options = {}
+        client_opts = options.dup
+        client_opts[:queue_url] = url
+        client_opts[:message_body] = body
+        response = client.send_message(client_opts)
         msg = SentMessage.new
-        msg.message_id = resp.message_id
-        msg.md5 = resp.md5_of_message_body
+        msg.message_id = response.message_id
+        msg.md5 = response.md5_of_message_body
         msg
       end
       # Retrieves one or more messages.  When a block is given, each
@@ -342,6 +358,23 @@ module AWS
         period
       end
+      # @return [Integer] Gets the current default delay for messages sent
+      #   to the queue.
+      def delay_seconds
+        get_attribute("DelaySeconds").to_i
+      end
+      # Sets the default delay for messages sent to the queue.
+      # @param [Integer] seconds How many seconds a message will be delayed.
+      def delay_seconds= seconds
+        set_attribute("DelaySeconds", seconds.to_s)
+      end
+      # @return [Integer] Returns an approximate count of messages delayed.
+      def approximate_number_of_messages_delayed
+        get_attribute("ApproximateNumberOfMessagesDelayed").to_i
+      end
       # @return [String] The queue's Amazon resource name (ARN).
       def arn
         @arn ||= get_attribute("QueueArn")
@@ -401,6 +434,7 @@ module AWS
       #   string when it received #to_json.
       #
       # @return [nil]
+      #
       def policy= policy
         policy_string = case policy
         when nil, '' then ''
@@ -411,6 +445,176 @@ module AWS
         nil
       end
+      # Sends a batch of up to 10 messages in a single request.
+      #
+      #   queue.send_messages('message-1', 'message-2')
+      #
+      # You can also set an optional delay for all of the messages:
+      #
+      #   # delay all messages 1 hour
+      #   queue.batch_send_message(msg1, msg2, :delay_seconds => 3600)
+      #
+      # If you need to set a custom delay for each message you can pass
+      # hashes:
+      #
+      #   messages = []
+      #   messages << { :message_body => 'msg1', :delay_seconds => 60 }
+      #   messages << { :message_body => 'msg2', :delay_seconds => 30 }
+      #
+      #   queue.batch_send_message(messages)
+      #
+      # @param [String,Hash] messages A list of messages.  Each message
+      #   should be a string, or a hash with a +:message_body+,
+      #   and optionally +:delay_seconds+.
+      #
+      # @raise [Errors::BatchSendError] Raises this error when one or more
+      #   of the messages failed to send, but others did.  On the raised
+      #   object you can access a list of the messages that failed, and
+      #   a list of messages that succeeded.
+      #
+      # @return [Array<SentMessage>] Returns an array of sent message objects.
+      #   Each object responds to #message_id and #md5_of_message_body.
+      #   The message id is generated by Amazon SQS.
+      #
+      def batch_send *messages
+        entries = messages.flatten
+        unless entries.first.is_a?(Hash)
+          options = entries.last.is_a?(Hash) ? entries.pop : {}
+          entries = entries.collect{|msg| { :message_body => msg } }
+          if delay = options[:delay_seconds]
+            entries.each {|entry| entry[:delay_seconds] = delay }
+          end
+        end
+        entries.each_with_index {|entry,n| entry[:id] = n.to_s }
+        client_opts = {}
+        client_opts[:queue_url] = url
+        client_opts[:entries] = entries
+        response = client.send_message_batch(client_opts)
+        failed = batch_failures(entries, response)
+        sent = response.successful.collect do |sent|
+          msg = SentMessage.new
+          msg.message_id = sent.message_id
+          msg.md5 = sent.md5_of_message_body
+          msg
+        end
+        raise Errors::BatchSendError.new(sent, failed) unless failed.empty?
+        sent
+      end
+      # @param [ReceivedMessage,String] message A list of up to 10 messages
+      #   to delete.  Each message should be a {ReceivedMessage} object
+      #   or a received message handle (string).
+      #
+      # @raise [Errors::BatchDeleteSend] Raised when one or more of the
+      #   messages failed to delete.  The raised error has a list
+      #   of the failures.
+      #
+      # @return [nil]
+      #
+      def batch_delete *messages
+        entries = []
+        messages.flatten.each_with_index do |msg,n|
+          handle = msg.is_a?(ReceivedMessage) ? msg.handle : msg
+          entries << { :id => n.to_s, :receipt_handle => handle }
+        end
+        response = client.delete_message_batch(
+          :queue_url => url, :entries => entries)
+        failures = batch_failures(entries, response)
+        raise Errors::BatchDeleteError.new(failures) unless failures.empty?
+        nil
+      end
+      # @overload batch_change_message_visibility(visibility_timeout, *messages)
+      #
+      #   Accepts a single +:visibility_timeout+ value and a list of
+      #   messages ({ReceivedMessage} objects or receipt handle strings).
+      #   This form of the method is useful when you want to set the same
+      #   timeout value for each message.
+      #
+      #     queue.bacth_change_message_visibility(10, messages)
+      #
+      #   @param [Integer] visibility_timeout The new value for the message's
+      #     visibility timeout (in seconds).
+      #
+      #   @param [ReceivedMessage,String] message A list of up to 10 messages
+      #     to change the visibility timeout for.
+      #
+      #   @raise [BatchChangeVisibilityError] Raises this error when one
+      #     or more of the messages failed the visibility update.
+      #
+      #   @return [nil]
+      #
+      # @overload batch_change_message_visibility(*messages_with_timeouts)
+      #
+      #   Accepts a list of hashes.  Each hash should provide the visibility
+      #   timeout and message (a {ReceivedMessage} object or the recipt handle
+      #   string).
+      #
+      #   Use this form when each message needs a different visiblity timeout.
+      #
+      #     messages = []
+      #     messages << { :message => 'handle1', :visibility_timeout => 5 }
+      #     messages << { :message => 'handle2', :visibility_timeout => 10 }
+      #
+      #     queue.bacth_change_message_visibility(*messages)
+      #
+      #   @param [Hash] message A list hashes, each with a +:visibility_timeout+
+      #     and a +:message+.
+      #
+      #   @raise [BatchChangeVisibilityError] Raises this error when one
+      #     or more of the messages failed the visibility update.
+      #
+      #   @return [nil]
+      #
+      def batch_change_visibility *args
+        args = args.flatten
+        if args.first.is_a?(Integer)
+          timeout = args.shift
+          messages = args.collect{|m| [m, timeout] }
+        else
+          messages = args.collect{|m| [m[:message], m[:visibility_timeout]] }
+        end
+        entries = []
+        messages.each do |msg,timeout|
+          handle = msg.is_a?(ReceivedMessage) ? msg.handle : msg
+          entries << {
+            :id => entries.size.to_s,
+            :receipt_handle => handle,
+            :visibility_timeout => timeout,
+          }
+        end
+        response = client.change_message_visibility_batch(
+          :queue_url => url, :entries => entries)
+        failures = batch_failures(entries, response)
+        raise Errors::BatchChangeVisibilityError.new(failures) unless
+          failures.empty?
+        nil
+      end
       # @return [Boolean] Returns true if the other queue has the same
       #   url.
       def ==(other)
@@ -423,6 +627,27 @@ module AWS
         "<#{self.class}:#{url}>"
       end
+      protected
+      def batch_failures entries, response
+        response.failed.inject([]) do |failures, failure|
+          entry = entries.find{|e| e[:id] == failure.id }
+          details = {
+            :error_code => failure.code,
+            :error_message => failure.message,
+            :sender_fault => failure.sender_fault?,
+          }
+          if handle = entry[:receipt_handle]
+            details[:receipt_handle] = handle
+          end
+          failures << details
+        end
+      end
       # @private
       protected
       def hit_timeout?(got_first, last_message_at, opts)