diff options
author | Brett Walker <bwalker@gitlab.com> | 2019-01-12 03:31:00 +0300 |
---|---|---|
committer | Brett Walker <bwalker@gitlab.com> | 2019-01-22 00:07:40 +0300 |
commit | 7bc0fbe22f0dd2c96b596b591ef5dbf3eaae8dd3 (patch) | |
tree | e59cc0f740c8511a58d057f16864f9cf661cd8ec /lib/banzai | |
parent | 45a04f93747a128588268395071f00d0af70acd7 (diff) |
Fix review comments
including refactoring, disabling sourcepos for pipelines that
don't need it, and minimizing spec changes by disabling
sourcepos when not testing for it explicitly.
Diffstat (limited to 'lib/banzai')
-rw-r--r-- | lib/banzai/filter/markdown_engines/common_mark.rb | 2 | ||||
-rw-r--r-- | lib/banzai/filter/spaced_link_filter.rb | 3 | ||||
-rw-r--r-- | lib/banzai/pipeline/broadcast_message_pipeline.rb | 6 | ||||
-rw-r--r-- | lib/banzai/pipeline/email_pipeline.rb | 3 | ||||
-rw-r--r-- | lib/banzai/pipeline/single_line_pipeline.rb | 6 |
5 files changed, 17 insertions, 3 deletions
diff --git a/lib/banzai/filter/markdown_engines/common_mark.rb b/lib/banzai/filter/markdown_engines/common_mark.rb index 81fdf0b2652..d3af776db05 100644 --- a/lib/banzai/filter/markdown_engines/common_mark.rb +++ b/lib/banzai/filter/markdown_engines/common_mark.rb @@ -50,7 +50,7 @@ module Banzai private def render_options - @context&.dig(:no_sourcepos) ? RENDER_OPTIONS : RENDER_OPTIONS_SOURCEPOS + @context[:no_sourcepos] ? RENDER_OPTIONS : RENDER_OPTIONS_SOURCEPOS end end end diff --git a/lib/banzai/filter/spaced_link_filter.rb b/lib/banzai/filter/spaced_link_filter.rb index de76e3f9df4..00dbf2d3130 100644 --- a/lib/banzai/filter/spaced_link_filter.rb +++ b/lib/banzai/filter/spaced_link_filter.rb @@ -73,7 +73,8 @@ module Banzai html = Banzai::Filter::MarkdownFilter.call(transform_markdown(match), context) # link is wrapped in a <p>, so strip that off - html.sub(/<p[^>]*>/, '').chomp('</p>') + p_node = Nokogiri::HTML.fragment(html).at_css('p') + p_node ? p_node.children.to_html : html end def spaced_link_filter(text) diff --git a/lib/banzai/pipeline/broadcast_message_pipeline.rb b/lib/banzai/pipeline/broadcast_message_pipeline.rb index a3d63e0aaf5..580b5b72474 100644 --- a/lib/banzai/pipeline/broadcast_message_pipeline.rb +++ b/lib/banzai/pipeline/broadcast_message_pipeline.rb @@ -14,6 +14,12 @@ module Banzai Filter::ExternalLinkFilter ] end + + def self.transform_context(context) + super(context).merge( + no_sourcepos: true + ) + end end end end diff --git a/lib/banzai/pipeline/email_pipeline.rb b/lib/banzai/pipeline/email_pipeline.rb index 2c08581ce0d..0f4dd9d143d 100644 --- a/lib/banzai/pipeline/email_pipeline.rb +++ b/lib/banzai/pipeline/email_pipeline.rb @@ -11,7 +11,8 @@ module Banzai def self.transform_context(context) super(context).merge( - only_path: false + only_path: false, + no_sourcepos: true ) end end diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb index 61ff7b0bcce..72374207a8f 100644 --- a/lib/banzai/pipeline/single_line_pipeline.rb +++ b/lib/banzai/pipeline/single_line_pipeline.rb @@ -27,6 +27,12 @@ module Banzai Filter::CommitReferenceFilter ] end + + def self.transform_context(context) + super(context).merge( + no_sourcepos: true + ) + end end end end |