aws-sdk 1.4.1 → 1.5.0

data/lib/aws/sqs/errors.rb

@@ -13,13 +13,9 @@
 
 module AWS
   class SQS
-
     module Errors
 
-      # @private
-      BASE_ERROR_GRAMMAR = Client::XML::BaseError
-
-      include Core::LazyErrorClasses
+      extend Core::LazyErrorClasses
 
       # @private
       def self.error_class(code)
@@ -100,7 +96,6 @@ module AWS
         attr_reader :failures
 
       end
-
     end
   end
 end

data/lib/aws/sqs/queue.rb

@@ -111,8 +111,8 @@ module AWS
         response = client.send_message(client_opts)
 
         msg = SentMessage.new
-        msg.message_id = response.message_id
-        msg.md5 = response.md5_of_message_body
+        msg.message_id = response[:message_id]
+        msg.md5 = response[:md5_of_message_body]
         msg
 
       end
@@ -172,11 +172,11 @@ module AWS
       def receive_message(opts = {}, &block)
         resp = client.receive_message(receive_opts(opts))
 
-        messages = resp.messages.map do |m|
-          ReceivedMessage.new(self, m.message_id, m.receipt_handle,
-                              :body => m.body,
-                              :md5 => m.md5_of_body,
-                              :attributes => m.attributes)
+        messages = resp[:messages].map do |m|
+          ReceivedMessage.new(self, m[:message_id], m[:receipt_handle],
+            :body => m[:body],
+            :md5 => m[:md5_of_body],
+            :attributes => m[:attributes])
         end
 
         if block
@@ -498,10 +498,10 @@ module AWS
 
         failed = batch_failures(entries, response)
 
-        sent = response.successful.collect do |sent|
+        sent = response[:successful].collect do |sent|
           msg = SentMessage.new
-          msg.message_id = sent.message_id
-          msg.md5 = sent.md5_of_message_body
+          msg.message_id = sent[:message_id]
+          msg.md5 = sent[:md5_of_message_body]
           msg
         end
 
@@ -511,7 +511,7 @@ module AWS
         
       end
 
-      # @param [ReceivedMessage,String] message A list of up to 10 messages 
+      # @param [ReceivedMessage,String] messages A list of up to 10 messages 
       #   to delete.  Each message should be a {ReceivedMessage} object 
       #   or a received message handle (string).
       #
@@ -629,14 +629,14 @@ module AWS
 
       protected
       def batch_failures entries, response
-        response.failed.inject([]) do |failures, failure|
+        response[:failed].inject([]) do |failures, failure|
 
-          entry = entries.find{|e| e[:id] == failure.id }
+          entry = entries.find{|e| e[:id] == failure[:id] }
 
           details = {
-            :error_code => failure.code,
-            :error_message => failure.message,
-            :sender_fault => failure.sender_fault?,
+            :error_code => failure[:code],
+            :error_message => failure[:message],
+            :sender_fault => failure[:sender_fault],
           }
 
           if handle = entry[:receipt_handle]
@@ -713,11 +713,10 @@ module AWS
       # @private
       protected
       def set_attribute(name, value)
-        client.set_queue_attributes(:queue_url => url,
-                                    :attribute => {
-                                      :name => name,
-                                      :value => value
-                                    })
+        client.set_queue_attributes({
+          :queue_url => url, 
+          :attributes => { name => value },
+        })
       end
 
     end

data/lib/aws/sqs/queue_collection.rb

@@ -105,7 +105,7 @@ module AWS
 
         response = client.create_queue(client_opts)
 
-        Queue.new(response.queue_url, :config => config)
+        Queue.new(response[:queue_url], :config => config)
 
       end
 
@@ -113,7 +113,7 @@ module AWS
       def each(&block)
         options = {}
         options[:queue_name_prefix] = prefix if prefix
-        client.list_queues(options).queue_urls.each do |url|
+        client.list_queues(options)[:queue_urls].each do |url|
           queue = self[url]
           yield(queue)
         end
@@ -161,7 +161,7 @@ module AWS
       def url_for queue_name, options = {}
         client_opts = {}
         client_opts[:queue_name] = queue_name
-        client.get_queue_url(client_opts.merge(options)).queue_url
+        client.get_queue_url(client_opts.merge(options))[:queue_url]
       end
 
     end

data/lib/aws/sqs/request.rb

@@ -17,8 +17,7 @@ module AWS
     # @private
     class Request < Core::Http::Request
 
-      include Core::AuthorizeV2
-      include Core::AuthorizeWithSessionToken
+      include Core::Signature::Version2
 
       def path
         full_url.path
@@ -29,6 +28,7 @@ module AWS
       end
 
       private
