qiita-markdown 0.33.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17dc016afba392cc6e3ea77af4cdc445e32c6004a6c23a24b8dce1a4e0ec1811
-  data.tar.gz: 042e3a11a8cc6d266463ae7bb8d3e46c8c732efeb061086586c80a277898cf38
+  metadata.gz: f0133d912562a9dcb693c507e7ec0caadb6ca0c509da6af2c57773d87a2af745
+  data.tar.gz: 997e0e521830183eccc1f009634352379a7697a8a9e95edb9bae1a9d4f4f7c78
 SHA512:
-  metadata.gz: 0c59646956b877c13e7c6ef62bd366483b5a7da78f19bfe8aee2305ea568c6f59dfb2d916e68a822e3363ddabbf7577166e8e21a8da79152550b11c77a3dc8d6
-  data.tar.gz: b907d5a284c9c77e9f264298d38d6ec4a0861179dda36320f6fd40187b606662b1e07e61d9f3e5bd2070f203e3de5d60b53cdb05593ca64ceb875c6bbd811f31
+  metadata.gz: 44318b683d2df089695d572a037ec393c495dd23a3d48f82be77287165eff54d3e7d1fb68143f4ad7004eca337df8ed83cfcdd921de6fe7133aaaddeaffe7248
+  data.tar.gz: 883a123e2dad403e8da8d87457be977270ac7dad837e2502d873aa3208e024e2593d784ae0105923658243771d497232e6776a5011a4e354df995447d8fe7c49

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## Unreleased
 
+## 0.38.0
+- Change default syntax highlighter from pygments to rouge
+
+## 0.37.0
+- Change keyword of notation
+
+## 0.36.0
+- Support message notation
+
+## 0.35.0
+
+- Allow Relative URL in iframe src attributes
+
+## 0.34.0
+
+- Delete gist embed rule to avoid XSS
+
 ## 0.33.0
 
 - Fix XSS possibility bug

data/lib/qiita/markdown.rb

@@ -4,13 +4,12 @@ require "html/pipeline"
 require "linguist"
 require "mem"
 require "nokogiri"
-require "pygments"
+require "rouge"
 require "sanitize"
 
 require "qiita/markdown/embed/code_pen"
 require "qiita/markdown/embed/tweet"
 require "qiita/markdown/embed/asciinema"
-require "qiita/markdown/embed/gist"
 require "qiita/markdown/embed/youtube"
 require "qiita/markdown/embed/slide_share"
 require "qiita/markdown/embed/google_slide"
@@ -21,6 +20,7 @@ require "qiita/markdown/transformers/filter_iframe"
 require "qiita/markdown/transformers/strip_invalid_node"
 require "qiita/markdown/filters/checkbox"
 require "qiita/markdown/filters/code_block"
+require "qiita/markdown/filters/custom_block"
 require "qiita/markdown/filters/emoji"
 require "qiita/markdown/filters/external_link"
 require "qiita/markdown/filters/final_sanitizer"

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

@@ -0,0 +1,63 @@
+module Qiita
+  module Markdown
+    module Filters
+      class CustomBlock < HTML::Pipeline::Filter
+        ALLOWED_TYPES = %w[note].freeze
+
+        def call
+          doc.search('div[data-type="customblock"]').each do |div|
+            metadata = Metadata.new(div["data-metadata"])
+            next unless ALLOWED_TYPES.include?(metadata.type)
+            klass = Object.const_get("#{self.class}::#{metadata.type.capitalize}")
+            klass.new(div, metadata.subtype).convert
+          end
+          doc
+        end
+
+        class Metadata
+          attr_reader :type, :subtype
+
+          # @param text [String, nil]
+          def initialize(text)
+            # Discared after the second word.
+            @type, @subtype = text.split(" ")
+          end
+        end
+
+        class Note
+          attr_reader :node, :type
+
+          ALLOWED_TYPES = %w[info warn alert].freeze
+          DEFAULT_TYPE = "info".freeze
+
+          # @param node [Nokogiri::XML::Node]
+          # @param type [String, nil]
+          def initialize(node, type)
+            @node = node
+            @type = ALLOWED_TYPES.include?(type) ? type : DEFAULT_TYPE
+          end
+
+          def convert
+            node.inner_html = message
+            node["class"] = "note #{type}"
+            node.children.first.add_previous_sibling(icon) if icon
+          end
+
+          private
+
+          def message
+            "<p>#{node.text}</p>"
+          end
+
+          def icon
+            {
+              info: %(<span class="fa fa-fw fa-check-circle"></span>),
+              warn: %(<span class="fa fa-fw fa-exclamation-circle"></span>),
+              alert: %(<span class="fa fa-fw fa-times-circle"></span>),
+            }[type.to_sym]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,6 +20,7 @@ module Qiita
             Qiita::Markdown::Greenmat::HTMLRenderer.new(hard_wrap: true, with_toc_data: true),
             autolink: true,
             fenced_code_blocks: true,
+            fenced_custom_blocks: true,
             footnotes: options[:footnotes],
             no_intra_emphasis: true,
             no_mention_emphasis: true,

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

@@ -4,6 +4,7 @@ module Qiita
       class SyntaxHighlight < HTML::Pipeline::Filter
         DEFAULT_LANGUAGE = "text"
         DEFAULT_TIMEOUT = Float::INFINITY
+        DEFAULT_OPTION = "html_legacy"
 
         def call
           elapsed = 0
@@ -79,11 +80,11 @@ module Qiita
           end
 
           def highlight(language)
-            Pygments.highlight(code, lexer: language, options: pygments_options)
+            Rouge.highlight(code, language, DEFAULT_OPTION)
           end
 
           def highlighted_node
-            if specific_language && Pygments::Lexer.find(specific_language)
+            if specific_language && Rouge::Lexer.find(specific_language)
               begin
                 highlight(specific_language).presence or raise
               rescue
@@ -102,14 +103,6 @@ module Qiita
             Nokogiri::HTML.fragment(%Q[<div class="code-frame" data-lang="#{language}"></div>])
           end
 
-          def pygments_options
-            @pygments_options ||= begin
-              options = { encoding: "utf-8", stripnl: false }
-              options[:startinline] = true if has_inline_php?
-              options
-            end
-          end
-
           def specific_language
             @specific_language || @node["lang"]
           end

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

@@ -13,7 +13,7 @@ module Qiita
             "a"          => %w[class href rel title],
             "blockquote" => %w[cite] + Embed::Tweet::ATTRIBUTES,
             "code"       => %w[data-metadata],
-            "div"        => %w[class],
+            "div"        => %w[class data-type data-metadata],
             "font"       => %w[color],
             "h1"         => %w[id],
             "h2"         => %w[id],

data/lib/qiita/markdown/processor.rb

@@ -14,6 +14,7 @@ module Qiita
           Filters::ImageLink,
           Filters::Footnote,
           Filters::CodeBlock,
+          Filters::CustomBlock,
           Filters::Checkbox,
           Filters::Toc,
           Filters::Emoji,

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

@@ -43,7 +43,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 ["http", "https", nil].include? scheme
           end
         rescue Addressable::URI::InvalidURIError, URI::InvalidURIError
           nil

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

@@ -10,7 +10,6 @@ module Qiita
 
         HOST_WHITE_LIST = [
           Embed::Asciinema::SCRIPT_HOST,
-          Embed::Gist::SCRIPT_HOST,
         ].flatten.freeze
 
         def self.call(*args)

data/lib/qiita/markdown/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "0.33.0"
+    VERSION = "0.38.0"
   end
 end

data/qiita-markdown.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "github-linguist", "~> 4.0"
   spec.add_dependency "html-pipeline", "~> 2.0"
   spec.add_dependency "mem"
-  spec.add_dependency "pygments.rb", "~> 1.0"
-  spec.add_dependency "greenmat", "3.5.1.1"
+  spec.add_dependency "rouge", "3.26.0"
+  spec.add_dependency "greenmat", "3.5.1.2"
   spec.add_dependency "sanitize"
   spec.add_dependency "addressable"
   spec.add_development_dependency "activesupport", "4.2.6"

data/spec/qiita/markdown/processor_spec.rb

@@ -149,8 +149,8 @@ describe Qiita::Markdown::Processor do
           should eq <<-HTML.strip_heredoc
             <div class="code-frame" data-lang="ruby">
             <div class="code-lang"><span class="bold">example.rb</span></div>
-            <div class="highlight"><pre><span></span><span class="mi">1</span>
-            </pre></div>
+            <div class="highlight"><pre class="codehilite"><code><span class="mi">1</span>
+            </code></pre></div>
             </div>
           HTML
         end
@@ -169,8 +169,8 @@ describe Qiita::Markdown::Processor do
           should eq <<-HTML.strip_heredoc
             <div class="code-frame" data-lang="php">
             <div class="code-lang"><span class="bold">example.php</span></div>
-            <div class="highlight"><pre><span></span><span class="mi">1</span>
-            </pre></div>
+            <div class="highlight"><pre class="codehilite"><code><span class="mi">1</span>
+            </code></pre></div>
             </div>
           HTML
         end
@@ -187,8 +187,8 @@ describe Qiita::Markdown::Processor do
 
         it "returns code-frame and highlighted pre element" do
           should eq <<-HTML.strip_heredoc
-            <div class="code-frame" data-lang="ruby"><div class="highlight"><pre><span></span><span class="mi">1</span>
-            </pre></div></div>
+            <div class="code-frame" data-lang="ruby"><div class="highlight"><pre class="codehilite"><code><span class="mi">1</span>
+            </code></pre></div></div>
           HTML
         end
       end
@@ -226,10 +226,10 @@ describe Qiita::Markdown::Processor do
 
         it "does not strip the newlines" do
           should eq <<-HTML.strip_heredoc
-            <div class="code-frame" data-lang="text"><div class="highlight"><pre><span></span>
+            <div class="code-frame" data-lang="text"><div class="highlight"><pre class="codehilite"><code>
             foo
 
-            </pre></div></div>
+            </code></pre></div></div>
            HTML
         end
       end
@@ -311,8 +311,8 @@ describe Qiita::Markdown::Processor do
           should include(<<-HTML.strip_heredoc.rstrip)
             <div class="code-frame" data-lang="ruby">
             <div class="code-lang"><span class="bold">@alice</span></div>
-            <div class="highlight"><pre><span></span><span class="mi">1</span>
-            </pre></div>
+            <div class="highlight"><pre class="codehilite"><code><span class="mi">1</span>
+            </code></pre></div>
             </div>
           HTML
         end
@@ -659,9 +659,9 @@ describe Qiita::Markdown::Processor do
 
         it "does not replace checkbox" do
           should eq <<-HTML.strip_heredoc
-            <div class="code-frame" data-lang="text"><div class="highlight"><pre><span></span>- [ ] a
+            <div class="code-frame" data-lang="text"><div class="highlight"><pre class="codehilite"><code>- [ ] a
             - [x] b
-            </pre></div></div>
+            </code></pre></div></div>
           HTML
         end
       end
@@ -768,9 +768,9 @@ describe Qiita::Markdown::Processor do
 
         it "generates only code blocks without footnotes" do
           should eq <<-HTML.strip_heredoc
-            <div class="code-frame" data-lang="text"><div class="highlight"><pre><span></span>[^1]
+            <div class="code-frame" data-lang="text"><div class="highlight"><pre class="codehilite"><code>[^1]
             [^1]: test
-            </pre></div></div>
+            </code></pre></div></div>
           HTML
         end
       end
@@ -1067,8 +1067,8 @@ describe Qiita::Markdown::Processor do
           expect(subject).to eq <<-HTML.strip_heredoc
             <p><details><summary>Folding sample</summary><div>
 
-            <div class="code-frame" data-lang="rb"><div class="highlight"><pre><span></span><span class="nb">puts</span> <span class="s2">"Hello, World"</span>
-            </pre></div></div>
+            <div class="code-frame" data-lang="rb"><div class="highlight"><pre class="codehilite"><code><span class="nb">puts</span> <span class="s2">"Hello, World"</span>
+            </code></pre></div></div>
 
             <p></p>
             </div></details></p>
@@ -1124,8 +1124,8 @@ describe Qiita::Markdown::Processor do
             should eq <<-HTML.strip_heredoc
               <div class="code-frame" data-lang="js">
               <div class="code-lang"><span class="bold">test<script>alert(1)</script></span></div>
-              <div class="highlight"><pre><span></span><span class="mi">1</span>
-              </pre></div>
+              <div class="highlight"><pre class="codehilite"><code><span class="mi">1</span>
+              </code></pre></div>
               </div>
             HTML
           end
@@ -1134,8 +1134,8 @@ describe Qiita::Markdown::Processor do
             should eq <<-HTML.strip_heredoc
               <div class="code-frame" data-lang="js">
               <div class="code-lang"><span class="bold">test</span></div>
-              <div class="highlight"><pre><span></span><span class="mi">1</span>
-              </pre></div>
+              <div class="highlight"><pre class="codehilite"><code><span class="mi">1</span>
+              </code></pre></div>
               </div>
             HTML
           end
@@ -1144,12 +1144,13 @@ describe Qiita::Markdown::Processor do
     end
 
     shared_examples_for "iframe element" do |allowed:|
-      context "with iframe" do
+      shared_examples "iframe element example" do
         let(:markdown) do
           <<-MARKDOWN.strip_heredoc
-            <iframe width="1" height="2" src="//example.com" frameborder="0" allowfullscreen></iframe>
+            <iframe width="1" height="2" src="#{url}" frameborder="0" allowfullscreen></iframe>
           MARKDOWN
         end
+        let(:url) { "#{scheme}//example.com" }
 
         if allowed
           it "allows iframe with some attributes" do
@@ -1161,6 +1162,20 @@ describe Qiita::Markdown::Processor do
           end
         end
       end
+
+      context "with iframe" do
+        context "with scheme" do
+          let(:scheme) { "https:" }
+
+          include_examples "iframe element example"
+        end
+
+        context "without scheme" do
+          let(:scheme) { "" }
+
+          include_examples "iframe element example"
+        end
+      end
     end
 
     shared_examples_for "input element" do |allowed:|
@@ -1451,114 +1466,138 @@ describe Qiita::Markdown::Processor do
         end
       end
 
-      context "with HTML embed code for Gist" do
-        let(:markdown) do
-          <<-MARKDOWN.strip_heredoc
-            <script id="example" src="https://gist.github.com/a/example.js"></script>
-          MARKDOWN
-        end
+      context "with HTML embed code for Youtube" do
+        shared_examples "embed code youtube example" do
+          let(:markdown) do
+            <<-MARKDOWN.strip_heredoc
+              <iframe width="100" height="100" src="#{url}"></iframe>
+            MARKDOWN
+          end
+          let(:url) { "#{scheme}//www.youtube.com/embed/example" }
 
-        if allowed
-          it "does not sanitize embed code" do
-            should eq <<-HTML.strip_heredoc
-              <script id="example" src="https://gist.github.com/a/example.js"></script>
-            HTML
+          if allowed
+            it "does not sanitize embed code" do
+              should eq <<-HTML.strip_heredoc
+                <iframe width="100" height="100" src="#{url}"></iframe>
+              HTML
+            end
+          else
+            it "forces width attribute on iframe" do
+              should eq <<-HTML.strip_heredoc
+                <iframe width="100%" height="100" src="#{url}"></iframe>
+              HTML
+            end
           end
-        else
-          it "forces async attribute on script" do
-            should eq <<-HTML.strip_heredoc
-              <script id="example" src="https://gist.github.com/a/example.js" async="async"></script>
-            HTML
+
+          context "when url is privacy enhanced mode" do
+            let(:markdown) do
+              <<-MARKDOWN.strip_heredoc
+                <iframe width="100" height="100" src="#{url}"></iframe>
+              MARKDOWN
+            end
+            let(:url) { "#{scheme}//www.youtube-nocookie.com/embed/example" }
+
+            if allowed
+              it "does not sanitize embed code" do
+                should eq <<-HTML.strip_heredoc
+                  <iframe width="100" height="100" src="#{url}"></iframe>
+                HTML
+              end
+            else
+              it "forces width attribute on iframe" do
+                should eq <<-HTML.strip_heredoc
+                  <iframe width="100%" height="100" src="#{url}"></iframe>
+                HTML
+              end
+            end
           end
         end
