Merge pull request #375 from gjtorikian/convert-no-need

req convert_filter if `text/node`filter present

Author: gjtorikian

lib/html_pipeline.rb

@@ -116,8 +116,9 @@ def initialize(text_filters: [], convert_filter: nil, sanitization_config: Sanit
     validate_filters(@node_filters, HTMLPipeline::NodeFilter)
 
     @convert_filter = convert_filter
-    if @convert_filter.nil? && !@node_filters.empty?
-      raise InvalidFilterError, "Must provide `convert_filter` if `node_filter`s is also provided"
+
+    if @convert_filter.nil? && (!@text_filters.empty? && !@node_filters.empty?)
+      raise InvalidFilterError, "Must provide `convert_filter` if `text_filters` and `node_filters` are also provided"
     elsif !@convert_filter.nil?
       validate_filter(@convert_filter, HTMLPipeline::ConvertFilter)
     end

lib/html_pipeline/filter.rb

@@ -80,7 +80,7 @@ def has_ancestor?(element, ancestor)
     def needs(*keys)
       missing = keys.reject { |key| context.include?(key) }
 
-      return unless missing.any?
+      return if missing.none?
 
       raise ArgumentError,
         "Missing context keys for #{self.class.name}: #{missing.map(&:inspect).join(", ")}"

lib/html_pipeline/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class HTMLPipeline
-  VERSION = "3.0.0.pre2"
+  VERSION = "3.0.0.pre3"
 end

test/html_pipeline_test.rb

@@ -4,17 +4,9 @@
 require "helpers/mocked_instrumentation_service"
 
 class HTMLPipelineTest < Minitest::Test
-  class TestFilter < HTMLPipeline::TextFilter
-    class << self
-      def call(input, context: {}, result: {})
-        input.reverse
-      end
-    end
-  end
-
   def setup
     @default_context = {}
-    @pipeline = HTMLPipeline.new(text_filters: [TestFilter], default_context: @default_context)
+    @pipeline = HTMLPipeline.new(text_filters: [TestTextFilter], default_context: @default_context)
   end
 
   def test_filter_instrumentation
@@ -27,7 +19,7 @@ def test_filter_instrumentation
 
     assert(event, "event expected")
     assert_equal("call_filter.html_pipeline", event)
-    assert_equal(TestFilter.name, payload[:filter])
+    assert_equal(TestTextFilter.name, payload[:filter])
     assert_equal(@pipeline.class.name, payload[:pipeline])
     assert_equal(body.reverse, payload[:result][:output])
   end
@@ -90,6 +82,18 @@ def test_incorrect_convert_filter
     end
   end
 
+  def test_convert_filter_needed_for_text_and_html_filters
+    assert_raises(HTMLPipeline::InvalidFilterError) do
+      HTMLPipeline.new(
+        text_filters: [TestTextFilter],
+        node_filters: [
+          HTMLPipeline::NodeFilter::MentionFilter.new,
+        ],
+        default_context: @default_context,
+      )
+    end
+  end
+
   def test_incorrect_node_filters
     assert_raises(HTMLPipeline::InvalidFilterError) do
       HTMLPipeline.new(node_filters: [HTMLPipeline::ConvertFilter::MarkdownFilter], default_context: @default_context)

test/test_helper.rb

@@ -15,3 +15,11 @@ module TestHelpers
 end
 
 Minitest::Test.include(TestHelpers)
+
+class TestTextFilter < HTMLPipeline::TextFilter
+  class << self
+    def call(input, context: {}, result: {})
+      input.reverse
+    end
+  end
+end