+
       def full_url
         if url_param = params.find { |p| p.name == "QueueUrl" }
           URI.parse(url_param.value)

data/lib/aws/sts.rb

@@ -120,9 +120,11 @@ module AWS
         opts[:policy] = opts[:policy].to_json
       end
       get_session(:get_federation_token, opts) do |resp, session_opts|
-        session_opts.merge!(:user_id => resp.federated_user.federated_user_id,
-                            :user_arn => resp.federated_user.arn,
-                            :packed_policy_size => resp.packed_policy_size)
+        session_opts.merge!(
+          :user_id => resp[:federated_user][:federated_user_id],
+          :user_arn => resp[:federated_user][:arn],
+          :packed_policy_size => resp[:packed_policy_size]
+        )
         FederatedSession.new(session_opts)
       end
     end
@@ -133,14 +135,10 @@ module AWS
       opts[:duration_seconds] = opts.delete(:duration) if
         opts[:duration]
       resp = client.send(method, opts)
-      credentials = resp.credentials
+      credentials = resp[:credentials].dup
       session_opts = {
-        :credentials => {
-          :access_key_id => credentials.access_key_id,
-          :secret_access_key => credentials.secret_access_key,
-          :session_token => credentials.session_token
-        },
-        :expires_at => credentials.expiration
+        :credentials => credentials,
+        :expires_at => credentials.delete(:expiration),
       }
       yield(resp, session_opts)
     end

data/lib/aws/sts/client.rb

@@ -14,22 +14,17 @@
 module AWS
   class STS
 
-    # @private
+    # Client class for AWS Security Token Service (STS).
     class Client < Core::Client
 
-      AWS.register_autoloads(self) do
-        autoload :XML, 'xml'
-      end
-
-      include Core::ConfiguredClientMethods
-
       API_VERSION = '2011-06-15'
 
-      REGION_US_E1 = 'sts.amazonaws.com'
+      extend Core::Client::QueryXML
 
-      REQUEST_CLASS = STS::Request
+      REGION_US_E1 = 'sts.amazonaws.com'
 
-      configure_client
+      # @private
+      CACHEABLE_REQUESTS = Set[]
 
       def initialize *args
         super
@@ -40,6 +35,68 @@ module AWS
         end
       end
 
+      ## client methods ##
+
+      # Calls the GetFederationToken API operation.
+      # @method get_federation_token(options = {})
+      #
+      # === Options:
+      #
+      # * +:name+ - *required* - (String) The name of the federated user
+      #   associated with the session.
+      # * +:policy+ - (String) A policy specifying the permissions associated
+      #   with the session. The caller can delegate their own permissions by
+      #   specifying a policy for the session, and both policies will be
+      #   checked when a service call is made. In other words, permissions of
+      #   the session credentials are the intersection of the policy specified
+      #   in the API and the policies associated with the user who issued the
+      #   session.
+      # * +:duration_seconds+ - (Integer) The duration, in seconds, that the
+      #   session should last. Acceptable durations for federation sessions
+      #   range from 3600s (1 hour) to 129600s (36 hours), with 43200 as the
+      #   default.
+      #
+      # === Response Structure:
+      #
+      # * +:credentials+ - (Hash)
+      #   * +:access_key_id+ - (String)
+      #   * +:secret_access_key+ - (String)
+      #   * +:session_token+ - (String)
+      #   * +:expiration+ - (Time)
+      # * +:federated_user+ - (Hash)
+      #   * +:federated_user_id+ - (String)
+      #   * +:arn+ - (String)
+      # * +:packed_policy_size+ - (Integer)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :get_federation_token, 'GetFederationToken'
+
+      # Calls the GetSessionToken API operation.
+      # @method get_session_token(options = {})
+      #
+      # === Options:
+      #
+      # * +:duration_seconds+ - (Integer) The duration, in seconds, that the
+      #   session should last. Acceptable durations for IAM user sessions range
+      #   from 3600s (1 hour) to 129600s (36 hours), with 43200 as the default.
+      #   Sessions started for AWS Account owners are restricted to a maximum
+      #   3600s.
+      #
+      # === Response Structure:
+      #
+      # * +:credentials+ - (Hash)
+      #   * +:access_key_id+ - (String)
+      #   * +:secret_access_key+ - (String)
+      #   * +:session_token+ - (String)
+      #   * +:expiration+ - (Time)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :get_session_token, 'GetSessionToken'
+
+      ## end client methods ##
+
     end
   end
 end

data/lib/aws/sts/errors.rb

@@ -13,13 +13,9 @@
 
 module AWS
   class STS
-
-    # @private
     module Errors
 
