qiita-markdown 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43439f5ff035232b9d8b129e7abe200e430d5df4a3130db8e2c74e2b0cf8ddf2
-  data.tar.gz: d92793576cb2fca8201049baeb4ca21f7caaa90e8e3b381325714d17b09463fe
+  metadata.gz: c0ade2d671aa9407b7c4467426a70d4dffd0d1591549935cf079c1b58e2adb88
+  data.tar.gz: 3f1b894ce505d0f0703f4675e7c27908d6ef343b15a883bfd65434a084197c67
 SHA512:
-  metadata.gz: 31288999c19624a922be45857a6c80248f7756e17f0fd45e7c734cadd2871fce408607dfcbda94d1797f23ce3f0d084ccf5bff387061daf69c82d8c95ab199a0
-  data.tar.gz: 6793705bc13ef157cb4055c8696b1fda3f18c658e4866beeefa593f2b34becd333b3893d3a46159542de1991246a5652ad0d46f735a1e9acaf14ee6878f49d16
+  metadata.gz: 3da8566097c634c94fc622e6eeddb422a7e5fbb70ab426189fcab9ed5e94d902deb3d73638b8f2fc119c1cd8e9785db623e66f74c953ddecb539a875ce6f6f87
+  data.tar.gz: 3951f59e21427af26fd58ad22ed0066d590e9d0faa7f6f7a77355d5ae6cf1c48fc38f091e8e906afa0ae2c544c98519239f7fbfff285aa05d230353f8fa8d1e3

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Unreleased
 
+## 1.2.0
+
+- Accept new codepen script url (public.codepenassets.com)
+
+## 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

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

@@ -6,6 +6,7 @@ module Qiita
           "https://production-assets.codepen.io/assets/embed/ei.js",
           "https://static.codepen.io/assets/embed/ei.js",
           "https://cpwebassets.codepen.io/assets/embed/ei.js",
+          "https://public.codepenassets.com/embed/index.js",
         ]
         CLASS_NAME = %w[codepen]
         DATA_ATTRIBUTES = %w[

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

@@ -86,7 +86,7 @@ module Qiita
           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

data/lib/qiita/markdown/version.rb

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

data/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"

data/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

data/spec/qiita/markdown/processor_spec.rb

@@ -1406,52 +1406,34 @@ describe Qiita::Markdown::Processor do
     end
 
     shared_examples_for "override embed code attributes" do |allowed:|
-      context "with HTML embed code for CodePen using old script url" do
-        let(:markdown) do
-          <<-MARKDOWN.strip_heredoc
-            <p data-height="1" data-theme-id="0" data-slug-hash="foo" data-default-tab="bar" data-user="baz" data-embed-version="2" data-pen-title="qux" class="codepen"></p>
-            <script src="https://production-assets.codepen.io/assets/embed/ei.js"></script>
-          MARKDOWN
-        end
-
-        if allowed
-          it "does not sanitize embed code" do
-            should eq <<-HTML.strip_heredoc
-              <p data-height="1" data-theme-id="0" data-slug-hash="foo" data-default-tab="bar" data-user="baz" data-embed-version="2" data-pen-title="qux" class="codepen"></p>
-              <script src="https://production-assets.codepen.io/assets/embed/ei.js"></script>
-            HTML
-          end
-        else
-          it "forces async attribute on script" do
-            should eq <<-HTML.strip_heredoc
+      [
+        "https://production-assets.codepen.io/assets/embed/ei.js",
+        "https://static.codepen.io/assets/embed/ei.js",
+        "https://cpwebassets.codepen.io/assets/embed/ei.js",
+        "https://public.codepenassets.com/embed/index.js",
+      ].each do |script_url|
+        context "with HTML embed code for CodePen using script url `#{script_url}`" do
+          let(:markdown) do
+            <<-MARKDOWN.strip_heredoc
               <p data-height="1" data-theme-id="0" data-slug-hash="foo" data-default-tab="bar" data-user="baz" data-embed-version="2" data-pen-title="qux" class="codepen"></p>
-              <script src="https://production-assets.codepen.io/assets/embed/ei.js" async="async"></script>
-            HTML
+              <script src="#{script_url}"></script>
+            MARKDOWN
           end
-        end
-      end
 
-      context "with HTML embed code for CodePen" do
-        let(:markdown) do
-          <<-MARKDOWN.strip_heredoc
-            <p data-height="1" data-theme-id="0" data-slug-hash="foo" data-default-tab="bar" data-user="baz" data-embed-version="2" data-pen-title="qux" class="codepen"></p>
-            <script src="https://static.codepen.io/assets/embed/ei.js"></script>
-          MARKDOWN
-        end
-
-        if allowed
-          it "does not sanitize embed code" do
-            should eq <<-HTML.strip_heredoc
-              <p data-height="1" data-theme-id="0" data-slug-hash="foo" data-default-tab="bar" data-user="baz" data-embed-version="2" data-pen-title="qux" class="codepen"></p>
-              <script src="https://static.codepen.io/assets/embed/ei.js"></script>
-            HTML
-          end
-        else
-          it "forces async attribute on script" do
-            should eq <<-HTML.strip_heredoc
-              <p data-height="1" data-theme-id="0" data-slug-hash="foo" data-default-tab="bar" data-user="baz" data-embed-version="2" data-pen-title="qux" class="codepen"></p>
-              <script src="https://static.codepen.io/assets/embed/ei.js" async="async"></script>
-            HTML
+          if allowed
+            it "does not sanitize embed code" do
+              should eq <<-HTML.strip_heredoc
+                <p data-height="1" data-theme-id="0" data-slug-hash="foo" data-default-tab="bar" data-user="baz" data-embed-version="2" data-pen-title="qux" class="codepen"></p>
+                <script src="#{script_url}"></script>
+              HTML
+            end
+          else
+            it "forces async attribute on script" do
+              should eq <<-HTML.strip_heredoc
+                <p data-height="1" data-theme-id="0" data-slug-hash="foo" data-default-tab="bar" data-user="baz" data-embed-version="2" data-pen-title="qux" class="codepen"></p>
+                <script src="#{script_url}" async="async"></script>
+              HTML
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-markdown
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - r7kamura@gmail.com
 executables: []
@@ -179,6 +179,7 @@ files:
 - lib/qiita/markdown/version.rb
 - qiita-markdown.gemspec
 - spec/qiita/markdown/filters/checkbox_spec.rb
+- spec/qiita/markdown/filters/code_block_spec.rb
 - spec/qiita/markdown/filters/heading_anchor_spec.rb
 - spec/qiita/markdown/filters/html_toc_spec.rb
 - spec/qiita/markdown/filters/inline_code_color_spec.rb
@@ -191,7 +192,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Qiita-specified markdown processor.
 test_files: []