aws-sdk 1.5.7 → 1.5.8

data/lib/aws/s3/config.rb

@@ -15,6 +15,8 @@ AWS::Core::Configuration.module_eval do
 
   add_service 'S3', 's3', 's3.amazonaws.com'
 
+  add_option :s3_force_path_style, false, :boolean => true
+
   add_option :s3_multipart_threshold, 16 * 1024 * 1024
 
   add_option :s3_multipart_min_part_size, 5 * 1024 * 1024

data/lib/aws/s3/request.rb

@@ -31,6 +31,9 @@ module AWS
       # @private
       attr_accessor :body_stream
 
+      # @private
+      attr_accessor :force_path_style
+
       def metadata= metadata
         Array(metadata).each do |name, value|
           headers["x-amz-meta-#{name}"] = value
@@ -46,12 +49,20 @@ module AWS
       end
 
       def host
-        Client.path_style_bucket_name?(bucket) ? @host : "#{bucket}.#{@host}"
+        path_style? ? @host : "#{bucket}.#{@host}"
+      end
+
+      def path_style?
+        if force_path_style
+          true
+        else
+          Client.path_style_bucket_name?(bucket)
+        end
       end
 
       def path
         parts = []
-        parts << bucket if bucket and Client.path_style_bucket_name?(bucket)
+        parts << bucket if bucket and path_style?
         parts << escape_path(key) if key
         "/#{parts.join('/')}"
       end
@@ -120,10 +131,7 @@ module AWS
 
         # virtual hosted-style requests require the hostname to appear
         # in the canonicalized resource prefixed by a forward slash.
-        if 
-          Client.dns_compatible_bucket_name?(bucket) and
-          !Client.path_style_bucket_name?(bucket)
-        then
+        if Client.dns_compatible_bucket_name?(bucket) and !path_style?
           parts << "/#{bucket}"
         end
   

data/lib/aws/simple_email_service/identity.rb

@@ -23,7 +23,7 @@ module AWS
     # @attr [String] complaint_topic_arn
     #
     # @attr [Boolean] forwarding_enabled When +false+, complaint and bounce
-    #   notifications will not be forwarded via email.  Can only be set to 
+    #   notifications will not be forwarded via email.  Can only be set to
     #   +false+ when there is both a +bounce_topic+ and +complaint_topic+.
     #
     class Identity < Core::Resource
@@ -42,9 +42,9 @@ module AWS
 
       attribute :verification_token, :static => true
 
-      mutable_attribute :bounce_topic_arn, :as => :bounce_topic
+      mutable_attribute :bounce_topic_arn, :from => :bounce_topic
 
-      mutable_attribute :complaint_topic_arn, :as => :complaint_topic
+      mutable_attribute :complaint_topic_arn, :from => :complaint_topic
 
       mutable_attribute :forwarding_enabled
 
@@ -109,7 +109,7 @@ module AWS
         verification_status == 'Success'
       end
 
-      # @return [Boolean] Returns +true+ if verification for this email 
+      # @return [Boolean] Returns +true+ if verification for this email
       #   address/domain is still pending.
       def pending?
         verification_status == 'Pending'
@@ -118,13 +118,15 @@ module AWS
       # Deletes the current identity.
       # @return [nil]
       def delete
-        client.delete_identity(:identity => identity)  
+        client.delete_identity(:identity => identity)
         nil
       end
 
       # @return [Boolean] Returns true if the identity exists.
       def exists?
-        !!get_resource[:verification_attributes][identity]
+        options = { :identities => [identity] }
+        resp = client.get_identity_verification_attributes(options)
+        !!resp[:verification_attributes][identity]
       end
 
       protected
@@ -158,7 +160,7 @@ module AWS
         when :forwarding_enabled
           method = :set_identity_feedback_forwarding_enabled
           client_opts[:forwarding_enabled] = value
-        else raise "unhandled attribute: #{attr.name}" 
+        else raise "unhandled attribute: #{attr.name}"
         end
         client.send(method, client_opts)
       end

data/lib/aws/simple_workflow/domain.rb

@@ -45,7 +45,7 @@ module AWS
       info_attribute :status, :to_sym => true
 
       config_attribute :retention_period, 
-        :as => 'workflowExecutionRetentionPeriodInDays',
+        :from => 'workflowExecutionRetentionPeriodInDays',
         :duration => true,
         :static => true
 

data/lib/aws/simple_workflow/resource.rb

@@ -29,12 +29,12 @@ module AWS
 
         # the simple workflow attributes are all given as 'lowerCamelCase'
         # this converts the :snake_case name to the correct format
-        unless options[:as]
+        unless options[:from]
           parts = []
           name.to_s.split(/_/).each_with_index do |part,n|
             parts << (n == 0 ? part : part.capitalize)
           end
-          options[:as] = parts.join.to_sym
+          options[:from] = parts.join.to_sym
         end
 
         if options[:duration]

data/lib/aws/simple_workflow/workflow_execution.rb

