aws-sdk 1.1.3 → 1.1.4

data/lib/aws/s3/tree/child_collection.rb

@@ -11,17 +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'
-require 'aws/s3/tree/leaf_node'
-require 'aws/s3/tree/branch_node'
-
 module AWS
   class S3
     class Tree
 
       class ChildCollection
 
-        include Model
+        include Core::Model
         include Enumerable
 
         # @private

data/lib/aws/s3/tree/leaf_node.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/s3/tree/node'
-require 'aws/s3/s3_object'
-require 'aws/s3/object_version'
-require 'aws/s3/multipart_upload'
-
 module AWS
   class S3
     class Tree

data/lib/aws/s3/tree/parent.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/s3/tree/node'
-
 module AWS
   class S3
 
@@ -23,7 +20,7 @@ module AWS
       # ({Tree} and {BranchNode}).
       module Parent
 
-        include Model
+        include Core::Model
 
         # @private
         def initialize collection, options = {}

data/lib/aws/s3/uploaded_part.rb

@@ -11,8 +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'
-
 module AWS
   class S3
 
@@ -23,7 +21,7 @@ module AWS
     #  upload.parts.inject(0) { |sum, part| sum + part.size }
     class UploadedPart
 
-      include Model
+      include Core::Model
 
       # @return [MultipartUpload] The upload to which this belongs.
       attr_reader :upload

data/lib/aws/s3/uploaded_part_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/s3/paginated_collection'
-require 'aws/s3/uploaded_part'
-
 module AWS
   class S3
 
@@ -27,7 +23,7 @@ module AWS
     class UploadedPartCollection
 
       include Enumerable
-      include Model
+      include Core::Model
       include PaginatedCollection
 
       # @return [MultipartUpload] The upload to which the parts belong.

data/lib/aws/simple_db.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/common'
-require 'aws/service_interface'
-require 'aws/simple_db/errors'
-require 'aws/simple_db/client'
-require 'aws/simple_db/domain_collection'
+require 'aws/core'
+require 'aws/simple_db/config'
 
 module AWS
 
@@ -141,7 +138,25 @@ module AWS
   #
   class SimpleDB
 
-    include ServiceInterface
+    AWS.register_autoloads(self, 'aws/simple_db') do
+      autoload :Attribute,             'attribute'
+      autoload :AttributeCollection,   'attribute_collection'
+      autoload :Client,                'client'
+      autoload :ConsistentReadOption,  'consistent_read_option'
+      autoload :DeleteAttributes,      'delete_attributes'
+      autoload :Domain,                'domain'
+      autoload :DomainCollection,      'domain_collection'
+      autoload :DomainMetadata,        'domain_metadata'
+      autoload :Errors,                'errors' 
+      autoload :ExpectConditionOption, 'expect_condition_option'
+      autoload :Item,                  'item'
+      autoload :ItemCollection,        'item_collection'
+      autoload :ItemData,              'item_data'
+      autoload :PutAttributes,         'put_attributes'
+      autoload :Request,               'request'
+    end
+
+    include Core::ServiceInterface
 
     # Returns a collection object that represents the domains in your
     # account.

data/lib/aws/simple_db/attribute.rb

@@ -11,18 +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'
-require 'aws/simple_db/consistent_read_option'
-require 'aws/simple_db/put_attributes'
-require 'aws/simple_db/delete_attributes'
-
 module AWS
   class SimpleDB
 
     # Represents a single named item attribute in SimpleDB.
     class Attribute
 
-      include Model
+      include Core::Model
       include Enumerable
       include ConsistentReadOption
       include PutAttributes

data/lib/aws/simple_db/attribute_collection.rb

@@ -11,17 +11,11 @@
 # 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/simple_db/attribute'
-require 'aws/simple_db/consistent_read_option'
-require 'aws/simple_db/put_attributes'
-require 'aws/simple_db/delete_attributes'
-
 module AWS
   class SimpleDB
     class AttributeCollection
 
-      include Model
+      include Core::Model
       include Enumerable
       include ConsistentReadOption
       include PutAttributes

data/lib/aws/simple_db/client.rb

@@ -11,22 +11,20 @@
 # 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/simple_db/request'
-require 'aws/simple_db/client/xml'
-require 'aws/simple_db/client/options'
-require 'aws/inflection'
-require 'aws/simple_db/errors'
 require 'time'
 
 module AWS
   class SimpleDB
     
     # @private
-    class Client < BaseClient
+    class Client < Core::Client
 
-      include ConfiguredClientMethods
+      AWS.register_autoloads(self, 'aws/simple_db/client') do
+        autoload :Options, 'options'
+        autoload :XML,     'xml'
+      end
+
+      include Core::ConfiguredClientMethods
 
       API_VERSION = '2009-04-15'
 

data/lib/aws/simple_db/client/options.rb

@@ -11,16 +11,14 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/configured_option_grammars'
-
 module AWS
   class SimpleDB
-    class Client < BaseClient
+    class Client < Core::Client
 
       # @private
       module Options
 
-        include ConfiguredOptionGrammars
+        include Core::ConfiguredOptionGrammars
 
         define_configured_grammars
 

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

@@ -11,22 +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'
-require 'aws/xml_grammar'
-
 module AWS
   class SimpleDB
-    class Client < BaseClient
+    class Client < Core::Client
 
       # @private
       module XML
 
-        include ConfiguredXmlGrammars
-
-        extend IgnoreResultElement
+        include Core::ConfiguredXmlGrammars
+        extend Core::IgnoreResultElement
 
-        BaseResponse = XmlGrammar.customize do
+        BaseResponse = Core::XmlGrammar.customize do
           element "ResponseMetadata" do
             element "BoxUsage" do
               float_value
@@ -34,7 +29,7 @@ module AWS
           end
         end
 
-        BaseError = XmlGrammar.customize do
+        BaseError = Core::XmlGrammar.customize do
           element("Errors") do
             ignore
             element("Error") do

data/lib/aws/{naming.rb → simple_db/config.rb}

@@ -11,21 +11,10 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/inflection'
+AWS::Core::Configuration.module_eval do
 
-module AWS
+  add_service 'SimpleDB', 'simple_db', 'sdb.amazonaws.com'
 
-  # @private
-  module Naming
-
-    def service_name
-      self.name.split(/::/)[1]
-    end
-
-    def service_ruby_name
-      @service_ruby_name ||= Inflection.ruby_name(service_name)
-    end
-
-  end
+  add_option :simple_db_consistent_reads, false, :boolean => true
 
 end

data/lib/aws/simple_db/delete_attributes.rb

@@ -11,8 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/simple_db/expect_condition_option'
-
 module AWS
   class SimpleDB
 

data/lib/aws/simple_db/domain.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/errors'
-require 'aws/model'
-require 'aws/simple_db/domain_metadata'
-require 'aws/simple_db/item_collection'
-
 module AWS
   class SimpleDB
 
@@ -36,7 +31,7 @@ module AWS
       # @private
       class NonEmptyDeleteError < StandardError; end
 
-      include Model
+      include Core::Model
 
       # @param [String] The name of a SimpleDB domain to reference.
       def initialize(name, options = {})

data/lib/aws/simple_db/domain_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/simple_db/domain'
-
 module AWS
   class SimpleDB
 
@@ -39,7 +36,7 @@ module AWS
     #
     class DomainCollection
 
-      include Model
+      include Core::Model
       include Enumerable
 
       # Creates a domain in SimpleDB and returns a domain object.

data/lib/aws/simple_db/domain_metadata.rb

@@ -11,8 +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'
-
 module AWS
   class SimpleDB
 
@@ -37,7 +35,7 @@ module AWS
     # 
     class DomainMetadata
 
-      include Model
+      include Core::Model
 
       # @private
       ATTRIBUTES = [

data/lib/aws/simple_db/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/simple_db/client/xml'
-
 module AWS
   class SimpleDB
 
@@ -39,7 +36,7 @@ module AWS
     # @private
     module Errors
       BASE_ERROR_GRAMMAR = Client::XML::BaseError
-      include LazyErrorClasses
+      include Core::LazyErrorClasses
     end
 
   end

data/lib/aws/simple_db/item.rb

@@ -11,12 +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/simple_db/item_data'
-require 'aws/simple_db/attribute_collection'
-require 'aws/simple_db/expect_condition_option'
-require 'aws/simple_db/consistent_read_option'
-
 module AWS
   class SimpleDB
 
@@ -29,7 +23,7 @@ module AWS
     #
     class Item
 
-      include Model
+      include Core::Model
       include ExpectConditionOption
       include ConsistentReadOption
 

data/lib/aws/simple_db/item_collection.rb

@@ -11,21 +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'
-require 'aws/simple_db/item'
-require 'aws/simple_db/item_data'
-require 'aws/simple_db/consistent_read_option'
-
-# for 1.8.6
-require 'enumerator'
-
 module AWS
   class SimpleDB
 
     # Represents a collection of items in a SimpleDB domain.
     class ItemCollection
 
-      include Model
+      include Core::Model
       include Enumerable
       include ConsistentReadOption
 
@@ -107,7 +99,9 @@ module AWS
       # @return [nil]
       def each options = {}, &block
 
-        return if handle_query_options(:each, options, &block)
+        handle_query_options(options) do |c, opts|
+          return c.each(opts, &block)
+        end
 
         if attributes = options.delete(:select)
           return select(attributes, options, &block)
@@ -185,12 +179,14 @@ module AWS
 
         args = attributes + [options]
 
-        return if handle_query_options(:select, *args, &block)
+        handle_query_options(*args) do |c, *clean_args|
+          return c.select(*clean_args, &block)
+        end
 
         unless block_given?
           return Enumerator.new(self, :select, *args)
         end
-  
+
         if attributes.empty?
           output_list = '*'
         #elsif attributes == ['*']
@@ -238,7 +234,9 @@ module AWS
       #   items to fetch from SimpleDB.  More than one request may be
       #   required to satisfy the limit.
       def count options = {}, &block
-        return if handle_query_options(:count, options, &block)
+        handle_query_options(options) do |c, opts|
+          return c.count(opts, &block)
+        end
 
         options = options.merge(:output_list => "count(*)")
 
@@ -403,17 +401,18 @@ module AWS
       # turns e.g. each(:where => 'foo', ...) into where('foo').each(...)
       # @private
       protected
-      def handle_query_options(method, *args, &block)
+      def handle_query_options(*args)
         options = args.pop if args.last.kind_of?(Hash)
-        if query_option = (options.keys & [:where, :order, :limit]).first
-          option_args = options[query_option]
-          option_args = [option_args] unless option_args.kind_of?(Array)
-          options.delete(query_option)
-          send(query_option, *option_args).
-            send(method, *(args + [options]), &block)
-          true
-        else
-          false
+        if query_options = options.keys & [:where, :order, :limit] and
+            !query_options.empty?
+          c = self
+          query_options.each do |query_option|
+            option_args = options[query_option]
+            option_args = [option_args] unless option_args.kind_of?(Array)
+            options.delete(query_option)
+            c = send(query_option, *option_args)
+          end
+          yield(c, *(args + [options]))
         end
       end