aws-sdk 1.2.2 → 1.2.3

data/lib/aws/core.rb

@@ -56,7 +56,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'

data/lib/aws/ec2/instance.rb

@@ -463,6 +463,13 @@ module AWS
         images.create(options.merge(:instance_id => id, :name => name))
       end
 
+      # Retrieves the console output for the instance.
+      #
+      # @return [String] the console output.
+      def console_output
+        Base64.decode64(client.get_console_output(:instance_id => self.id).output)
+      end
+
       # Associates the elastic IP address with this instance.
       #
       # @param [ElasticIp,String] elastic_ip Either a public IP address

data/lib/aws/ec2/security_group/ingress_ip_permission_collection.rb

@@ -30,7 +30,7 @@ module AWS
         def each
           security_group.ip_permissions_list.each do |p|
 
-            ports = [p.from_port, p.to_port]
+            ports = p.respond_to?(:from_port) ? [p.from_port, p.to_port] : nil
 
             ip_ranges = p.ip_ranges.collect{|ip| ip.cidr_ip }
 

data/lib/aws/record/finder_methods.rb

@@ -20,13 +20,16 @@ module AWS
     module FinderMethods
   
       # @param [String] id The id of the record to load.
+      # @param [Hash] options
+      # @option options [String] :domain Specifies what domain
+      #   should be searched.
       # @raise [RecordNotFound] Raises a record not found exception if there
       #   was no data found for the given id.
       # @return [Record::Base] Returns the record, as a sub-class of 
       #   Record::Base
-      def [] id
+      def find_by_id id, options = {}
 
-        data = sdb_domain.items[id].data.attributes
+        data = sdb_domain(options[:domain]).items[id].data.attributes
 
         raise RecordNotFound, "no data found for id: #{id}" if data.empty?
 
@@ -35,6 +38,7 @@ module AWS
         obj
 
       end
+      alias_method :[], :find_by_id
 
       # Finds records in SimpleDB and returns them as objects of the 
       # current class.

data/lib/aws/record/scope.rb

@@ -103,13 +103,8 @@ module AWS
         case
         when id_or_mode == :all   then scope
         when id_or_mode == :first then scope.limit(1).first
-        when scope.send(:_empty?) then base_class[id_or_mode]
         else
-          object = scope.where('itemName() = ?', id_or_mode).limit(1).first
-          if object.nil?
-            raise RecordNotFound, "no data found for record `#{id_or_mode}`"
-          end
-          object
+          base_class.find_by_id(id_or_mode, :domain => scope._domain)
         end
   
       end
@@ -205,11 +200,10 @@ module AWS
           Enumerator.new(self, :"_each_object")
         end
       end
-  
-      # @private
-      private
-      def _empty?
-        @options == {}
+
+      protected
+      def _domain
+        @options[:domain] 
       end
   
       # @private
@@ -290,7 +284,7 @@ module AWS
       # @private
       private
       def _item_collection
-        items = base_class.sdb_domain(@options[:domain]).items
+        items = base_class.sdb_domain(_domain).items
         items = items.order(*@options[:order]) if @options[:order]
         items = items.limit(*@options[:limit]) if @options[:limit]
         Record.as_array(@options[:where]).each do |where_condition|

data/lib/aws/s3/multipart_upload.rb

@@ -178,6 +178,8 @@ module AWS
       #     this option must match the total number of bytes written
       #     to S3 during the operation.  This option is required if
       #     +:data+ is an IO-like object without a +size+ method.
+      #
+      #   @option options [Integer] :part_number The part number.
       def add_part(data_or_options, options = {})
         if data_or_options.kind_of?(Hash)
           part_options = base_opts.merge(data_or_options)

data/lib/aws/s3/s3_object.rb

@@ -781,6 +781,8 @@ module AWS
         req.add_param("AWSAccessKeyId", config.signer.access_key_id)
         req.add_param("Signature", signature(method, expires, req))
         req.add_param("Expires", expires)
+        req.add_param("x-amz-security-token", config.signer.session_token) if
+          config.signer.session_token
 
         build_uri(options[:secure] != false, req)
       end
@@ -791,7 +793,9 @@ module AWS
       #
       # @option options [Boolean] :secure Whether to generate a
       #   secure (HTTPS) URL or a plain HTTP url.
+      #
       # @return [URI::HTTP, URI::HTTPS]
+      #
       def public_url(options = {})
         req = request_for_signing(options)
         build_uri(options[:secure] != false, req)
@@ -837,11 +841,20 @@ module AWS
       # @private
       private
       def signature(method, expires, request)
-        string_to_sign = [method,
-                          "", "",
-                          expires,
-                          request.canonicalized_resource].join("\n")
+
+        parts = []
+        parts << method
+        parts << ""
+        parts << ""
+        parts << expires
+        parts << "x-amz-security-token:#{config.signer.session_token}" if
+          config.signer.session_token
+        parts << request.canonicalized_resource
+
+        string_to_sign = parts.join("\n")
+
         config.signer.sign(string_to_sign, "sha1")
+
       end
 
       # @private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdk
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Amazon Web Services
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 -07:00
+date: 2011-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency