gitlab_kramdown 0.6.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0ca6d723ef2cfbc3cc3ec87d184561abea8d451172a0bb4a3a9a136e243eb7
-  data.tar.gz: 8e322c9cda56f6f730a0cae0823cf27ad2bf3092f33ef5bba04760b725e64cdc
+  metadata.gz: 4cb65c38f5c2b3874971ea5d06871cd88e66461665292431117b24800319f9e8
+  data.tar.gz: 1824f2bb612c8b161231646161bb2c9e05f167fbc2d3879d6a5701bdc1e194b5
 SHA512:
-  metadata.gz: f31f20474eabfe807f33e33a36cedf1487f44c0cec1a4298c7852fe68237fb7638130fdb1603e790b60a60eb1db9c0e5a2af30509b25cb387346c22247cd5a03
-  data.tar.gz: 7cf6232f7840fd12e17c294e332213b226cdbe6bcee554ccc6e6ec9e30c12333b185bdc2746cf28d3d91f97a284f63fe8583aeee0cfed9afdcb8fe26130be906
+  metadata.gz: be2d78979f965235916159f56fe2c33be32d71f749cc7028542b462e7664879f2796a4824ad6b1ac8c87b4ce0a4702d433d6c17f41509064d43693a9f52bb74a
+  data.tar.gz: abc999da7070bcd89bc807453d430cfa2dcf02a2fa866fa12ab3886454edb52d88a2fd40b2e66d3416a084eafa4decb4ebd007459a26b4bc6745582e666820e9

data/CHANGELOG.md

@@ -0,0 +1,134 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.11.0] - 2021-01-25
+
+### Changed
+
+- Update Gem dependencies.
+- Update minimum required Ruby to 2.7.x.
+
+## [0.10.0] - 2020-08-27
+
+- Update Gem dependencies
+
+## [0.9.0] - 2019-10-17
+
+### Fixed
+
+- Fix very long IDs for headers that include links.
+
+### Added
+
+- Images should be clickable and linked to itself
+- Clickable images behavior is configurable
+
+## [0.8.0] - 2019-10-14
+
+### Changed
+
+- Revert "Fix very long IDs for headers that include links"
+
+## [0.7.0] - 2019-10-11
+
+### Added
+
+- Add support for PlantUML
+
+### Changed
+
+- Ruby 2.4 support is dropped.
+- Fix very long IDs for headers that include links.
+
+## [0.6.0] - 2019-05-07
+
+### Changed
+
+- URL Autolinks are now disabled by default (you can re-enable with `autolink: true` configuration param)
+
+### Added
+
+- Added support for rendering Mermaid when their JS is available
+
+## [0.5.0] - 2019-04-09
+
+### Added
+
+- Strikethrough support
+
+## [0.4.2] - 2018-11-21
+
+### Changed
+
+- URL autolinks will not execute inside `[]()` or `[]` blocks
+- Freezing `kramdown` version to allow only patchlevel changes
+
+## [0.4.1] - 2018-11-02
+
+### Added
+
+- Codebase now have a benchmark utility to compare with plain Kramdown
+
+### Changed
+
+- Many performance improvements on existing RegExp rules
+- Improve gemspec metadata and include only needed files on gem
+
+## [0.4.0] - 2018-04-12
+
+### Added
+
+- URL auto-linking support
+
+### Changed
+
+- Fixed many inconsistencies in references autolink
+
+## [0.3.0] - 2018-03-23
+
+### Added
+
+- Headers will include by default an anchor tag (you can disable with `linkable_headers: false`)
+
+### Changed
+
+- Fixed multiline blockquote delimiter
+- GitLab URL is not customizable with `gitlab_url: 'http://yourcustomgitlab.com'`
+
+## [0.2.0] - 2018-03-19
+
+### Added
+
+- Syntax highlighter uses `` ``` `` or `~~~`
+
+### Changed
+
+- Requires Ruby 2.4
+- Requires rouge `~> 3.0`
+
+## [0.1.0] - 2018-03-17
+
+### Added
+
+- The initial version of the Gem
+- Special GitLab References
+- Multiline Blockquote
+
+[0.11.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.10.0...v0.11.0
+[0.10.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.9.0...v0.10.0
+[0.9.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.8.0...v0.9.0
+[0.8.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.7.0...v0.8.0
+[0.7.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.6.0...v0.7.0
+[0.6.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.5.0...v0.6.0
+[0.5.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.4.2...v0.5.0
+[0.4.2]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.4.1...v0.4.2
+[0.4.1]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.4.0...v0.4.1
+[0.4.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.3.0...v0.4.0
+[0.3.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.2.0...v0.3.0
+[0.2.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/v0.1.0...v0.2.0
+[0.1.0]: https://gitlab.com/gitlab-org/gitlab_kramdown/compare/15b5e4b46aa0e42974ec2e5ee36c68d97219736f...v0.1.0

data/LICENSE.txt

@@ -1,20 +1,21 @@
+The MIT License (MIT)
+
 Copyright (c) 2018-2019 Gabriel Mazetto
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -26,6 +26,7 @@ This is a list of GitLab Flavored Markdown (GFM) extensions and their status of
 | [Math]                          | No           |
 | [Colors]                        | No           |
 | [Mermaid]                       | **Yes**      |
+| [PlantUML]                       | **Yes**      |
 
 > **Note**: Extensions marked as `Kramdown` in the `Implemented?` means behavior already exists
   in Kramdown flavor.
@@ -36,7 +37,8 @@ This is a list of GitLab Flavored Markdown (GFM) extensions and their status of
 | :------------------| :------------------: | -------------------------------------------- |
 | `gitlab_url`       | `https://gitlab.com` | GitLab instance URL to build reference links |
 | `linkable_headers` | true                 | Generate anchor tags with headers?           |