-      end
 
-      context "with HTML embed code for Youtube" do
-        let(:markdown) do
-          <<-MARKDOWN.strip_heredoc
-            <iframe width="100" height="100" src="https://www.youtube.com/embed/example"></iframe>
-          MARKDOWN
+        context "with scheme" do
+          let(:scheme) { "https:" }
+
+          include_examples "embed code youtube example"
         end
 
-        if allowed
-          it "does not sanitize embed code" do
-            should eq <<-HTML.strip_heredoc
-              <iframe width="100" height="100" src="https://www.youtube.com/embed/example"></iframe>
-            HTML
-          end
-        else
-          it "forces width attribute on iframe" do
-            should eq <<-HTML.strip_heredoc
-              <iframe width="100%" height="100" src="https://www.youtube.com/embed/example"></iframe>
-            HTML
-          end
+        context "without scheme" do
+          let(:scheme) { "" }
+
+          include_examples "embed code youtube example"
         end
+      end
 
-        context "when url is privacy enhanced mode" do
+      context "with HTML embed code for SlideShare" do
+        shared_examples "embed code slideshare example" do
           let(:markdown) do
             <<-MARKDOWN.strip_heredoc
-              <iframe width="100" height="100" src="https://www.youtube-nocookie.com/embed/example"></iframe>
+              <iframe width="100" height="100" src="#{url}"></iframe>
             MARKDOWN
           end
+          let(:url) { "#{scheme}//www.slideshare.net/embed/example" }
 
           if allowed
             it "does not sanitize embed code" do
               should eq <<-HTML.strip_heredoc
-                <iframe width="100" height="100" src="https://www.youtube-nocookie.com/embed/example"></iframe>
+                <iframe width="100" height="100" src="#{url}"></iframe>
               HTML
             end
           else
             it "forces width attribute on iframe" do
               should eq <<-HTML.strip_heredoc
-                <iframe width="100%" height="100" src="https://www.youtube-nocookie.com/embed/example"></iframe>
+                <iframe width="100%" height="100" src="#{url}"></iframe>
               HTML
             end
           end
         end
-      end
 
-      context "with HTML embed code for SlideShare" do
-        let(:markdown) do
-          <<-MARKDOWN.strip_heredoc
-            <iframe width="100" height="100" src="https://www.slideshare.net/embed/example"></iframe>
-          MARKDOWN
+        context "with scheme" do
+          let(:scheme) { "https:" }
+
+          include_examples "embed code slideshare example"
         end
 
-        if allowed
-          it "does not sanitize embed code" do
-            should eq <<-HTML.strip_heredoc
-              <iframe width="100" height="100" src="https://www.slideshare.net/embed/example"></iframe>
-            HTML
-          end
-        else
-          it "forces width attribute on iframe" do
-            should eq <<-HTML.strip_heredoc
-              <iframe width="100%" height="100" src="https://www.slideshare.net/embed/example"></iframe>
-            HTML
-          end
+        context "without scheme" do
+          let(:scheme) { "" }
+
+          include_examples "embed code slideshare example"
         end
       end
 
       context "with HTML embed code for GoogleSlide" do
-        let(:markdown) do
-          <<-MARKDOWN.strip_heredoc
-            <iframe src="https://docs.google.com/presentation/d/example/embed" frameborder="0" width="482" height="300" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-          MARKDOWN
-        end
-
-        if allowed
-          it "does not sanitize embed code" do
-            should eq <<-HTML.strip_heredoc
-              <iframe src="https://docs.google.com/presentation/d/example/embed" frameborder="0" width="482" height="300" allowfullscreen="true"></iframe>
-            HTML
+        shared_examples "embed code googleslide example" do
+          let(:markdown) do
+            <<-MARKDOWN.strip_heredoc
+            <iframe src="#{url}" frameborder="0" width="482" height="300" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+            MARKDOWN
           end
