aws-sdk 1.1.3 → 1.1.4

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

@@ -11,17 +11,14 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/xml_grammar'
-require 'aws/base_client'
-
 module AWS
   class S3
-    class Client < BaseClient
+    class Client < Core::Client
 
       # @private
       module XML
 
-        Error = XmlGrammar.customize { }
+        Error = Core::XmlGrammar.customize { }
 
         module HasCommonPrefixes
 
@@ -36,7 +33,7 @@ module AWS
 
         end
 
-        ListBuckets = XmlGrammar.customize do
+        ListBuckets = Core::XmlGrammar.customize do
           element "Buckets" do
             element "Bucket" do
               collect_values
@@ -45,7 +42,7 @@ module AWS
           end
         end
 
-        GetBucketAcl = GetObjectAcl = XmlGrammar.customize do
+        GetBucketAcl = GetObjectAcl = Core::XmlGrammar.customize do
           wrapper(:acl,
                   :for => ["Owner",
                            "AccessControlList"]) do
@@ -79,7 +76,7 @@ module AWS
           end
         end
 
-        ListObjects = XmlGrammar.customize do
+        ListObjects = Core::XmlGrammar.customize do
 
           element("Name") { rename "bucket_name" }
           element("MaxKeys") { integer_value }
@@ -105,7 +102,7 @@ module AWS
 
         end
 
-        GetBucketVersioning = XmlGrammar.customize do
+        GetBucketVersioning = Core::XmlGrammar.customize do
           element("Status") do
             symbol_value
             format_value {|value| super(value) || :unversioned }
@@ -113,7 +110,7 @@ module AWS
           end
         end
 
-        ListObjectVersions = XmlGrammar.customize do
+        ListObjectVersions = Core::XmlGrammar.customize do
 
           element("MaxKeys") { integer_value }
           element("IsTruncated") { rename "Truncated"; boolean_value }
@@ -147,11 +144,11 @@ module AWS
         end
 
         # default behavior is good enough
-        InitiateMultipartUpload = XmlGrammar.customize do
+        InitiateMultipartUpload = Core::XmlGrammar.customize do
           element("UploadId") { force }
         end
 
-        ListMultipartUploads = XmlGrammar.customize do
+        ListMultipartUploads = Core::XmlGrammar.customize do
           element("IsTruncated") { rename "Truncated"; boolean_value }
           element("MaxUploads") { integer_value }
           element("NextKeyMarker") { force }
@@ -167,9 +164,9 @@ module AWS
         end
 
         # keep default behavior
-        CompleteMultipartUpload = XmlGrammar.customize
+        CompleteMultipartUpload = Core::XmlGrammar.customize
 
-        ListParts = XmlGrammar.customize do
+        ListParts = Core::XmlGrammar.customize do
           element("StorageClass") { symbol_value }
           element("IsTruncated") { rename "Truncated"; boolean_value }
           element("MaxParts") { integer_value }

data/lib/aws/{resource_cache.rb → s3/config.rb}

@@ -11,28 +11,14 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-module AWS
+AWS::Core::Configuration.module_eval do
 
-  # @private
-  class ResourceCache
+  add_service 'S3', 's3', 's3.amazonaws.com'
 
-    def initialize
-      @cache = {}
-    end
+  add_option :s3_multipart_threshold, 16 * 1024 * 1024
 
-    def store(key, attributes)
-      (@cache[key] ||= {}).merge!(attributes)
-    end
+  add_option :s3_multipart_min_part_size, 5 * 1024 * 1024
 
-    def cached?(key, attribute)
-      attributes = @cache[key] and attributes.has_key?(attribute)
-    end
-
-    def get(key, attribute)
-      raise "No cached value for attribute :#{attribute} of #{key}" unless
-        cached?(key, attribute)
-      @cache[key][attribute]
-    end
-
-  end
+  add_option :s3_multipart_max_parts, 10000
+  
 end

data/lib/aws/s3/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/s3/client/xml'
-
 module AWS
   class S3
 
@@ -34,14 +31,11 @@ module AWS
     # @private
     module Errors
 
-      BASE_ERROR_GRAMMAR = Client::XML::Error
-
-      include LazyErrorClasses
-
       # This error is special, because S3 does not (and must not
       # according to RFC 2616) return a body with the HTTP response.
       # The interface is the same as for any other client error.
       class NotModified < AWS::Errors::Base
+
         include AWS::Errors::ClientError
 
         def code; "NotModified"; end
@@ -56,6 +50,7 @@ module AWS
       # the HTTP response.  The interface is the same as for any other
       # client error.
       class NoSuchKey < AWS::Errors::Base
+
         include AWS::Errors::ClientError
 
         def code; "NoSuchKey"; end
@@ -66,6 +61,10 @@ module AWS
 
       end
 
+      BASE_ERROR_GRAMMAR = Client::XML::Error
+
+      include Core::LazyErrorClasses
+
     end
   end
 end

