aws-sdk 1.2.5 → 1.2.6

data/lib/aws/sqs/queue_collection.rb

@@ -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
@@ -53,27 +53,60 @@ module AWS
       #   Constraints: Maximum 80 characters; alphanumeric
       #   characters, hyphens (-), and underscores (_) are allowed.
       #
-      #   To successfully create a new queue, you must provide a
-      #   name that is unique within the scope of your own
-      #   queues. If you provide the name of an existing queue, a
-      #   new queue isn't created and an error isn't
-      #   returned. Instead, the request succeeds and the queue URL
-      #   for the existing queue is returned. Exception: if you
-      #   provide a value for +:default_visibility_timeout+ that is
-      #   different from the value for the existing queue, you
-      #   receive an error.
+      #   The name of the queue should be unique within your account.  If
+      #   you provide the name of an existing queue with the same options
+      #   it was created with then no error is raised and the existing
+      #   queue will be returned.
       #
-      # @param [Hash] opts Additional options for creating the
-      #   queue.
+      # @param [Hash] options
       #
-      # @option opts [Integer] :default_visibility_timeout The
-      #   visibility timeout (in seconds) to use for this queue.
+      # @option options [Integer] :visibility_timeout (30) The number of 
+      #   seconds a message received from a queue will be invisible to 
+      #   others when they ask to receive messages.
+      #
+      # @option options [Policy] :policy A policy object or policy desription
+      #   (a json string).
+      #
+      # @option options [Integer] :maximum_message_size (65536) The maximum
+      #   number of bytes a message can contain before Amazon SQS rejects 
+      #   it.
+      #
+      # @option options [Integer] :delay_seconds The time in seconds that 
+      #   the delivery of all messages in the queue will be delayed.
+      #   This can be overriden when sending a message to the queue.
+      #
+      # @option options [Integer] :message_retention_period The number of
+      #   seconds from 60 (1 minute) to 1209600 (14 days).  The default
+      #   is 345600 (4 days).
       #
       # @return [Queue] The newly created queue.
       #
-      def create(name, opts = {})
-        resp = client.create_queue(opts.merge(:queue_name => name))
-        Queue.new(resp.queue_url, :config => config)
+      def create name, options = {}
+
+        # SQS removed the default prefix to the visibility timeout option
+        # in the 2011-10-01 update -- this allows us to not break existing
+        # customers.
+        if options[:default_visibility_timeout]
+          options[:visibility_timeout] = 
+            options.delete(:default_visibility_timeout)
+        end
+
+        if policy = options[:policy]
+          options[:policy] = policy.to_json unless policy.is_a?(String)
+        end
+
+        client_opts = {}
+        client_opts[:queue_name] = name
+        unless options.empty?
+          client_opts[:attributes] = options.inject({}) do |attributes,(k,v)|
+            attributes.merge(Core::Inflection.class_name(k.to_s) => v.to_s)
+          end
+        end
+
+        response = client.create_queue(client_opts)
+
+        Queue.new(response.queue_url, :config => config)
+
       end
 
       # @yieldparam [Queue] queue Each {Queue} object in the collection.
@@ -94,9 +127,42 @@ module AWS
       end
 
       # @return [Queue] The queue with the given URL.
-      def [](url)
+      def [] url
         Queue.new(url, :config => config)
       end
+      
+      # Returns the queue with the given name.  This requires making
+      # a request to SQS to get the queue url.  If you know the url,
+      # you should use {#[]} instead.
+      #
+      #   queue = AWS::SQS.new.queues.named('my-queue')
+      #
+      # @param (see #url_for)
+      # @option (see #url_for)
+      # @return [Queue] Returns the queue with the given name.
+      def named queue_name, options = {}
+        self[url_for(queue_name, options = {})]
+      end
+
+      # Returns the url for the given queue.
+      #
+      #   sqs.queues.url_for('my-queue') 
+      #   #=> "https://sqs.us-east-1.amazonaws.com/123456789012/my-queue" 
+      #
+      # @param [String] queue_name The name of the queue you need a URL for.
+      #
+      # @param [Hash] options
+      #
+      # @option options [String] :queue_owner_aws_account_id The AWS account
+      #   ID of the account that created the queue.  You can only get the
+      #   url for queues in other accounts when the account owner has
+      #   granted you permission.
+      #
+      def url_for queue_name, options = {}
+        client_opts = {}
+        client_opts[:queue_name] = queue_name
+        client.get_queue_url(client_opts.merge(options)).queue_url
+      end
 
     end
 

data/lib/aws/sqs/received_message.rb

@@ -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
@@ -99,8 +99,7 @@ module AWS
       def delete
         client.delete_message(
           :queue_url => queue.url, 
-          :receipt_handle => handle
-        )
+          :receipt_handle => handle)
         nil
       end
 

data/lib/aws/sqs/received_sns_message.rb

@@ -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/request.rb

@@ -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/sts.rb

@@ -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/sts/client.rb

@@ -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/sts/client/xml.rb

@@ -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/sts/config.rb

@@ -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/sts/errors.rb

@@ -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/sts/federated_session.rb

@@ -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/sts/policy.rb

@@ -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/sts/request.rb

@@ -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/sts/session.rb

@@ -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/net/http/connection_pool.rb

@@ -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/net/http/connection_pool/connection.rb

@@ -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/net/http/connection_pool/session.rb

@@ -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/rails/init.rb

@@ -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

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdk
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 5
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Amazon Web Services
@@ -15,70 +10,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 -08:00
-default_executable: 
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
         version: "2.1"
   type: :runtime
-  requirement: *id001
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
         version: "0.7"
   type: :runtime
-  requirement: *id002
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
         version: 1.4.4
   type: :runtime
-  requirement: *id003
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
         version: "1.4"
   type: :runtime
-  requirement: *id004
+  prerelease: false
+  version_requirements: *id004
 description: AWS SDK for Ruby
 email: 
 executables: []
@@ -363,14 +340,13 @@ files:
 - lib/aws/api_config/SimpleDB-2009-04-15.yml
 - lib/aws/api_config/SimpleEmailService-2010-12-01.yml
 - lib/aws/api_config/SNS-2010-03-31.yml
-- lib/aws/api_config/SQS-2009-02-01.yml
+- lib/aws/api_config/SQS-2011-10-01.yml
 - lib/aws/api_config/STS-2011-06-15.yml
 - lib/aws/api_config/.document
 - .yardopts
 - README.rdoc
 - NOTICE.txt
 - LICENSE.txt
-has_rdoc: true
 homepage: http://aws.amazon.com/sdkforruby
 licenses: 
 - Apache 2.0
@@ -384,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2254749614229087864
       segments: 
       - 0
       version: "0"
@@ -393,14 +369,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: AWS SDK for Ruby