Skip to content

Soften Nokogiri dependency to versions ">= 1.4" #208

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

Merged
merged 2 commits into from
Sep 29, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.2.1

* Soften Nokogiri dependency to versions ">= 1.4" [#208](https://github.com/jch/html-pipeline/pull/208)

## 2.2.0

* Only allow cite attribute on blockquote and restrict schemes [#223](https://github.com/jch/html-pipeline/pull/223)
Expand Down
2 changes: 1 addition & 1 deletion html-pipeline.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
gem.test_files = gem.files.grep(%r{^test})
gem.require_paths = ["lib"]

gem.add_dependency "nokogiri", [">= 1.4", "<= 1.6.5"]
gem.add_dependency "nokogiri", ">= 1.4"
gem.add_dependency "activesupport", [">= 2", "< 5"]

gem.post_install_message = <<msg
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/@mention_filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def self.mentioned_logins_in(text, username_pattern=UsernamePattern)
def call
result[:mentioned_usernames] ||= []

doc.search('text()').each do |node|
doc.search('.//text()').each do |node|
content = node.to_html
next if !content.include?('@')
next if has_ancestor?(node, IGNORE_PARENTS)
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 @@ -19,7 +19,7 @@ class EmojiFilter < Filter
DEFAULT_IGNORED_ANCESTOR_TAGS = %w(pre code tt).freeze

def call
doc.search('text()').each do |node|
doc.search('.//text()').each do |node|
content = node.to_html
next unless content.include?(':')
next if has_ancestor?(node, ignored_ancestor_tags)
Expand Down
2 changes: 1 addition & 1 deletion lib/html/pipeline/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module HTML
class Pipeline
VERSION = "2.2.0"
VERSION = "2.2.1"
end
end