aws-sdk-resources 2.0.19.pre → 2.0.20.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5343b4a72639e9a6d1d439dff2489d670ed307ce
-  data.tar.gz: 281a1fc5f17f129f329b080b55cc77e47b259aee
+  metadata.gz: 74611ee6c47bd6e6d50be251f12fe89cc0efd3fa
+  data.tar.gz: 75b5f0a20ac2a13e89ccf28eb89611c67253c921
 SHA512:
-  metadata.gz: 21c4ebe7c7715ef34a2c2d6dec31e3c8a8a4cc64afa3168d9e21147fcf9020156988426d56f625b45d37bc3f39fb06ab61ccc7378301ff3a0df24a6585d347c2
-  data.tar.gz: 20bc14e715abf9320f02115e4c63e4dbb6339dc5921b6f3c1a98d67d51c26846284a5b78b3290eeba12a0b7ff7ce248f94fb89f4e68cd2dc5c83d7f4c808ea0f
+  metadata.gz: 13b72864f2aae0d746e892d16575b7d36a7810db21dc9e4007be603a88319b03ffc4d7feb74a0ba292ec941d5517438d811ec0eddeda02b7b4aa84eb8d77fe9c
+  data.tar.gz: a5e9f37666fcb63d913f4ede66d10f487e6c089b383cf25ed8ef90dd319ca060704b0a4b014fb041e1743a08e0e0fb7fc8750d0d0d0560d136b5dcdc9f3cda07

data/lib/aws-sdk-resources/collection.rb

@@ -10,7 +10,6 @@ module Aws
       def initialize(operation, options)
         @operation = operation
         @options = options
-        reject_limit_param(options)
       end
 
       # @return [Enumerator<Resource>]
@@ -22,6 +21,7 @@ module Aws
         end
       end
 
+      # @api private
       # @return [Enumerator<Batch>]
       def batches(&block)
         @operation.batches(@options)
@@ -40,28 +40,6 @@ module Aws
         self.class.new(@operation, @options.merge(limit: limit))
       end
 
-      # Specifies max size of each batch. Some services may return fewer
-      # than `size` number of items per request.
-      #
-      # @example Enumerate the collection in batches with a max size
-      #
-      #   collection.batch_size(10).batches.each do |batch|
-      #     # batch has at most 10 items
-      #   end
-      #
-      # @param [Integer] size
-      # @return [Collection]
-      def batch_size(size)
-        if limit_key
-          self.class.new(@operation, @options.merge(batch_size: size))
-        else
-          resource = resource_class.name
-          method_name = @operation.request.method_name
-          msg = "batch size not supported by #{resource}##{method_name}"
-          raise NotImplementedError, msg
-        end
-      end
-
       # Returns the first resource from the collection.
       #
       #     resource = collection.first
@@ -107,7 +85,6 @@ module Aws
         parts = {}
         parts[:type] = resource_class.name
         parts[:limit] = @options[:limit]
-        parts[:batch_size] = @options[:batch_size] if limit_key
         parts[:params] = @options[:params] || {}
         parts = parts.inject("") {|s,(k,v)| s << " #{k}=#{v.inspect}" }
         ['#<', self.class.name, parts, '>'].join
@@ -120,14 +97,6 @@ module Aws
         @operation.limit_key
       end
 
-      def reject_limit_param(options)
-        if options[:params] && options[:params][limit_key]
-          msg = "invalid option :#{limit_key}, call #limit or #batch_size "
-          msg << "on the returned Aws::Resources::Collection instead"
-          raise ArgumentError, msg
-        end
-      end
-
       def resource_class
         @operation.builder.resource_class
       end

data/lib/aws-sdk-resources/operations.rb

@@ -124,7 +124,6 @@ module Aws
         private
 
         def all_batches(options, &block)
-          options = apply_batch_size(options)
           @request.call(options).each do |response|
             yield(@builder.build(options.merge(response:response)))
           end
@@ -143,15 +142,6 @@ module Aws
           end
         end
 
-        def apply_batch_size(options)
-          if batch_size = options[:batch_size]
-            params = (options[:params] || {}).merge(limit_key => batch_size)
-            options.merge(params: params)
-          else
-            options
-          end
-        end
-
       end
 
       class HasOperation < Base

data/lib/aws-sdk-resources/services/s3.rb

@@ -3,6 +3,7 @@ module Aws
 
     require 'aws-sdk-resources/services/s3/bucket'
     require 'aws-sdk-resources/services/s3/object'
+    require 'aws-sdk-resources/services/s3/object_summary'
     require 'aws-sdk-resources/services/s3/multipart_upload'
     require 'aws-sdk-resources/services/s3/public_url'
 

data/lib/aws-sdk-resources/services/s3/object.rb

@@ -2,6 +2,8 @@ module Aws
   module S3
     class Object
 
+      alias size content_length
+
       # Generates a pre-signed URL for this object.
       #
       # @example Pre-signed GET URL, valid for one hour

data/lib/aws-sdk-resources/services/s3/object_summary.rb

@@ -0,0 +1,17 @@
+module Aws
+  module S3
+    class ObjectSummary
+
+      alias content_length size
+
+      # @param (see Object#upload_file)
+      # @options (see Object#upload_file)
+      # @return (see Object#upload_file)
+      # @see Object#upload_file
+      def upload_file(source, options = {})
+        object.upload_file(source, options)
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.0.19.pre
+  version: 2.0.20.pre
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
 description: Provides resource-oriented abstractions for AWS.
 email: 
 executables: []
@@ -74,6 +74,7 @@ files:
 - lib/aws-sdk-resources/services/s3/multipart_upload.rb
 - lib/aws-sdk-resources/services/s3/multipart_upload_error.rb
 - lib/aws-sdk-resources/services/s3/object.rb
+- lib/aws-sdk-resources/services/s3/object_summary.rb
 - lib/aws-sdk-resources/services/s3/public_url.rb
 - lib/aws-sdk-resources/services/sqs.rb
 - lib/aws-sdk-resources/services/sqs/queue.rb