DRY'd up uri path escaping.

aws · Oct 16, 2015 · d0661e7 · d0661e7
1 parent 534a24d
commit d0661e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb b/aws-sdk-core/lib/aws-sdk-core/signers/v4.rb
@@ -134,7 +134,7 @@ def path(uri)
         if @service_name == 's3'
           path
         else
-          path.gsub(/[^\/]+/) { |segment| Seahorse::Util.uri_escape(segment) }
+          Seahorse::Util.uri_path_escape(path)
         end
       end
 

diff --git a/aws-sdk-core/lib/seahorse/util.rb b/aws-sdk-core/lib/seahorse/util.rb
@@ -24,6 +24,10 @@ def uri_escape(string)
         CGI.escape(string.encode('UTF-8')).gsub('+', '%20').gsub('%7E', '~')
       end
 
+      def uri_path_escape(path)
+        path.gsub(/[^\/]+/) { |part| uri_escape(part) }
+      end
+
     end
 
     @irregular_inflections = {}

diff --git a/aws-sdk-resources/lib/aws-sdk-resources/services/s3/bucket.rb b/aws-sdk-resources/lib/aws-sdk-resources/services/s3/bucket.rb
@@ -87,7 +87,7 @@ def s3_bucket_url
           url.host = "#{name}.#{url.host}"
         else
           url.path += '/' unless url.path[-1] == '/'
-          url.path += path_escape(name)
+          url.path += Seahorse::Util.uri_path_escape(name)
         end
         url.to_s
       end
@@ -97,9 +97,6 @@ def bucket_as_hostname?(https)
         !client.config.force_path_style
       end
 
-      def path_escape(name)
-        name.gsub(/[^\/]+/) {|part| Seahorse::Util.uri_escape(part) }
-      end
     end
   end
 end