gitlab_kramdown 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d97e30917ac631afb70c1e37fb2d807279604195fd538a5093620ca087d2b6fe
-  data.tar.gz: 9895d7ffa9284ebcd9edbb892b726f0e038a727e545191d6128256071d069aff
+  metadata.gz: f56f5ad5ed710fefd24289c68ec7fe621f67261875def66fc7c4588a1a3f4930
+  data.tar.gz: 023f11be46858b9fff9cbf7aaf880629b665155aeb95f6f8804ff3fab19fd992
 SHA512:
-  metadata.gz: c8704fb0267233b71c4dd3ca5a147b637a14b0d0dde02e9cedb3047bdda6de5941c05302186e31821b1dd6feb617e8fc892055930adcd94beb6fffef9e5e55d4
-  data.tar.gz: 0eea8586e745f4c57b910e23d991a35514a4289105d25ca0d129be7c673a9fa60b18d67dd4b02acaa46918946a89733ddc6ef69a2b247774594fae32cdb6b4c4
+  metadata.gz: 41affa513909efce3c3aed46a185d0e2220dd96a64a54a33d0862aabf71fd21a46cc8fa3992966284e31a8deb6e0c0e38131427f3e0ab96d3e31d50f6ee94222
+  data.tar.gz: 2ad36ecf7f2b4003f1c7fbec5f99208be2e5098de42ad4bd129ff38004eaca9d334e1ac94eae14ca3dcbe84cfa39b4090227524c308d0b72c9492c0a82708c60

data/lib/gitlab_kramdown/parser/autolink.rb

@@ -8,16 +8,18 @@ module GitlabKramdown
     #
     # @see https://docs.gitlab.com/ee/user/markdown.html#url-auto-linking
     module Autolink
-      PUNCTUATION_PAIRS = /['"][)\]}][(\[{]/
-      ACHARS = /[[:alnum:]]_/
+      PUNCTUATION_PAIRS = /['"][)\]}][(\[{]/.freeze
+      ACHARS = /[[:alnum:]]_/.freeze
 
       AUTOLINK_START = %r{
-        (
-          (?<schema>mailto|https?|ftps?|irc|smb):[^\s>]+(?<!\?|!|\.|,|:)
-            |
-          [-.[[:alnum:]]_]+@[-[[:alnum:]]_]+(?:\.[-[[:alnum:]]_]+)*\.[a-z]+
+        (?<uri>
+          (?<schema>mailto|https?|ftps?|irc|smb):
+          [^\s\[\]>]+
+          (?<!\?|!|\.|,|:)
+        |
+          [-.#{ACHARS}]+@[-#{ACHARS}]+(?:\.[-#{ACHARS}]+)*\.[a-z]+
         )
-      }x
+      }x.freeze
 
       def self.included(klass)
         klass.define_parser(:gitlab_autolink, AUTOLINK_START)
@@ -28,10 +30,25 @@ module GitlabKramdown
         start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
 
-        href = (@src[:schema].nil? ? "mailto:#{@src[0]}" : @src[0])
+        # current StringScanner has limitations that prevent lookbehind to work properly
+        # so we can't use something like this: `(?<!\[)(?<!\]\()`. Using a negative lookbehind
+        # would improve performance on the cases where it would prevent a match.
+        #
+        # There is an alternative we could explore: https://github.com/luikore/zscan which
+        # does fix the current limitations, but them we are depending on another third party gem.
+        #
+        # Instead of depending on a third party, I'm opting for a simple fix that achieve the same
+        # results but without the performance improvements:
+        if @src.pre_match.end_with?('[', '](')
+          add_text(@src[:uri])
+
+          return
+        end
+
+        href = (@src[:schema].nil? ? "mailto:#{@src[:uri]}" : @src[:uri])
         el = Kramdown::Element.new(:a, nil, { 'href' => href }, location: start_line_number)
 
-        add_text(@src[0].sub(/^mailto:/, ''), el)
+        add_text(@src[:uri].sub(/^mailto:/, ''), el)
         @tree.children << el
       end
     end

data/lib/gitlab_kramdown/parser/fenced_blockquote.rb

@@ -8,7 +8,7 @@ module GitlabKramdown
     #
     # @see https://docs.gitlab.com/ee/user/markdown.html#multiline-blockquote
     module FencedBlockquote
-      FENCED_BLOCKQUOTE_START = />{3}/x
+      FENCED_BLOCKQUOTE_START = />{3}/x.freeze
 
       FENCED_BLOCKQUOTE_MATCH = %r{
         ^(?<delimiter>>{3})   # line must start with >>>
@@ -19,7 +19,7 @@ module GitlabKramdown
         \k<delimiter>         # same delimiter used to open the block
         [ \t]*                # any amount of trailling whitespace
         \s
-      }xm
+      }xm.freeze
 
       def self.included(klass)
         klass.define_parser(:fenced_blockquote, FENCED_BLOCKQUOTE_START)

data/lib/gitlab_kramdown/parser/fenced_codeblock.rb

@@ -13,8 +13,8 @@ module GitlabKramdown
     #
     # @see https://docs.gitlab.com/ee/user/markdown.html#code-and-syntax-highlighting
     module FencedCodeblock
-      FENCED_CODEBLOCK_START = /^[ ]{0,3}[~`]{3,}/
-      FENCED_CODEBLOCK_MATCH = /^[ ]{0,3}(([~`]){3,})\s*?((\S+?)(?:\?\S*)?)?\s*?\n(.*?)^[ ]{0,3}\1\2*\s*?\n/m
+      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

@@ -9,8 +9,12 @@ module GitlabKramdown
     #
     # @see https://docs.gitlab.com/ee/user/markdown.html#headers
     module Header
-      HEADER_ID = /(?:[ \t]+\{#([A-Za-z][\w:-]*)\})?/
-      SETEXT_HEADER_START = /^(#{Kramdown::Parser::Kramdown::OPT_SPACE}[^ \t].*?)#{HEADER_ID}[ \t]*?\n(-|=)+\s*?\n/
+      HEADER_ID = /(?:[ \t]+\{#([A-Za-z][\w:-]*)\})?/.freeze
+      SETEXT_HEADER_START = %r{
+        ^(#{Kramdown::Parser::Kramdown::OPT_SPACE}[^ \t].*?)
+          #{HEADER_ID}[ \t]*?\n
+          (-|=)+\s*?\n
+      }x.freeze
 
       def self.included(klass)
         klass.define_parser(:setext_gitlab_header, SETEXT_HEADER_START)
@@ -26,7 +30,7 @@ module GitlabKramdown
 
         el = new_block_el(:header, nil, nil, level: (level == '-' ? 2 : 1), raw_text: text, location: start_line_number)
         add_text(text, el)
-        el.attr['id'] = id ? id : generate_header_id(text)
+        el.attr['id'] = id || generate_header_id(text)
 
         if @options[:linkable_headers]
           el.children << Kramdown::Element.new(:a, nil, {
@@ -40,8 +44,8 @@ module GitlabKramdown
         true
       end
 
-      ATX_HEADER_START = /^\#{1,6}/
-      ATX_HEADER_MATCH = /^(\#{1,6})(.+?(?:\\#)?)\s*?#*#{HEADER_ID}\s*?\n/
+      ATX_HEADER_START = /^\#{1,6}/.freeze
+      ATX_HEADER_MATCH = /^(\#{1,6})(.+?(?:\\#)?)\s*?#*#{HEADER_ID}\s*?\n/.freeze
 
       # Parse the Atx header at the current location.
       def parse_atx_gitlab_header
@@ -54,7 +58,7 @@ module GitlabKramdown
 
         el = new_block_el(:header, nil, nil, level: level.length, raw_text: text, location: start_line_number)
         add_text(text, el)
-        el.attr['id'] = id ? id : generate_header_id(text)
+        el.attr['id'] = id || generate_header_id(text)
 
         if @options[:linkable_headers]
           el.children << Kramdown::Element.new(:a, nil, {
@@ -68,7 +72,7 @@ module GitlabKramdown
         true
       end
 
-      NON_WORD_RE = /[^\p{Word}\- \t]/
+      NON_WORD_RE = /[^\p{Word}\- \t]/.freeze
 
       def generate_header_id(text)
         result = text.downcase

data/lib/gitlab_kramdown/parser/reference.rb

@@ -9,28 +9,28 @@ 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_\-\.]+/
+      PATH_REGEX = /[a-zA-Z0-9_\.][a-zA-Z0-9_\-\.]+/.freeze
 
       NAMESPACE_FORMAT_REGEX = %r{
         (?:#{PATH_REGEX}[a-zA-Z0-9_\-])
         (?<!\.git|\.atom)
         |[a-zA-Z0-9_]
-      }x
+      }x.freeze
 
-      FULL_NAMESPACE_FORMAT_REGEX = %r{(#{NAMESPACE_FORMAT_REGEX}/)*#{NAMESPACE_FORMAT_REGEX}}
-      ALWAYS_FULL_NAMESPACE_FORMAT_REGEX = %r{(#{NAMESPACE_FORMAT_REGEX}/)+#{NAMESPACE_FORMAT_REGEX}}
+      FULL_NAMESPACE_FORMAT_REGEX = %r{(#{NAMESPACE_FORMAT_REGEX}/)*#{NAMESPACE_FORMAT_REGEX}}.freeze
+      ALWAYS_FULL_NAMESPACE_FORMAT_REGEX = %r{(#{NAMESPACE_FORMAT_REGEX}/)+#{NAMESPACE_FORMAT_REGEX}}.freeze
 
       USER_GROUP_PATTERN = %r{
         #{Regexp.escape('@')}
         (?<user>#{FULL_NAMESPACE_FORMAT_REGEX})
-      }x
+      }x.freeze
 
       PROJECT_COMMIT_PATTERN = %r{
         (?<namespace>#{ALWAYS_FULL_NAMESPACE_FORMAT_REGEX})
         #{Regexp.escape('@')}
         (?<commit>[a-f0-9]{7,40})
         (?!\.{3})
-      }x
+      }x.freeze
 
       PROJECT_COMMIT_DIFF_PATTERN = %r{
         (?<namespace>#{ALWAYS_FULL_NAMESPACE_FORMAT_REGEX})
@@ -38,25 +38,25 @@ module GitlabKramdown
         (?<commit_source>[a-f0-9]{7,40})
         \.{3}
         (?<commit_target>[a-f0-9]{7,40})
-      }x
+      }x.freeze
 
       PROJECT_ISSUE_PATTERN = %r{
         (?<namespace>#{ALWAYS_FULL_NAMESPACE_FORMAT_REGEX})
         #{Regexp.escape('#')}
         (?<issue>[1-9][0-9]*)
-      }x
+      }x.freeze
 
       PROJECT_MERGE_REQUEST_PATTERN = %r{
         (?<namespace>#{ALWAYS_FULL_NAMESPACE_FORMAT_REGEX})
         #{Regexp.escape('!')}
         (?<merge_request>[1-9][0-9]*)
-      }x
+      }x.freeze
 
       PROJECT_SNIPPET_PATTERN = %r{
         (?<namespace>#{ALWAYS_FULL_NAMESPACE_FORMAT_REGEX})
         #{Regexp.escape('$')}
         (?<snippet>[1-9][0-9]*)
-      }x
+      }x.freeze
 
       PROJECT_LABEL_PATTERN = %r{
         (?<namespace>#{ALWAYS_FULL_NAMESPACE_FORMAT_REGEX})
@@ -65,7 +65,7 @@ module GitlabKramdown
           [A-Za-z0-9_\-\?\.&]+ | # String-based single-word label title, or
           ".+?"                  # String-based multi-word label surrounded in quotes
         )
-      }x
+      }x.freeze
 
       def self.included(klass)
         klass.define_parser(:user_group_mention, USER_GROUP_PATTERN, '@')

data/lib/gitlab_kramdown/version.rb

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

data/lib/kramdown/parser/gitlab_kramdown.rb

@@ -36,6 +36,7 @@ module Kramdown
         index = @block_parsers.index(original)
 
         return false unless index
+
         @block_parsers[index] = new
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_kramdown
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Gabriel Mazetto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement