Skip to content

Re-add support for Ruby 1.9.3 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2015
Merged

Re-add support for Ruby 1.9.3 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aefff1
travis: add back 1.9.3
parkr Aug 18, 2015
825137a
Spike out fake Net::OpenTimeout and Net::ReadTimeout for Ruby 1.9.3
parkr Aug 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ rvm:
- 2.2
- 2.1
- 2.0
- 1.9.3
sudo: false
notifications:
email: false
Expand Down
15 changes: 6 additions & 9 deletions lib/jekyll-gist/gist_tag.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
require 'cgi'
require 'net/http'

Net::OpenTimeout = Class.new(RuntimeError) unless Net.const_defined?(:OpenTimeout)
Net::ReadTimeout = Class.new(RuntimeError) unless Net.const_defined?(:ReadTimeout)

module Jekyll
module Gist
class GistTag < Liquid::Tag
Expand Down Expand Up @@ -62,19 +65,13 @@ def fetch_raw_code(gist_id, filename = nil)
begin
uri = URI(url)
Net::HTTP.start(uri.host, uri.port,
use_ssl: uri.scheme == 'https',
use_ssl: uri.scheme == 'https',
read_timeout: 3, open_timeout: 3) do |http|
request = Net::HTTP::Get.new uri
request = Net::HTTP::Get.new uri.to_s
response = http.request(request)
response.body
end
rescue SocketError
nil
rescue Net::HTTPError
nil
rescue Net::OpenTimeout
nil
rescue Net::ReadTimeout
rescue SocketError, Net::HTTPError, Net::OpenTimeout, Net::ReadTimeout
nil
end
end
Expand Down