deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

More URI encoding and decoding. Addresses #1406

Browse source
This commit is contained in:
Thomas Reynolds 2014-11-19 10:39:48 -08:00
parent 17eb54b9dc
commit 29693e4533
7 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
middleman-core/lib/middleman-core/util.rb
View file

@ -68,7 +68,7 @@ module Middleman
# @return [String]
def normalize_path(path)
# The tr call works around a bug in Ruby's Unicode handling
path.sub(%r{^/}, '').tr('', '')
URI.decode(path).sub(%r{^/}, '').tr('', '')
end
# This is a separate method from normalize_path in case we
@ -144,7 +144,7 @@ module Middleman
path_or_resource.url
else
path_or_resource.dup
end.gsub(' ', '%20')
end
# Try to parse URL
begin
@ -182,7 +182,7 @@ module Middleman
end
if resource
uri.path = relative_path_from_resource(this_resource, resource_url, effective_relative)
uri.path = URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
else
# If they explicitly asked for relative links but we can't find a resource...
raise "No resource exists at #{url}" if relative