aws-sdk 1.1.3 → 1.1.4

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

@@ -0,0 +1,73 @@
+# 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
+    module Http
+  
+      # Represents the http response from a service request.
+      #
+      # Responses have:
+      #
+      # * status (200, 404, 500, etc)
+      # * headers (hash of response headers)
+      # * body (the response body)
+      class Response
+  
+        # @return [Integer] (200) response http status code 
+        attr_accessor :status
+  
+        # @return [Hash] ({}) response http headers
+        attr_accessor :headers
+  
+        # @return [String] ('') response http body
+        attr_accessor :body
+  
+        # @return [String] (false) set to true if the client gives up
+        #   before getting a response from the service.
+        attr_accessor :timeout
+        alias_method :timeout?, :timeout
+  
+        # @param [Hash] options
+        # @option options [Integer] :status (200) HTTP status code
+        # @option options [Hash] :headers ({}) HTTP response headers
+        # @option options [String] :body ('') HTTP response body
+        def initialize options = {}, &block
+          @status = options[:status] || 200
+          @headers = options[:headers] || {}
+          @body = options[:body] || ''
+          yield(self) if block_given?
+          self
+        end
+  
+        # Returns the header value with the given name.
+        #
+        # The value is matched case-insensitively so if the headers hash
+        # contains a key like 'Date' and you request the value for
+        # 'date' the 'Date' value will be returned.
+        #
+        # @param [String,Symbol] name The name of the header to fetch a value for.
+        # @return [String,nil] The value of the given header
+        def header name
+          headers.each_pair do |header_name, header_value|
+            if header_name.downcase == name.to_s.downcase
+              return header_value.is_a?(Array) ? header_value.first : header_value
+            end
+          end
+          nil
+        end
+  
+      end
+    end
+  end
+end

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

@@ -11,28 +11,24 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/configured_xml_grammars'
-
 module AWS
-
-  # @private
-  #
-  # Mixin for XML grammar modules to ignore the outer
-  # "OperationNameResult" element that wraps the response fields in
-  # Coral-like service responses.
-  module IgnoreResultElement
+  module Core
 
     # @private
     #
-    # Invoked by
-    # ConfiguredXmlGrammars::ClassMethods#define_configured_grammars
-    def process_customizations(name, customizations)
-      [{
-         "#{name}Result" =>
-         [:ignore, *customizations]
-       }]
+    # Mixin for XML grammar modules to ignore the outer
+    # "OperationNameResult" element that wraps the response fields in
+    # Coral-like service responses.
+    module IgnoreResultElement
+  
+      # @private
+      #
+      # Invoked by
+      # ConfiguredXmlGrammars::ClassMethods#define_configured_grammars
+      def process_customizations name, customizations
+        [{ "#{name}Result" => [:ignore, *customizations] }]
+      end
+  
     end
-
   end
-
 end

data/lib/aws/core/indifferent_hash.rb

@@ -0,0 +1,88 @@
+# 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
+
+    # A utility class to provide indifferent access to hash data.  
+    #
+    # Inspired by ActiveSupport's HashWithIndifferentAccess, this class
+    # has a few notable differences:
+    #
+    # * ALL keys are converted to strings (via #to_s)
+    # * It does not deep merge/convert hashes indifferently, good for fla
+    # * It will not perserve default value behaviours
+    #
+    # These features were omitted because our primary use for this class is to
+    # wrap a 1-level hash as a return value, but we want the user to access
+    # the values with string or symbol keys.
+    # 
+    # @private
+    class IndifferentHash < Hash
+  
+      def initialize *args
+        if args.first.is_a?(Hash)
+          super()
+          merge!(*args)
+        else
+          super(*args)
+        end
+      end
+  
+      alias_method :_getter, :[]
+      alias_method :_setter, :[]=
+  
+      def []=(key, value)
+        _setter(_convert_key(key), value)
+      end
+      alias_method :store, :[]=
+  
+      def [] key
+        _getter(_convert_key(key))
+      end
+  
+      def merge! hash
+        hash.each_pair do |key,value|
+          self[key] = value 
+        end
+        self
+      end
+      alias_method :update, :merge!
+  
+      def merge hash
+        self.dup.merge!(hash)
+      end
+  
+      def has_key? key
+        super(_convert_key(key))
+      end
+      alias_method :key?, :has_key?
+      alias_method :member?, :has_key?
+      alias_method :include?, :has_key?
+  
+      def fetch key, *extras, &block
+        super(_convert_key(key), *extras, &block)
+      end
+  
+      def delete key
+        super(_convert_key(key))
+      end
+  
+      private
+      def _convert_key key
+        key.is_a?(String) ? key : key.to_s
+      end
+  
+    end
+  end
+end

data/lib/aws/core/inflection.rb

