fix old style gist url not found issue
This commit is contained in:
parent
f75547f61f
commit
cbf4b6570f
@ -46,7 +46,7 @@ module Jekyll
|
|||||||
end
|
end
|
||||||
|
|
||||||
def get_gist_url_for(gist, file)
|
def get_gist_url_for(gist, file)
|
||||||
"https://raw.github.com/gist/#{gist}/#{file}"
|
"https://gist.github.com/raw/#{gist}/#{file}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def cache(gist, file, data)
|
def cache(gist, file, data)
|
||||||
@ -72,7 +72,29 @@ module Jekyll
|
|||||||
|
|
||||||
def get_gist_from_web(gist, file)
|
def get_gist_from_web(gist, file)
|
||||||
gist_url = get_gist_url_for gist, file
|
gist_url = get_gist_url_for gist, file
|
||||||
raw_uri = URI.parse gist_url
|
data = get_web_content gist_url
|
||||||
|
data = handle_gist_redirecting data
|
||||||
|
if data.code.to_i != 200
|
||||||
|
raise RuntimeError, "Gist replied with #{data.code} for #{gist_url}"
|
||||||
|
end
|
||||||
|
data = data.body
|
||||||
|
cache gist, file, data unless @cache_disabled
|
||||||
|
data
|
||||||
|
end
|
||||||
|
|
||||||
|
def handle_gist_redirecting(data)
|
||||||
|
if data.code.to_i == 302
|
||||||
|
redirected_url = data.header['Location']
|
||||||
|
data = get_web_content redirected_url
|
||||||
|
if data.code.to_i != 200
|
||||||
|
raise RuntimeError, "Gist replied with #{data.code} for #{gist_url}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
data
|
||||||
|
end
|
||||||
|
|
||||||
|
def get_web_content(url)
|
||||||
|
raw_uri = URI.parse url
|
||||||
proxy = ENV['http_proxy']
|
proxy = ENV['http_proxy']
|
||||||
if proxy
|
if proxy
|
||||||
proxy_uri = URI.parse(proxy)
|
proxy_uri = URI.parse(proxy)
|
||||||
@ -84,12 +106,6 @@ module Jekyll
|
|||||||
https.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
https.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
||||||
request = Net::HTTP::Get.new raw_uri.request_uri
|
request = Net::HTTP::Get.new raw_uri.request_uri
|
||||||
data = https.request request
|
data = https.request request
|
||||||
if data.code.to_i != 200
|
|
||||||
raise RuntimeError, "Gist replied with #{data.code} for #{gist_url}"
|
|
||||||
end
|
|
||||||
data = data.body
|
|
||||||
cache gist, file, data unless @cache_disabled
|
|
||||||
data
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user