motion-markdown-it 8.4.1.1 → 8.4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce02411a4d64cb6e09347db122e59cb409d77316
-  data.tar.gz: 130993721fe5e59734b17af32a77aa7980d60fcf
+SHA256:
+  metadata.gz: 650922a627efaf3a0b14a2b615a77fa2368f3fa9521aebd02fa8102a9d472c03
+  data.tar.gz: e615b7de9baa7f930d2e69f3e8d6562d4796373e112602cc19b9472d5e4ed628
 SHA512:
-  metadata.gz: 90fce20e2e664e6ea14def698f0a846c1e7235687164c48a7c0388d495fd431f11c83387534e6e965658e4211b7c55e4650f0a3681f5517f4a36a7c76e6c10a8
-  data.tar.gz: 77560ecca3754fb7ab767ee6837a69f3b15c0f89c7d966c29c87a937cfa702e5f4728e2127ead479a5dab18673ef264eba3e0b1dfe117aa98044950f5d7da34e
+  metadata.gz: 13890868afe5b3eb188a35fbcd0042c9334e5047a7e05fe46262ca45cd8bd919442e129856b74dfd8844edf66884899f3c36bf350664cd2e9b057d2d43690985
+  data.tar.gz: 73b64c8811203fb281a8ab9d802ca59ae330b2134d6d2cf0142c8fd20ca526efc97667ef8f080485f4d1e6f4f37813ee45b925df5e661a90f377e561fce636b2

data/README.md

