aws-sdk-resources 2.0.11.pre → 2.0.12.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40fdd4d2650569c8c2c171fc78ff3b028bcca01
-  data.tar.gz: eaa5e8d378d80948885606de523ab83fa48cd1fa
+  metadata.gz: 4ca487789f2a39ff784ba8b39432b8a59d94038c
+  data.tar.gz: ddf5b991bd762e79fc62a542e140a06f4fa10e9f
 SHA512:
-  metadata.gz: 0b28aff2fd2739d2412ff3b259a63cf283477485fdcaa45b67d10e5b11d19fa732a636f5efbfdb9b6d9f64590c2e5df42bfc31f358e9936638df63f915fdda5f
-  data.tar.gz: baf2c5ba95436817c23af6caa2bbc5576591ea8e03dbd245479f72612a50514546fd1ff171e52e33990750521728948124df11ce5d5c87c5c64a89a0545caeb5
+  metadata.gz: 7ebe4e9108017edfc0d2eac908a5518b3440d584b576f4eec4e53325e60af98390375ef2731e07ced6c065e752effc9ce53fa08f0fdd2452915af063933f0493
+  data.tar.gz: 7827a636fbfe52562a591c977f62a0ace65bd148fd7a2871e5676218e3c6c3eea31017c83a1cfb118db53cb6a67a93dcf3ab80a8ecc96a9d4b1f7972b91902bc

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

@@ -4,6 +4,7 @@ module Aws
     require 'aws-sdk-resources/services/s3/bucket'
     require 'aws-sdk-resources/services/s3/object'
     require 'aws-sdk-resources/services/s3/multipart_upload'
+    require 'aws-sdk-resources/services/s3/public_url'
 
     autoload :FilePart, 'aws-sdk-resources/services/s3/file_part'
     autoload :FileUploader, 'aws-sdk-resources/services/s3/file_uploader'

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

@@ -48,6 +48,21 @@ module Aws
         ))
       end
 
+      # Returns the public (un-signed) URL for this object.
+      #
+      #     s3.bucket('bucket-name').object('obj-key').public_url
+      #     #=> "https://bucket-name.s3.amazonaws.com/obj-key"
+      #
+      # @return [String]
+      def public_url
+        PublicUrl.build(
+          endpoint: client.config.endpoint,
+          bucket_name: bucket_name,
+          object_key: key,
+          force_path_style: client.config.force_path_style
+        )
+      end
+
       # Uploads a file from disk to the current object in S3.
       #
       # @example

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

@@ -0,0 +1,71 @@
+module Aws
+  module S3
+    # @api private
+    module PublicUrl
+      class << self
+
+        # @option options [required, URI::HTTP, URI::HTTPS] :endpoint
+        #   The Amazon S3 endpoint to generate the public URL against.
+        #
+        # @option options [required, String] :bucket_name Name of the bucket
+        #   the object is in.
+        #
+        # @option options [required, String] :object_key Key of the object
+        #   to generate a URL for.
+        #
+        # @param [Boolean] :force_path_style (false) When `true`, the bucket
+        #   name will always be part of the URI path. When `false`, DNS
+        #   compatible bucket names will be the endpoint host subdomain.
+        #
+        #       # path style
+        #       "https://s3.amazonaws.com/bucket-name/key"
+        #
+        #       # dns-style
+        #       "https://bucket-name.s3.amazonaws.com/key"
+        #
+        # @return [String]
+        def build(options = {})
+          endpoint = options[:endpoint].dup
+          apply_bucket_name(endpoint, options)
+          apply_object_key(endpoint, options)
+          endpoint.to_s
+        end
+
+        private
+
+        def apply_bucket_name(endpoint, options)
+          if path_style?(endpoint, options)
+            endpoint.path += '/' unless endpoint.path[-1] == '/'
+            endpoint.path += Seahorse::Util.uri_escape(options[:bucket_name])
+          else
+            endpoint.host = options[:bucket_name] + '.' + endpoint.host
+          end
+        end
+
+        def apply_object_key(endpoint, options)
+          key = options[:object_key]
+          endpoint.path += '/' unless endpoint.path[-1] == '/'
+          endpoint.path += key.split('/').map { |v| escape(v) }.join('/')
+        end
+
+        def path_style?(endpoint, options)
+          options[:force_path_style] == true ||
+          dns_compat?(endpoint, options) == false
+        end
+
+        def dns_compat?(endpoint, options)
+          Aws::Plugins::S3BucketDns.dns_compatible?(
+            options[:bucket_name],
+            endpoint.scheme == 'https'
+          )
+        end
+
+        def escape(string)
+          Seahorse::Util.uri_escape(string)
+        end
+
+
+      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.11.pre
+  version: 2.0.12.pre
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-04 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.11
+        version: 2.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: Provides resource-oriented abstractions for AWS.
 email: 
 executables: []
@@ -59,6 +59,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/public_url.rb
 - lib/aws-sdk-resources/services/s3.rb
 - lib/aws-sdk-resources/services/sqs/queue.rb
 - lib/aws-sdk-resources/services/sqs.rb