@@ -0,0 +1,47 @@
+# 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 Inflection
+
+      def ruby_name(aws_name)
+
+        #aws_name.sub(/^.*:/, '').
+        #  gsub(/[A-Z]+[a-z]+/){|str| "_#{str.downcase}_" }.
+        #  gsub(/(^_|_$)/, '').
+        #  gsub(/__/, '_').
+        #  downcase
+
+        return 'etag' if aws_name == 'ETag'
+
+        aws_name.
+          sub(/^.*:/, '').                          # strip namespace
+          gsub(/([A-Z0-9]+)([A-Z][a-z])/, '\1_\2'). # split acronyms from words
+          scan(/[a-z]+|\d+|[A-Z0-9]+[a-z]*/).       # split remaining words
+          join('_').downcase                        # join parts _ and downcase
+
+      end
+      module_function :ruby_name
+
+      def class_name(name)
+        name.sub(/^(.)/) { |m| m.upcase }.
+          gsub(/[-_]([a-z])/i) { |m| m[1,1].upcase }
+      end
+      module_function :class_name
+
+    end
+  end
+end

data/lib/aws/core/lazy_error_classes.rb

@@ -0,0 +1,62 @@
+# 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 LazyErrorClasses
+  
+      # @private
+      module ClassMethods
+  
+        def const_missing(name)
+          base_error_grammar = self::BASE_ERROR_GRAMMAR
+          const_missing_mutex.synchronize do
+            return if const_defined?(name)
+            const_set(name,
+                      Class.new(self::Base) do
+                        include Errors::ModeledError
+  
+                        # so that MyService::Errors::Foo::Bar will work
+                        const_set(:BASE_ERROR_GRAMMAR, base_error_grammar)
+                        include LazyErrorClasses
+                      end)
+          end
+        end
+  
+        def error_class(code)
+          module_eval(code.gsub(".","::"))
+        end
+  
+        def included(mod)
+          raise NotImplementedError.new("#{self} lazy-generates error classes; "+
+                                        "therefore it is not suitable for "+
+                                        "inclusion in other modules")
+        end
+  
+      end
+  
+      def self.included(mod)
+        unless mod.const_defined?(:BASE_ERROR_GRAMMAR)
+          mod.const_set(:BASE_ERROR_GRAMMAR, XmlGrammar)
+        end
+        mutex = Mutex.new
+        MetaUtils.extend_method(mod, :const_missing_mutex) { mutex }
+        mod.send(:include, Errors)
+        mod.extend(ClassMethods)
+      end
+  
+    end
+  end
+end

data/lib/aws/{uri_escape.rb → core/meta_utils.rb}

@@ -11,34 +11,35 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'cgi'
-
 module AWS
+  module Core
 
-  # @private
-  module UriEscape
-
-    # Does URI escaping the way AWS expects it to be done.
-    #
     # @private
-    protected
-    def escape value
-      value = value.encode("UTF-8") if
-        value.respond_to?(:encode)
-      CGI::escape(value.to_s).gsub('+', '%20')
-    end
+    module MetaUtils
 
-    # URI-escapes a path without escaping the separators
-    #
-    # @private
-    protected
-    def escape_path value
-      escaped = ""
-      value.scan(%r{(/?)([^/]+)(/?)}) do |(leading, part, trailing)|
-        escaped << leading + escape(part) + trailing
+      def extend_method(object, name, &block)
+        object.extend(
+          Module.new do
+            define_method(name, &block)
+          end
+        )
       end
-      escaped
-    end
+      module_function :extend_method
 
+      def class_extend_method(klass, name, &block)
+        klass.send(:include,
+          Module.new do
+           define_method(name, &block)
+          end
+        )
+      end
+      module_function :class_extend_method
+
+      def extend(object, &block)
+        object.extend(Module.new(&block))
+      end
+      module_function :extend
+
+    end
   end
 end

data/lib/aws/core/model.rb

@@ -0,0 +1,57 @@
+# 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 Model
+  
+      # @private 
+      def initialize(*args)
+        options = args.last.kind_of?(Hash) ? args.last : {}
+        @config = case
+        when options[:config] then options[:config]
+        when args.first.respond_to?(:config) then args.first.config
+        else AWS.config
+        end
+      end
+  
+      # @return [Configuration] Returns the configuration for this object.
+      attr_reader :config
+  
+      # Each class including this module has its own client class.
+      # Generally it is the service namespace suffixed by client:
+      #
+      # * s3_client
+      # * simple_db_client
+      #
+      # @return Retruns the proper client class for the given model.
+      def client
+        @config.send("#{config_prefix}_client")
+      end
+  
+      # @return [String] The short name of the service as used in coniguration.
+      #   (e.g. SimpleDB::Client.config_prefix #=> 'simple_db')
+      def config_prefix
+        Inflection.ruby_name(self.class.to_s.split(/::/)[1])
+      end
+  
+      # @return [String] A sensible default inspect string.
+      def inspect
+        "<#{self.class}>"
+      end
+
+    end
+  end
+end

data/lib/aws/{authorize_with_session_token.rb → core/naming.rb}

@@ -12,18 +12,19 @@
 # language governing permissions and limitations under the License.
 
 module AWS
+  module Core
 
-  module AuthorizeWithSessionToken
+    # @private
+    module Naming
 
-    def add_authorization! signer
-      if signer.respond_to?(:session_token) and
-          token = signer.session_token
-        add_param("SecurityToken", token)
+      def service_name
+        self.name.split(/::/)[1]
       end
 
-      super
-    end
+      def service_ruby_name
+        @service_ruby_name ||= Inflection.ruby_name(service_name)
+      end
 
+    end
   end
-
 end