-        else
-          it "forces width attribute on iframe" do
-            should eq <<-HTML.strip_heredoc
-              <iframe src="https://docs.google.com/presentation/d/example/embed" frameborder="0" width="100%" height="300" allowfullscreen="true"></iframe>
-            HTML
+          let(:url) { "#{scheme}//docs.google.com/presentation/d/example/embed" }
+
+          if allowed
+            it "does not sanitize embed code" do
+              should eq <<-HTML.strip_heredoc
+              <iframe src="#{url}" frameborder="0" width="482" height="300" allowfullscreen="true"></iframe>
+              HTML
+            end
+          else
+            it "forces width attribute on iframe" do
+              should eq <<-HTML.strip_heredoc
+              <iframe src="#{url}" frameborder="0" width="100%" height="300" allowfullscreen="true"></iframe>
+              HTML
+            end
           end
         end
+
+        context "with scheme" do
+          let(:scheme) { "https:" }
+
+          include_examples "embed code googleslide example"
+        end
+
+        context "without scheme" do
+          let(:scheme) { "" }
+
+          include_examples "embed code googleslide example"
+        end
       end
 
       context "with HTML embed code for SpeekerDeck" do
@@ -1604,11 +1643,15 @@ describe Qiita::Markdown::Processor do
           <<-MARKDOWN.strip_heredoc
             <script async class="speakerdeck-embed" data-id="example" data-ratio="1.33333333333333" src="javascript://speakerdeck.com/assets/embed.js"></script>
           MARKDOWN
+        end
 
+        if allowed
+          it "does not sanitize embed code" do
+            should eq markdown
+          end
+        else
           it "forces width attribute on iframe" do
-            should eq <<-HTML.strip_heredoc
-              \n
-            HTML
+            should eq "\n"
           end
         end
       end
@@ -1618,12 +1661,127 @@ describe Qiita::Markdown::Processor do
           <<-MARKDOWN.strip_heredoc
             <iframe src="javascript://docs.google.com:80/%0d%0aalert(document.domain)" frameborder="0" width="482" height="300" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
           MARKDOWN
+        end
 
-          it "forces width attribute on iframe" do
+        if allowed
+          it "does not sanitize embed code" do
             should eq <<-HTML.strip_heredoc
-              \n
+              <iframe src="javascript://docs.google.com:80/%0d%0aalert(document.domain)" frameborder="0" width="482" height="300" allowfullscreen="true"></iframe>
             HTML
           end
+        else
+          it "forces width attribute on iframe" do
+            should eq "\n"
+          end
+        end
+      end
+    end
+
+    shared_examples_for "custom block" do |allowed:|
+      context "with custom block" do
+        let(:type) { "" }
+        let(:subtype) { "" }
+
+        let(:markdown) do
+          <<-MARKDOWN.strip_heredoc
+            :::#{[type, subtype].join(' ').rstrip}
+            Some kind of text is here.
+            :::
+          MARKDOWN
+        end
+
+        context "when type is not allowed" do
+          let(:type) { "anytype" }
+
+          if allowed
+            it "returns simple div element" do
+              should eq <<-HTML.strip_heredoc
+                <div data-type="customblock" data-metadata="anytype">Some kind of text is here.
+                </div>
+              HTML
+            end
+          else
+            it "returns simple div element" do
+              should eq <<-HTML.strip_heredoc
+                <div>Some kind of text is here.
+                </div>
+              HTML
+            end
+          end
+        end
+
+        context "when type is note" do
+          let(:type) { "note" }
+
+          context "when subtype is empty" do
+            if allowed
+              it "returns info note block with class including icon as default type" do
+                should eq <<-HTML.strip_heredoc
+                  <div data-type="customblock" data-metadata="note" class="note info">
+                  <span class="fa fa-fw fa-check-circle"></span><p>Some kind of text is here.
+                  </p>
+                  </div>
+                HTML
+              end
+            else
+              it "returns note block with class including icon" do
+                should eq <<-HTML.strip_heredoc
+                  <div class="note info">
+                  <span class="fa fa-fw fa-check-circle"></span><p>Some kind of text is here.
+                  </p>
+                  </div>
+                HTML
+              end
+            end
+          end
+
+          context "when subtype is warn" do
+            let(:subtype) { "warn" }
+
+            if allowed
+              it "returns warning note block with class including icon" do
+                should eq <<-HTML.strip_heredoc
+                  <div data-type="customblock" data-metadata="note warn" class="note warn">
+                  <span class="fa fa-fw fa-exclamation-circle"></span><p>Some kind of text is here.
+                  </p>
+                  </div>
+                HTML
+              end
+            else
+              it "returns note block with class including icon" do
+                should eq <<-HTML.strip_heredoc
+                  <div class="note warn">
+                  <span class="fa fa-fw fa-exclamation-circle"></span><p>Some kind of text is here.
+                  </p>
+                  </div>
+                HTML
+              end
+            end
+          end
+
+          context "when subtype is alert" do
+            let(:subtype) { "alert" }
+
+            if allowed
+              it "returns alerting note block with class including icon" do
+                should eq <<-HTML.strip_heredoc
+                  <div data-type="customblock" data-metadata="note alert" class="note alert">
+                  <span class="fa fa-fw fa-times-circle"></span><p>Some kind of text is here.
+                  </p>
+                  </div>
+                HTML
+              end
+            else
+              it "returns note block with class including icon" do
+                should eq <<-HTML.strip_heredoc
+                  <div class="note alert">
+                  <span class="fa fa-fw fa-times-circle"></span><p>Some kind of text is here.
+                  </p>
+                  </div>
+                HTML
+              end
+            end
+          end
         end
       end
     end
