qiita-markdown 0.36.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c87f030f51598557770e12094601817c916a8e468cd030aeead44855b982dd14
-  data.tar.gz: 93a458246834fe89530ae20396dbffc98436be494331df2505359727e4fea92d
+  metadata.gz: b1aef6d79d99a5925a9240aa6de2553ef76ca3059325df9b448a07599c42d40b
+  data.tar.gz: 319006bd5e853597d99c87d089647f9306a5cd1fcd2e2a56763f3fc574e56f69
 SHA512:
-  metadata.gz: c94ef6737d7881c6ab6ebb7078eb9b24be05d3804362cdde38d37f16397cb2a635f1b1d7a215d61e57effa0f1043eb2c6f901d70dff6b70ae2595e2c446208e0
-  data.tar.gz: 7e8941da6683eb93716e05ecb89528b6208ceac2f02107c43aa3792ff6ddc302ed0fba27a7bf8a0cd488e8c66e27dc53a7c6432981e7c9b7961e24c41094cee3
+  metadata.gz: a0622168bf03b042da4d02f74e190efa93842879d9705a227616149f4ce7948e043cc45b2fe8f06ecbad7acf34950c19097acd3eaab9d2136375e3c7cfe1f2f2
+  data.tar.gz: 37728413f92234f2e18d8f76480c7be571e58496303e8256ff9c0debf11d27cad843f750907676756a7ee30bbe43b988193fc96d5099e810fcac580a284749c7

data/.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: Test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['ubuntu-18.04', 'macos-latest']
+        ruby: ['2.2', '2.3', '2.4', '2.5', '2.7']
+        experimental: [false]
+        include:
+          - os: 'ubuntu-18.04'
+            ruby: 'head'
+            experimental: true
+        exclude:
+          - os: 'ubuntu-18.04'
+            ruby: '2.2' # Rugged uses the wrong openssl version on CI and segfaults (similar to https://github.com/libgit2/rugged/issues/718)
+          - os: 'ubuntu-18.04'
+            ruby: '2.3' # Rugged uses the wrong openssl version on CI and segfaults (similar to https://github.com/libgit2/rugged/issues/718)
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    steps:
+      - name: Get branch names
+        id: branch-name
+        uses: tj-actions/branch-names@v4.9
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test & publish code coverage
+        uses: paambaati/codeclimate-action@v2.7.5
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+          GIT_BRANCH: ${{ steps.branch-name.outputs.current_branch }}
+          GIT_COMMIT_SHA: ${{ github.sha }}
+        with:
+          coverageCommand: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## Unreleased
 
+## 0.40.0
+- Change ci platform to Github Actions.
+- Fix regular expressions to detect group id(url_name) for group mention.
+
+## 0.39.0
+- Fix an error when custom block type is empty
+
+## 0.38.0
+- Change default syntax highlighter from pygments to rouge
+
+## 0.37.0
+- Change keyword of notation
+
 ## 0.36.0
 - Support message notation
 

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

@@ -2,7 +2,7 @@ module Qiita
   module Markdown
     module Filters
       class CustomBlock < HTML::Pipeline::Filter
-        ALLOWED_TYPES = %(message).freeze
+        ALLOWED_TYPES = %w[note].freeze
 
         def call
           doc.search('div[data-type="customblock"]').each do |div|
@@ -18,13 +18,15 @@ module Qiita
           attr_reader :type, :subtype
 
           # @param text [String, nil]
+          # @note Attribute `type` will be nil if `text` is nil
+          # @note Attribute `subtype` will be nil if `text` does not include white space.
           def initialize(text)
             # Discared after the second word.
-            @type, @subtype = text.split(" ")
+            @type, @subtype = text && text.split(" ")
           end
         end
 
-        class Message
+        class Note
           attr_reader :node, :type
 
           ALLOWED_TYPES = %w[info warn alert].freeze
@@ -39,7 +41,7 @@ module Qiita
 
           def convert
             node.inner_html = message
-            node["class"] = "message #{type}"
+            node["class"] = "note #{type}"
             node.children.first.add_previous_sibling(icon) if icon
           end
 

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

@@ -22,7 +22,7 @@ module Qiita
             (?:^|\W)
             @((?>[a-z\d][a-z\d-]{2,31}))
             \/
