Skip to content
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.

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

raise MissingDependencyError instead of aborting on missing dependency #241

Merged
merged 2 commits into from
Jan 14, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 2 additions & 0 deletions lib/html/pipeline.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class Pipeline
autoload :TextileFilter, 'html/pipeline/textile_filter'
autoload :TableOfContentsFilter, 'html/pipeline/toc_filter'
autoload :TextFilter, 'html/pipeline/text_filter'

MissingDependencyError = Class.new(LoadError)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you switch this to this syntax:

class MissingDependencyError < LoadError; end

It's a bit easier for ctags, and editors to find the definition this way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!


# Our DOM implementation.
DocumentFragment = Nokogiri::HTML::DocumentFragment
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/autolink_filter.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
begin
require "rinku"
rescue LoadError => _
abort "Missing dependency 'rinku' for AutolinkFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'rinku' for AutolinkFilter. See README.md for details."
end

module HTML
Expand Down
4 changes: 2 additions & 2 deletions lib/html/pipeline/email_reply_filter.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
begin
require "escape_utils"
rescue LoadError => _
abort "Missing dependency 'escape_utils' for EmailReplyFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'escape_utils' for EmailReplyFilter. See README.md for details."
end

begin
require "email_reply_parser"
rescue LoadError => _
abort "Missing dependency 'email_reply_parser' for EmailReplyFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'email_reply_parser' for EmailReplyFilter. See README.md for details."
end

module HTML
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/emoji_filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
begin
require "gemoji"
rescue LoadError => _
abort "Missing dependency 'gemoji' for EmojiFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'gemoji' for EmojiFilter. See README.md for details."
end

module HTML
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/markdown_filter.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
begin
require "github/markdown"
rescue LoadError => _
abort "Missing dependency 'github-markdown' for MarkdownFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'github-markdown' for MarkdownFilter. See README.md for details."
end

module HTML
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/plain_text_input_filter.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
begin
require "escape_utils"
rescue LoadError => _
abort "Missing dependency 'escape_utils' for PlainTextInputFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'escape_utils' for PlainTextInputFilter. See README.md for details."
end

module HTML
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/sanitization_filter.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
begin
require "sanitize"
rescue LoadError => _
abort "Missing dependency 'sanitize' for SanitizationFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'sanitize' for SanitizationFilter. See README.md for details."
end

module HTML
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/syntax_highlight_filter.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
begin
require "linguist"
rescue LoadError => _
abort "Missing dependency 'github-linguist' for SyntaxHighlightFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'github-linguist' for SyntaxHighlightFilter. See README.md for details."
end

module HTML
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/textile_filter.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
begin
require "redcloth"
rescue LoadError => _
abort "Missing dependency 'RedCloth' for TextileFilter. See README.md for details."
raise MissingDependencyError, "Missing dependency 'RedCloth' for TextileFilter. See README.md for details."
end

module HTML
Expand Down