aws-sdk 1.1.3 → 1.1.4

data/lib/aws/core/configured_client_methods.rb

@@ -0,0 +1,76 @@
+# Copyright 2011 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 ConfiguredClientMethods
+  
+      # @private
+      module ClassMethods
+  
+        include ApiConfig
+  
+        def configure_client
+  
+          super
+  
+          unless self::XML.include?(ConfiguredXmlGrammars)
+            self::XML.module_eval do
+              include(ConfiguredXmlGrammars)
+              define_configured_grammars
+            end
+          end
+  
+          unless self::Options.include?(ConfiguredOptionGrammars)
+            self::Options.module_eval do
+              include(ConfiguredOptionGrammars)
+              define_configured_grammars
+            end
+          end
+  
+          api_config[:operations].each do |name, customizations|
+            option_grammar = self::Options.operation_grammar(name)
+            add_client_request_method(Inflection.ruby_name(name).to_sym,
+                                      :xml_grammar =>
+                                      self::XML.operation_grammar(name)) do
+              configure_request do |request, options|
+                request.add_param("Action", name)
+                option_grammar.request_params(options).each do |param|
+                  request.add_param(param)
+                end
+              end
+            end
+          end
+           
+        end
+  
+        def operation_xml_grammar(name)
+          customized_name = "Customized#{name}"
+          if self::XML.const_defined?(customized_name)
+            self::XML.const_get(customized_name)
+          else
+            self::XML.const_get(name)
+          end
+        end
+  
+      end
+  
+      def self.included(mod)
+        mod.extend(ClassMethods)
+      end
+  
+    end
+  end
+end

data/lib/aws/core/configured_grammars.rb

@@ -0,0 +1,63 @@
+# Copyright 2011 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 ConfiguredGrammars
+  
+      # @private
+      module ClassMethods
+  
+        include ApiConfig
+  
+        def base_grammar
+          raise NotImplementedError
+        end
+  
+        def operation_grammar(name)
+          customized_name = "Customized#{name}"
+          if const_defined?(customized_name)
+            const_get(customized_name)
+          else
+            const_get(name)
+          end
+        end
+  
+        def input_or_output
+          raise NotImplementedError
+        end
+  
+        def process_customizations(name, customizations)
+          customizations
+        end
+  
+        def define_configured_grammars
+          api_config[:operations].each do |name, data|
+            customizations = process_customizations(name,
+                                                    data[input_or_output])
+            const_set(name,
+                      base_grammar.customize(customizations))
+            #                     BaseResponse.customize([{
+            #                                               "#{name}Result" =>
+            #                                               [:ignore, *data[:output]]
+            #                                             }]))
+          end
+        end
+  
+      end
+  
+    end
+  end
+end

data/lib/aws/{configured_option_grammars.rb → core/configured_option_grammars.rb}

@@ -11,36 +11,34 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/configured_grammars'
-require 'aws/option_grammar'
-
 module AWS
+  module Core
 
-  # @private
-  module ConfiguredOptionGrammars
+    # @private
+    module ConfiguredOptionGrammars
 
-    module ClassMethods
+      module ClassMethods
 
-      include ConfiguredGrammars::ClassMethods
+        include ConfiguredGrammars::ClassMethods
 
-      def base_grammar
-        if const_defined?(:BaseOptions)
-          const_get(:BaseOptions)
-        else
-          OptionGrammar
+        def base_grammar
+          if const_defined?(:BaseOptions)
+            const_get(:BaseOptions)
+          else
+            OptionGrammar
+          end
+        end
+
+        def input_or_output
+          :input
         end
-      end
 
-      def input_or_output
-        :input
       end
 
-    end
+      def self.included(mod)
+        mod.extend(ClassMethods)
+      end
 
-    def self.included(mod)
-      mod.extend(ClassMethods)
     end
-
   end
-
 end

data/lib/aws/{configured_xml_grammars.rb → core/configured_xml_grammars.rb}

