aws-sdk 1.1.3 → 1.1.4

data/lib/aws/record/base.rb

@@ -13,9 +13,10 @@
 
 # todo move these to included modules (like validations and naming)
 
+require 'aws/simple_db'
+
 require 'set'
 require 'uuidtools'
-require 'aws/indifferent_hash'
 
 require 'aws/record/naming'
 require 'aws/record/attribute_macros'
@@ -318,7 +319,7 @@ module AWS
       # @return [Hash] A hash with attribute names as hash keys (strings) and 
       #   attribute values (of mixed types) as hash values.
       def attributes
-        attributes = IndifferentHash.new
+        attributes = Core::IndifferentHash.new
         attributes['id'] = id if persisted?
         self.class.attributes.keys.inject(attributes) do |hash,attr_name|
           hash[attr_name] = __send__(attr_name)

data/lib/aws/record/errors.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/indifferent_hash'
-
 module AWS
   module Record
 
@@ -24,7 +22,7 @@ module AWS
 
     end
 
-    class Errors < IndifferentHash
+    class Errors < Core::IndifferentHash
       
       include Enumerable
 

data/lib/aws/s3.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/s3/client'
-require 'aws/s3/errors'
-require 'aws/s3/bucket_collection'
+require 'aws/core'
+require 'aws/s3/config'
 
 module AWS
 
@@ -97,7 +94,35 @@ module AWS
   #
   class S3
 
-    include ServiceInterface
+    AWS.register_autoloads(self) do
+      autoload :AccessControlList,            'access_control_list'
+      autoload :ACLObject,                    'acl_object'
+      autoload :Bucket,                       'bucket'
+      autoload :BucketCollection,             'bucket_collection'
+      autoload :BucketVersionCollection,      'bucket_version_collection'
+      autoload :Client,                       'client'
+      autoload :DataOptions,                  'data_options'
+      autoload :Errors,                       'errors'
+      autoload :MultipartUpload,              'multipart_upload'
+      autoload :MultipartUploadCollection,    'multipart_upload_collection'
+      autoload :ObjectCollection,             'object_collection'
+      autoload :ObjectMetadata,               'object_metadata'
+      autoload :ObjectUploadCollection,       'object_upload_collection'
+      autoload :ObjectVersion,                'object_version'
+      autoload :ObjectVersionCollection,      'object_version_collection'
+      autoload :PaginatedCollection,          'paginated_collection'
+      autoload :Policy,                       'policy'
+      autoload :PrefixAndDelimiterCollection, 'prefix_and_delimiter_collection'
+      autoload :PrefixedCollection,           'prefixed_collection'
+      autoload :PresignedPost,                'presigned_post'
+      autoload :Request,                      'request'
+      autoload :S3Object,                     's3_object'
+      autoload :Tree,                         'tree'
+      autoload :UploadedPart,                 'uploaded_part'
+      autoload :UploadedPartCollection,       'uploaded_part_collection'
+    end
+
+    include Core::ServiceInterface
 
     # @return [BucketCollection] Returns a collection that represents all 
     #  buckets in the account.

data/lib/aws/s3/access_control_list.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/s3/acl_object'
-
 module AWS
   class S3
 

data/lib/aws/s3/acl_object.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/meta_utils'
-require 'aws/inflection'
 require 'rexml/text'
 
 module AWS
@@ -81,7 +79,7 @@ module AWS
 
         def string_attr(element_name, options = {})
           method_name = options[:method_name] ||
-            Inflection.ruby_name(element_name)
+            Core::Inflection.ruby_name(element_name)
 
           attr_accessor(method_name)
           setter_option(method_name)
@@ -92,7 +90,7 @@ module AWS
 
         def object_attr(klass, options = {})
           base_name = klass.name[/::([^:]*)$/, 1]
-          method_name = Inflection.ruby_name(base_name)
+          method_name = Core::Inflection.ruby_name(base_name)
           cast = options[:cast] || Hash
 
           attr_reader(method_name)
@@ -105,7 +103,7 @@ module AWS
 
         def object_list_attr(list_element, klass, options = {})
           base_name = klass.name[/::([^:]*)$/, 1]
-          method_name = Inflection.ruby_name(options[:method_name].to_s || list_element)
+          method_name = Core::Inflection.ruby_name(options[:method_name].to_s || list_element)
           default_value = nil
           default_value = [] if options[:required]
 
@@ -118,7 +116,7 @@ module AWS
         end
 
         def setter_option(method_name)
-          MetaUtils.class_extend_method(self, :initialize) do |*args|
+          Core::MetaUtils.class_extend_method(self, :initialize) do |*args|
             opts = args.last || {}
             instance_variable_set("@#{method_name}", yield) if block_given?
             key = method_name.to_sym
@@ -168,8 +166,8 @@ module AWS
 
         def input_validator(method_name, &blk)
           validator = "__validator__#{blk.object_id}"
-          MetaUtils.class_extend_method(self, validator, &blk)
-          MetaUtils.class_extend_method(self, "validate_#{method_name}_input!") do |*args|
+          Core::MetaUtils.class_extend_method(self, validator, &blk)
+          Core::MetaUtils.class_extend_method(self, "validate_#{method_name}_input!") do |*args|
             (value, context) = args
             context = " "+context if context
             context ||= ""
@@ -202,14 +200,14 @@ module AWS
         end
 
         def validate_string(method_name)
-          MetaUtils.class_extend_method(self, :validate!) do
+          Core::MetaUtils.class_extend_method(self, :validate!) do
             super()
             raise "missing #{method_name}" unless send(method_name)
           end
         end
 
         def validate_object(method_name)
-          MetaUtils.class_extend_method(self, :validate!) do
+          Core::MetaUtils.class_extend_method(self, :validate!) do
             super()
             raise "missing #{method_name}" unless send(method_name)
             send(method_name).validate!
@@ -217,7 +215,7 @@ module AWS
         end
 
         def validate_list(method_name)
-          MetaUtils.class_extend_method(self, :validate!) do
+          Core::MetaUtils.class_extend_method(self, :validate!) do
             super()
             raise "missing #{method_name}" unless send(method_name)
             send(method_name).each { |member| member.validate! }
@@ -247,7 +245,7 @@ module AWS
         end
 
         def add_xml_child(method_name)
-          MetaUtils.class_extend_method(self, :body_xml) do
+          Core::MetaUtils.class_extend_method(self, :body_xml) do
             xml = super()
             value = send(method_name)
             xml += yield(value) if value

data/lib/aws/s3/bucket.rb

@@ -11,14 +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/object_collection'
-require 'aws/s3/bucket_version_collection'
-require 'aws/s3/object_version_collection'
-require 'aws/s3/multipart_upload_collection'
-require 'aws/s3/tree'
-require 'aws/meta_utils'
-
 module AWS
   class S3
 
@@ -34,7 +26,7 @@ module AWS
     #
     class Bucket
 
-      include Model
+      include Core::Model
 
       # @param [String] name
       # @param [Hash] options

data/lib/aws/s3/bucket_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/s3/bucket'
-
 module AWS
   class S3
 
@@ -36,7 +33,7 @@ module AWS
     #
     class BucketCollection
 
-      include Model
+      include Core::Model
       include Enumerable
 
       # Creates and returns a new Bucket.  For example:
@@ -79,7 +76,7 @@ module AWS
       #   :public_read_write, :authenticated_read, :bucket_owner_read and
       #   :bucket_owner_full_control
       # @return [Bucket]
-      def create(bucket_name, options = {})
+      def create bucket_name, options = {}
 
         # auto set the location constraint for the user if it is not 
         # passed in and the endpoint is not the us-standard region.  don't 