-            ([A-Za-z\d][A-Za-z\d-]{0,14}[A-Za-z\d])
+            ([A-Za-z\d][A-Za-z\d-]{0,62}[A-Za-z\d])
             (?!\/)
             (?=
               \.+[ \t\W]|

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/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "0.36.0"
+    VERSION = "0.40.0"
   end
 end

data/lib/qiita/markdown.rb

@@ -4,7 +4,7 @@ require "html/pipeline"
 require "linguist"
 require "mem"
 require "nokogiri"
-require "pygments"
+require "rouge"
 require "sanitize"
 
 require "qiita/markdown/embed/code_pen"

data/qiita-markdown.gemspec

@@ -22,7 +22,7 @@ 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 "rouge", "3.26.0"
   spec.add_dependency "greenmat", "3.5.1.2"
   spec.add_dependency "sanitize"
   spec.add_dependency "addressable"
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   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"

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
@@ -1690,6 +1690,24 @@ describe Qiita::Markdown::Processor do
           MARKDOWN
         end
 
+        context "when type is empty" do
+          if allowed
+            it "returns simple div element" do
+              should eq <<-HTML.strip_heredoc
+                <div data-type="customblock">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 not allowed" do
           let(:type) { "anytype" }
 
@@ -1710,23 +1728,23 @@ describe Qiita::Markdown::Processor do
           end
         end
 
-        context "when type is message" do
-          let(:type) { "message" }
+        context "when type is note" do
+          let(:type) { "note" }
 
           context "when subtype is empty" do
             if allowed
-              it "returns info message block with class including icon as default type" do
+              it "returns info note block with class including icon as default type" do
                 should eq <<-HTML.strip_heredoc
-                  <div data-type="customblock" data-metadata="message" class="message info">
+                  <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 message block with class including icon" do
+              it "returns note block with class including icon" do
                 should eq <<-HTML.strip_heredoc
-                  <div class="message info">
+                  <div class="note info">
                   <span class="fa fa-fw fa-check-circle"></span><p>Some kind of text is here.
                   </p>
                   </div>
@@ -1739,18 +1757,18 @@ describe Qiita::Markdown::Processor do
             let(:subtype) { "warn" }
 
             if allowed
-              it "returns warning message block with class including icon" do
+              it "returns warning note block with class including icon" do
                 should eq <<-HTML.strip_heredoc
-                  <div data-type="customblock" data-metadata="message warn" class="message warn">
+                  <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 message block with class including icon" do
+              it "returns note block with class including icon" do
                 should eq <<-HTML.strip_heredoc
-                  <div class="message warn">
+                  <div class="note warn">
                   <span class="fa fa-fw fa-exclamation-circle"></span><p>Some kind of text is here.
                   </p>
                   </div>
@@ -1763,18 +1781,18 @@ describe Qiita::Markdown::Processor do
             let(:subtype) { "alert" }
 
             if allowed
-              it "returns alerting message block with class including icon" do
+              it "returns alerting note block with class including icon" do
                 should eq <<-HTML.strip_heredoc
-                  <div data-type="customblock" data-metadata="message alert" class="message alert">
+                  <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 message block with class including icon" do
+              it "returns note block with class including icon" do
                 should eq <<-HTML.strip_heredoc
-                  <div class="message alert">
+                  <div class="note alert">
                   <span class="fa fa-fw fa-times-circle"></span><p>Some kind of text is here.
                   </p>
                   </div>

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 if ENV["CI"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
+  if ENV["GITHUB_ACTIONS"]
+    require "simplecov"
+    SimpleCov.start
+  else
+    require "codeclimate-test-reporter"
+    CodeClimate::TestReporter.start
+  end
 end
 
 require "qiita-markdown"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-markdown
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemoji
@@ -67,19 +67,19 @@ 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
@@ -178,6 +178,62 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.3
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.4
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.3
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.4
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.19.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -234,18 +290,18 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.49.1
-description:
+description: 
 email:
 - r7kamura@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -301,7 +357,7 @@ homepage: https://github.com/increments/qiita-markdown
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -316,8 +372,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Qiita-specified markdown processor.
 test_files:

data/.travis.yml

@@ -1,16 +0,0 @@
-sudo: false
-addons:
-  apt:
-    packages:
-      - libicu-dev
-before_install:
-  - gem update bundler
-language: ruby
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-env:
-  global:
-    secure: n8eyxYYfxLApgR4YGKqbrOgGlraIyLyoql4K4DvLZV4kqfGf9LLsPdP7Shudqrv5k2h8xIwnJVnwcPZx9YCu5WWYrJd7vmivpU2j52LwFPYRM+GFNcu7TXmzcNSPG8agnc5We9amF5zJY6XSTpzWpxyqfIwEZM75iR6XXuHuLFk=
-cache: bundler