@@ -1642,6 +1800,7 @@ describe Qiita::Markdown::Processor do
       include_examples "class attribute", allowed: true
       include_examples "background-color", allowed: true
       include_examples "override embed code attributes", allowed: false
+      include_examples "custom block", allowed: false
     end
 
     context "with script context" do
@@ -1658,6 +1817,7 @@ describe Qiita::Markdown::Processor do
       include_examples "class attribute", allowed: true
       include_examples "background-color", allowed: true
       include_examples "override embed code attributes", allowed: true
+      include_examples "custom block", allowed: true
     end
 
     context "with strict context" do
@@ -1674,6 +1834,7 @@ describe Qiita::Markdown::Processor do
       include_examples "class attribute", allowed: false
       include_examples "background-color", allowed: false
       include_examples "override embed code attributes", allowed: false
+      include_examples "custom block", allowed: false
     end
 
     context "with script and strict context" do
@@ -1690,6 +1851,7 @@ describe Qiita::Markdown::Processor do
       include_examples "class attribute", allowed: false
       include_examples "background-color", allowed: false
       include_examples "override embed code attributes", allowed: false
+      include_examples "custom block", allowed: true
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-markdown
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemoji
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.26.0
 - !ruby/object:Gem::Dependency
   name: greenmat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.1.1
+        version: 3.5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.1.1
+        version: 3.5.1.2
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.49.1
-description:
+description: 
 email:
 - r7kamura@gmail.com
 executables: []
@@ -258,7 +258,6 @@ files:
 - lib/qiita/markdown/base_processor.rb
 - lib/qiita/markdown/embed/asciinema.rb
 - lib/qiita/markdown/embed/code_pen.rb
-- lib/qiita/markdown/embed/gist.rb
 - lib/qiita/markdown/embed/google_slide.rb
 - lib/qiita/markdown/embed/slide_share.rb
 - lib/qiita/markdown/embed/speeker_deck.rb
@@ -266,6 +265,7 @@ files:
 - lib/qiita/markdown/embed/youtube.rb
 - lib/qiita/markdown/filters/checkbox.rb
 - lib/qiita/markdown/filters/code_block.rb
+- lib/qiita/markdown/filters/custom_block.rb
 - lib/qiita/markdown/filters/emoji.rb
 - lib/qiita/markdown/filters/external_link.rb
 - lib/qiita/markdown/filters/final_sanitizer.rb
@@ -301,7 +301,7 @@ homepage: https://github.com/increments/qiita-markdown
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Qiita-specified markdown processor.
 test_files:

data/lib/qiita/markdown/embed/gist.rb

@@ -1,9 +0,0 @@
-module Qiita
-  module Markdown
-    module Embed
-      module Gist
-        SCRIPT_HOST = "gist.github.com".freeze
-      end
-    end
-  end
-end