data/lib/aws/s3/multipart_upload.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/uploaded_part'
-require 'aws/s3/uploaded_part_collection'
 require 'thread'
 
 module AWS
@@ -24,7 +21,7 @@ module AWS
     # multipart upload.
     class MultipartUpload
 
-      include Model
+      include Core::Model
 
       # @private
       def initialize(object, id, options = {})

data/lib/aws/s3/multipart_upload_collection.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/model'
-require 'aws/s3/prefix_and_delimiter_collection'
-require 'aws/s3/multipart_upload'
-require 'aws/s3/s3_object'
-
 module AWS
   class S3
 
@@ -35,7 +30,7 @@ module AWS
     class MultipartUploadCollection
 
       include Enumerable
-      include Model
+      include Core::Model
       include PrefixAndDelimiterCollection
 
       # @return [Bucket] The bucket in which the uploads are taking

data/lib/aws/s3/object_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/s3_object'
-require 'aws/s3/prefix_and_delimiter_collection'
-
 module AWS
   class S3
 
@@ -62,7 +58,7 @@ module AWS
     #
     class ObjectCollection
 
-      include Model
+      include Core::Model
       include Enumerable
       include PrefixAndDelimiterCollection
 

data/lib/aws/s3/object_metadata.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 S3
 
     # Returns an object that represents the metadata for an S3 object.
     class ObjectMetadata
 
-      include Model
+      include Core::Model
 
       # @param [S3Object]
       # @param [Hash] options

data/lib/aws/s3/object_upload_collection.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/s3/paginated_collection'
-require 'aws/s3/multipart_upload'
-require 'aws/s3/multipart_upload_collection'
-require 'aws/s3/s3_object'
-
 module AWS
   class S3
 
@@ -30,7 +24,7 @@ module AWS
     class ObjectUploadCollection
 
       include Enumerable
-      include Model
+      include Core::Model
 
       # @return [S3Object] The object to which the uploads belong.
       attr_reader :object

data/lib/aws/s3/object_version.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/errors'
-
 module AWS
   class S3
 
@@ -24,7 +21,7 @@ module AWS
     # object.
     class ObjectVersion
 
-      include Model
+      include Core::Model
 
       # @param [S3Object] object The object this is a version of.
       # @param [String] version_id The unique id for this version.

data/lib/aws/s3/object_version_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/object_version'
-
 module AWS
   class S3
 
@@ -34,7 +31,7 @@ module AWS
     #   
     class ObjectVersionCollection
 
-      include Model
+      include Core::Model
       include Enumerable
 
       # @return [S3Object] The object this collection belongs to.

data/lib/aws/s3/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 S3
 
-    # @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 = {
           :list_buckets => "s3:ListAllMyBuckets",

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

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

data/lib/aws/s3/presigned_post.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'
-require 'aws/s3/request'
 require 'uri'
 require 'base64'
 require 'time'
@@ -52,7 +50,7 @@ module AWS
     #  bucket.presigned_post.where(:key).starts_with("photos/")
     class PresignedPost
 
-      include Model
+      include Core::Model
 
       # @return [Bucket] The bucket to which data can be uploaded
       #   using the form fields

data/lib/aws/s3/request.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/http/request'
-require 'aws/base_client'
-require 'aws/uri_escape'
 require 'uri'
 require 'time'
 
@@ -21,9 +18,9 @@ module AWS
   class S3
 
     # @private
-    class Request < AWS::Http::Request
+    class Request < Core::Http::Request
 
-      include UriEscape
+      include Core::UriEscape
 
       # @param [bucket] S3 bucket name
       attr_accessor :bucket

data/lib/aws/s3/s3_object.rb

@@ -11,13 +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/request'
-require 'aws/s3/object_metadata'
-require 'aws/s3/multipart_upload'
-require 'aws/s3/object_upload_collection'
-require 'aws/s3/presigned_post'
-require 'aws/s3/data_options'
 require 'uri'
 
 module AWS
@@ -44,7 +37,7 @@ module AWS
     #
     class S3Object
 
-      include Model
+      include Core::Model
       include DataOptions
 
       # @param [Bucket] bucket The bucket this object belongs to.

data/lib/aws/s3/tree.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/s3/tree/parent'
-require 'aws/s3/tree/leaf_node'
-require 'aws/s3/tree/branch_node'
-require 'aws/s3/tree/child_collection'
-
 module AWS
   class S3
 
@@ -83,6 +77,14 @@ module AWS
     # using.
     class Tree
 
+      AWS.register_autoloads(self) do
+        autoload :BranchNode, 'branch_node'
+        autoload :ChildCollection, 'child_collection'
+        autoload :LeafNode, 'leaf_node'
+        autoload :Node, 'node'
+        autoload :Parent, 'parent'
+      end
+
       include Parent
 
       # @param [ObjectCollection, BucketVersionCollection,

data/lib/aws/s3/tree/branch_node.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/parent'
-
 module AWS
   class S3
     class Tree