-| `autolink`         | false                | Converts URLs to HTML links (can be slow)    | 
+| `autolink`         | false                | Converts URLs to HTML links (can be slow)    |
+| `clickable_images` | true                 | Autolink images to themselves                |
 
 ## Usage example
 
@@ -69,6 +71,10 @@ To have also syntax highlighting using the same engine GitLab use, you need to d
 Kramdown::Document.new(source, input: 'GitlabKramdown', syntax_highlighter: :rouge).to_html
 ```
 
+## Supported and tested Ruby versions
+
+- Ruby 2.7
+
 ## Contributing to gitlab_kramdown
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
@@ -102,3 +108,4 @@ further details.
 [Math]: https://docs.gitlab.com/ee/user/markdown.html#math
 [Colors]: https://docs.gitlab.com/ee/user/markdown.html#colors
 [Mermaid]: https://docs.gitlab.com/ee/user/markdown.html#mermaid
+[PlantUML]: https://docs.gitlab.com/ee/administration/integration/plantuml.html#creating-diagrams

data/lib/gitlab_kramdown/converter/gitlab_html.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'kramdown/converter/html'
+require 'nokogiri'
+require 'asciidoctor-plantuml'
 
 module GitlabKramdown
   module Converter
@@ -8,17 +10,64 @@ module GitlabKramdown
     #
     # This includes GitLab custom elements from GitLab Flavored Markdown syntax
     module GitlabHtml
+      # Initializes a GitLab custom HTML converter with a given document
+      #
+      # It accepts all existing options for HTML converter with our custom ones:
+      #
+      # * +clickable_images+ (default: true) - whether images will have a link to itself
+      #
+      # @param [Kramdown::Document] root
+      # @param [Hash] options
+      def initialize(root, options)
+        super(root, options)
+
+        @clickable_images = options[:clickable_images] != false
+      end
+
       # Codeblock is customized in order to implement a different output to Mermaid
       #
       # Mermaid requires `<div class="mermaid"></div>` surrounding the content in order
       # to trigger the unobtrusive JS.
       def convert_codeblock(element, opts)
-        if element.options[:lang] == 'mermaid'
+        case element.options[:lang]
+        when 'mermaid'
           %(<div class="mermaid">#{element.value}</div>\n)
+        when 'plantuml'
+          plantuml_setup
+
+          img_tag = Nokogiri::HTML::DocumentFragment.parse(
+            Asciidoctor::PlantUml::Processor.plantuml_content(element.value, {})
+          )
+
+          %(#{img_tag}\n)
         else
           super
         end
       end
+
+      def plantuml_setup
+        Asciidoctor::PlantUml.configure do |conf|
+          conf.url = 'https://plantuml.gitlab-static.net'
+          conf.png_enable = true
+          conf.svg_enable = false
+          conf.txt_enable = false
+        end
+      end
+
+      # Images can have a link to themselves when configuration allows
+      #
+      # We don't autolink when image is already linked to something-else
+      #
+      # @param [Kramdown::Element] element
+      # @param [Integer] _indent
+      def convert_img(element, _indent)
+        return super unless @clickable_images
+        return super if @stack.last.type == :a
+
+        href = element.attr['src']
+
+        %(<a href="#{href}" target="_blank" rel="noopener noreferrer">#{super}</a>)
+      end
     end
   end
 end

data/lib/gitlab_kramdown/parser/escape.rb

@@ -8,7 +8,7 @@ module GitlabKramdown
     #
     # Based on Kramdown GFM implementation
     module Escape
-      ESCAPED_CHARS_GFM = /\\([\\.*_+`<>()\[\]{}#!:\|"'\$=\-~])/.freeze
+      ESCAPED_CHARS_GFM = /\\([\\.*_+`<>()\[\]{}#!:|"'$=\-~])/.freeze
 
       def self.included(klass)
         klass.define_parser(:escape_chars_gitlab, ESCAPED_CHARS_GFM, '\\\\', :parse_escaped_chars)

data/lib/gitlab_kramdown/parser/fenced_codeblock.rb

@@ -15,8 +15,8 @@ module GitlabKramdown
     #
     # @see https://docs.gitlab.com/ee/user/markdown.html#code-and-syntax-highlighting
     module FencedCodeblock
-      FENCED_CODEBLOCK_START = /^[ ]{0,3}[~`]{3,}/.freeze
-      FENCED_CODEBLOCK_MATCH = /^[ ]{0,3}(([~`]){3,})\s*?((\S+?)(?:\?\S*)?)?\s*?\n(.*?)^[ ]{0,3}\1\2*\s*?\n/m.freeze
+      FENCED_CODEBLOCK_START = /^ {0,3}[~`]{3,}/.freeze
+      FENCED_CODEBLOCK_MATCH = /^ {0,3}(([~`]){3,})\s*?((\S+?)(?:\?\S*)?)?\s*?\n(.*?)^ {0,3}\1\2*\s*?\n/m.freeze
 
       def self.included(klass)
         klass.define_parser(:codeblock_fenced_gitlab, FENCED_CODEBLOCK_START, nil, 'parse_codeblock_fenced')

data/lib/gitlab_kramdown/parser/header.rb

@@ -73,9 +73,11 @@ module GitlabKramdown
       end
 
       NON_WORD_RE = /[^\p{Word}\- \t]/.freeze
+      MARKDOWN_LINK_TEXT = /\[(?<link_text>[^\]]+)\]\((?<link_url>[^)]+)\)/.freeze
 
       def generate_header_id(text)
         result = text.downcase
+        result.gsub!(MARKDOWN_LINK_TEXT) { |s| MARKDOWN_LINK_TEXT.match(s)[:link_text].gsub(NON_WORD_RE, '') }
         result.gsub!(NON_WORD_RE, '')
         result.tr!(" \t", '-')
         @id_counter[result] += 1

data/lib/gitlab_kramdown/parser/reference.rb

@@ -9,7 +9,7 @@ module GitlabKramdown
     #
     # @see https://docs.gitlab.com/ee/user/markdown.html#special-gitlab-references
     module Reference
-      PATH_REGEX = /[a-zA-Z0-9_\.][a-zA-Z0-9_\-\.]+/.freeze
+      PATH_REGEX = /[a-zA-Z0-9_.][a-zA-Z0-9_\-.]+/.freeze
 
       NAMESPACE_FORMAT_REGEX = %r{
         (?:#{PATH_REGEX}[a-zA-Z0-9_\-])
@@ -62,7 +62,7 @@ module GitlabKramdown
         (?<namespace>#{ALWAYS_FULL_NAMESPACE_FORMAT_REGEX})
         #{Regexp.escape('~')}
         (?<label>
-          [A-Za-z0-9_\-\?\.&]+ | # String-based single-word label title, or
+          [A-Za-z0-9_\-?.&]+ | # String-based single-word label title, or
           ".+?"                  # String-based multi-word label surrounded in quotes
         )
       }x.freeze

data/lib/gitlab_kramdown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitlabKramdown
-  VERSION = '0.6.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_kramdown
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Gabriel Mazetto
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,58 +16,86 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.26.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: asciidoctor-plantuml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.13
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 6.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
-  name: juwelier
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -84,81 +112,81 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.8.0
 description: GitLab Flavored Markdown extensions on top of Kramdown markup. Tries
   to be as close as possible to existing extensions.
-email: brodock@gmail.com
+email:
+- brodock@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - lib/gitlab_kramdown.rb
@@ -173,31 +201,30 @@ files:
 - lib/gitlab_kramdown/parser/strikethrough.rb
 - lib/gitlab_kramdown/version.rb
 - lib/kramdown/parser/gitlab_kramdown.rb
-homepage: http://gitlab.com/gitlab-org/gitlab_kramdown
+homepage: https://gitlab.com/gitlab-org/gitlab_kramdown
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: http://gitlab.com/gitlab-org/gitlab_kramdown/issues
-  changelog_uri: http://gitlab.com/gitlab-org/gitlab_kramdown/blob/master/CHANGELOG.md
-  homepage_uri: http://gitlab.com/gitlab-org/gitlab_kramdown
-  source_code_uri: http://gitlab.com/gitlab-org/gitlab_kramdown
+  homepage_uri: https://gitlab.com/gitlab-org/gitlab_kramdown
+  source_code_uri: https://gitlab.com/gitlab-org/gitlab_kramdown
+  changelog_uri: https://gitlab.com/gitlab-org/gitlab_kramdown/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://gitlab.com/gitlab-org/gitlab_kramdown/-/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: GitLab Flavored Kramdown