html-pipeline 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a78d7a993503d1652b0143b5c5cc5314251a1b1e
-  data.tar.gz: 1d5e8f1286c4dbb564b42824d8b950f296a18652
+  metadata.gz: e02d528270e77bac532de323b85833d8cd1e291f
+  data.tar.gz: 34b71d6b7e4cc37953be770f478f4c8a61406494
 SHA512:
-  metadata.gz: a41f0686fe77ab68a026926840865f5ac81a3065657919724a4df3c6fe5f906125dbcd5e8b91949d8d4a666954566272cff512de81cacf5998cb61ed5970b3d1
-  data.tar.gz: 66e61ab2aba3d69f442fd537477c1350d7d1c6b2eb65aa6814c38276918162b8bb120b3a0e5c08777d08d9d23a2838734651a71600c339fbb161c0c4618e2534
+  metadata.gz: bce2524133b63fd81edb803e16e4f33be361a02bbec16c1be5d81bb045b0fc85df90e380e0a1b36b9ae37beb06b2f08302f8ed964bd6ff2138fee1d798992db0
+  data.tar.gz: 0dd07655ca6e4efd6bfe74be9282722c52add045543f34b26c4fdb5a4cec7d32687d7d43d03854e0477c3db1479adbdf27b33b6860334f52bffbf78931665743

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 1.11.0
+
+  * Search for text nodes on DocumentFragments without root tags #146 Razer6
+  * Don't filter @mentions in <style> tags #145 jch
+  * Prefer `http_url` in HttpsFilter. `base_url` still works. #142 bkeepers
+  * Remove duplicate check in EmojiFilter #141 Razer6
+
 ## 1.10.0
 
   * Anchor TOCFilter with id's instead of name's #140 bkeepers

data/lib/html/pipeline/@mention_filter.rb

@@ -57,12 +57,12 @@ module HTML
       )
 
       # Don't look for mentions in text nodes that are children of these elements
-      IGNORE_PARENTS = %w(pre code a).to_set
+      IGNORE_PARENTS = %w(pre code a style).to_set
 
       def call
         result[:mentioned_usernames] ||= []
 
-        doc.search('text()').each do |node|
+        search_text_nodes(doc).each do |node|
           content = node.to_html
           next if !content.include?('@')
           next if has_ancestor?(node, IGNORE_PARENTS)
@@ -118,4 +118,4 @@ module HTML
       end
     end
   end
-end
+end

data/lib/html/pipeline/emoji_filter.rb

@@ -15,9 +15,9 @@ module HTML
     #   :asset_path (optional) - url path to link to emoji sprite. :file_name can be used as a placeholder for the sprite file name. If no asset_path is set "emoji/:file_name" is used.
     class EmojiFilter < Filter
       def call
-        doc.search('text()').each do |node|
+        search_text_nodes(doc).each do |node|
           content = node.to_html
-          next if !content.include?(':')
+          next unless content.include?(':')
           next if has_ancestor?(node, %w(pre code))
           html = emoji_image_filter(content)
           next if html == content
@@ -38,8 +38,6 @@ module HTML
       #
       # Returns a String with :emoji: replaced with images.
       def emoji_image_filter(text)
-        return text unless text.include?(':')
-
         text.gsub(emoji_pattern) do |match|
           name = $1
           "<img class='emoji' title=':#{name}:' alt=':#{name}:' src='#{emoji_url(name)}' height='20' width='20' align='absmiddle' />"

data/lib/html/pipeline/filter.rb

@@ -59,6 +59,13 @@ module HTML
         @doc ||= parse_html(html)
       end
 
+      # Searches a Nokogiri::HTML::DocumentFragment for text nodes. If no elements
+      # are found, a second search without root tags is invoked.
+      def search_text_nodes(doc)
+        nodes = doc.xpath('.//text()')
+        nodes.empty? ? doc.xpath('text()') : nodes
+      end
+
       # The String representation of the document. If a DocumentFragment was
       # provided to the Filter, it is serialized into a String when this method is
       # called.

data/lib/html/pipeline/https_filter.rb

