aws-sdk 1.1.3 → 1.1.4

data/lib/aws/sns/subscription_collection.rb

@@ -11,10 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/sns/subscription'
-require 'aws/sns/topic'
-
 module AWS
   class SNS
 
@@ -29,7 +25,7 @@ module AWS
     #
     class SubscriptionCollection
 
-      include Model
+      include Core::Model
       include Enumerable
 
       # Yield each subscription belonging to this account.

data/lib/aws/sns/topic.rb

@@ -12,18 +12,13 @@
 # language governing permissions and limitations under the License.
 
 require 'json'
-require 'aws/model'
-require 'aws/sns/policy'
-require 'aws/sns/subscription'
-require 'aws/sns/topic_subscription_collection'
-require 'aws/sqs'
 
 module AWS
   class SNS
 
     class Topic
 
-      include Model
+      include Core::Model
 
       # @param [String] arn The topic ARN.
       def initialize arn, options = {}

data/lib/aws/sns/topic_collection.rb

@@ -11,15 +11,12 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/sns/topic'
-
 module AWS
   class SNS
 
     class TopicCollection
 
-      include Model
+      include Core::Model
       include Enumerable
 
 

data/lib/aws/sns/topic_subscription_collection.rb

@@ -11,9 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/sns/subscription_collection'
-
 module AWS
   class SNS
 
@@ -27,7 +24,7 @@ module AWS
     #    map(&:endpoint)
     class TopicSubscriptionCollection < SubscriptionCollection
 
-      include Model
+      include Core::Model
       include Enumerable
 
       # @return [Topic] The topic to which all the subscriptions

data/lib/aws/sqs.rb

@@ -11,10 +11,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/common'
-require 'aws/service_interface'
-require 'aws/sqs/client'
-require 'aws/sqs/queue_collection'
+require 'aws/core'
+require 'aws/sqs/config'
 
 module AWS
 
@@ -57,7 +55,18 @@ module AWS
   #
   class SQS
 
-    include ServiceInterface
+    AWS.register_autoloads(self) do
+      autoload :Client,             'client'
+      autoload :Errors,             'errors'
+      autoload :Queue,              'queue'
+      autoload :QueueCollection,    'queue_collection'
+      autoload :Policy,             'policy'
+      autoload :ReceivedMessage,    'received_message'
+      autoload :ReceivedSNSMessage, 'received_sns_message'
+      autoload :Request,            'request'
+    end
+
+    include Core::ServiceInterface
 
     # @return [QueueCollection] The collection of all {Queue}
     #   objects in your account.

data/lib/aws/sqs/client.rb

@@ -11,20 +11,17 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/base_client'
-require 'aws/configured_client_methods'
-require 'aws/sqs/request'
-require 'aws/sqs/client/xml'
-require 'aws/sqs/errors'
-require 'aws/sqs/policy'
-
 module AWS
   class SQS
 
     # @private
-    class Client < BaseClient
+    class Client < Core::Client
+
+      AWS.register_autoloads(self) do
+        autoload :XML, 'xml'
+      end
 
-      include ConfiguredClientMethods
+      include Core::ConfiguredClientMethods
 
       API_VERSION = '2009-02-01'
 

data/lib/aws/sqs/client/xml.rb

@@ -11,20 +11,17 @@
 # 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'
-require 'aws/ignore_result_element'
-
 module AWS
   class SQS
-    class Client < BaseClient
+    class Client < Core::Client
 
       # @private
       module XML
 
-        include ConfiguredXmlGrammars
-        extend IgnoreResultElement
+        include Core::ConfiguredXmlGrammars
+        extend Core::IgnoreResultElement
 
-        BaseError = XmlGrammar.customize do
+        BaseError = Core::XmlGrammar.customize do
           element("Error") { ignore }
         end
 

data/lib/aws/sqs/config.rb

@@ -0,0 +1,18 @@
+# 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.
+
+AWS::Core::Configuration.module_eval do
+
+  add_service 'SQS', 'sqs', 'sqs.us-east-1.amazonaws.com'
+
+end

data/lib/aws/sqs/errors.rb

@@ -11,9 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/lazy_error_classes'
-require 'aws/sqs/client/xml'
-
 module AWS
   class SQS
 
@@ -22,7 +19,7 @@ module AWS
 
       BASE_ERROR_GRAMMAR = Client::XML::BaseError
 
-      include LazyErrorClasses
+      include Core::LazyErrorClasses
 
       def self.error_class(code)
         super(code.sub(/^AWS\.SimpleQueueService\./, ''))

data/lib/aws/sqs/policy.rb

@@ -11,15 +11,13 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/policy'
-
 module AWS
   class SQS
 
-    # @see AWS::Policy
-    class Policy < AWS::Policy
+    # @see Core::Policy
+    class Policy < Core::Policy
 