-      BASE_ERROR_GRAMMAR = Client::XML::BaseError
-
-      include Core::LazyErrorClasses
+      extend Core::LazyErrorClasses
 
     end
   end

data/lib/aws/sts/request.rb

@@ -17,7 +17,7 @@ module AWS
     # @private
     class Request < Core::Http::Request
 
-      include Core::AuthorizeV4
+      include Core::Signature::Version4
 
       def service
         'sts'

data/lib/user.rb

@@ -0,0 +1,49 @@
+# 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
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+class User < AWS::Record::HashModel
+
+  set_shard_name 'ruby-users'
+
+  optimistic_locking
+
+  ## attributes
+
+  string_attr :username
+  string_attr :role
+  string_attr :tags, :set => true
+
+  boolean_attr :verified, :default => false
+
+  timestamps
+
+  ## validations
+
+  validates_presence_of :username, :role
+
+  validates_inclusion_of :role, 
+    :in => %w(root admin member), 
+    :allow_nil => true
+
+  validates_length_of :username, 
+    :within => 3..20, 
+    :allow_nil => true
+
+  validates_format_of :username, :tags,
+    :with => /^[a-z0-9]+$/i, 
+    :allow_nil => true,
+    :message => 'may only be letters and numbers'
+
+  validates_count_of :tags, :maximum => 3
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -85,7 +85,6 @@ files:
 - rails/init.rb
 - lib/aws/auto_scaling/activity.rb
 - lib/aws/auto_scaling/activity_collection.rb
-- lib/aws/auto_scaling/client/xml.rb
 - lib/aws/auto_scaling/client.rb
 - lib/aws/auto_scaling/config.rb
 - lib/aws/auto_scaling/errors.rb
@@ -107,7 +106,6 @@ files:
 - lib/aws/auto_scaling/tag.rb
 - lib/aws/auto_scaling/tag_collection.rb
 - lib/aws/auto_scaling.rb
-- lib/aws/cloud_formation/client/xml.rb
 - lib/aws/cloud_formation/client.rb
 - lib/aws/cloud_formation/config.rb
 - lib/aws/cloud_formation/errors.rb
@@ -124,24 +122,17 @@ files:
 - lib/aws/cloud_formation/stack_summary.rb
 - lib/aws/cloud_formation/stack_summary_collection.rb
 - lib/aws/cloud_formation.rb
-- lib/aws/core/api_config.rb
 - lib/aws/core/async_handle.rb
-- lib/aws/core/authorize_v2.rb
-- lib/aws/core/authorize_v3.rb
-- lib/aws/core/authorize_v4.rb
-- lib/aws/core/authorize_with_session_token.rb
 - lib/aws/core/autoloader.rb
 - lib/aws/core/cacheable.rb
+- lib/aws/core/client/query_json.rb
+- lib/aws/core/client/query_xml.rb
 - lib/aws/core/client.rb
 - lib/aws/core/collection/limitable.rb
 - lib/aws/core/collection/simple.rb
 - lib/aws/core/collection.rb
 - lib/aws/core/configuration.rb
-- lib/aws/core/configured_client_methods.rb
-- lib/aws/core/configured_grammars.rb
-- lib/aws/core/configured_json_client_methods.rb
-- lib/aws/core/configured_option_grammars.rb
-- lib/aws/core/configured_xml_grammars.rb
+- lib/aws/core/data.rb
 - lib/aws/core/default_signer.rb
 - lib/aws/core/http/curb_handler.rb
 - lib/aws/core/http/handler.rb
@@ -149,10 +140,8 @@ files:
 - lib/aws/core/http/net_http_handler.rb
 - lib/aws/core/http/request.rb
 - lib/aws/core/http/response.rb
-- lib/aws/core/ignore_result_element.rb
 - lib/aws/core/indifferent_hash.rb
 - lib/aws/core/inflection.rb
-- lib/aws/core/json_client.rb
 - lib/aws/core/lazy_error_classes.rb
 - lib/aws/core/log_formatter.rb
 - lib/aws/core/meta_utils.rb
@@ -167,8 +156,21 @@ files:
 - lib/aws/core/response_cache.rb
 - lib/aws/core/service_interface.rb
 - lib/aws/core/session_signer.rb
+- lib/aws/core/signature/version_2.rb
+- lib/aws/core/signature/version_3.rb
+- lib/aws/core/signature/version_3_http.rb
+- lib/aws/core/signature/version_4.rb
 - lib/aws/core/uri_escape.rb