@@ -1,21 +1,26 @@
 module HTML
   class Pipeline
-    # HTML Filter for replacing http references to :base_url with https versions.
+    # HTML Filter for replacing http references to :http_url with https versions.
     # Subdomain references are not rewritten.
     #
     # Context options:
-    #   :base_url - The url to force https
+    #   :http_url - The HTTP url to force HTTPS. Falls back to :base_url
     class HttpsFilter < Filter
       def call
-        doc.css(%Q(a[href^="#{context[:base_url]}"])).each do |element|
+        doc.css(%Q(a[href^="#{http_url}"])).each do |element|
           element['href'] = element['href'].sub(/^http:/,'https:')
         end
         doc
       end
 
-      # Raise error if :base_url undefined
+      # HTTP url to replace. Falls back to :base_url
+      def http_url
+        context[:http_url] || context[:base_url]
+      end
+
+      # Raise error if :http_url undefined
       def validate
-        needs :base_url
+        needs :http_url unless http_url
       end
     end
   end

data/lib/html/pipeline/version.rb

@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "1.10.0"
+    VERSION = "1.11.0"
   end
 end

data/test/html/pipeline/emoji_filter_test.rb

@@ -8,6 +8,12 @@ class HTML::Pipeline::EmojiFilterTest < Minitest::Test
     doc = filter.call
     assert_match "https://foo.com/emoji/shipit.png", doc.search('img').attr('src').value
   end
+
+  def test_emojify_on_string
+    filter = EmojiFilter.new(":shipit:", {:asset_root => 'https://foo.com'})
+    doc = filter.call
+    assert_match "https://foo.com/emoji/shipit.png", doc.search('img').attr('src').value
+  end
   
   def test_uri_encoding
     filter = EmojiFilter.new("<p>:+1:</p>", {:asset_root => 'https://foo.com'})

data/test/html/pipeline/https_filter_test.rb

@@ -3,8 +3,12 @@ require "test_helper"
 HttpsFilter = HTML::Pipeline::HttpsFilter
 
 class HTML::Pipeline::AutolinkFilterTest < Minitest::Test
-  def filter(html, base_url="http://github.com")
-    HttpsFilter.to_html(html, :base_url => base_url)
+  def filter(html)
+    HttpsFilter.to_html(html, @options)
+  end
+
+  def setup
+    @options = {:base_url => "http://github.com"}
   end
 
   def test_http
@@ -27,8 +31,23 @@ class HTML::Pipeline::AutolinkFilterTest < Minitest::Test
           filter(%(<a href="http://github.io">github.io</a>))
   end
 
-  def test_validation
-    exception = assert_raises(ArgumentError) { HttpsFilter.call(nil, {}) }
-    assert_match "HTML::Pipeline::HttpsFilter: :base_url", exception.message
+  def test_uses_http_url_over_base_url
+    @options =  {:http_url => "http://github.com", :base_url => "https://github.com"}
+
+    assert_equal %(<a href="https://github.com">github.com</a>),
+          filter(%(<a href="http://github.com">github.com</a>))
+  end
+
+  def test_only_http_url
+    @options = {:http_url => "http://github.com"}
+
+    assert_equal %(<a href="https://github.com">github.com</a>),
+          filter(%(<a href="http://github.com">github.com</a>))
+  end
+
+  def test_validates_http_url
+    @options.clear
+    exception = assert_raises(ArgumentError) { filter("") }
+    assert_match "HTML::Pipeline::HttpsFilter: :http_url", exception.message
   end
 end

data/test/html/pipeline/mention_filter_test.rb

@@ -36,6 +36,11 @@ class HTML::Pipeline::MentionFilterTest < Minitest::Test
     assert_equal body, filter(body).to_html
   end
 
+  def test_not_replacing_mentions_in_style_tags
+    body = "<style>@media (min-width: 768px) { color: red; }</style>"
+    assert_equal body, filter(body).to_html
+  end
+
   def test_not_replacing_mentions_in_links
     body = "<p><a>@kneath</a> okay</p>"
     assert_equal body, filter(body).to_html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri