[pull] master from increments:master

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 1.1.2
+
+- Add test for code_block filter
+- Upgrade github-linguist from 4.x to 7.x
+
 ## 1.1.1
 
 - Allow open attribute on details

lib/qiita/markdown/filters/code_block.rb

@@ -86,7 +86,7 @@ def has_only_filename?
           end
 
           def linguist_language
-            @linguist_language ||= Linguist::Language.find_by_filename(filename).first
+            @linguist_language ||= Linguist::Language.find_by_extension(filename).first
           end
 
           def sections

lib/qiita/markdown/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

qiita-markdown.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "addressable"
   spec.add_dependency "gemoji"
-  spec.add_dependency "github-linguist", "~> 4.0"
+  spec.add_dependency "github-linguist", "~> 7.0"
   spec.add_dependency "html-pipeline", "~> 2.0"
   spec.add_dependency "mem"
   spec.add_dependency "qiita_marker", "~> 0.23.9"

spec/qiita/markdown/filters/code_block_spec.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+describe Qiita::Markdown::Filters::CodeBlock do
+  subject(:filter) { described_class.new(input_html) }
+
+  let(:context) { nil }
+
+  context "without code" do
+    let(:input_html) do
+      <<~HTML
+        <pre>
+        </pre>
+      HTML
+    end
+
+    it "does not change" do
+      expect(filter.call.to_s).to eq(input_html)
+    end
+  end
+
+  context "with code" do
+    let(:input_html) do
+      <<~HTML
+        <pre><code>
+        </code></pre>
+      HTML
+    end
+
+    it "does not change" do
+      expect(filter.call.to_s).to eq(input_html)
+    end
+
+    context "with data-metadata" do
+      let(:input_html) do
+        <<~HTML
+          <pre><code data-metadata>
+          </code></pre>
+        HTML
+      end
+
+      it "does not change" do
+        expect(filter.call.to_s).to eq(input_html)
+      end
+
+      context "with data-metadata value" do
+        let(:input_html) do
+          <<~HTML
+            <pre><code data-metadata="ruby">
+            </code></pre>
+          HTML
+        end
+
+        let(:output_html) do
+          <<~HTML
+            <pre lang="ruby"><code data-metadata="ruby">
+            </code></pre>
+          HTML
+        end
+
+        it "adds lang on pre" do
+          expect(filter.call.to_s).to eq(output_html)
+        end
+
+        context "with value include filename" do
+          let(:input_html) do
+            <<~HTML
+              <pre><code data-metadata="ruby:abc.rb">
+              </code></pre>
+            HTML
+          end
+
+          let(:output_html) do
+            <<~HTML
+              <pre filename="abc.rb" lang="ruby"><code data-metadata="ruby:abc.rb">
+              </code></pre>
+            HTML
+          end
+
+          it "adds lang and filename on pre" do
+            expect(filter.call.to_s).to eq(output_html)
+          end
+        end
+      end
+
+      context "with data-metadata value like filename" do
+        let(:input_html) do
+          <<~HTML
+            <pre><code data-metadata="abc.rb">
+            </code></pre>
+          HTML
+        end
+
+        let(:output_html) do
+          <<~HTML
+            <pre filename="abc.rb" lang="ruby"><code data-metadata="abc.rb">
+            </code></pre>
+          HTML
+        end
+
+        it "adds lang and filename on pre" do
+          expect(filter.call.to_s).to eq(output_html)
+        end
+      end
+
+      context "with data-metadata value like filename without extension" do
+        let(:input_html) do
+          <<~HTML
+            <pre><code data-metadata="Dockerfile">
+            </code></pre>
+          HTML
+        end
+
+        let(:output_html) do
+          <<~HTML
+            <pre lang="Dockerfile"><code data-metadata="Dockerfile">
+            </code></pre>
+          HTML
+        end
+
+        it "adds lang and filename on pre" do
+          expect(filter.call.to_s).to eq(output_html)
+        end
+      end
+    end
+  end
+end