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

Merge from stable

Browse source
This commit is contained in:
Thomas Reynolds 2015-02-24 11:06:28 -08:00
commit c94e5d0f4d
30 changed files with 99 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@ module Middleman
Contract String => 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
@ -225,7 +225,7 @@ module Middleman
path_or_resource.url
else
path_or_resource.dup
end.gsub(' ', '%20')
end
# Try to parse URL
begin
@ -273,7 +273,7 @@ module Middleman
if resource
uri.path = if this_resource
relative_path_from_resource(this_resource, resource_url, effective_relative)
URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
else
resource_url
end