@@ -96,27 +96,27 @@ module AWS
       info_attribute :close_status, :to_sym => true
       protected :close_status
 
-      info_attribute :closed_at, :as => 'closeTimestamp', :timestamp => true
+      info_attribute :closed_at, :from => 'closeTimestamp', :timestamp => true
 
       info_attribute :execution_status, :to_sym => true
       protected :execution_status
 
-      info_attribute :parent_details, :as => 'parent', :static => true
+      info_attribute :parent_details, :from => 'parent', :static => true
       protected :parent_details
 
       info_attribute :started_at, 
-        :as => 'startTimestamp', 
+        :from => 'startTimestamp', 
         :timestamp => true,
         :static => true
 
       info_attribute :tag_list, :static => true
       protected :tag_list
 
-      info_attribute :type_details, :as => 'workflowType', :static => true
+      info_attribute :type_details, :from => 'workflowType', :static => true
       protected :type_details
 
       attribute :latest_activity_task_scheduled_at, 
-        :as => 'latestActivityTaskTimestamp',
+        :from => 'latestActivityTaskTimestamp',
         :timestamp => true
 
       attribute :latest_execution_context

data/lib/aws/sns/subscription_collection.rb

@@ -25,52 +25,50 @@ module AWS
     #
     class SubscriptionCollection
 
-      include Core::Model
-      include Enumerable
+      include Core::Collection::WithNextToken
+
+      # Returns a subscription with the given ARN.  This does not make
+      # a request to AWS.
+      # @param [String] arn The subscription ARN.
+      # @return [Subscription]
+      def [] arn
+        Subscription.new(arn, :config => config)
+      end
+
+      protected
 
       # Yield each subscription belonging to this account.
       # @yieldparam [Subscription] subscription Each of the
       #   subscriptions in the account.
       # @return [nil]
-      def each
-        next_token = nil
-        begin
-          opts = request_opts
-          opts[:next_token] = next_token if next_token
-          resp = client.send(list_request, opts)
-          resp.subscriptions.each do |sub|
-            subscription = Subscription.new(sub.subscription_arn,
-              :endpoint => sub.endpoint,
-              :protocol => sub.protocol.tr('-','_').to_sym,
-              :owner_id => sub.owner,
-              :topic_arn => sub.topic_arn,
-              :config => config
-            )
-            yield(subscription)
-          end
-          next_token = resp.data[:next_token]
-        end until next_token.nil?
-        nil
-      end
+      def _each_item next_token, options, &block
+
+        options[:next_token] = next_token if next_token
+
+        resp = client.send(client_method, options.merge(request_options))
+        resp.data[:subscriptions].each do |sub|
+
+          subscription = Subscription.new(
+            sub[:subscription_arn],
+            :endpoint => sub[:endpoint],
+            :protocol => sub[:protocol].tr('-','_').to_sym,
+            :owner_id => sub[:owner],
+            :topic_arn => sub[:topic_arn],
+            :config => config)
+
+          yield(subscription)
+
+        end
+
+        resp.data[:next_token]
 
-      # Retrieves a subscription object by ARN.  This method does not
-      # make any requests to the service.
-      #
-      # @param [String] arn The ARN of the subscription to retrieve.
-      # @return [Subscription] The subscription with the given ARN.
-      def [] arn
-        Subscription.new(arn, :config => config)
       end
 
-      # @private
-      protected
-      def list_request
+      def client_method
         :list_subscriptions
       end
 
-      # @private
-      protected
-      def request_opts
+      def request_options
         {}
       end
 

data/lib/aws/sns/topic_collection.rb

@@ -16,9 +16,7 @@ module AWS
 
     class TopicCollection
 
-      include Core::Model
-      include Enumerable
-
+      include Core::Collection::WithNextToken
 
       # Creates and returns a new SNS Topic.
       # @return [Topic] Returns a new topic with the given name.
@@ -40,25 +38,22 @@ module AWS
         Topic.new(topic_arn, :config => config)
       end
 
-      # Yields once for each topic.
-      # @yieldparam [Topic] topic
-      # @return [nil]
-      def each &block
+      protected
+
+      def _each_item next_token, options, &block
+
+        options[:next_token] = next_token if next_token
 
-        next_token = nil
+        resp = client.list_topics(options)
+        resp.data[:topics].each do |details|
 
-        begin
-          
-          list_options = next_token ? { :next_token => next_token } : {} 
-          response = client.list_topics(list_options)
+          topic = Topic.new(details[:topic_arn], :config => config)
 
-          response.topics.each do |t|
-            topic = Topic.new(t.topic_arn, :config => config)
-            yield(topic)
-          end
+          yield(topic)
+
+        end
 
-        end while(next_token = response.data[:next_token])
-        nil
+        resp.data[:next_token]
 
       end
 

data/lib/aws/sns/topic_subscription_collection.rb

@@ -22,30 +22,29 @@ module AWS
     #  topic.subscriptions.
     #    select { |s| s.protocol == :email }.
     #    map(&:endpoint)
+    #
     class TopicSubscriptionCollection < SubscriptionCollection
 
       include Core::Model
       include Enumerable
 
-      # @return [Topic] The topic to which all the subscriptions
-      # belong.
-      attr_reader :topic
-
       # @private
       def initialize(topic, opts = {})
         @topic = topic
         super
       end
 
-      # @private
+      # @return [Topic] The topic to which all the subscriptions
+      # belong.
+      attr_reader :topic
+
       protected
-      def list_request
+
+      def client_method
         :list_subscriptions_by_topic
       end
 
-      # @private
-      protected
-      def request_opts
+      def request_options
         { :topic_arn => topic.arn }
       end
 

data/lib/aws/sqs/queue.rb

@@ -540,14 +540,14 @@ module AWS
 
       end
 
-      # @overload batch_change_message_visibility(visibility_timeout, *messages)
+      # @overload batch_change_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)
+      #     queue.batch_change_visibility(10, messages)
       #
       #   @param [Integer] visibility_timeout The new value for the message's 
       #     visibility timeout (in seconds).
@@ -560,7 +560,7 @@ module AWS
       #
       #   @return [nil]
       #
-      # @overload batch_change_message_visibility(*messages_with_timeouts)
+      # @overload batch_change_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
@@ -572,7 +572,7 @@ module AWS
       #     messages << { :message => 'handle1', :visibility_timeout => 5 }
       #     messages << { :message => 'handle2', :visibility_timeout => 10 }
       #
-      #     queue.bacth_change_message_visibility(*messages)
+      #     queue.batch_change_visibility(*messages)
       #
       #   @param [Hash] message A list hashes, each with a +:visibility_timeout+
       #     and a +:message+.  

data/lib/aws/sqs/queue_collection.rb

@@ -31,8 +31,7 @@ module AWS
     #   sqs.queues[url].send_message("HELLO")
     class QueueCollection
 
-      include Core::Model
-      include Enumerable
+      include Core::Collection::Simple
 
       # @private
       def initialize(opts = {})
@@ -109,16 +108,6 @@ module AWS
 
       end
 
-      # @yieldparam [Queue] queue Each {Queue} object in the collection.
-      def each(&block)
-        options = {}
-        options[:queue_name_prefix] = prefix if prefix
-        client.list_queues(options)[:queue_urls].each do |url|
-          queue = self[url]
-          yield(queue)
-        end
-      end
-
       # @param [String] prefix The queue name prefix.
       # @return [QueueCollection] A new collection representing only
       #   the queues whose names start with the given prefix.
@@ -130,7 +119,7 @@ module AWS
       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.
@@ -164,6 +153,21 @@ module AWS
         client.get_queue_url(client_opts.merge(options))[:queue_url]
       end
 
+      protected
+
+      # @yieldparam [Queue] queue Each {Queue} object in the collection.
+      def _each_item options, &block
+
+        options[:queue_name_prefix] = prefix if prefix
+
+        resp = client.list_queues(options)
+        resp.data[:queue_urls].each do |url|
+          queue = self[url]
+          yield(queue)
+        end
+
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -119,7 +119,6 @@ files:
 - lib/aws/cloud_formation/stack_resource.rb
 - lib/aws/cloud_formation/stack_resource_collection.rb
 - lib/aws/cloud_formation/stack_resource_summary_collection.rb
-- lib/aws/cloud_formation/stack_summary.rb
 - lib/aws/cloud_formation/stack_summary_collection.rb
 - lib/aws/cloud_formation.rb
 - lib/aws/cloud_watch/alarm.rb
@@ -292,6 +291,15 @@ files:
 - lib/aws/elb/load_balancer_policy_collection.rb
 - lib/aws/elb/request.rb
 - lib/aws/elb.rb
+- lib/aws/emr/client.rb
+- lib/aws/emr/config.rb
+- lib/aws/emr/errors.rb
+- lib/aws/emr/instance_group.rb
+- lib/aws/emr/instance_group_collection.rb
+- lib/aws/emr/job_flow.rb
+- lib/aws/emr/job_flow_collection.rb
+- lib/aws/emr/request.rb
+- lib/aws/emr.rb
 - lib/aws/errors.rb
 - lib/aws/iam/access_key.rb
 - lib/aws/iam/access_key_collection.rb
@@ -481,6 +489,7 @@ files:
 - lib/aws/api_config/DynamoDB-2011-12-05.yml
 - lib/aws/api_config/EC2-2012-06-01.yml
 - lib/aws/api_config/ELB-2011-08-15.yml
+- lib/aws/api_config/EMR-2009-03-31.yml
 - lib/aws/api_config/IAM-2010-05-08.yml
 - lib/aws/api_config/SimpleDB-2009-04-15.yml
 - lib/aws/api_config/SimpleEmailService-2010-12-01.yml
@@ -508,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -730295580872100044
+      hash: -3495806020275811726
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: