Merge pull request gjtorikian#208 from jch/feature/soften-nokogiri-dependency

jch · jch · commit a02673b8f6d8 · 2015-09-29T09:44:22.000-07:00
Soften Nokogiri dependency to versions "&gt;= 1.4"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
diff --git a/html-pipeline.gemspec b/html-pipeline.gemspec
@@ -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
diff --git a/lib/html/pipeline/@mention_filter.rb b/lib/html/pipeline/@mention_filter.rb
@@ -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)
diff --git a/lib/html/pipeline/emoji_filter.rb b/lib/html/pipeline/emoji_filter.rb
@@ -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)
diff --git a/lib/html/pipeline/version.rb b/lib/html/pipeline/version.rb
@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "2.2.0"
+    VERSION = "2.2.1"
   end
 end
