qiita-markdown 0.44.0 → 0.44.1

data/lib/qiita/markdown/filters/group_mention.rb

@@ -21,9 +21,9 @@ module Qiita
           GROUP_IDENTIFIER_PATTERN = %r{
             (?:^|\W)
             @((?>[a-z\d][a-z\d-]{2,31}))
-            \/
+            /
             ([A-Za-z\d][A-Za-z\d-]{0,62}[A-Za-z\d])
-            (?!\/)
+            (?!/)
             (?=
               \.+[ \t\W]|
               \.+$|

data/lib/qiita/markdown/filters/image_link.rb

@@ -4,12 +4,12 @@ module Qiita
       class ImageLink < HTML::Pipeline::Filter
         def call
           doc.search("img").each do |img|
-            unless img.ancestors.any? { |ancestor| ancestor.name == "a" }
-              outer = Nokogiri::HTML.fragment(%(<a href="#{img['src']}" target="_blank"></a>))
-              inner = img.clone
-              outer.at("a").add_child(inner)
-              img.replace(outer)
-            end
+            next if img.ancestors.any? { |ancestor| ancestor.name == "a" }
+
+            outer = Nokogiri::HTML.fragment(%(<a href="#{img['src']}" target="_blank"></a>))
+            inner = img.clone
+            outer.at("a").add_child(inner)
+            img.replace(outer)
           end
           doc
         end

data/lib/qiita/markdown/filters/inline_code_color.rb

@@ -6,15 +6,15 @@ module Qiita
 
         REGEXPS = Regexp.union(
           /\#(?:\h{3}|\h{6})/,
-          /rgba?\(\s*(?:\d+(?:\,|\s)\s*){2}\d+\s*\)/,
-          /rgba?\(\s*(?:\d+%(?:\,|\s)\s*){2}\d+%\s*\)/,
-          /rgba?\(\s*(?:\d+\,\s*){3}\d*\.?\d+%?\s*\)/,
-          /rgba?\(\s*(?:\d+\s*){2}\d+\s*\/\s*\d?\.?\d+%?\s*\)/,
-          /rgba?\(\s*(?:\d+%\s*){2}\d+%\s*\/\s*\d?\.?\d+%?\s*\)/,
-          /hsla?\(\s*\d+(?:deg|rad|grad|turn)?\,\s*\d+%\,\s*\d+%\s*\)/,
+          /rgba?\(\s*(?:\d+(?:,|\s)\s*){2}\d+\s*\)/,
+          /rgba?\(\s*(?:\d+%(?:,|\s)\s*){2}\d+%\s*\)/,
+          /rgba?\(\s*(?:\d+,\s*){3}\d*\.?\d+%?\s*\)/,
+          %r{rgba?\(\s*(?:\d+\s*){2}\d+\s*/\s*\d?\.?\d+%?\s*\)},
+          %r{rgba?\(\s*(?:\d+%\s*){2}\d+%\s*/\s*\d?\.?\d+%?\s*\)},
+          /hsla?\(\s*\d+(?:deg|rad|grad|turn)?,\s*\d+%,\s*\d+%\s*\)/,
           /hsla?\(\s*\d+(?:deg|rad|grad|turn)?\s+\d+%\s+\d+%\s*\)/,
-          /hsla?\(\s*\d+(?:deg|rad|grad|turn)?\,\s*(?:\d+%\,\s*){2}\d?\.?\d+%?\s*\)/,
-          /hsla?\(\s*\d+(?:deg|rad|grad|turn)?\s+\d+%\s+\d+%\s*\/\s*\d?\.?\d+%?\s*\)/,
+          /hsla?\(\s*\d+(?:deg|rad|grad|turn)?,\s*(?:\d+%,\s*){2}\d?\.?\d+%?\s*\)/,
+          %r{hsla?\(\s*\d+(?:deg|rad|grad|turn)?\s+\d+%\s+\d+%\s*/\s*\d?\.?\d+%?\s*\)},
         )
 
         COLOR_CODE_PATTERN = /\A\s*(#{REGEXPS})\s*\z/

data/lib/qiita/markdown/filters/mention.rb

@@ -8,17 +8,17 @@ module Qiita
       class Mention < HTML::Pipeline::MentionFilter
         IGNORE_PARENTS = ::HTML::Pipeline::MentionFilter::IGNORE_PARENTS + Set["blockquote"]
 
-        MentionPattern = /
+        MentionPattern = %r{
           (?:^|\W)
-          @((?>[\w][\w-]{0,30}\w(?:@github)?))
-          (?!\/)
+          @((?>\w[\w-]{0,30}\w(?:@github)?))
+          (?!/)
           (?=
             \.+[ \t\W]|
             \.+$|
             [^0-9a-zA-Z_.]|
             $
           )
-        /ix
+        }ix
 
         # @note Override to use another IGNORE_PARENTS
         def call
@@ -28,8 +28,10 @@ module Qiita
             content = node.to_html
             next unless content.include?("@")
             next if has_ancestor?(node, IGNORE_PARENTS)
+
             html = mention_link_filter(content, base_url, info_url, username_pattern)
             next if html == content
+
             node.replace(html)
           end
           doc
@@ -38,22 +40,22 @@ module Qiita
         # @note Override to use customized MentionPattern and allowed_usernames logic.
         def mention_link_filter(text, _, _, _)
           text.gsub(MentionPattern) do |match|
-            name = $1
+            name = ::Regexp.last_match(1)
             case
             when allowed_usernames && name == "all"
               result[:mentioned_usernames] |= allowed_usernames
               match.sub(
                 "@#{name}",
-                %[<a href="/" class="user-mention" title="#{name}">@#{name}</a>]
+                %(<a href="/" class="user-mention" title="#{name}">@#{name}</a>),
               )
-            when allowed_usernames && !allowed_usernames.include?(name) || name == "all"
+            when (allowed_usernames && !allowed_usernames.include?(name)) || name == "all"
               match
             else
               result[:mentioned_usernames] |= [name]
               url = File.join(base_url, name)
               match.sub(
                 "@#{name}",
-                %[<a href="#{url}" class="user-mention js-hovercard" title="#{name}" data-hovercard-target-type="user" data-hovercard-target-name="#{name}">@#{name}</a>]
+                %(<a href="#{url}" class="user-mention js-hovercard" title="#{name}" data-hovercard-target-type="user" data-hovercard-target-name="#{name}">@#{name}</a>),
               )
             end
           end
@@ -66,7 +68,7 @@ module Qiita
         end
 
         def has_ancestor?(node, tags)
-          super || node.parent.parent && node.parent.parent["class"] == "code-lang"
+          super || (node.parent.parent && node.parent.parent["class"] == "code-lang")
         end
       end
     end

data/lib/qiita/markdown/filters/simplify.rb

@@ -38,6 +38,7 @@ module Qiita
           doc.traverse do |node|
             next unless node.element?
             next if SIMPLE_ELEMENTS.include?(node.name)
+
             node.replace(node.children)
           end
         end

data/lib/qiita/markdown/filters/syntax_highlight.rb

@@ -54,7 +54,7 @@ module Qiita
           end
 
           def call
-            outer = Nokogiri::HTML.fragment(%Q[<div class="code-frame" data-lang="#{language}">])
+            outer = Nokogiri::HTML.fragment(%(<div class="code-frame" data-lang="#{language}">))
             frame = outer.at("div")
             frame.add_child(filename_node) if filename
             frame.add_child(highlighted_node)
@@ -72,7 +72,7 @@ module Qiita
           end
 
           def filename_node
-            %Q[<div class="code-lang"><span class="bold">#{filename}</span></div>]
+            %(<div class="code-lang"><span class="bold">#{filename}</span></div>)
           end
 
           def has_inline_php?
@@ -87,7 +87,7 @@ module Qiita
             if specific_language && Rouge::Lexer.find(specific_language)
               begin
                 highlight(specific_language).presence or raise
-              rescue
+              rescue StandardError
                 highlight(@default_language)
               end
             else
@@ -100,7 +100,7 @@ module Qiita
           end
 
           def language_node
-            Nokogiri::HTML.fragment(%Q[<div class="code-frame" data-lang="#{language}"></div>])
+            Nokogiri::HTML.fragment(%(<div class="code-frame" data-lang="#{language}"></div>))
           end
 
           def specific_language

data/lib/qiita/markdown/filters/truncate.rb

@@ -51,9 +51,7 @@ module Qiita
           node.content.each_char.with_index do |char, index|
             current_char_is_blank = char.strip.empty?
 
-            if !@previous_char_was_blank || !current_char_is_blank
-              @current_length += 1
-            end
+            @current_length += 1 if !@previous_char_was_blank || !current_char_is_blank
 
             @previous_char_was_blank = current_char_is_blank
 

data/lib/qiita/markdown/filters/user_input_sanitizer.rb

@@ -10,24 +10,24 @@ module Qiita
             summary sup table tbody td tfoot th thead tr ul var
           ],
           attributes: {
-            "a"          => %w[class href rel title],
+            "a" => %w[class href rel title],
             "blockquote" => %w[cite] + Embed::Tweet::ATTRIBUTES,
-            "code"       => %w[data-metadata],
-            "div"        => %w[class data-type data-metadata],
-            "font"       => %w[color],
-            "h1"         => %w[id],
-            "h2"         => %w[id],
-            "h3"         => %w[id],
-            "h4"         => %w[id],
-            "h5"         => %w[id],
-            "h6"         => %w[id],
-            "img"        => %w[alt height src title width],
-            "ins"        => %w[cite datetime],
-            "li"         => %w[id],
-            "p"          => Embed::CodePen::ATTRIBUTES,
-            "q"          => %w[cite],
-            "script"     => %w[async src id].concat(Embed::SpeekerDeck::ATTRIBUTES, Embed::Docswell::ATTRIBUTES),
-            "iframe"     => %w[
+            "code" => %w[data-metadata],
+            "div" => %w[class data-type data-metadata],
+            "font" => %w[color],
+            "h1" => %w[id],
+            "h2" => %w[id],
+            "h3" => %w[id],
+            "h4" => %w[id],
+            "h5" => %w[id],
+            "h6" => %w[id],
+            "img" => %w[alt height src title width],
+            "ins" => %w[cite datetime],
+            "li" => %w[id],
+            "p" => Embed::CodePen::ATTRIBUTES,
+            "q" => %w[cite],
+            "script" => %w[async src id].concat(Embed::SpeekerDeck::ATTRIBUTES, Embed::Docswell::ATTRIBUTES),
+            "iframe" => %w[
               allowfullscreen
               frameborder
               height
@@ -38,14 +38,14 @@ module Qiita
               style
               width
             ],
-            "sup"        => %w[id],
-            "td"         => %w[colspan rowspan style],
-            "th"         => %w[colspan rowspan style],
+            "sup" => %w[id],
+            "td" => %w[colspan rowspan style],
+            "th" => %w[colspan rowspan style],
           },
           protocols: {
-            "a"          => { "href" => ["http", "https", "mailto", :relative] },
+            "a" => { "href" => ["http", "https", "mailto", :relative] },
             "blockquote" => { "cite" => ["http", "https", :relative] },
-            "q"          => { "cite" => ["http", "https", :relative] },
+            "q" => { "cite" => ["http", "https", :relative] },
           },
           css: {
             properties: %w[

data/lib/qiita/markdown/greenmat/heading_rendering.rb

@@ -18,11 +18,11 @@ module Qiita
           end
 
           def to_s
-            fail NotImplementedError
+            raise NotImplementedError
           end
 
           def increment
-            fail NotImplementedError
+            raise NotImplementedError
           end
 
           private

data/lib/qiita/markdown/greenmat/html_toc_renderer.rb

@@ -12,7 +12,7 @@ module Qiita
 
         # https://github.com/vmg/redcarpet/blob/v3.2.3/ext/redcarpet/html.c#L609-L642
         def header(text, level)
-          @level_offset = level - 1 unless @level_offset
+          @level_offset ||= level - 1
 
           level -= @level_offset
           level = 1 if level < 1

data/lib/qiita/markdown/transformers/filter_attributes.rb

@@ -37,6 +37,7 @@ module Qiita
 
         def transform
           return unless FILTERS.key?(name)
+
           FILTERS[name].each_pair do |attr, pattern|
             filter_attribute(attr, pattern) if node.attributes.key?(attr)
           end

data/lib/qiita/markdown/transformers/filter_iframe.rb

@@ -2,8 +2,7 @@ module Qiita
   module Markdown
     module Transformers
       class FilterIframe
-        URL_WHITE_LIST = [
-        ].flatten.freeze
+        URL_WHITE_LIST = [].flatten.freeze
 
         HOST_WHITE_LIST = [
           Embed::Youtube::SCRIPT_HOSTS,

data/lib/qiita/markdown/transformers/filter_script.rb

@@ -45,7 +45,7 @@ module Qiita
         def host_of(url)
           if url
             scheme = URI.parse(url).scheme
-            Addressable::URI.parse(url).host if ["http", "https"].include? scheme
+            Addressable::URI.parse(url).host if %w[http https].include? scheme
           end
         rescue Addressable::URI::InvalidURIError, URI::InvalidURIError
           nil

data/lib/qiita/markdown/transformers/strip_invalid_node.rb

@@ -12,9 +12,7 @@ module Qiita
         end
 
         def transform
-          if has_invalid_list_node? || has_invalid_table_node?
-            node.replace(node.children)
-          end
+          node.replace(node.children) if has_invalid_list_node? || has_invalid_table_node?
         end
 
         private

data/lib/qiita/markdown/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "0.44.0"
+    VERSION = "0.44.1"
   end
 end

data/qiita-markdown.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "qiita/markdown/version"
 
@@ -13,26 +13,26 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.6.0"
 
+  spec.add_dependency "addressable"
   spec.add_dependency "gemoji"
   spec.add_dependency "github-linguist", "~> 4.0"
+  spec.add_dependency "greenmat", "3.5.1.4"
   spec.add_dependency "html-pipeline", "~> 2.0"
   spec.add_dependency "mem"
   spec.add_dependency "rouge", "3.26.0"
-  spec.add_dependency "greenmat", "3.5.1.4"
   spec.add_dependency "sanitize"
-  spec.add_dependency "addressable"
   spec.add_development_dependency "activesupport", "~> 5.2.7"
   spec.add_development_dependency "benchmark-ips", "~> 1.2"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "codeclimate-test-reporter", "0.4.4"
-  spec.add_development_dependency "simplecov", "!= 0.18.0", "!= 0.18.1", "!= 0.18.2", "!= 0.18.3", "!= 0.18.4", "!= 0.18.5", "!= 0.19.0", "!= 0.19.1"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1"
-  spec.add_development_dependency "rubocop", "~> 1.27.0"
+  spec.add_development_dependency "rubocop", "~> 1.39.0"
+  spec.add_development_dependency "simplecov", "!= 0.18.0", "!= 0.18.1", "!= 0.18.2", "!= 0.18.3", "!= 0.18.4", "!= 0.18.5", "!= 0.19.0", "!= 0.19.1"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/spec/qiita/markdown/processor_spec.rb

@@ -250,7 +250,7 @@ describe Qiita::Markdown::Processor do
             foo
 
             </code></pre></div></div>
-           HTML
+          HTML
         end
       end
 
@@ -383,7 +383,7 @@ describe Qiita::Markdown::Processor do
 
       context "with @all and allowed_usernames context" do
         before do
-          context[:allowed_usernames] = ["alice", "bob"]
+          context[:allowed_usernames] = %w[alice bob]
         end
 
         let(:markdown) do
@@ -400,7 +400,7 @@ describe Qiita::Markdown::Processor do
 
       context "with @all and @alice" do
         before do
-          context[:allowed_usernames] = ["alice", "bob"]
+          context[:allowed_usernames] = %w[alice bob]
         end
 
         let(:markdown) do
@@ -517,7 +517,7 @@ describe Qiita::Markdown::Processor do
         it "creates link for that with .autolink class" do
           should eq(
             '<p><a href="http://example.com/search?q=%E6%97%A5%E6%9C%AC%E8%AA%9E" class="autolink">' \
-            "http://example.com/search?q=日本語</a></p>\n"
+            "http://example.com/search?q=日本語</a></p>\n",
           )
         end
       end
@@ -613,7 +613,7 @@ describe Qiita::Markdown::Processor do
 
       context "with font element with color attribute" do
         let(:markdown) do
-          %[<font color="red">test</font>]
+          %(<font color="red">test</font>)
         end
 
         it "allows font element with color attribute" do
@@ -844,7 +844,7 @@ describe Qiita::Markdown::Processor do
 
       context "with emoji_names and emoji_url_generator context" do
         before do
-          context[:emoji_names] = %w(foo o)
+          context[:emoji_names] = %w[foo o]
 
           context[:emoji_url_generator] = proc do |emoji_name|
             "https://example.com/foo.png" if emoji_name == "foo"
@@ -860,11 +860,11 @@ describe Qiita::Markdown::Processor do
         it "replaces only the specified emoji names with img elements with custom URL" do
           should include(
             '<img class="emoji" title=":foo:" alt=":foo:" src="https://example.com/foo.png"',
-            '<img class="emoji" title=":o:" alt=":o:" src="/images/emoji/unicode/2b55.png"'
+            '<img class="emoji" title=":o:" alt=":o:" src="/images/emoji/unicode/2b55.png"',
           )
 
           should_not include(
-            '<img class="emoji" title=":x:" alt=":x:"'
+            '<img class="emoji" title=":x:" alt=":x:"',
           )
         end
       end
@@ -881,7 +881,7 @@ describe Qiita::Markdown::Processor do
         it "creates link which does not have rel='nofollow noopener' and target='_blank'" do
           should eq(
             '<p><a href="http://qiita.com/?a=b" class="autolink">' \
-            "http://qiita.com/?a=b</a></p>\n"
+            "http://qiita.com/?a=b</a></p>\n",
           )
         end
       end
@@ -898,7 +898,7 @@ describe Qiita::Markdown::Processor do
         it "creates link which has rel='nofollow noopener' and target='_blank'" do
           should eq(
             '<p><a href="http://external.com/?a=b" class="autolink" rel="nofollow noopener" target="_blank">' \
-            "http://external.com/?a=b</a></p>\n"
+            "http://external.com/?a=b</a></p>\n",
           )
         end
       end
@@ -914,7 +914,7 @@ describe Qiita::Markdown::Processor do
 
         it "creates link which does not have rel='nofollow noopener' and target='_blank'" do
           should eq(
-            "<p><a href=\"http://qiita.com/?a=b\">foobar</a></p>\n"
+            "<p><a href=\"http://qiita.com/?a=b\">foobar</a></p>\n",
           )
         end
       end
@@ -930,7 +930,7 @@ describe Qiita::Markdown::Processor do
 
         it "creates link which has rel='nofollow noopener' and target='_blank'" do
           should eq(
-            "<p><a href=\"http://external.com/?a=b\" rel=\"nofollow noopener\" target=\"_blank\">foobar</a></p>\n"
+            "<p><a href=\"http://external.com/?a=b\" rel=\"nofollow noopener\" target=\"_blank\">foobar</a></p>\n",
           )
         end
       end
@@ -947,7 +947,7 @@ describe Qiita::Markdown::Processor do
         it "creates link which has rel='nofollow noopener' and target='_blank'" do
           should eq(
             '<p><a href="http://qqqqqqiita.com/?a=b" class="autolink" rel="nofollow noopener" target="_blank">' \
-            "http://qqqqqqiita.com/?a=b</a></p>\n"
+            "http://qqqqqqiita.com/?a=b</a></p>\n",
           )
         end
       end
@@ -963,7 +963,7 @@ describe Qiita::Markdown::Processor do
 
         it "creates link which has rel='nofollow noopener' and target='_blank'" do
           should eq(
-            "<p><a href=\"http://qqqqqqiita.com/?a=b\" rel=\"nofollow noopener\" target=\"_blank\">foobar</a></p>\n"
+            "<p><a href=\"http://qqqqqqiita.com/?a=b\" rel=\"nofollow noopener\" target=\"_blank\">foobar</a></p>\n",
           )
         end
       end
@@ -980,7 +980,7 @@ describe Qiita::Markdown::Processor do
         it "creates link which has rel='nofollow noopener' and target='_blank'" do
           should eq(
             '<p><a href="http://sub.qiita.com/?a=b" class="autolink" rel="nofollow noopener" target="_blank">' \
-            "http://sub.qiita.com/?a=b</a></p>\n"
+            "http://sub.qiita.com/?a=b</a></p>\n",
           )
         end
       end
@@ -996,7 +996,7 @@ describe Qiita::Markdown::Processor do
 
         it "creates link which has rel='nofollow noopener' and target='_blank', and rel value is overwritten" do
           should eq(
-            "<p><a href=\"http://external.com/?a=b\" rel=\"nofollow noopener\" target=\"_blank\">foobar</a></p>\n"
+            "<p><a href=\"http://external.com/?a=b\" rel=\"nofollow noopener\" target=\"_blank\">foobar</a></p>\n",
           )
         end
       end

data/spec/qiita/markdown/summary_processor_spec.rb

@@ -11,7 +11,7 @@ describe Qiita::Markdown::SummaryProcessor do
     end
 
     let(:markdown) do
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     let(:result) do
@@ -240,7 +240,7 @@ describe Qiita::Markdown::SummaryProcessor do
       end
 
       it "replaces mention with link" do
-        should eq %{<a href="/alice" class="user-mention js-hovercard" title="alice" data-hovercard-target-type="user" data-hovercard-target-name="alice">@alice</a>\n}
+        should eq %(<a href="/alice" class="user-mention js-hovercard" title="alice" data-hovercard-target-type="user" data-hovercard-target-name="alice">@alice</a>\n)
       end
     end