aws-sdk-resources 2.0.2.pre → 2.0.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d73ea1b21204559a8fb036e60f6d380268a743
-  data.tar.gz: b92f963d53c46d4dc64aaab930a5acea6bcba3b3
+  metadata.gz: 2a81b17767e316a7a512bb61c9b9cb392a0c7150
+  data.tar.gz: 7630c31ed82206477494004bb74ea2b5fbf03702
 SHA512:
-  metadata.gz: cf73777ea642f80159f357fc2b0e6e1c935637c7688e650ba8949205a242517997a88e84527d02c78264caf37abf19cc92e69f3b510d42a5fca945fc9ff4dca0
-  data.tar.gz: ad3dd237c4c1ef3068794bfa1d2ec347f07e44880321a748f610f18037aa82cd57203984d808e431f8106ed4844ea61626cf1b78bd020eaf87da4158d1bb558d
+  metadata.gz: 8ef040fef33dd3ad75ad628d038de5ec9e1c28e32e875d949aa944fc50921ece4f1637d8b47156b2b396e9999993707dc26a4dfd97ee08d2e93ae381b350c61a
+  data.tar.gz: c69c84b2b228f504aaccf75c19e3074ad5a6e3c139f1e92c58e2fa38211b1731e3df3d6c38e4ff84bdb39d2b383b03e9e9cb2c3477c5ed665afbc9ff39f47103

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

@@ -26,7 +26,7 @@ module Aws
           define_has_many(namespace, resource, definition['hasMany'] || {})
           define_has_some(namespace, resource, definition['hasSome'] || {})
           define_has_one(namespace, resource, definition['hasOne'] || {})
-          define_data_attributes(namespace, resource, definition['shape'])
+          define_data_attributes(namespace, resource, definition)
           define_subresources(namespace, resource, definition['subResources'] || {})
         end
         define_top_level_references(namespace)
@@ -109,13 +109,13 @@ module Aws
         end
       end
 
-      def define_data_attributes(namespace, resource, shape_name)
-        return unless shape_name
+      def define_data_attributes(namespace, resource, definition)
+        return unless shape_name = definition['shape']
         shape = resource.client_class.api.shape_map.shape('shape' => shape_name)
         shape.member_names.each do |member_name|
           if
-            resource.identifiers.include?(member_name) ||
-            resource.instance_methods.include?(member_name)
+            resource.instance_methods.include?(member_name) ||
+            data_attribute_is_an_identifier?(member_name, resource, definition)
           then
             next # some data attributes are duplicates to identifiers
           else
@@ -124,6 +124,11 @@ module Aws
         end
       end
 
+      def data_attribute_is_an_identifier?(attr_name, resource, definition)
+        resource.identifiers.include?(attr_name) ||
+        definition['identifiers'].any? { |i| underscore(i['dataMember']) == attr_name.to_s }
+      end
+
       def define_load(namespace, resource, definition)
         return unless definition
         resource.load_operation = Operations::DataOperation.new(

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

@@ -188,7 +188,7 @@ module Aws
               remaining -= batch.size
             else
               yield(batch.first(remaining))
-              break
+              return
             end
           end
         end

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

@@ -8,6 +8,52 @@ module Aws
 
     class Object
 
+      # Generates a pre-signed URL for this object.
+      #
+      # @example Pre-signed GET URL, valid for one hour
+      #
+      #     obj.presigned_url(:get, expires_in: 3600)
+      #     #=> "https://bucket-name.s3.amazonaws.com/object-key?..."
+      #
+      # @example Pre-signed PUT with a canned ACL
+      #
+      #     # the object uploaded using this URL will be publicly accessible
+      #     obj.presigned_url(:put, acl: 'public-read')
+      #     #=> "https://bucket-name.s3.amazonaws.com/object-key?..."
+      #
+      # @param [Symbol] http_method
+      #   The HTTP method to generate a presigned URL for. Valid values
+      #   are `:get`, `:put`, `:head`, and `:delete`.
+      #
+      # @param [Hash] params
+      #   Additional request parameters to use when generating the pre-signed
+      #   URL. See the related documentation in {Client} for accepted
+      #   params.
+      #
+      #   | HTTP Method   | Client Method          |
+      #   |---------------|------------------------|
+      #   | `:get`        | {Client#put_object}    |
+      #   | `:put`        | {Client#get_object}    |
+      #   | `:head`       | {Client#head_object}   |
+      #   | `:delete`     | {Client#delete_object} |
+      #
+      # @option params [Integer] :exipres_in (900) Number of seconds before
+      #   the pre-signed URL expires. This may not exceed one week (604800
+      #   seconds).
+      #
+      # @raise [ArgumentError] Raised if `:expires_in` exceeds one week
+      #   (604800 seconds).
+      #
+      # @return [String]
+      #
+      def presigned_url(http_method, params = {})
+        presigner = Presigner.new(client: client)
+        presigner.presigned_url("#{http_method.downcase}_object", params.merge(
+          bucket: bucket_name,
+          key: key,
+        ))
+      end
+
       # Uploads a file from disk to the current object in S3.
       #
       # @example

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.0.2.pre
+  version: 2.0.3.pre
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-16 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.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 description: Provides resource-oriented abstractions for AWS.
 email: 
 executables: []
@@ -89,3 +89,4 @@ signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby - Resources
 test_files: []
+has_rdoc: