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

[aws] narrow scope of unf warning

Browse source 
see #2320
This commit is contained in:
geemus 2013-11-11 09:06:42 -06:00
parent d2d6ccf116
commit e9a72f1c9e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/fog/aws.rb
View file

@ -2,12 +2,6 @@ require 'fog/core'
require 'fog/aws/credential_fetcher' require 'fog/aws/credential_fetcher'
require 'fog/aws/signaturev4' require 'fog/aws/signaturev4'
begin
require 'unf/normalizer'
rescue LoadError
Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
end
module Fog module Fog
module AWS module AWS
extend Fog::Provider extend Fog::Provider
@ -92,6 +86,14 @@ module Fog
end end
def self.escape(string) def self.escape(string)
unless @unf_loaded_or_warned
begin
require('unf/normalizer')
rescue LoadError
Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
end
@unf_loaded_or_warned = true
end
string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
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