data/lib/aws/s3/bucket_version_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/object_version'
-require 'aws/s3/prefix_and_delimiter_collection'
-
 module AWS
   class S3
 
@@ -23,7 +19,7 @@ module AWS
     # @see PrefixedCollection
     class BucketVersionCollection
 
-      include Model
+      include Core::Model
       include Enumerable
       include PrefixAndDelimiterCollection
 

data/lib/aws/s3/client.rb

@@ -11,19 +11,10 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/s3/request'
-require 'aws/http/response'
-require 'aws/base_client'
-require 'aws/s3/errors'
-require 'aws/s3/data_options'
-require 'aws/uri_escape'
-require 'aws/s3/access_control_list'
-require 'aws/s3/policy'
-require 'aws/s3/client/xml'
+require 'rexml/document'
 require 'pathname'
 require 'stringio'
 require 'json'
-require 'rexml/document'
 
 module AWS
   class S3
@@ -73,7 +64,11 @@ module AWS
     #     response.on_success { p response.buckets.map(&:name) }
     #
     # @private
-    class Client < BaseClient
+    class Client < Core::Client
+
+      AWS.register_autoloads(self) do
+        autoload :XML, 'xml'
+      end
 
       API_VERSION = '2006-03-01'
 
@@ -85,7 +80,7 @@ module AWS
       }
 
       include DataOptions
-      include UriEscape
+      include Core::UriEscape
 
       configure_client
 
@@ -211,7 +206,7 @@ module AWS
           # FIXME: this makes unit testing easier, but is there something
           # we should be doing in case of invalid JSON from the service?
           policy = Policy.from_json(resp.http_response.body) rescue nil
-          MetaUtils.extend_method(resp, :policy) { policy }
+          Core::MetaUtils.extend_method(resp, :policy) { policy }
         end
       end
 
@@ -248,7 +243,7 @@ module AWS
           regex = />(.*)<\/LocationConstraint>/
           matches = response.http_response.body.match(regex)
           location = matches ? matches[1] : nil
-          MetaUtils.extend_method(response, :location_constraint) { location }
+          Core::MetaUtils.extend_method(response, :location_constraint) { location }
         end
       end
 
@@ -463,7 +458,8 @@ module AWS
                       :content_disposition => 'Content-Disposition',
                       :content_encoding => 'Content-Encoding',
                       :content_type => 'Content-Type',
-                      :storage_class => 'x-amz-storage-class'
+                      :storage_class => 'x-amz-storage-class',
+                      :expires => 'Expires'
                     }) do
         configure_request do |request, options, block|
           super(request, options)
@@ -474,20 +470,20 @@ module AWS
         end
 
         process_response do |response|
-          MetaUtils.extend_method(response, :version_id) do
+          Core::MetaUtils.extend_method(response, :version_id) do
             response.http_response.header('x-amz-version-id')
           end
-          MetaUtils.extend_method(response, :etag) do
+          Core::MetaUtils.extend_method(response, :etag) do
             response.http_response.header('ETag')
           end
-          MetaUtils.extend_method(response, :last_modified) do
+          Core::MetaUtils.extend_method(response, :last_modified) do
             Time.parse(response.http_response.header('Last-Modified'))
           end
         end
 
         simulate_response do |response|
-          MetaUtils.extend_method(response, :etag) { "abc123" }
-          MetaUtils.extend_method(response, :version_id) { nil }
+          Core::MetaUtils.extend_method(response, :etag) { "abc123" }
+          Core::MetaUtils.extend_method(response, :version_id) { nil }
         end
       end
 
@@ -583,8 +579,8 @@ module AWS
         end
 
         process_response do |resp|
-          MetaUtils.extend_method(resp, :data) { resp.http_response.body }
-          MetaUtils.extend_method(resp, :version_id) do
+          Core::MetaUtils.extend_method(resp, :data) { resp.http_response.body }
+          Core::MetaUtils.extend_method(resp, :version_id) do
             http_response.header('x-amz-version-id')
           end
         end
@@ -601,7 +597,7 @@ module AWS
         process_response do |resp|
 
           # create a hash of user-supplied metadata
-          MetaUtils.extend_method(resp, :meta) do
+          Core::MetaUtils.extend_method(resp, :meta) do
             meta = {}
             resp.http_response.headers.each_pair do |name,value|
               if name =~ /^x-amz-meta-(.+)$/i
@@ -617,16 +613,16 @@ module AWS
             'content-type' => :content_type,
             'etag' => :etag,
           }.each_pair do |header,method|
-            MetaUtils.extend_method(resp, method) do
+            Core::MetaUtils.extend_method(resp, method) do
               http_response.header(header)
             end
           end
 
-          MetaUtils.extend_method(resp, :last_modified) do
+          Core::MetaUtils.extend_method(resp, :last_modified) do
             Time.parse(resp.http_response.header('Last-Modified'))
           end
 
-          MetaUtils.extend_method(resp, :content_length) do
+          Core::MetaUtils.extend_method(resp, :content_length) do
             http_response.header('content-length').to_i
           end
         end
@@ -641,7 +637,7 @@ module AWS
         end
 
         process_response do |resp|
-          MetaUtils.extend_method(resp, :version_id) do
+          Core::MetaUtils.extend_method(resp, :version_id) do
             http_response.header('x-amz-version-id')
           end
         end
@@ -667,7 +663,8 @@ module AWS
                       :content_disposition => 'Content-Disposition',
                       :content_encoding => 'Content-Encoding',
                       :content_type => 'Content-Type',
-                      :storage_class => 'x-amz-storage-class'
+                      :storage_class => 'x-amz-storage-class',
+                      :expires => 'Expires'
                     }) do
         configure_request do |req, options|
           super(req, options)
@@ -708,16 +705,16 @@ module AWS
         end
 
         process_response do |response|
-          MetaUtils.extend_method(response, :etag) do
+          Core::MetaUtils.extend_method(response, :etag) do
             response.http_response.header('ETag')
           end
-          MetaUtils.extend_method(response, :last_modified) do
+          Core::MetaUtils.extend_method(response, :last_modified) do
             Time.parse(response.http_response.header('Last-Modified'))
           end
         end
 
         simulate_response do |response|
-          MetaUtils.extend_method(response, :etag) { "abc123" }
+          Core::MetaUtils.extend_method(response, :etag) { "abc123" }
         end
       end
 
@@ -739,13 +736,13 @@ module AWS
         end
 
         process_response do |response|
-          MetaUtils.extend_method(response, :version_id) do
+          Core::MetaUtils.extend_method(response, :version_id) do
             response.http_response.header('x-amz-version-id')
           end
         end
 
         simulate_response do |response|
-          MetaUtils.extend_method(response, :version_id) { nil }
+          Core::MetaUtils.extend_method(response, :version_id) { nil }
         end
       end
 
@@ -807,13 +804,13 @@ module AWS
         end
 
         process_response do |response|
-          MetaUtils.extend_method(response, :version_id) do
+          Core::MetaUtils.extend_method(response, :version_id) do
             response.http_response.header('x-amz-version-id')
           end
-          MetaUtils.extend_method(response, :etag) do
+          Core::MetaUtils.extend_method(response, :etag) do
             response.http_response.header('ETag')
           end
-          MetaUtils.extend_method(response, :last_modified) do
+          Core::MetaUtils.extend_method(response, :last_modified) do
             Time.parse(response.http_response.header('Last-Modified'))
           end
         end
@@ -825,7 +822,7 @@ module AWS
         (response.http_response.status >= 300 ||
          response.request_type == :complete_multipart_upload) and
           response.http_response.body and
-          XmlGrammar.parse(response.http_response.body).respond_to?(:code)
+          Core::XmlGrammar.parse(response.http_response.body).respond_to?(:code)
       end
 
       protected