@@ -11,37 +11,35 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/configured_grammars'
-require 'aws/xml_grammar'
-
 module AWS
-
-  # @private
-  module ConfiguredXmlGrammars
+  module Core
 
     # @private
-    module ClassMethods
+    module ConfiguredXmlGrammars
+
+      # @private
+      module ClassMethods
 
-      include ConfiguredGrammars::ClassMethods
+        include ConfiguredGrammars::ClassMethods
 
-      def base_grammar
-        if const_defined?(:BaseResponse)
-          const_get(:BaseResponse)
-        else
-          XmlGrammar
+        def base_grammar
+          if const_defined?(:BaseResponse)
+            const_get(:BaseResponse)
+          else
+            XmlGrammar
+          end
+        end
+
+        def input_or_output
+          :output
         end
-      end
 
-      def input_or_output
-        :output
       end
 
-    end
+      def self.included(mod)
+        mod.extend(ClassMethods)
+      end
 
-    def self.included(mod)
-      mod.extend(ClassMethods)
     end
-
   end
-
 end

data/lib/aws/core/default_signer.rb

@@ -0,0 +1,67 @@
+# Copyright 2011 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.
+
+require 'base64'
+require 'openssl'
+
+module AWS
+  module Core
+
+    # Computes signatures using credentials that are stored in memory.
+    class DefaultSigner
+
+      # @return [String] The Access Key ID used to sign requests.
+      attr_reader :access_key_id
+
+      # @return [String] The Secret Access Key used to sign requests.
+      attr_reader :secret_access_key
+
+      # @return [String] The Session Token used to sign requests.
+      attr_reader :session_token
+
+      # @param [String] access_key_id The Access Key ID used to sign
+      #   requests.
+      #
+      # @param [String] secret_access_key The Secret Access Key used to
+      #   sign requests.
+      #
+      # @param [String] session_token The Session Token used to sign
+      #   requests.  You can get credentials that include a session
+      #   token using the {STS} class.
+      def initialize(access_key_id, secret_access_key, session_token = nil)
+
+        @access_key_id = access_key_id
+        @secret_access_key = secret_access_key
+        @session_token = session_token
+
+        raise "Missing credentials" unless access_key_id and secret_access_key
+
+      end
+
+      # Signs a string using the credentials stored in memory.
+      #
+      # @param [String] string_to_sign The string to sign.
+      #
+      # @param [String] digest_method The digest method to use when
+      #   computing the HMAC digest.
+      def sign(string_to_sign, digest_method = 'sha256')
+        Base64.encode64(
+          OpenSSL::HMAC.digest(
+            OpenSSL::Digest::Digest.new(digest_method),
+            secret_access_key, 
+            string_to_sign)).strip
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,129 @@
+# Copyright 2011 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.
+
+require 'thread'
+
+module AWS
+  module Core
+    module Http
+  
+      # @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
+          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
+        def fill_multi(items)
+          items.each do |item|
+            c = make_easy_handle(*item)
+            @multi.add(c)
+          end
+        end
+  
+        # starts a background thread that waits for new items and
+        # sends them through the Curl::Multi handle
+        private
+        def start_processor
+          @processor = Thread.new do
+            loop do
+              items = nil
+              @sem.synchronize do
+                items = @q.slice!(0..-1)
+              end
+              unless items.empty?
+                fill_multi(items)
+                @multi.perform do
+                  # curl is idle, so process more items if we can get them
+                  # without blocking
+                  if !@q.empty? && @sem.try_lock
+                    begin
+                      fill_multi(@q.slice!(0..-1))
+                    ensure
+                      @sem.unlock
+                    end
+                  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
+  
+          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
+            header_data.length
+          }
+  
+          case request.http_method
+          when 'GET'
+            # ....
+          when 'HEAD'
+            curl.head = true
+          when 'PUT'
+            curl.put_data = request.body
+          when 'POST'
+            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
+end