aws-sdk 1.6.4 → 1.6.5

data/lib/aws/elb/load_balancer_policy.rb

@@ -14,7 +14,7 @@
 module AWS
   class ELB
     class LoadBalancerPolicy < Core::Resource
-      
+
       # @private
       def initialize load_balancer, name, options = {}
         @load_balancer = load_balancer

data/lib/aws/elb/load_balancer_policy_collection.rb

@@ -15,7 +15,7 @@ module AWS
   class ELB
 
     class LoadBalancerPolicyCollection
-      
+
       include Core::Collection::Simple
 
       def initialize load_balancer, options = {}
@@ -25,10 +25,10 @@ module AWS
 
       attr_reader :load_balancer
 
-      # Creates a new load balancer policy that contains the necessary 
-      # attributes depending on the policy type. Policies are settings 
-      # that are saved for your load balancer and that can be applied to 
-      # the front-end listener, or the back-end application server, 
+      # Creates a new load balancer policy that contains the necessary
+      # attributes depending on the policy type. Policies are settings
+      # that are saved for your load balancer and that can be applied to
+      # the front-end listener, or the back-end application server,
       # depending on your policy type.
       #
       # == Applying Policies
@@ -161,9 +161,9 @@ module AWS
 
         attributes.each do |attr_name,values|
           [values].flatten.each do |value|
-            attribute_list << { 
-              :attribute_name => attr_name, 
-              :attribute_value => value.to_s 
+            attribute_list << {
+              :attribute_name => attr_name,
+              :attribute_value => value.to_s
             }
           end
         end
@@ -194,7 +194,7 @@ module AWS
         response.policy_descriptions.each do |desc|
 
           load_balancer_policy = LoadBalancerPolicy.new_from(
-            :describe_load_balancer_policies, 
+            :describe_load_balancer_policies,
             desc, load_balancer, desc.policy_name)
 
           yield(load_balancer_policy)

data/lib/aws/emr/client.rb

@@ -15,8 +15,6 @@ module AWS
   class EMR
     class Client < Core::QueryClient
 
-      define_client_methods('2009-03-31')
-
       # @private
       CACHEABLE_REQUESTS = Set[]
 
@@ -295,6 +293,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2009-03-31')
+
     end
   end
 end

data/lib/aws/iam/client.rb

@@ -17,8 +17,6 @@ module AWS
     # Client class for AWS Identity and Access Management (IAM).
     class Client < Core::QueryClient
 
-      define_client_methods('2010-05-08')
-
       # @private
       CACHEABLE_REQUESTS = Set[
         :get_group,
@@ -1087,6 +1085,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2010-05-08')
+
     end
   end
 end

data/lib/aws/route_53/client.rb

@@ -15,8 +15,6 @@ module AWS
   class Route53
     class Client < Core::RESTClient
 
-      define_client_methods('2012-02-29')
-
       # @private
       CACHEABLE_REQUESTS = Set[]
 
@@ -257,6 +255,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2012-02-29')
+
     end
   end
 end

data/lib/aws/s3/bucket_lifecycle_configuration.rb

@@ -31,9 +31,9 @@ module AWS
     # * +#status+
     # * +#id+
     #
-    # Objects with keys matching a rule prefix will be deleted after 
+    # Objects with keys matching a rule prefix will be deleted after
     # #expiration_days have passed.
-    # 
+    #
     # A rule is comprised primarily of a prefix and number of expiration days.
     # Objects with keys that start with the given prefix will be automatically
     # deleted after "expiration days" have passed.  Rules also have an
@@ -80,15 +80,15 @@ module AWS
     #       remove_rule(rule) if rule.disabled?
     #     end
     #   end
-    #   
+    #
     # You can also remove all rules in a single call:
     #
     #   # remove all rules from this lifecycle configuration
     #   bucket.lifecycle_configuration.clear
-    # 
+    #
     # == Editing Existing Rules
     #
-    # You can also make changes to existing rules.  
+    # You can also make changes to existing rules.
     #
     #   # change the expiration days to 10 for EVERY rule
     #   bucket.lifecycle_configuration.update do
@@ -102,7 +102,7 @@ module AWS
     # or the changes will not be persisted.
     #
     class BucketLifecycleConfiguration
-      
+
       # @private
       def initialize bucket, options = {}
         @bucket = bucket
@@ -110,7 +110,7 @@ module AWS
         @rules = [] if options[:empty] == true
       end
 
-      # @return [Bucket] Returns the bucket this lifecycle configuration 
+      # @return [Bucket] Returns the bucket this lifecycle configuration
       #   belongs to.
       attr_reader :bucket
 
@@ -127,7 +127,7 @@ module AWS
         end
       end
 
-      # @param [String] prefix 
+      # @param [String] prefix
       #
       # @param [Integer] expiration_days Indicates the lifetime for objects
       #   matching the given prefix.
@@ -158,7 +158,7 @@ module AWS
       #   bucket.lifecycle_configuration.update do
       #     remove_rule('rule-id')
       #   end
-      #   
+      #
       #   # remove all disabled rules
       #   bucket.lifecycle_configuration.update do
       #     rules.each do |rule|
@@ -172,7 +172,7 @@ module AWS
       # @param [Rule,String] rule_or_rule_id
       #
       # @return [nil]
-      # 
+      #
       def remove_rule rule_or_rule_id
         rule_id = rule_or_rule_id
         if rule_id.nil?
@@ -184,7 +184,7 @@ module AWS
       end
 
       # Saves changes made to this lifecycle configuration.
-      # 
+      #
       #   # set the number of days before expiration for all rules to 10
       #   config = bucket.lifecycle_configuration
       #   config.rules.each do |rule|
@@ -213,7 +213,7 @@ module AWS
       #  # 2 requests
       #  bucket.lifecycle_configuration.add_rule 'prefix/a', 10
       #  bucket.lifecycle_configuration.add_rule 'prefix/b', 5
-      # 
+      #
       # @return [nil]
       #
       def update &block
@@ -229,7 +229,7 @@ module AWS
 
       # Yields to the given block.  Before yielding, the current
       # rules will be blanked out.  This allows you to provide all
-      # new rules. 
+      # new rules.
       #
       # When the block is complete, a single call will be made to save
       # the new rules.
@@ -257,19 +257,20 @@ module AWS
       # @return [String] Returns an xml string representation of this
       #   bucket lifecycle configuration.
       def to_xml
-        xml = Builder::XmlMarkup.new(:indent => 2)
-        xml.LifecycleConfiguration do
-          rules.each do |rule|
-            xml.Rule do
-              xml.ID rule.id
-              xml.Prefix rule.prefix
-              xml.Status rule.status
-              xml.Expiration do
-                xml.Days rule.expiration_days
+        Nokogiri::XML::Builder.new do |xml|
+          xml.LifecycleConfiguration do
+            rules.each do |rule|
+              xml.Rule do
+                xml.ID rule.id
+                xml.Prefix rule.prefix
+                xml.Status rule.status
+                xml.Expiration do
+                  xml.Days rule.expiration_days
+                end
               end
             end
           end
-        end.strip
+        end.doc.root.to_xml
       end
 
       protected
@@ -299,7 +300,7 @@ module AWS
       #   # remove the rule created above
       #   bucket.lifecycle_configuration.remove_rule 'temporary/'
       #
-      # 
+      #
       class Rule
 
         def initialize configuration, id, prefix, expiration_days, status

data/lib/aws/s3/s3_object.rb

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 
 require 'uri'
+require 'base64'
 
 module AWS
   class S3
@@ -819,13 +820,16 @@ module AWS
           copy_opts[:metadata_directive] = "REPLACE"
         end
 
+        if options[:cache_control]
+          copy_opts[:cache_control] = options[:cache_control]
+          copy_opts[:metadata_directive] = "REPLACE"
+        end
+
         copy_opts[:acl] = options[:acl] if options[:acl]
         copy_opts[:version_id] = options[:version_id] if options[:version_id]
         copy_opts[:server_side_encryption] =
           options[:server_side_encryption] if
           options.key?(:server_side_encryption)
-        copy_opts[:cache_control] = options[:cache_control] if
-          options[:cache_control]
         add_sse_options(copy_opts)
 
         if options[:reduced_redundancy]

data/lib/aws/simple_db/client.rb

@@ -17,8 +17,6 @@ module AWS
     # Client class for Amazon SimpleDB.
     class Client < Core::QueryClient
 
-      define_client_methods('2009-04-15')
-
       # @private
       REGION_US_E1 = 'sdb.amazonaws.com'
 
@@ -282,6 +280,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2009-04-15')
+
     end
   end
 end

data/lib/aws/simple_email_service/client.rb

@@ -17,8 +17,6 @@ module AWS
     # Client class for Amazon Simple E-mail Service (SES).
     class Client < Core::QueryClient
 
-      define_client_methods('2010-12-01')
-
       REGION_US_E1 = 'email.us-east-1.amazonaws.com'
 
       # @private
@@ -271,6 +269,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2010-12-01')
+
     end
   end
 end

data/lib/aws/simple_workflow/client.rb

@@ -17,8 +17,6 @@ module AWS
     # Client class for Amazon Simple Workflow Service (SWF).
     class Client < Core::JSONClient
 
-      define_client_methods('2012-01-25')
-
       # @private
       CACHEABLE_REQUESTS = Set[
         :count_pending_activity_tasks,
@@ -1189,6 +1187,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2012-01-25')
+
       protected
 
       def cacheable_request? name, options

data/lib/aws/sns/client.rb

@@ -17,8 +17,6 @@ module AWS
     # Client class for Amazon Simple Notifications Service (SNS).
     class Client < Core::QueryClient
 
-      define_client_methods('2010-03-31')
-
       # @private
       CACHEABLE_REQUESTS = Set[]
 
@@ -261,6 +259,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2010-03-31')
+
     end
   end
 end

data/lib/aws/sqs/client.rb

@@ -17,8 +17,6 @@ module AWS
     # Client class for Amazon Simple Queue Service (SQS).
     class Client < Core::QueryClient
 
-      define_client_methods('2011-10-01')
-
       # @private
       CACHEABLE_REQUESTS = Set[]
 
@@ -247,6 +245,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2011-10-01')
+
     end
   end
 end

data/lib/aws/sts/client.rb

@@ -17,8 +17,6 @@ module AWS
     # Client class for AWS Security Token Service (STS).
     class Client < Core::QueryClient
 
-      define_client_methods('2011-06-15')
-
       REGION_US_E1 = 'sts.amazonaws.com'
 
       # @private
@@ -101,6 +99,8 @@ module AWS
 
       ## end client methods ##
 
+      define_client_methods('2011-06-15')
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -154,7 +154,6 @@ files:
 - lib/aws/core/indifferent_hash.rb
 - lib/aws/core/inflection.rb
 - lib/aws/core/json_client.rb
-- lib/aws/core/json_error_parser.rb
 - lib/aws/core/json_request_builder.rb
 - lib/aws/core/json_response_parser.rb
 - lib/aws/core/lazy_error_classes.rb
@@ -520,7 +519,6 @@ files:
 - lib/aws/api_config/SNS-2010-03-31.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
@@ -540,7 +538,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 339006987852134461
+      hash: -4596701733449318258
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/aws/core/json_error_parser.rb

@@ -1,25 +0,0 @@
-# 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.
-
-module AWS
-  module Core
-
-    # @private
-    module JSONErrorParser
-
-      end
-
-    end
-
-  end
-end