Merge upstream/master; activesupport is a full dependency

Author: Simeon F. Willbanks

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.3.1
+
+  * Guard against nil node replacement in SyntaxHighlightFilter #84 jbarnette
+
+## 0.3.0
+
+  * Add support for manually specified default language in SyntaxHighlightFilter #81 jbarnette
+
 ## 0.2.1
 
   * Moves ActiveSupport as a development dependency #79

README.md

@@ -121,6 +121,15 @@ gem 'github-linguist'
 
 _Note:_ See [Gemfile](https://github.com/jch/html-pipeline/blob/master/Gemfile) `:test` block for version requirements.
 
+## 3rd Party Extensions
+
+If you have an idea for a filter, propose it as
+[an issue](https://github.com/jch/html-pipeline/issues) first. This allows us discuss
+whether the filter is a common enough use case to belong in this gem, or should be
+built as an external gem.
+
+* [html-pipeline-asciidoc_filter](https://github.com/asciidoctor/html-pipeline-asciidoc_filter) - asciidoc support
+
 ## Examples
 
 We define different pipelines for different parts of our app. Here are a few

html-pipeline.gemspec

@@ -15,9 +15,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^test})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "nokogiri", RUBY_VERSION < "1.9.2" ? [">= 1.4", "< 1.6"] : "~> 1.4"
-
-  gem.add_development_dependency "activesupport", RUBY_VERSION < "1.9.3" ? [">= 2", "< 4"] : ">= 2"
+  gem.add_dependency "nokogiri",      RUBY_VERSION < "1.9.2" ? [">= 1.4", "< 1.6"] : "~> 1.4"
+  gem.add_dependency "activesupport", RUBY_VERSION < "1.9.3" ? [">= 2", "< 4"] : ">= 2"
 
   gem.post_install_message = <<msg
 -------------------------------------------------

lib/html/pipeline.rb

@@ -1,4 +1,5 @@
 require "nokogiri"
+require "active_support/xml_mini/nokogiri" # convert Documents to hashes
 
 module HTML
   # GitHub HTML processing filters and utilities. This module includes a small

lib/html/pipeline/syntax_highlight_filter.rb

@@ -12,14 +12,20 @@ class Pipeline
     class SyntaxHighlightFilter < Filter
       def call
         doc.search('pre').each do |node|
-          next unless lang = node['lang']
+          default = context[:highlight] && context[:highlight].to_s
+          next unless lang = node['lang'] || default
           next unless lexer = Pygments::Lexer[lang]
           text = node.inner_text
 
           html = highlight_with_timeout_handling(lexer, text)
           next if html.nil?
 
-          node.replace(html)
+          if (node = node.replace(html).first)
+            klass = node["class"]
+            klass = [klass, "highlight-#{lang}"].compact.join " "
+
+            node["class"] = klass
+          end
         end
         doc
       end

lib/html/pipeline/version.rb

@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "0.2.1"
+    VERSION = "0.3.1"
   end
 end

test/html/pipeline/syntax_highlight_filter_test.rb

@@ -1,7 +1,26 @@
 require "test_helper"
 
+SyntaxHighlightFilter = HTML::Pipeline::SyntaxHighlightFilter
+
 class HTML::Pipeline::SyntaxHighlightFilterTest < Test::Unit::TestCase
   def test_dependency_management
     assert_dependency "syntax_highlight_filter", "github-linguist"
   end
+
+  def test_highlight_default
+    filter = SyntaxHighlightFilter.new \
+      "<pre>hello</pre>", :highlight => "coffeescript"
+
+    doc = filter.call
+    assert !doc.css(".highlight-coffeescript").empty?
+  end
+
+  def test_highlight_default_will_not_override
+    filter = SyntaxHighlightFilter.new \
+      "<pre lang='c'>hello</pre>", :highlight => "coffeescript"
+
+    doc = filter.call
+    assert doc.css(".highlight-coffeescript").empty?
+    assert !doc.css(".highlight-c").empty?
+  end
 end

test/test_helper.rb

@@ -2,8 +2,8 @@
 require "html/pipeline"
 require "test/unit"
 
+require "active_support/core_ext/string"
 require "active_support/core_ext/object/try"
-require "active_support/xml_mini/nokogiri" # convert Documents to hashes
 
 module TestHelpers
   # Asserts that `needle` is not a member of `haystack`, where