kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Handle another case of the 'unicode' gem breaking things on JRuby.

Browse source 
This is was an omission from pull request #2315.
This commit is contained in:
Kevin Menard 2013-10-24 11:01:43 -04:00
parent f28ac60ab2
commit dabed804b0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/fog/aws/storage.rb
View file

@ -168,9 +168,15 @@ module Fog
"/#{escape(bucket_name.to_s)}#{path}" "/#{escape(bucket_name.to_s)}#{path}"
end end
# NOTE: differs fram Fog::AWS.escape by NOT escaping `/` # NOTE: differs from Fog::AWS.escape by NOT escaping `/`
def escape(string) def escape(string)
string = Unicode::normalize_C(string) string = begin
::Unicode::normalize_C(string)
rescue
Fog::Logger.warning("Fog::Storage::AWS string escaping will not normalize Unicode characters on JRuby, pending a fix for issue #2279")
string
end
string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) { string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) {
"%" + $1.unpack("H2" * $1.bytesize).join("%").upcase "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
} }