@@ -55,6 +55,7 @@ redcarpet 3.4.0             0.0065
 - [Install](#install)
 - [Usage examples](#usage-examples)
 - [Plugins](#plugins)
+- [Upgrading](#upgrading)
 - [References / Thanks](#references--thanks)
 - [License](#license)
 
@@ -297,6 +298,44 @@ other implementations.
 
 -->
 
+## Upgrading
+
+Upgrading to `8.4.1.2` could cause some small breakage if you are using any custom plugins.  The [motion-markdown-it-plugins](https://github.com/digitalmoksha/motion-markdown-it-plugins) plugins have already been upgraded.
+
+#### charCodeAt
+
+Make sure you have
+
+```ruby
+include MarkdownIt::Common::Utils
+```
+
+at the top of your plugin file.  Then change any references to `charCodeAt`.  For example,
+
+```ruby
+state.src.charCodeAt(pos)
+```
+
+would become
+
+```ruby
+charCodeAt(state.src, pos)
+```
+
+#### slice_to_end
+
+`slice_to_end` has been removed.  Change references like this
+
+```ruby
+state.src.slice_to_end(pos)
+```
+
+to
+
+```ruby
+state.src[pos..-1]
+```
+
 ## References / Thanks
 
 Thanks to the authors of the original implementation in Javascript, [markdown-it](https://github.com/markdown-it/markdown-it):

data/lib/motion-markdown-it.rb

@@ -24,7 +24,6 @@ else
   require 'motion-markdown-it/common/utils'
   require 'motion-markdown-it/common/html_blocks'
   require 'motion-markdown-it/common/html_re'
-  require 'motion-markdown-it/common/string'
   require 'motion-markdown-it/common/simpleidn'
   require 'motion-markdown-it/helpers/parse_link_destination'
   require 'motion-markdown-it/helpers/parse_link_label'

data/lib/motion-markdown-it/common/simpleidn.rb

@@ -1,11 +1,6 @@
 # encoding: UTF-8
 # Borrowed from https://github.com/mmriis/simpleidn
 #------------------------------------------------------------------------------
-class Integer
-  def to_utf8_character
-    [self].pack("U*")
-  end
-end
 
 module SimpleIDN
     
@@ -21,7 +16,11 @@ module SimpleIDN
     SKEW = 38
     MAXINT = 0x7FFFFFFF
 
-    module_function  
+    module_function
+    
+    def to_utf8_character(int)
+      [int].pack("U*")
+    end  
     
     # decode_digit(cp) returns the numeric value of a basic code 
     # point (for use in representing integers) in the range 0 to
@@ -75,7 +74,7 @@ module SimpleIDN
       # Handle the basic code points: Let basic be the number of input code 
       # points before the last delimiter, or 0 if there is none, then
       # copy the first basic code points to the output.
-      basic = input.rindex(DELIMITER.to_utf8_character) || 0
+      basic = input.rindex(to_utf8_character(DELIMITER)) || 0
 
       input.unpack("U*")[0, basic].each do |char|
         raise(RangeError, "Illegal input >= 0x80") if char >= 0x80
@@ -126,7 +125,7 @@ module SimpleIDN
         i %= out
 
         # Insert n at position i of the output: 
-        output.insert(i, n.to_utf8_character)
+        output.insert(i, to_utf8_character(n))
         i += 1
       end
     
@@ -202,7 +201,7 @@ module SimpleIDN
         delta += 1
         n += 1
       end
-      return output.collect {|c| c.to_utf8_character}.join
+      return output.collect {|c| to_utf8_character(c)}.join
     end
 
   end

data/lib/motion-markdown-it/common/utils.rb

@@ -55,7 +55,11 @@ module MarkdownIt
       def fromCharCode(c)
         c.chr
       end
-
+      
+      #------------------------------------------------------------------------------
+      def charCodeAt(str, ch)
+        str[ch].ord unless str[ch].nil?
+      end
 
       UNESCAPE_MD_RE  = /\\([\!\"\#\$\%\&\'\(\)\*\+\,\-.\/:;<=>?@\[\\\]^_`{|}~])/
 
@@ -70,8 +74,8 @@ module MarkdownIt
 
         return fromCodePoint(MarkdownIt::HTMLEntities::MAPPINGS[name]) if MarkdownIt::HTMLEntities::MAPPINGS[name]
 
-        if (name.charCodeAt(0) == 0x23 && DIGITAL_ENTITY_TEST_RE =~ name) # '#'
-          code = name[1].downcase == 'x' ? name.slice_to_end(2).to_i(16) : name.slice_to_end(1).to_i
+        if (charCodeAt(name, 0) == 0x23 && DIGITAL_ENTITY_TEST_RE =~ name) # '#'
+          code = name[1].downcase == 'x' ? name[2..-1].to_i(16) : name[1..-1].to_i
           if (isValidEntityCode(code))
             return fromCodePoint(code)
           end

data/lib/motion-markdown-it/helpers/parse_link_destination.rb

@@ -11,10 +11,10 @@ module MarkdownIt
         start = pos
         result = {ok: false, pos: 0, lines: 0, str: ''}
 
-        if (str.charCodeAt(pos) == 0x3C ) # <
+        if (charCodeAt(str, pos) == 0x3C ) # <
           pos += 1
           while (pos < max)
-            code = str.charCodeAt(pos)
+            code = charCodeAt(str, pos)
             return result if (code == 0x0A || isSpace(code)) # \n
             if (code == 0x3E) #  >
               result[:pos] = pos + 1
@@ -38,7 +38,7 @@ module MarkdownIt
 
         level = 0
         while (pos < max)
-          code = str.charCodeAt(pos)
+          code = charCodeAt(str, pos)
 
           break if (code == 0x20)
 

data/lib/motion-markdown-it/helpers/parse_link_label.rb

@@ -15,7 +15,7 @@ module MarkdownIt
         level     = 1
 
         while (state.pos < max)
-          marker = state.src.charCodeAt(state.pos)
+          marker = charCodeAt(state.src, state.pos)
           if (marker == 0x5D) # ]
             level -= 1
             if (level == 0)

data/lib/motion-markdown-it/helpers/parse_link_title.rb

@@ -12,7 +12,7 @@ module MarkdownIt
 
         return result if (pos >= max)
 
-        marker = str.charCodeAt(pos)
+        marker = charCodeAt(str, pos)
 
         return result if (marker != 0x22 && marker != 0x27 && marker != 0x28) # " ' (
 
@@ -22,7 +22,7 @@ module MarkdownIt
         marker = 0x29 if (marker == 0x28)
 
         while (pos < max)
-          code = str.charCodeAt(pos)
+          code = charCodeAt(str, pos)
           if (code == marker)
             result[:pos]   = pos + 1
             result[:lines] = lines
@@ -33,7 +33,7 @@ module MarkdownIt
             lines += 1
           elsif (code == 0x5C && pos + 1 < max) # \
             pos += 1
-            if (str.charCodeAt(pos) == 0x0A)
+            if (charCodeAt(str, pos) == 0x0A)
               lines += 1
             end
           end

data/lib/motion-markdown-it/rules_block/blockquote.rb

@@ -15,7 +15,7 @@ module MarkdownIt
         return false if (state.sCount[startLine] - state.blkIndent >= 4)
 
         # check the block quote marker
-        return false if state.src.charCodeAt(pos) != 0x3E # >
+        return false if charCodeAt(state.src, pos) != 0x3E # >
         pos += 1
 
         # we know that it's going to be a valid blockquote,
@@ -26,7 +26,7 @@ module MarkdownIt
         initial = offset = state.sCount[startLine] + pos - (state.bMarks[startLine] + state.tShift[startLine])
 
         # skip one optional space after '>'
-        if state.src.charCodeAt(pos) == 0x20 # space
+        if charCodeAt(state.src, pos) == 0x20 # space
           # ' >   test '
           #     ^ -- position start of line here:
           pos             += 1
@@ -34,7 +34,7 @@ module MarkdownIt
           offset          +=1
           adjustTab        = false
           spaceAfterMarker = true
-        elsif state.src.charCodeAt(pos) == 0x09 # tab
+        elsif charCodeAt(state.src, pos) == 0x09 # tab
           spaceAfterMarker = true
 
           if ((state.bsCount[startLine] + offset) % 4 == 3)
@@ -58,7 +58,7 @@ module MarkdownIt
         state.bMarks[startLine] = pos
 
         while pos < max
-          ch = state.src.charCodeAt(pos)
+          ch = charCodeAt(state.src, pos)
 
           if isSpace(ch)
             if ch == 0x09
@@ -128,7 +128,7 @@ module MarkdownIt
             break
           end
 
-          if state.src.charCodeAt(pos) == 0x3E && !wasOutdented # >
+          if charCodeAt(state.src, pos) == 0x3E && !wasOutdented # >
             pos += 1
             # This line is inside the blockquote.
 
@@ -136,7 +136,7 @@ module MarkdownIt
             initial = offset = state.sCount[nextLine] + pos - (state.bMarks[nextLine] + state.tShift[nextLine])
 
             # skip one optional space after '>'
-            if state.src.charCodeAt(pos) == 0x20 # space
+            if charCodeAt(state.src, pos) == 0x20 # space
               # ' >   test '
               #     ^ -- position start of line here:
               pos             += 1
@@ -144,7 +144,7 @@ module MarkdownIt
               offset          += 1
               adjustTab        = false
               spaceAfterMarker = true
-            elsif state.src.charCodeAt(pos) == 0x09 # tab
+            elsif charCodeAt(state.src, pos) == 0x09 # tab
               spaceAfterMarker = true
 
               if ((state.bsCount[nextLine] + offset) % 4 == 3)
@@ -168,7 +168,7 @@ module MarkdownIt
             state.bMarks[nextLine] = pos
 
             while pos < max
-              ch = state.src.charCodeAt(pos)
+              ch = charCodeAt(state.src, pos)
 
               if isSpace(ch)
                 if ch == 0x09

data/lib/motion-markdown-it/rules_block/fence.rb

@@ -16,7 +16,7 @@ module MarkdownIt
 
         return false if pos + 3 > max
 
-        marker = state.src.charCodeAt(pos)
+        marker = charCodeAt(state.src, pos)
 
         if marker != 0x7E && marker != 0x60 #  != ~ && != `
           return false
@@ -58,7 +58,7 @@ module MarkdownIt
             break
           end
 
-          next if state.src.charCodeAt(pos) != marker
+          next if charCodeAt(state.src, pos) != marker
 
           if state.sCount[nextLine] - state.blkIndent >= 4
             # closing fence should be indented less than 4 spaces

data/lib/motion-markdown-it/rules_block/heading.rb

@@ -13,18 +13,18 @@ module MarkdownIt
         # if it's indented more than 3 spaces, it should be a code block
         return false if state.sCount[startLine] - state.blkIndent >= 4
 
-        ch  = state.src.charCodeAt(pos)
+        ch  = charCodeAt(state.src, pos)
 
         return false if (ch != 0x23 || pos >= max)
 
         # count heading level
         level = 1
         pos  += 1
-        ch = state.src.charCodeAt(pos)
+        ch = charCodeAt(state.src, pos)
         while (ch == 0x23 && pos < max && level <= 6)  # '#'
           level += 1
           pos   += 1
-          ch = state.src.charCodeAt(pos)
+          ch = charCodeAt(state.src, pos)
         end
 
         return false if (level > 6 || (pos < max && !isSpace(ch)))
@@ -35,7 +35,7 @@ module MarkdownIt
 
         max = state.skipSpacesBack(max, pos)
         tmp = state.skipCharsBack(max, 0x23, pos) # '#'
-        if (tmp > pos && isSpace(state.src.charCodeAt(tmp - 1)))
+        if (tmp > pos && isSpace(charCodeAt(state.src, tmp - 1)))
           max = tmp
         end
 

data/lib/motion-markdown-it/rules_block/hr.rb

@@ -13,7 +13,7 @@ module MarkdownIt
         # if it's indented more than 3 spaces, it should be a code block
         return false if (state.sCount[startLine] - state.blkIndent >= 4)
 
-        marker = state.src.charCodeAt(pos)
+        marker = charCodeAt(state.src, pos)
         pos   += 1
 
         # Check hr marker
@@ -27,7 +27,7 @@ module MarkdownIt
 
         cnt = 1
         while (pos < max)
-          ch   = state.src.charCodeAt(pos)
+          ch   = charCodeAt(state.src, pos)
           pos += 1
           return false if ch != marker && !isSpace(ch)
           cnt += 1 if ch == marker

data/lib/motion-markdown-it/rules_block/html_block.rb

@@ -3,6 +3,7 @@
 module MarkdownIt
   module RulesBlock
     class HtmlBlock
+      extend Common::Utils
 
       HTML_OPEN_CLOSE_TAG_RE = MarkdownIt::Common::HtmlRe::HTML_OPEN_CLOSE_TAG_RE
 
@@ -28,7 +29,7 @@ module MarkdownIt
         return false if state.sCount[startLine] - state.blkIndent >= 4
 
         return false if !state.md.options[:html]
-        return false if state.src.charCodeAt(pos) != 0x3C    # <
+        return false if charCodeAt(state.src, pos) != 0x3C    # <
 
         lineText = state.src.slice(pos...max)
 

data/lib/motion-markdown-it/rules_block/lheading.rb

@@ -3,6 +3,7 @@
 module MarkdownIt
   module RulesBlock
     class Lheading
+      extend Common::Utils
 
       #------------------------------------------------------------------------------
       def self.lheading(state, startLine, endLine, silent = true)
@@ -29,7 +30,7 @@ module MarkdownIt
             max = state.eMarks[nextLine]
 
             if pos < max
-              marker = state.src.charCodeAt(pos)
+              marker = charCodeAt(state.src, pos)
 
               if marker == 0x2D || marker == 0x3D # - or =
                 pos = state.skipChars(pos, marker)

data/lib/motion-markdown-it/rules_block/list.rb

@@ -12,7 +12,7 @@ module MarkdownIt
         pos = state.bMarks[startLine] + state.tShift[startLine]
         max = state.eMarks[startLine]
 
-        marker = state.src.charCodeAt(pos)
+        marker = charCodeAt(state.src, pos)
         pos   += 1
         # Check bullet
         if (marker != 0x2A && # *
@@ -22,7 +22,7 @@ module MarkdownIt
         end
 
         if pos < max
-          ch = state.src.charCodeAt(pos)
+          ch = charCodeAt(state.src, pos)
 
           if !isSpace(ch)
             # " -test " - is not a list item
@@ -44,7 +44,7 @@ module MarkdownIt
         # List marker should have at least 2 chars (digit + dot)
         return -1 if (pos + 1 >= max)
 
-        ch   = state.src.charCodeAt(pos)
+        ch   = charCodeAt(state.src, pos)
         pos += 1
 
         return -1 if ch.nil?
@@ -54,7 +54,7 @@ module MarkdownIt
           # EOL -> fail
           return -1 if (pos >= max)
 
-          ch   = state.src.charCodeAt(pos)
+          ch   = charCodeAt(state.src, pos)
           pos += 1
 
           if (ch >= 0x30 && ch <= 0x39) #  >= 0 && <= 9
@@ -75,7 +75,7 @@ module MarkdownIt
         end
 
         if pos < max
-          ch = state.src.charCodeAt(pos)
+          ch = charCodeAt(state.src, pos)
 
           if !isSpace(ch)
             # " 1.test " - is not a list item
@@ -144,7 +144,7 @@ module MarkdownIt
         end
 
         # We should terminate list on style change. Remember first one to compare.
-        markerCharCode = state.src.charCodeAt(posAfterMarker - 1)
+        markerCharCode = charCodeAt(state.src, posAfterMarker - 1)
 
         # For validation mode we can terminate immediately
         return true if (silent)
@@ -185,7 +185,7 @@ module MarkdownIt
           initial = offset = state.sCount[nextLine] + posAfterMarker - (state.bMarks[startLine] + state.tShift[startLine])
 
           while pos < max
-            ch = state.src.charCodeAt(pos)
+            ch = charCodeAt(state.src, pos)
 
             if ch == 0x09
               offset += 4 - (offset + state.bsCount[nextLine]) % 4
@@ -288,7 +288,7 @@ module MarkdownIt
             break if (posAfterMarker < 0)
           end
 
-          break if (markerCharCode != state.src.charCodeAt(posAfterMarker - 1))
+          break if (markerCharCode != charCodeAt(state.src, posAfterMarker - 1))
         end
 
         # Finalize list

data/lib/motion-markdown-it/rules_block/reference.rb

@@ -13,16 +13,16 @@ module MarkdownIt
          # if it's indented more than 3 spaces, it should be a code block
         return false if state.sCount[startLine] - state.blkIndent >= 4
 
-        return false if state.src.charCodeAt(pos) != 0x5B # [
+        return false if charCodeAt(state.src, pos) != 0x5B # [
 
         # Simple check to quickly interrupt scan on [link](url) at the start of line.
         # Can be useful on practice: https://github.com/markdown-it/markdown-it/issues/54
         pos += 1
         while (pos < max)
-          if (state.src.charCodeAt(pos) == 0x5D &&    # ]
-              state.src.charCodeAt(pos - 1) != 0x5C)  # \
+          if (charCodeAt(state.src, pos) == 0x5D &&    # ]
+              charCodeAt(state.src, pos - 1) != 0x5C)  # \
             return false if (pos + 1 === max)
-            return false if (state.src.charCodeAt(pos + 1) != 0x3A)  # :
+            return false if (charCodeAt(state.src, pos + 1) != 0x3A)  # :
             break
           end
           pos += 1
@@ -62,7 +62,7 @@ module MarkdownIt
 
         pos = 1
         while pos < max
-          ch = str.charCodeAt(pos)
+          ch = charCodeAt(str, pos)
           if (ch == 0x5B ) # [
             return false
           elsif (ch == 0x5D) # ]
@@ -72,20 +72,20 @@ module MarkdownIt
             lines += 1
           elsif (ch == 0x5C) # \
             pos += 1
-            if (pos < max && str.charCodeAt(pos) == 0x0A)
+            if (pos < max && charCodeAt(str, pos) == 0x0A)
               lines += 1
             end
           end
           pos += 1
         end
 
-        return false if (labelEnd < 0 || str.charCodeAt(labelEnd + 1) != 0x3A) # :
+        return false if (labelEnd < 0 || charCodeAt(str, labelEnd + 1) != 0x3A) # :
 
         # [label]:   destination   'title'
         #         ^^^ skip optional whitespace here
         pos = labelEnd + 2
         while pos < max
-          ch = str.charCodeAt(pos)
+          ch = charCodeAt(str, pos)
           if (ch == 0x0A)
             lines += 1
           elsif isSpace(ch)
@@ -114,7 +114,7 @@ module MarkdownIt
         #                       ^^^ skipping those spaces
         start = pos
         while (pos < max)
-          ch = str.charCodeAt(pos)
+          ch = charCodeAt(str, pos)
           if (ch == 0x0A)
             lines += 1
           elsif isSpace(ch)
@@ -139,12 +139,12 @@ module MarkdownIt
 
         # skip trailing spaces until the rest of the line
         while pos < max
-          ch = str.charCodeAt(pos)
+          ch = charCodeAt(str, pos)
           break if !isSpace(ch)
           pos += 1
         end
 
-        if (pos < max && str.charCodeAt(pos) != 0x0A)
+        if (pos < max && charCodeAt(str, pos) != 0x0A)
           if (title)
             # garbage at the end of the line after title,
             # but it could still be a valid reference if we roll back
@@ -152,14 +152,14 @@ module MarkdownIt
             pos = destEndPos
             lines = destEndLineNo
             while pos < max
-              ch = str.charCodeAt(pos)
+              ch = charCodeAt(str, pos)
               break if !isSpace(ch)
               pos += 1
             end
           end
         end
 
-        if (pos < max && str.charCodeAt(pos) != 0x0A)
+        if (pos < max && charCodeAt(str, pos) != 0x0A)
           # garbage at the end of the line
           return false
         end

data/lib/motion-markdown-it/rules_block/state_block.rb

@@ -63,7 +63,7 @@ module MarkdownIt
         start = pos = indent = offset = 0
         len = s.length
         while pos < len
-          ch = s.charCodeAt(pos)
+          ch = charCodeAt(s, pos)
 
           if !indent_found
             if isSpace(ch)
@@ -140,7 +140,7 @@ module MarkdownIt
       def skipSpaces(pos)
         max = @src.length
         while pos < max
-          ch = @src.charCodeAt(pos)
+          ch = charCodeAt(@src, pos)
           break if !isSpace(ch)
           pos += 1
         end
@@ -153,7 +153,7 @@ module MarkdownIt
         return pos if pos <= min
 
         while (pos > min)
-          return pos + 1 if !isSpace(@src.charCodeAt(pos -= 1))
+          return pos + 1 if !isSpace(charCodeAt(@src, pos -= 1))
         end
         return pos
       end
@@ -163,7 +163,7 @@ module MarkdownIt
       def skipChars(pos, code)
         max = @src.length
         while pos < max
-          break if (@src.charCodeAt(pos) != code)
+          break if (charCodeAt(@src, pos) != code)
           pos += 1
         end
         return pos
@@ -175,7 +175,7 @@ module MarkdownIt
         return pos if pos <= min
 
         while (pos > min)
-          return (pos + 1) if code != @src.charCodeAt(pos -= 1)
+          return (pos + 1) if code != charCodeAt(@src, pos -= 1)
         end
         return pos
       end
@@ -202,7 +202,7 @@ module MarkdownIt
           end
 
           while first < last && lineIndent < indent
-            ch = @src.charCodeAt(first)
+            ch = charCodeAt(@src, first)
 
             if isSpace(ch)
               if ch === 0x09

data/lib/motion-markdown-it/rules_block/table.rb

@@ -23,7 +23,7 @@ module MarkdownIt
         backTicked   = false
         lastBackTick = 0
 
-        ch           = str.charCodeAt(pos)
+        ch           = charCodeAt(str, pos)
 
         while (pos < max)
           if ch == 0x60  # `
@@ -54,10 +54,10 @@ module MarkdownIt
             backTicked = false
             pos = lastBackTick + 1
           end
-          ch   = str.charCodeAt(pos)
+          ch   = charCodeAt(str, pos)
         end
 
-        result.push(str.slice_to_end(lastPos))
+        result.push(str[lastPos..-1])
 
         return result
       end
@@ -82,12 +82,12 @@ module MarkdownIt
         pos = state.bMarks[nextLine] + state.tShift[nextLine]
         return false if (pos >= state.eMarks[nextLine])
 
-        ch = state.src.charCodeAt(pos)
+        ch = charCodeAt(state.src, pos)
         pos += 1
         return false if (ch != 0x7C && ch != 0x2D && ch != 0x3A) # | or  - or :
 
         while pos < state.eMarks[nextLine]
-          ch = state.src.charCodeAt(pos)
+          ch = charCodeAt(state.src, pos)
           return false if (ch != 0x7C && ch != 0x2D && ch != 0x3A && !isSpace(ch)) # | or - or :
 
           pos += 1
@@ -110,9 +110,9 @@ module MarkdownIt
           end
 
           return false if (/^:?-+:?$/ =~ t).nil?
-          if (t.charCodeAt(t.length - 1) == 0x3A)  # ':'
-            aligns.push(t.charCodeAt(0) == 0x3A ? 'center' : 'right')
-          elsif (t.charCodeAt(0) == 0x3A)
+          if (charCodeAt(t, t.length - 1) == 0x3A)  # ':'
+            aligns.push(charCodeAt(t, 0) == 0x3A ? 'center' : 'right')
+          elsif (charCodeAt(t, 0) == 0x3A)
             aligns.push('left')
           else
             aligns.push('')

data/lib/motion-markdown-it/rules_core/linkify.rb

@@ -117,7 +117,7 @@ module MarkdownIt
               end
               if (lastPos < text.length)
                 token         = Token.new('text', '', 0)
-                token.content = text.slice_to_end(lastPos)
+                token.content = text[lastPos..-1]
                 token.level   = level
                 nodes.push(token)
               end

data/lib/motion-markdown-it/rules_core/smartquotes.rb

@@ -11,7 +11,7 @@ module MarkdownIt
 
       #------------------------------------------------------------------------------
       def self.replaceAt(str, index, ch)
-        return str[0, index] + ch + str.slice_to_end(index + 1)
+        return str[0, index] + ch + str[(index + 1)..-1]
       end
 
       #------------------------------------------------------------------------------
@@ -55,13 +55,13 @@ module MarkdownIt
             lastChar = 0x20
 
             if t.begin(0) - 1 >= 0
-              lastChar = text.charCodeAt(t.begin(0) - 1)
+              lastChar = charCodeAt(text, t.begin(0) - 1)
             else
               (i - 1).downto(0) do |j|
                 break if tokens[j].type == 'softbreak' || tokens[j].type == 'hardbreak' # lastChar defaults to 0x20
                 next if tokens[j].type != 'text'
 
-                lastChar = tokens[j].content.charCodeAt(tokens[j].content.length - 1)
+                lastChar = charCodeAt(tokens[j].content, tokens[j].content.length - 1)
                 break
               end
             end
@@ -72,13 +72,13 @@ module MarkdownIt
             nextChar = 0x20
 
             if pos < max
-              nextChar = text.charCodeAt(pos)
+              nextChar = charCodeAt(text, pos)
             else
               (i + 1).upto(tokens.length - 1) do |j|
                 break if tokens[j].type == 'softbreak' || tokens[j].type == 'hardbreak' # nextChar defaults to 0x20
                 next if tokens[j].type != 'text'
 
-                nextChar = tokens[j].content.charCodeAt(0)
+                nextChar = charCodeAt(tokens[j].content, 0)
                 break
               end
             end

data/lib/motion-markdown-it/rules_inline/autolink.rb

@@ -3,6 +3,7 @@
 module MarkdownIt
   module RulesInline
     class Autolink
+      extend Common::Utils
 
       EMAIL_RE    = /^<([a-zA-Z0-9.!#$\%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/
       AUTOLINK_RE = /^<([a-zA-Z][a-zA-Z0-9+.\-]{1,31}):([^<>\x00-\x20]*)>/
@@ -11,9 +12,9 @@ module MarkdownIt
       def self.autolink(state, silent)
         pos = state.pos
 
-        return false if (state.src.charCodeAt(pos) != 0x3C)  # <
+        return false if (charCodeAt(state.src, pos) != 0x3C)  # <
 
-        tail = state.src.slice_to_end(pos)
+        tail = state.src[pos..-1]
 
         return false if !tail.include?('>')
 

data/lib/motion-markdown-it/rules_inline/backticks.rb

@@ -3,19 +3,20 @@
 module MarkdownIt
   module RulesInline
     class Backticks
+      extend Common::Utils
 
       #------------------------------------------------------------------------------
       def self.backtick(state, silent)
         pos = state.pos
-        ch = state.src.charCodeAt(pos)
+        ch = charCodeAt(state.src, pos)
 
-        return false if (ch != 0x60)  #  ` 
+        return false if (ch != 0x60)  #  `
 
         start = pos
         pos  += 1
         max  = state.posMax
 
-        while (pos < max && state.src.charCodeAt(pos) == 0x60)  # `
+        while (pos < max && charCodeAt(state.src, pos) == 0x60)  # `
           pos += 1
         end
 
@@ -26,7 +27,7 @@ module MarkdownIt
         while ((matchStart = state.src.index('`', matchEnd)) != nil)
           matchEnd = matchStart + 1
 
-          while (matchEnd < max && state.src.charCodeAt(matchEnd) == 0x60) # `
+          while (matchEnd < max && charCodeAt(state.src, matchEnd) == 0x60) # `
             matchEnd += 1
           end
 

data/lib/motion-markdown-it/rules_inline/emphasis.rb

@@ -9,7 +9,7 @@ module MarkdownIt
       #
       def self.tokenize(state, silent)
         start   = state.pos
-        marker  = state.src.charCodeAt(start)
+        marker  = charCodeAt(state.src, start)
 
         return false if silent
 

data/lib/motion-markdown-it/rules_inline/entity.rb

@@ -14,23 +14,23 @@ module MarkdownIt
         pos = state.pos
         max = state.posMax
 
-        return false if state.src.charCodeAt(pos) != 0x26    # &
+        return false if charCodeAt(state.src, pos) != 0x26    # &
 
         if pos + 1 < max
-          ch = state.src.charCodeAt(pos + 1)
+          ch = charCodeAt(state.src, pos + 1)
 
           if ch == 0x23     # '#'
-            match = state.src.slice_to_end(pos).match(DIGITAL_RE)
+            match = state.src[pos..-1].match(DIGITAL_RE)
             if match
               if !silent
-                code = match[1][0].downcase == 'x' ? match[1].slice_to_end(1).to_i(16) : match[1].to_i
+                code = match[1][0].downcase == 'x' ? match[1][1..-1].to_i(16) : match[1].to_i
                 state.pending += isValidEntityCode(code) ? fromCodePoint(code) : fromCodePoint(0xFFFD)
               end
               state.pos += match[0].length
               return true
             end
           else
-            match = state.src.slice_to_end(pos).match(NAMED_RE)
+            match = state.src[pos..-1].match(NAMED_RE)
             if match
               if MarkdownIt::HTMLEntities::MAPPINGS[match[1]]
                 state.pending += fromCodePoint(MarkdownIt::HTMLEntities::MAPPINGS[match[1]]) if !silent

data/lib/motion-markdown-it/rules_inline/escape.rb

@@ -17,12 +17,12 @@ module MarkdownIt
         pos = state.pos
         max = state.posMax
 
-        return false if state.src.charCodeAt(pos) != 0x5C    # \
+        return false if charCodeAt(state.src, pos) != 0x5C    # \
 
         pos += 1
 
         if pos < max
-          ch = state.src.charCodeAt(pos)
+          ch = charCodeAt(state.src, pos)
 
           if ch < 256 && ESCAPED[ch] != 0
             state.pending += state.src[pos] if !silent
@@ -38,7 +38,7 @@ module MarkdownIt
             pos += 1
             # skip leading whitespaces from next line
             while pos < max
-              ch = state.src.charCodeAt(pos)
+              ch = charCodeAt(state.src, pos)
               break if !isSpace(ch)
               pos += 1
             end

data/lib/motion-markdown-it/rules_inline/html_inline.rb

@@ -1,11 +1,11 @@
 # Process html tags
 #------------------------------------------------------------------------------
 module MarkdownIt
-
   module RulesInline
     class HtmlInline
+      extend Common::Utils
       include MarkdownIt::Common::HtmlRe
-      
+
       #------------------------------------------------------------------------------
       def self.isLetter(ch)
         lc = ch | 0x20    # to lower case
@@ -20,12 +20,12 @@ module MarkdownIt
 
         # Check start
         max = state.posMax
-        if (state.src.charCodeAt(pos) != 0x3C || pos + 2 >= max)  #  < 
+        if (charCodeAt(state.src, pos) != 0x3C || pos + 2 >= max)  #  <
           return false
         end
 
         # Quick fail on second char
-        ch = state.src.charCodeAt(pos + 1)
+        ch = charCodeAt(state.src, pos + 1)
         if (ch != 0x21 &&  # !
             ch != 0x3F &&  # ?
             ch != 0x2F &&  # /
@@ -33,7 +33,7 @@ module MarkdownIt
           return false
         end
 
-        match = state.src.slice_to_end(pos).match(HTML_TAG_RE)
+        match = state.src[pos..-1].match(HTML_TAG_RE)
         return false if !match
 
         if !silent

data/lib/motion-markdown-it/rules_inline/image.rb

@@ -11,8 +11,8 @@ module MarkdownIt
         oldPos = state.pos
         max    = state.posMax
 
-        return false if (state.src.charCodeAt(state.pos) != 0x21) #  !
-        return false if (state.src.charCodeAt(state.pos + 1) != 0x5B) # [
+        return false if (charCodeAt(state.src, state.pos) != 0x21) #  !
+        return false if (charCodeAt(state.src, state.pos + 1) != 0x5B) # [
 
         labelStart  = state.pos + 2
         labelEnd    = state.md.helpers.parseLinkLabel(state, state.pos + 1, false)
@@ -21,7 +21,7 @@ module MarkdownIt
         return false if (labelEnd < 0)
 
         pos = labelEnd + 1
-        if (pos < max && state.src.charCodeAt(pos) == 0x28) # (
+        if (pos < max && charCodeAt(state.src, pos) == 0x28) # (
           #
           # Inline link
           #
@@ -30,7 +30,7 @@ module MarkdownIt
           #        ^^ skipping these spaces
           pos += 1
           while pos < max
-            code = state.src.charCodeAt(pos)
+            code = charCodeAt(state.src, pos)
             break if (!isSpace(code) && code != 0x0A)
             pos += 1
           end
@@ -53,7 +53,7 @@ module MarkdownIt
           #                ^^ skipping these spaces
           start = pos
           while pos < max
-            code = state.src.charCodeAt(pos)
+            code = charCodeAt(state.src, pos)
             break if (!isSpace(code) && code != 0x0A)
             pos += 1
           end
@@ -68,7 +68,7 @@ module MarkdownIt
             # [link](  <href>  "title"  )
             #                         ^^ skipping these spaces
             while pos < max
-              code = state.src.charCodeAt(pos);
+              code = charCodeAt(state.src, pos);
               break if (!isSpace(code) && code != 0x0A)
               pos += 1
             end
@@ -76,7 +76,7 @@ module MarkdownIt
             title = ''
           end
 
-          if (pos >= max || state.src.charCodeAt(pos) != 0x29) # )
+          if (pos >= max || charCodeAt(state.src, pos) != 0x29) # )
             state.pos = oldPos
             return false
           end
@@ -87,7 +87,7 @@ module MarkdownIt
           #
           return false if state.env[:references].nil?
 
-          if (pos < max && state.src.charCodeAt(pos) == 0x5B) # [
+          if (pos < max && charCodeAt(state.src, pos) == 0x5B) # [
             start = pos + 1
             pos   = state.md.helpers.parseLinkLabel(state, pos)
             if (pos >= 0)

data/lib/motion-markdown-it/rules_inline/link.rb

@@ -13,7 +13,7 @@ module MarkdownIt
         start           = state.pos
         parseReference  = true
 
-        return false if (state.src.charCodeAt(state.pos) != 0x5B) # [
+        return false if (charCodeAt(state.src, state.pos) != 0x5B) # [
 
         labelStart = state.pos + 1
         labelEnd   = state.md.helpers.parseLinkLabel(state, state.pos, true)
@@ -22,7 +22,7 @@ module MarkdownIt
         return false if (labelEnd < 0)
 
         pos = labelEnd + 1
-        if (pos < max && state.src.charCodeAt(pos) == 0x28) # (
+        if (pos < max && charCodeAt(state.src, pos) == 0x28) # (
           #
           # Inline link
           #
@@ -34,7 +34,7 @@ module MarkdownIt
           #        ^^ skipping these spaces
           pos += 1
           while pos < max
-            code = state.src.charCodeAt(pos)
+            code = charCodeAt(state.src, pos)
             break if (!isSpace(code) && code != 0x0A)
             pos += 1
           end
@@ -57,7 +57,7 @@ module MarkdownIt
           #                ^^ skipping these spaces
           start = pos
           while pos < max
-            code = state.src.charCodeAt(pos)
+            code = charCodeAt(state.src, pos)
             break if (!isSpace(code) && code != 0x0A)
             pos += 1
           end
@@ -72,7 +72,7 @@ module MarkdownIt
             # [link](  <href>  "title"  )
             #                         ^^ skipping these spaces
             while pos < max
-              code = state.src.charCodeAt(pos)
+              code = charCodeAt(state.src, pos)
               break if (!isSpace(code) && code != 0x0A)
               pos += 1
             end
@@ -80,7 +80,7 @@ module MarkdownIt
             title = ''
           end
 
-          if (pos >= max || state.src.charCodeAt(pos) != 0x29) # )
+          if (pos >= max || charCodeAt(state.src, pos) != 0x29) # )
             # parsing a valid shortcut link failed, fallback to reference
             parseReference = true
           end
@@ -93,7 +93,7 @@ module MarkdownIt
           #
           return false if state.env[:references].nil?
 
-          if (pos < max && state.src.charCodeAt(pos) == 0x5B)  # [
+          if (pos < max && charCodeAt(state.src, pos) == 0x5B)  # [
             start = pos + 1
             pos   = state.md.helpers.parseLinkLabel(state, pos)
             if (pos >= 0)

data/lib/motion-markdown-it/rules_inline/newline.rb

@@ -8,7 +8,7 @@ module MarkdownIt
       #------------------------------------------------------------------------------
       def self.newline(state, silent)
         pos = state.pos
-        return false if state.src.charCodeAt(pos) != 0x0A  # \n
+        return false if charCodeAt(state.src, pos) != 0x0A  # \n
 
         pmax  = state.pending.length - 1
         max   = state.posMax
@@ -18,8 +18,8 @@ module MarkdownIt
         # Pending string is stored in concat mode, indexed lookups will cause
         # convertion to flat mode.
         if !silent
-          if pmax >= 0 && state.pending.charCodeAt(pmax) == 0x20
-            if pmax >= 1 && state.pending.charCodeAt(pmax - 1) == 0x20
+          if pmax >= 0 && charCodeAt(state.pending, pmax) == 0x20
+            if pmax >= 1 && charCodeAt(state.pending, pmax - 1) == 0x20
               state.pending = state.pending.sub(/ +$/, '')
               state.push('hardbreak', 'br', 0)
             else
@@ -35,7 +35,7 @@ module MarkdownIt
         pos += 1
 
         # skip heading spaces for next line
-        while pos < max && isSpace(state.src.charCodeAt(pos))
+        while pos < max && isSpace(charCodeAt(state.src, pos))
           pos += 1
         end
 

data/lib/motion-markdown-it/rules_inline/state_inline.rb

@@ -65,19 +65,19 @@ module MarkdownIt
         left_flanking  = true
         right_flanking = true
         max            = @posMax
-        marker         = @src.charCodeAt(start)
+        marker         = charCodeAt(@src, start)
 
         # treat beginning of the line as a whitespace
-        lastChar = start > 0 ? @src.charCodeAt(start - 1) : 0x20
+        lastChar = start > 0 ? charCodeAt(@src, start - 1) : 0x20
 
-        while (pos < max && @src.charCodeAt(pos) == marker)
+        while (pos < max && charCodeAt(@src, pos) == marker)
           pos += 1
         end
 
         count = pos - start
 
         # treat end of the line as a whitespace
-        nextChar = pos < max ? @src.charCodeAt(pos) : 0x20
+        nextChar = pos < max ? charCodeAt(@src, pos) : 0x20
 
         isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(fromCodePoint(lastChar))
         isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(fromCodePoint(nextChar))

data/lib/motion-markdown-it/rules_inline/strikethrough.rb

@@ -9,7 +9,7 @@ module MarkdownIt
       #------------------------------------------------------------------------------
       def self.tokenize(state, silent)
         start = state.pos
-        marker = state.src.charCodeAt(start)
+        marker = charCodeAt(state.src, start)
 
         return false if silent
 

data/lib/motion-markdown-it/rules_inline/text.rb

@@ -4,6 +4,7 @@
 module MarkdownIt
   module RulesInline
     class Text
+      extend Common::Utils
 
       # Rule to skip pure text
       # '{}$%@~+=:' reserved for extentions
@@ -48,7 +49,7 @@ module MarkdownIt
       def self.text(state, silent)
         pos = state.pos
 
-        while pos < state.posMax && !self.isTerminatorChar(state.src.charCodeAt(pos))
+        while pos < state.posMax && !self.isTerminatorChar(charCodeAt(state.src, pos))
           pos += 1
         end
 

data/lib/motion-markdown-it/version.rb

@@ -1,5 +1,5 @@
 module MotionMarkdownIt
 
-  VERSION = '8.4.1.1'
+  VERSION = '8.4.1.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-markdown-it
 version: !ruby/object:Gem::Version
-  version: 8.4.1.1
+  version: 8.4.1.2
 platform: ruby
 authors:
 - Brett Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdurl-rb
@@ -80,7 +80,6 @@ files:
 - lib/motion-markdown-it/common/html_blocks.rb
 - lib/motion-markdown-it/common/html_re.rb
 - lib/motion-markdown-it/common/simpleidn.rb
-- lib/motion-markdown-it/common/string.rb
 - lib/motion-markdown-it/common/utils.rb
 - lib/motion-markdown-it/helpers/helper_wrapper.rb
 - lib/motion-markdown-it/helpers/parse_link_destination.rb
@@ -158,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby version markdown-it

data/lib/motion-markdown-it/common/string.rb

@@ -1,14 +0,0 @@
-class String
-  
-  # grab the remainder of the string starting at 'start'
-  #------------------------------------------------------------------------------
-  def slice_to_end(start)
-    self.slice(start...self.length)
-  end
-  
-  # port of Javascript function charCodeAt
-  #------------------------------------------------------------------------------
-  def charCodeAt(ch)
-    self[ch].ord unless self[ch].nil?
-  end
-end