-- lib/aws/core/xml_grammar.rb
+- lib/aws/core/xml/frame.rb
+- lib/aws/core/xml/frame_stack.rb
+- lib/aws/core/xml/grammar.rb
+- lib/aws/core/xml/parser.rb
+- lib/aws/core/xml/root_frame.rb
+- lib/aws/core/xml/sax_handlers/libxml.rb
+- lib/aws/core/xml/sax_handlers/nokogiri.rb
+- lib/aws/core/xml/sax_handlers/ox.rb
+- lib/aws/core/xml/sax_handlers/rexml.rb
+- lib/aws/core/xml/stub.rb
 - lib/aws/core.rb
 - lib/aws/dynamo_db/attribute_collection.rb
 - lib/aws/dynamo_db/batch_get.rb
@@ -193,7 +195,6 @@ files:
 - lib/aws/ec2/availability_zone.rb
 - lib/aws/ec2/availability_zone_collection.rb
 - lib/aws/ec2/block_device_mappings.rb
-- lib/aws/ec2/client/xml.rb
 - lib/aws/ec2/client.rb
 - lib/aws/ec2/collection.rb
 - lib/aws/ec2/config.rb
@@ -263,7 +264,6 @@ files:
 - lib/aws/ec2.rb
 - lib/aws/elb/availability_zone_collection.rb
 - lib/aws/elb/backend_server_policy_collection.rb
-- lib/aws/elb/client/xml.rb
 - lib/aws/elb/client.rb
 - lib/aws/elb/config.rb
 - lib/aws/elb/errors.rb
@@ -271,7 +271,6 @@ files:
 - lib/aws/elb/listener.rb
 - lib/aws/elb/listener_collection.rb
 - lib/aws/elb/listener_opts.rb
-- lib/aws/elb/listener_spec.rb
 - lib/aws/elb/load_balancer.rb
 - lib/aws/elb/load_balancer_collection.rb
 - lib/aws/elb/load_balancer_policy.rb
@@ -282,7 +281,6 @@ files:
 - lib/aws/iam/access_key.rb
 - lib/aws/iam/access_key_collection.rb
 - lib/aws/iam/account_alias_collection.rb
-- lib/aws/iam/client/xml.rb
 - lib/aws/iam/client.rb
 - lib/aws/iam/collection.rb
 - lib/aws/iam/config.rb
@@ -377,8 +375,6 @@ files:
 - lib/aws/s3.rb
 - lib/aws/simple_db/attribute.rb
 - lib/aws/simple_db/attribute_collection.rb
-- lib/aws/simple_db/client/options.rb
-- lib/aws/simple_db/client/xml.rb
 - lib/aws/simple_db/client.rb
 - lib/aws/simple_db/config.rb
 - lib/aws/simple_db/consistent_read_option.rb
@@ -394,7 +390,6 @@ files:
 - lib/aws/simple_db/put_attributes.rb
 - lib/aws/simple_db/request.rb
 - lib/aws/simple_db.rb
-- lib/aws/simple_email_service/client/xml.rb
 - lib/aws/simple_email_service/client.rb
 - lib/aws/simple_email_service/config.rb
 - lib/aws/simple_email_service/email_address_collection.rb
@@ -426,7 +421,6 @@ files:
 - lib/aws/simple_workflow/workflow_type.rb
 - lib/aws/simple_workflow/workflow_type_collection.rb
 - lib/aws/simple_workflow.rb
-- lib/aws/sns/client/xml.rb
 - lib/aws/sns/client.rb
 - lib/aws/sns/config.rb
 - lib/aws/sns/errors.rb
@@ -439,7 +433,6 @@ files:
 - lib/aws/sns/topic_collection.rb
 - lib/aws/sns/topic_subscription_collection.rb
 - lib/aws/sns.rb
-- lib/aws/sqs/client/xml.rb
 - lib/aws/sqs/client.rb
 - lib/aws/sqs/config.rb
 - lib/aws/sqs/errors.rb
@@ -450,7 +443,6 @@ files:
 - lib/aws/sqs/received_sns_message.rb
 - lib/aws/sqs/request.rb
 - lib/aws/sqs.rb
-- lib/aws/sts/client/xml.rb
 - lib/aws/sts/client.rb
 - lib/aws/sts/config.rb
 - lib/aws/sts/errors.rb
@@ -464,6 +456,7 @@ files:
 - lib/net/http/connection_pool/connection.rb
 - lib/net/http/connection_pool/session.rb
 - lib/net/http/connection_pool.rb
+- lib/user.rb
 - lib/aws/api_config/AutoScaling-2011-01-01.yml
 - lib/aws/api_config/CloudFormation-2010-05-15.yml
 - lib/aws/api_config/DynamoDB-2011-12-05.yml
@@ -496,7 +489,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 886230137059201469
+      hash: -3624603295564050615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: