aws-sdk 1.2.4 → 1.2.5

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.4"
+  VERSION = "1.2.5"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'

data/lib/aws/core/http/curb_handler.rb

@@ -19,26 +19,30 @@ module AWS
   
       # @private
       class CurbHandler
-  
+
         def initialize
           @q = []
           @sem = Mutex.new
           @multi = Curl::Multi.new
-  
+
           start_processor
         end
-  
+
         def handle request, response
           raise "unsupport http reqest method: #{request.http_method}" unless
             ['GET', 'HEAD', 'PUT', 'POST', 'DELETE'].include? request.http_method
           @sem.synchronize do
             @q << [request, response, Thread.current]
-            @processor.wakeup
+            begin
+             @processor.wakeup
+            rescue ThreadError
+              start_processor
+            end
           end
           Thread.stop
           nil
         end
-  
+
         # fills the Curl::Multi handle with the given array of queue
         # items, calling make_easy_handle on each one first
         private
@@ -48,7 +52,7 @@ module AWS
             @multi.add(c)
           end
         end
-  
+
         # starts a background thread that waits for new items and
         # sends them through the Curl::Multi handle
         private
@@ -73,56 +77,60 @@ module AWS
                   end
                 end
               end
-  
+
               # wait for a new item to show up before continuing
               Thread.stop if @q.empty?
             end
           end
         end
-  
+
         private
         def make_easy_handle request, response, thread = nil
-  
+
           url = request.use_ssl? ? 
             "https://#{request.host}:443#{request.uri}" :
             "http://#{request.host}#{request.uri}"
-  
+
           curl = Curl::Easy.new(url)
-          curl.headers = request.headers
-  
+          # curl.verbose = true
+          request.headers.each {|k, v| curl.headers[k] = v}
+
           if proxy = request.proxy_uri
             curl.proxy_url = proxy.to_s
             curl.proxy_port = proxy.port
           end
-  
+
           curl.on_header {|header_data|
-            name, value = header_data.strip.split(/:\s+/, 2)
-            response.headers[name] = value
+            if header_data =~ /:\s+/
+              name, value = header_data.strip.split(/:\s+/, 2)
+              response.headers[name] = value
+            end
             header_data.length
           }
-  
+
           case request.http_method
           when 'GET'
             # ....
           when 'HEAD'
             curl.head = true
           when 'PUT'
-            curl.put_data = request.body
+            curl.put_data = request.body || ''
           when 'POST'
-            curl.post_body = request.body
+            curl.headers['Content-Type'] = curl.headers['Content-Type'] || ''
+            curl.post_body = request.body || ''
           when 'DELETE'
             curl.delete = true
           end
-  
+
           curl.on_complete do
             response.body = curl.body_str
             response.status = curl.response_code
             thread.run if thread
           end
-  
+
           curl
         end
-  
+
       end
     end
   end

data/lib/aws/ec2/instance.rb

@@ -467,7 +467,8 @@ module AWS
       #
       # @return [String] the console output.
       def console_output
-        Base64.decode64(client.get_console_output(:instance_id => self.id).output)
+        output = client.get_console_output(:instance_id => self.id).output
+        Base64.decode64(output) if output
       end
 
       # Associates the elastic IP address with this instance.

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

@@ -36,7 +36,6 @@ module AWS
 
             groups = p.groups.collect do |group|
               SecurityGroup.new(group.group_id,
-                :name => group.group_name,
                 :owner_id => group.user_id,
                 :config => config)
             end

data/lib/aws/s3/object_collection.rb

@@ -287,7 +287,12 @@ module AWS
       # @private
       protected
       def next_markers page
-        { :marker => (last = page.contents.last and last.key) }
+        marker = (last = page.contents.last and last.key)
+        if marker.nil?
+          raise 'Unable to find marker in S3 list objects response'
+        else
+          { :marker => marker }
+        end
       end
 
       # processes items in batches of 1k items

data/lib/aws/sns/topic.rb

@@ -91,17 +91,20 @@ module AWS
       # @param [mixed] endpoint The endpoint that should receive
       #   messages that are published to this topic.  Valid values
       #   for +endpoint+ include:
+      #
       #   * URI object
       #   * http and https URI strings
-      #   * email addresse
+      #   * email address
       #   * {SQS::Queue}
       #   * SQS queue ARN
+      #   * phone number of an SMS-enabled device
+      #
       # @param [Hash] options
       # @option options [Boolean] :json (false)
       # @return [Subscription,nil] Returns a subscription when possible.
       #   If the subscription requires confirmation first, then +nil+ is
       #   returned instead.
-      def subscribe(endpoint, opts = {})
+      def subscribe endpoint, opts = {}
         subscribe_opts = endpoint_opts(endpoint, opts).merge(:topic_arn => arn)
         resp = client.subscribe(subscribe_opts)
         if arn = resp.subscription_arn and arn =~ /^arn:/
@@ -369,6 +372,8 @@ module AWS
         when endpoint.include?("@")
           { :protocol => opts[:json] ? "email-json" : "email",
             :endpoint => endpoint }
+        when endpoint.gsub(/\D/,'') =~ /\d{11,15}/
+          { :protocol => "sms", :endpoint => endpoint.gsub(/\D/,'') }
         else
           raise ArgumentError, "could not determine protocol for '#{endpoint}'"
         end

data/lib/aws/sqs/queue.rb

@@ -94,8 +94,7 @@ module AWS
       # @return [SentMessage] An object containing information about
       #   the message that was sent.
       def send_message(body)
-        resp = client.send_message(:queue_url => url,
-                                   :message_body => body)
+        resp = client.send_message(:queue_url => url, :message_body => body)
         msg = SentMessage.new
         msg.message_id = resp.message_id
         msg.md5 = resp.md5_of_message_body

data/lib/aws/sqs/received_sns_message.rb

@@ -22,19 +22,19 @@ module AWS
 
       include Core::Model
 
-      # @param [String] encoded_body The base64 encoded json string
+      # @param [String] body The SQS message body
       #   from a message published by SNS.
       # @param [Hash] options
-      def initialize encoded_body, options = {}
-        @encoded_body = encoded_body
+      def initialize body, options = {}
+        @body = body
         super
       end
 
-      # @return [String] Returns the Base64 encoded JSON hash as was
+      # @return [String] Returns the JSON hash (as a string) as was
       #   published by SNS.  See {#body} to get the decoded message
       #   or {#to_h} to get the decoded JSON hash as a ruby hash.
-      def encoded_body
-        @encoded_body
+      def raw_message
+        @body
       end
 
       # @return[String] Returns the decoded message as was published.
@@ -92,7 +92,7 @@ module AWS
 
       # @return [Hash] Returns the decoded message as a hash.
       def to_h
-        data = JSON.parse(Base64.decode64(@encoded_body))
+        data = JSON.parse(@body)
         {
           :body => data['Message'],
           :topic_arn => data['TopicArn'],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdk
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Amazon Web Services
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-07 00:00:00 -08:00
+date: 2011-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency