dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2420 from albertogg/fix-encoding-issue

This commit is contained in:
Parker Moore 2014-05-20 22:35:50 -04:00
parent ebd87bfb78 879184fe37
commit 7e05b6e0b3
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jekyll/url.rb
View File

@ -89,7 +89,7 @@ module Jekyll
# pct-encoded = "%" HEXDIG HEXDIG # pct-encoded = "%" HEXDIG HEXDIG
# sub-delims = "!" / "$" / "&" / "'" / "(" / ")" # sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
# / "*" / "+" / "," / ";" / "=" # / "*" / "+" / "," / ";" / "="
URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/) URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/).encode('utf-8')
end end
# Unescapes a URL path segment # Unescapes a URL path segment
@ -103,7 +103,7 @@ module Jekyll
# #
# Returns the unescaped path. # Returns the unescaped path.
def self.unescape_path(path) def self.unescape_path(path)
URI.unescape(path) URI.unescape(path.encode('utf-8'))
end end
end end
end end

10
test/test_post.rb
View File

@ -1,3 +1,5 @@
# encoding: utf-8
require 'helper' require 'helper'
class TestPost < Test::Unit::TestCase class TestPost < Test::Unit::TestCase
@ -100,6 +102,14 @@ class TestPost < Test::Unit::TestCase
assert_equal "/2014/03/22/escape-+ %20[]", @post.id assert_equal "/2014/03/22/escape-+ %20[]", @post.id
end end
should "return a UTF-8 escaped string" do
assert_equal Encoding::UTF_8, URL.escape_path("/rails笔记/2014/04/20/escaped/").encoding
end
should "return a UTF-8 unescaped string" do
assert_equal Encoding::UTF_8, URL.unescape_path("/rails%E7%AC%94%E8%AE%B0/2014/04/20/escaped/".encode(Encoding::ASCII)).encoding
end
should "respect permalink in yaml front matter" do should "respect permalink in yaml front matter" do
file = "2008-12-03-permalinked-post.textile" file = "2008-12-03-permalinked-post.textile"
@post.process(file) @post.process(file)