-      class Statement < AWS::Policy::Statement
+      class Statement < Core::Policy::Statement
 
         ACTION_MAPPING = {
           :add_permission => 'sqs:AddPermission',

data/lib/aws/sqs/queue.rb

@@ -11,11 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/inflection'
-require 'aws/model'
-require 'aws/sqs/received_message'
-require 'aws/sqs/received_sns_message'
-
 module AWS
   class SQS
 
@@ -36,7 +31,7 @@ module AWS
       # new messages.  
       DEFAULT_POLL_INTERVAL = 1
 
-      include Model
+      include Core::Model
 
       # @return [String] The queue URL.
       attr_reader :url
@@ -458,7 +453,7 @@ module AWS
           receive_opts[:attribute_names] = names.map do |name|
             name = ReceivedMessage::ATTRIBUTE_ALIASES[name.to_sym] if
               ReceivedMessage::ATTRIBUTE_ALIASES.key?(name.to_sym)
-            name = Inflection.class_name(name.to_s) if name.kind_of?(Symbol)
+            name = Core::Inflection.class_name(name.to_s) if name.kind_of?(Symbol)
             name
           end
         end

data/lib/aws/sqs/queue_collection.rb

@@ -11,9 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/sqs/queue'
-
 module AWS
   class SQS
 
@@ -34,7 +31,7 @@ module AWS
     #   sqs.queues[url].send_message("HELLO")
     class QueueCollection
 
-      include Model
+      include Core::Model
       include Enumerable
 
       # @private
@@ -81,7 +78,9 @@ module AWS
 
       # @yieldparam [Queue] queue Each {Queue} object in the collection.
       def each(&block)
-        client.list_queues.queue_urls.each do |url|
+        options = {}
+        options[:queue_name_prefix] = prefix if prefix
+        client.list_queues(options).queue_urls.each do |url|
           queue = self[url]
           yield(queue)
         end

data/lib/aws/sqs/received_message.rb

@@ -11,15 +11,13 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-
 module AWS
   class SQS
 
     # Represents a message received from an Amazon SQS Queue.
     class ReceivedMessage
 
-      include Model
+      include Core::Model
 
       # @return [Queue] The queue from which this message was
       #   received.

data/lib/aws/sqs/received_sns_message.rb

@@ -11,8 +11,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
 require 'time'
+require 'base64'
 
 module AWS
   class SQS
@@ -20,7 +20,7 @@ module AWS
     # Represents message published from an {SNS::Topic} to an {SQS::Queue}.
     class ReceivedSNSMessage
 
-      include Model
+      include Core::Model
 
       # @param [String] encoded_body The base64 encoded json string
       #   from a message published by SNS.

data/lib/aws/sqs/request.rb

@@ -11,18 +11,14 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/http/request'
-require 'aws/authorize_v2'
-require 'aws/authorize_with_session_token'
-
 module AWS
   class SQS
 
     # @private
-    class Request < AWS::Http::Request
+    class Request < Core::Http::Request
 
-      include AuthorizeV2
-      include AuthorizeWithSessionToken
+      include Core::AuthorizeV2
+      include Core::AuthorizeWithSessionToken
 
       def path
         full_url.path
@@ -42,5 +38,6 @@ module AWS
       end
 
     end
+
   end
 end

data/lib/aws/sts.rb

@@ -11,11 +11,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/service_interface'
-require 'aws/sts/client'
-require 'aws/sts/session'
-require 'aws/sts/federated_session'
-require 'aws/sts/policy'
+require 'aws/core'
+require 'aws/sts/config'
 
 module AWS
 
@@ -42,7 +39,16 @@ module AWS
   #
   class STS
 
-    include ServiceInterface
+    AWS.register_autoloads(self) do
+      autoload :Client,           'client'
+      autoload :Errors,           'errors'
+      autoload :FederatedSession, 'federated_session'
+      autoload :Policy,           'policy'
+      autoload :Request,          'request'
+      autoload :Session,          'session'
+    end
+
+    include Core::ServiceInterface
 
     # Returns a set of temporary credentials for an AWS account or IAM
     # User. The credentials consist of an Access Key ID, a Secret

data/lib/aws/sts/client.rb

@@ -11,19 +11,17 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/base_client'
-require 'aws/configured_client_methods'
-require 'aws/sts/request'
-require 'aws/sts/client/xml'
-require 'aws/sts/errors'
-
 module AWS
   class STS
 
     # @private
-    class Client < BaseClient
+    class Client < Core::Client
+
+      AWS.register_autoloads(self) do
+        autoload :XML, 'xml'
+      end
 
-      include ConfiguredClientMethods
+      include Core::ConfiguredClientMethods
 
       API_VERSION = '2011-06-15'
 

data/lib/aws/sts/client/xml.rb

@@ -11,22 +11,18 @@
 # 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'
-require 'aws/ignore_result_element'
-require 'aws/xml_grammar'
-
 module AWS
   class STS
-    class Client < BaseClient
+    class Client < Core::Client
 
       # @private
       module XML
 
-        include ConfiguredXmlGrammars
+        include Core::ConfiguredXmlGrammars
 
-        extend IgnoreResultElement
+        extend Core::IgnoreResultElement
 
-        BaseError = XmlGrammar.customize do
+        BaseError = Core::XmlGrammar.customize do
           element("Error") { ignore }
         end
 

data/lib/aws/sts/config.rb

@@ -0,0 +1,18 @@
+# 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.
+
+AWS::Core::Configuration.module_eval do
+
+  add_service 'STS', 'sts', 'sts.amazonaws.com'
+
+end