Skip to content

Commit 5d38e21

Browse files
committed
Merge pull request gjtorikian#110 from foca/email_reply_filter-dependencies
EmailReplyFilter depends on EmailReplyParser
2 parents 5744986 + 39a8c6c commit 5d38e21

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

Gemfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ group :development do
99
end
1010

1111
group :test do
12-
gem "rinku", "~> 1.7", :require => false
13-
gem "gemoji", "~> 1.0", :require => false
14-
gem "RedCloth", "~> 4.2.9", :require => false
15-
gem "escape_utils", "~> 0.3", :require => false
16-
gem "github-linguist", "~> 2.6.2", :require => false
17-
gem "github-markdown", "~> 0.5", :require => false
12+
gem "rinku", "~> 1.7", :require => false
13+
gem "gemoji", "~> 1.0", :require => false
14+
gem "RedCloth", "~> 4.2.9", :require => false
15+
gem "escape_utils", "~> 0.3", :require => false
16+
gem "github-linguist", "~> 2.6.2", :require => false
17+
gem "github-markdown", "~> 0.5", :require => false
18+
gem "email_reply_parser", "~> 0.5", :require => false
1819

1920
if RUBY_VERSION < "1.9.2"
2021
gem "sanitize", ">= 2", "< 2.0.4", :require => false

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ gem 'github-linguist'
111111
```
112112

113113
* `AutolinkFilter` - `rinku`
114-
* `EmailReplyFilter` - `escape_utils`
114+
* `EmailReplyFilter` - `escape_utils`, `email_reply_parser`
115115
* `EmojiFilter` - `gemoji`
116116
* `MarkdownFilter` - `github-markdown`
117117
* `PlainTextInputFilter` - `escape_utils`

lib/html/pipeline/email_reply_filter.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
abort "Missing dependency 'escape_utils' for EmailReplyFilter. See README.md for details."
55
end
66

7+
begin
8+
require "email_reply_parser"
9+
rescue LoadError => _
10+
abort "Missing dependency 'email_reply_parser' for EmailReplyFilter. See README.md for details."
11+
end
12+
713
module HTML
814
class Pipeline
915
# HTML Filter that converts email reply text into an HTML DocumentFragment.

0 commit comments

Comments
 (0)