qiita-markdown 1.6.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82135467b0d5d3bf73ec7e94d45f1cb48507eab15bcf0624f14d6cd33ee7b3df
-  data.tar.gz: 31ebd2cb70c3f3c9e632c49ea3baeb8dff5d869e9ecb3aac8051158054bccef7
+  metadata.gz: 4fedd17f0ad92ab616ec9fa96ee52c1accfb1f6d9cd4b018c7a0a5f834f5d538
+  data.tar.gz: c0f5b06236b754b2c028ec4a52d9aeb8687df8b780b362887fea9fe231b55210
 SHA512:
-  metadata.gz: ce417c195faa1b52f8cb70f81a654efc5bacda6338aedff1e3a9601cb4b210280a25aa7a763a3fb59f229ac767659b5fcc31b8673e2199a35fbad583cfab69eb
-  data.tar.gz: bc58fbba5f0e8a56ebeed5b97b4f1c97f5fe6c91526aeccdd104b43cc02e7f0d850a4a26ce2b7b558382f4910da5a1da2e139d13f2c9a09ad32a38fdc940764e
+  metadata.gz: 4f23320a96822a5c35941cce7b6e712ebbeb411ee0a8c38588086373883b4eda31ebfcb49395f8b38684c62ffdad4f94a635bc35c5442a15b9c9ae89cbc1dc39
+  data.tar.gz: 5c8156c6849e23d19f4aeb2891edcd379be73b4f0a67e6ce26b231f190fe32486afc91584e24ae39c1561122239d1b192b2bc52dd75910efaf05e1c7b260bb2b

data/.github/dependabot.yml

@@ -12,6 +12,9 @@ updates:
     rebase-strategy: "disabled"
     cooldown:
       default-days: 7
+    ignore:
+      - dependency-name: "html-pipeline"
+        versions: [">=3.0"]
 
   - package-ecosystem: "github-actions"
     directories:

data/.github/workflows/release.yml

@@ -14,9 +14,9 @@ jobs:
       contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: ruby/setup-ruby@efbf473cab83af4468e8606cc33eca9281bb213f # v1.256.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
         with:
-          ruby-version: 3.4.4 # Latest stable Ruby for release builds
+          ruby-version: "3.4"
           bundler-cache: true
-      - uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
+      - uses: rubygems/release-gem@7f9650160c1a4e7989fdc9855807bdbd421d8b6b # v1.4.1

data/.github/workflows/test.yml

@@ -16,17 +16,19 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'macos-latest']
-        ruby: ['3.2', '3.3', '3.4']
+        ruby: ['3.3', '3.4']
         experimental: [false]
-        include:
-          - os: 'ubuntu-latest'
-            ruby: 'head'
-            experimental: true
+        # Temporarily disabled: qiita_marker does not support Ruby 4 yet
+        # See: https://github.com/increments/qiita-markdown/issues/268
+        # include:
+        #   - os: 'ubuntu-latest'
+        #     ruby: 'head'
+        #     experimental: true
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-      - uses: ruby/setup-ruby@efbf473cab83af4468e8606cc33eca9281bb213f # v1.256.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
@@ -36,14 +38,14 @@ jobs:
   qlty:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-      - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
         with:
-          ruby-version: '3.2'
+          ruby-version: '3.3'
           bundler-cache: true
       - name: Test
         run: bundle exec rake
-      - uses: qltysh/qlty-action/coverage@a19242102d17e497f437d7466aa01b528537e899 # v2.2.0
+      - uses: qltysh/qlty-action/coverage@08a0a862c159eae9b9003081da6663d96efef637 # v2.3.0
         with:
           token: ${{secrets.QLTY_COVERAGE_TOKEN}}
           files: ./coverage/coverage.json

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
 
+## 1.8.0
+
+- Drop Ruby 3.0, 3.1, 3.2 support
+- Detect code block language from filename with Rouge instead of github-linguist
+- Require rouge 5.1 or later
+
+## 1.7.0
+
+- Support for embedding Claude Artifacts iframes
+
 ## 1.6.1
 
 - Add a dependency on the uri gem to use version 1.0.4 or higher.

data/Gemfile

@@ -3,11 +3,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in qiita-markdown.gemspec
 gemspec
 
-gem "activesupport", "~> 5.2.7"
+gem "activesupport", "~> 8.1.3"
 gem "bundler"
 gem "pry"
 gem "rake"
 gem "rspec", "~> 3.1"
-gem "rubocop", "~> 1.76.0"
+gem "rubocop", "~> 1.91.0"
 gem "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"
 gem "simplecov_json_formatter"

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Qiita
+  module Markdown
+    module Embed
+      module ClaudeArtifact
+        SCRIPT_HOST = "claude.site"
+      end
+    end
+  end
+end

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

@@ -70,8 +70,8 @@ module Qiita
               nil
             when !has_only_filename?
               sections[0]
-            when linguist_language
-              linguist_language.default_alias_name
+            when rouge_lexer
+              rouge_lexer.tag
             end
           end
 
@@ -85,8 +85,8 @@ module Qiita
             sections[1].nil? && sections[0]&.include?(".")
           end
 
-          def linguist_language
-            @linguist_language ||= Linguist::Language.find_by_extension(filename).first
+          def rouge_lexer
+            @rouge_lexer ||= Rouge::Lexer.guesses(filename: filename).first
           end
 
           def sections

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

@@ -4,7 +4,7 @@ module Qiita
       class SyntaxHighlight < HTML::Pipeline::Filter
         DEFAULT_LANGUAGE = "text"
         DEFAULT_TIMEOUT = Float::INFINITY
-        DEFAULT_OPTION = "html_legacy"
+        FORMATTER = Rouge::Formatters::HTMLPygments.new(Rouge::Formatters::HTML.new)
 
         def call
           elapsed = 0
@@ -80,7 +80,7 @@ module Qiita
           end
 
           def highlight(language)
-            Rouge.highlight(code, language, DEFAULT_OPTION)
+            Rouge.highlight(code, language, FORMATTER)
           end
 
           def highlighted_node

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

@@ -13,6 +13,7 @@ module Qiita
           Embed::GoogleDrive::SCRIPT_HOST,
           Embed::StackBlitz::SCRIPT_HOST,
           Embed::BlueprintUe::SCRIPT_HOST,
+          Embed::ClaudeArtifact::SCRIPT_HOST,
         ].flatten.freeze
 
         def self.call(**args)

data/lib/qiita/markdown/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "1.6.1"
+    VERSION = "1.8.0"
   end
 end

data/lib/qiita/markdown.rb

@@ -1,6 +1,5 @@
 require "cgi"
 require "html/pipeline"
-require "linguist"
 require "mem"
 require "nokogiri"
 require "qiita_marker"
@@ -20,6 +19,7 @@ require "qiita/markdown/embed/docswell"
 require "qiita/markdown/embed/figma"
 require "qiita/markdown/embed/stack_blitz"
 require "qiita/markdown/embed/blueprint_ue"
+require "qiita/markdown/embed/claude_artifact"
 require "qiita/markdown/transformers/filter_attributes"
 require "qiita/markdown/transformers/filter_script"
 require "qiita/markdown/transformers/filter_iframe"

data/qiita-markdown.gemspec

@@ -15,15 +15,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = [">= 3.3.0", "< 4.0"]
 
   spec.add_dependency "addressable"
   spec.add_dependency "gemoji"
-  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.add_dependency "rouge", "~> 4.2"
+  spec.add_dependency "rouge", "~> 5.1"
   spec.add_dependency "sanitize"
   spec.add_dependency "uri", ">= 1.0.4"
   spec.metadata["rubygems_mfa_required"] = "true"

data/spec/qiita/markdown/processor_spec.rb

@@ -1829,6 +1829,43 @@ describe Qiita::Markdown::Processor do
         end
       end
 
+      context "with HTML embed code for Claude Artifact" do
+        shared_examples "embed code claude artifact example" do
+          let(:markdown) do
+            <<~MARKDOWN
+              <iframe src="#{url}" width="100%" height="600" frameborder="0" allowfullscreen></iframe>
+            MARKDOWN
+          end
+          let(:url) { "#{scheme}//claude.site/public/artifacts/4f47d0d5-3be1-41da-a871-df530aae8f54/embed" }
+
+          if allowed
+            it "does not sanitize embed code" do
+              should eq <<~HTML
+                <iframe src="#{url}" width="100%" height="600" frameborder="0" allowfullscreen></iframe>
+              HTML
+            end
+          else
+            it "forces width attribute on iframe" do
+              should eq <<~HTML
+                <iframe src="#{url}" width="100%" height="600" frameborder="0" allowfullscreen></iframe>
+              HTML
+            end
+          end
+        end
+
+        context "with scheme" do
+          let(:scheme) { "https:" }
+
+          include_examples "embed code claude artifact example"
+        end
+
+        context "without scheme" do
+          let(:scheme) { "" }
+
+          include_examples "embed code claude artifact example"
+        end
+      end
+
       context "with embed code for Tweet" do
         let(:markdown) do
           <<-MARKDOWN.strip_heredoc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiita-markdown
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -37,20 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: github-linguist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +145,7 @@ files:
 - lib/qiita/markdown/base_processor.rb
 - lib/qiita/markdown/embed/asciinema.rb
 - lib/qiita/markdown/embed/blueprint_ue.rb
+- lib/qiita/markdown/embed/claude_artifact.rb
 - lib/qiita/markdown/embed/code_pen.rb
 - lib/qiita/markdown/embed/docswell.rb
 - lib/qiita/markdown/embed/figma.rb
@@ -219,14 +206,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.3.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Qiita-specified markdown processor.
 test_files: []