aws-sdk-resources 2.1.10 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d82eab920e3920327e72467858eb52048d432efc
-  data.tar.gz: e5978b84777534653793268e73e2699aab67a69b
+  metadata.gz: ffbe024e349c47a5e33aa5379e3308a6e63a5ca6
+  data.tar.gz: b0e23cc39bf790b7d955a34787121d0070340515
 SHA512:
-  metadata.gz: 41825ae78f1f0c4cecedc6b4a51f2a3ff7052107d2e7ec3a7c28e296f94f809920cf8f167a1dc857c5bdccc4f75fcb93fa124832a74bdb4bb13fbee97d8728cf
-  data.tar.gz: a73d555d3e57d794cc4e9992598c75a644745761421407eb00fbf850d387a7ae1ad006abddf6912db5c5fb719ffc241700a92773ff8f3dcc3eefa228b79191fb
+  metadata.gz: cc23f381add28d612cf00e3af1330209d16fa36be401d78cc539b83ae343b9168099995f8f004736d1595ef5c81e249307221e4224626a805521657f1be71e2c
+  data.tar.gz: 20931e36d4bee2f6de27eba4b8e234626085446e112567ffa17082ca278c5e78afee13016e51cdd0032da8d911de9fb56207692aa579c474bc011ed489d51e5c

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

@@ -5,7 +5,6 @@ module Aws
     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'
 
     autoload :Encryption, 'aws-sdk-resources/services/s3/encryption'
     autoload :FilePart, 'aws-sdk-resources/services/s3/file_part'

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

@@ -28,15 +28,30 @@ module Aws
         delete
       end
 
+      # Returns a public URL for this bucket.
+      #
+      #     bucket = s3.bucket('bucket-name')
+      #     bucket.url
+      #     #=> "https://bucket-name.s3.amazonaws.com"
+      #
+      # You can pass `virtual_host: true` to use the bucket name as the
+      # host name.
+      #
+      #     bucket = s3.bucket('my.bucket.com', virtual_host: true)
+      #     bucket.url
+      #     #=> "http://my.bucket.com"
+      #
+      # @option options [Boolean] :virtual_host (false) When `true`,
+      #   the bucket name will be used as the host name. This is useful
+      #   when you have a CNAME configured for this bucket.
+      #
       # @return [String] the URL for this bucket.
-      def url
-        url = URI.parse(client.config.endpoint.to_s)
-        if dns_compatible?(url.scheme) && !client.config.force_path_style
-          url.host = "#{name}.#{url.host}"
+      def url(options = {})
+        if options[:virtual_host]
+          "http://#{name}"
         else
-          url.path = "/#{name}"
+          s3_bucket_url
         end
-        url.to_s
       end
 
       # Creates a {PresignedPost} that makes it easy to upload a file from
@@ -66,10 +81,25 @@ module Aws
 
       private
 
-      def dns_compatible?(scheme)
-        Plugins::S3BucketDns.dns_compatible?(name, scheme == 'https')
+      def s3_bucket_url
+        url = client.config.endpoint.dup
+        if bucket_as_hostname?(url.scheme == 'https')
+          url.host = "#{name}.#{url.host}"
+        else
+          url.path += '/' unless url.path[-1] == '/'
+          url.path += path_escape(name)
+        end
+        url.to_s
       end
 
+      def bucket_as_hostname?(https)
+        Plugins::S3BucketDns.dns_compatible?(name, https) &&
+        !client.config.force_path_style
+      end
+
+      def path_escape(name)
+        name.gsub(/[^\/]+/) {|part| Seahorse::Util.uri_escape(part) }
+      end
     end
   end
 end

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

@@ -33,6 +33,13 @@ module Aws
       #   | `:head`       | {Client#head_object}   |
       #   | `:delete`     | {Client#delete_object} |
       #
+      # @option params [Boolean] :virtual_host (false) When `true` the
+      #   presigned URL will use the bucket name as a virtual host.
+      #
+      #     bucket = Aws::S3::Bucket.new('my.bucket.com')
+      #     bucket.object('key').presigned_url(virtual_host: true)
+      #     #=> "http://my.bucket.com/key?..."
+      #
       # @option params [Integer] :expires_in (900) Number of seconds before
       #   the pre-signed URL expires. This may not exceed one week (604800
       #   seconds).
@@ -55,14 +62,21 @@ module Aws
       #     s3.bucket('bucket-name').object('obj-key').public_url
       #     #=> "https://bucket-name.s3.amazonaws.com/obj-key"
       #
+      # To use virtual hosted bucket url (disables https):
+      #
+      #     s3.bucket('my.bucket.com').object('key').public_url(virtual_host: true)
+      #     #=> "http://my.bucket.com/key"
+      #
+      # @option options [Boolean] :virtual_host (false) When `true`, the bucket
+      #   name will be used as the host name. This is useful when you have
+      #   a CNAME configured for the bucket.
+      #
       # @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
-        )
+      def public_url(options = {})
+        url = URI.parse(bucket.url(options))
+        url.path += '/' unless url.path[-1] == '/'
+        url.path += key.gsub(/[^\/]+/) { |s| Seahorse::Util.uri_escape(s) }
+        url.to_s
       end
 
       # Uploads a file from disk to the current object in S3.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.11
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-30 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.1.10
+        version: 2.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.10
+        version: 2.1.11
 description: Provides resource oriented interfaces and other higher-level abstractions
   for many AWS services. This gem is part of the official AWS SDK for Ruby.
 email:
@@ -79,7 +79,6 @@ files:
 - lib/aws-sdk-resources/services/s3/object.rb
 - lib/aws-sdk-resources/services/s3/object_summary.rb
 - lib/aws-sdk-resources/services/s3/presigned_post.rb
-- lib/aws-sdk-resources/services/s3/public_url.rb
 - lib/aws-sdk-resources/services/sns.rb
 - lib/aws-sdk-resources/services/sns/message_verifier.rb
 - lib/aws-sdk-resources/services/sqs.rb

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

@@ -1,71 +0,0 @@
-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.
-        #
-        # @option options [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