motion-markdown-it 4.1.0.2 → 4.2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 214800d2799b974abec953888695a55f613bf244
-  data.tar.gz: 16fed8197c4f45298e8afe3994ff701c49bf3b61
+  metadata.gz: c25f046cd230dec30329ee31997f8d1c4820e888
+  data.tar.gz: 989cfb0a87fd1efbbc4f332e63aff23e4a1c3349
 SHA512:
-  metadata.gz: 73a7c3eb82df1344805e860c58ad815618cbbe727a2cbd42350687d6c559a7bf7b6672f70f22d5234bbf679fc10896263192f6e617899663d7dfb0967b273c88
-  data.tar.gz: 357565490abb891b1bf6cc3d5b31240aa8b0da3c6e8f512e9440276bfcd750676c634989c76abe8db96109c86d207fe7b215526b0919535eac70f823d4870d1e
+  metadata.gz: 08c3e0baeb9071852ea680700f33222ece16cec1a8edc5e33c1b8c56cc2c8efb1442a439e8c4ca1838bdec1adb47e21072f50c1eb4496c0172d4da39c5337ff2
+  data.tar.gz: a3a58cdd184efba1d5820d5a8b10e75efa8205f5d938e0f9b87c709320fb8f71c9a899999eecd203004b98fb6f309250746e245da1cfba49c2996af1d15eb375

data/README.md

@@ -4,14 +4,17 @@
 
 Ruby/RubyMotion version of Markdown-it (CommonMark compliant and extendable)
 
-This gem is a port of the [markdown-it Javascript package](https://github.com/markdown-it/markdown-it) by Vitaly Puzrin and Alex Kocharin. Currently synced with markdown-it 4.1.0
+This gem is a port of the [markdown-it Javascript package](https://github.com/markdown-it/markdown-it) by Vitaly Puzrin and Alex Kocharin. Currently synced with markdown-it 4.2.2
 
 __[Javascript Live demo](https://markdown-it.github.io)__
 
-- Supports the CommonMark spec + syntax extensions + sugar (URL autolinking, typographer)
+Follows the __[CommonMark spec](http://spec.commonmark.org/)__ + adds syntax extensions & sugar (URL autolinking, typographer).
 - Configurable syntax. You can add new rules and even replace existing ones.
-- High speed
+- [Safe](https://github.com/markdown-it/markdown-it/tree/master/docs/security.md) by default.
 - Community-written plugins
+- Community-written plugins
+  * [Ruby/RubyMotion](https://github.com/digitalmoksha/motion-markdown-it-plugins)
+  * [original javascript plugins](https://www.npmjs.org/browse/keyword/markdown-it-plugin) and [other packages](https://www.npmjs.org/browse/keyword/markdown-it) on npm.
 
 ## Benefit
 
@@ -25,6 +28,7 @@ Performance is still an issue.  While it performs reasonably well with small to
 
 - [Install](#install)
 - [Usage examples](#usage-examples)
+- [Plugins](#plugins)
 - [References / Thanks](#references--thanks)
 - [License](#license)
 
@@ -101,7 +105,10 @@ parser = MarkdownIt::Parser.new({
   typographer:  false,
 
   # Double + single quotes replacement pairs, when typographer enabled,
-  # and smartquotes on. Set doubles to '«»' for Russian, '„“' for German.
+  # and smartquotes on. Could be either a String or an Array.
+  #
+  # For example, you can use '«»„“' for Russian, '„“‚‘' for German,
+  # and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
   quotes: '“”‘’',
 
   # Highlighter function. Should return escaped HTML,
@@ -110,6 +117,19 @@ parser = MarkdownIt::Parser.new({
 })
 ```
 
+## Plugins
+
+Plugins can be used to extend the syntax and functionality.  A [sample set of plugins](https://github.com/digitalmoksha/motion-markdown-it-plugins) has been created based on those already created for the javascript version.  Included are:
+
+* [Abbreviations](https://github.com/digitalmoksha/motion-markdown-it-plugins/tree/master/lib/motion-markdown-it-plugins/abbr)
+* [Checkbox/Tasklists](https://github.com/digitalmoksha/motion-markdown-it-plugins/tree/master/lib/motion-markdown-it-plugins/checkbox_replace)
+* [Containers](https://github.com/digitalmoksha/motion-markdown-it-plugins/tree/master/lib/motion-markdown-it-plugins/container)
+* [Definition Lists](https://github.com/digitalmoksha/motion-markdown-it-plugins/tree/master/lib/motion-markdown-it-plugins/deflist)
+* [Insert](https://github.com/digitalmoksha/motion-markdown-it-plugins/tree/master/lib/motion-markdown-it-plugins/ins)
+* [Mark](https://github.com/digitalmoksha/motion-markdown-it-plugins/tree/master/lib/motion-markdown-it-plugins/mark)
+* [Subscript](https://github.com/digitalmoksha/motion-markdown-it-plugins/tree/master/lib/motion-markdown-it-plugins/sub)
+* [Superscript](https://github.com/digitalmoksha/motion-markdown-it-plugins/tree/master/lib/motion-markdown-it-plugins/sup)
+
 <!--
 ### Plugins load
 
@@ -179,7 +199,7 @@ Via plugins:
 ### Manage rules
 
 By default all rules are enabled, but can be restricted by options. On plugin
-load all it's rules are enabled automatically.
+load all its rules are enabled automatically.
 
 ```js
 // Activate/deactivate rules, with curring
@@ -197,9 +217,9 @@ md = require('markdown-it')('full', {
 ```
 
 
-## Benchmark
+## Benchmark (for Javascript version)
 
-Here is result of readme parse at MB Pro Retina 2013 (2.4 GHz):
+Here is the result of readme parse at MB Pro Retina 2013 (2.4 GHz):
 
 ```bash
 $ benchmark/benchmark.js readme
@@ -217,7 +237,7 @@ __Note.__ CommonMark version runs with [simplified link normalizers](https://git
 for more "honest" compare. Difference is ~ 1.5x.
 
 As you can see, `markdown-it` doesn't pay with speed for it's flexibility.
-Slowdown of "full" version caused by additional features, not available in
+Slowdown of "full" version caused by additional features not available in
 other implementations.
 
 -->

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

@@ -8,8 +8,9 @@ CONFIG = {
 }
 
 #------------------------------------------------------------------------------
-# This validator does not pretend to functionality of full weight sanitizers.
-# It's a tradeoff between default security, simplicity and usability.
+# This validator can prohibit more than really needed to prevent XSS. It's a
+# tradeoff to keep code simple and to be secure by default.
+#
 # If you need different setup - override validator method as you wish. Or
 # replace it with dummy function and use external sanitizer.
 
@@ -151,9 +152,10 @@ module MarkdownIt
     # - __typographer__  - `false`. Set `true` to enable [some language-neutral
     #   replacement](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.js) +
     #   quotes beautification (smartquotes).
-    # - __quotes__ - `“”‘’`, string. Double + single quotes replacement pairs, when
-    #   typographer enabled and smartquotes on. Set doubles to '«»' for Russian,
-    #   '„“' for German.
+    # - __quotes__ - `“”‘’`, String or Array. Double + single quotes replacement
+    #   pairs, when typographer enabled and smartquotes on. For example, you can
+    #   use `'«»„“'` for Russian, `'„“‚‘'` for German, and
+    #   `['«\xA0', '\xA0»', '‹\xA0', '\xA0›']` for French (including nbsp).
     # - __highlight__ - `nil`. Highlighter function for fenced code blocks.
     #   Highlighter `function (str, lang)` should return escaped HTML. It can also
     #   return nil if the source was not changed and should be escaped externaly.
@@ -257,8 +259,10 @@ module MarkdownIt
       # MarkdownIt#validateLink(url) -> Boolean
       #
       # Link validation function. CommonMark allows too much in links. By default
-      # we disable `javascript:` and `vbscript:` schemas. You can change this
-      # behaviour.
+      # we disable `javascript:`, `vbscript:`, `file:` schemas, and almost all `data:...` schemas
+      # except some embedded image types.
+      #
+      # You can change this behaviour:
       #
       # ```javascript
       # var md = require('markdown-it')();

data/lib/motion-markdown-it/presets/commonmark.rb

@@ -16,7 +16,10 @@ module MarkdownIt
             typographer:  false,
 
             # Double + single quotes replacement pairs, when typographer enabled,
-            # and smartquotes on. Set doubles to '«»' for Russian, '„“' for German.
+            # and smartquotes on. Could be either a String or an Array.
+            #
+            # For example, you can use '«»„“' for Russian, '„“‚‘' for German,
+            # and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
             quotes: "\u201c\u201d\u2018\u2019", # “”‘’
 
             # Highlighter function. Should return escaped HTML,

data/lib/motion-markdown-it/presets/default.rb

@@ -16,7 +16,10 @@ module MarkdownIt
             typographer:  false,
 
             # Double + single quotes replacement pairs, when typographer enabled,
-            # and smartquotes on. Set doubles to '«»' for Russian, '„“' for German.
+            # and smartquotes on. Could be either a String or an Array.
+            #
+            # For example, you can use '«»„“' for Russian, '„“‚‘' for German,
+            # and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
             quotes: "\u201c\u201d\u2018\u2019", # “”‘’ 
 
             # Highlighter function. Should return escaped HTML,

data/lib/motion-markdown-it/presets/zero.rb

@@ -17,7 +17,10 @@ module MarkdownIt
             typographer:  false,
 
             # Double + single quotes replacement pairs, when typographer enabled,
-            # and smartquotes on. Set doubles to '«»' for Russian, '„“' for German.
+            # and smartquotes on. Could be either a String or an Array.
+            #
+            # For example, you can use '«»„“' for Russian, '„“‚‘' for German,
+            # and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
             quotes: "\u201c\u201d\u2018\u2019", # “”‘’
 
             # Highlighter function. Should return escaped HTML,

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

@@ -209,7 +209,7 @@ module MarkdownIt
     # * ```javascript
     # * var md = require('markdown-it')();
     # *
-    # * md.core.ruler.push('emphasis', 'my_rule', function replace(state) {
+    # * md.core.ruler.push('my_rule', function replace(state) {
     # *   //...
     # * });
     # * ```

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

@@ -55,6 +55,8 @@ module MarkdownIt
         #     ```
         nextLine = startLine + 1
         while nextLine < endLine
+          break if state.tShift[nextLine] < oldIndent
+          
           pos = state.bMarks[nextLine] + state.tShift[nextLine]
           max = state.eMarks[nextLine]
 
@@ -104,7 +106,7 @@ module MarkdownIt
           #
           # Any negative number will do the job here, but it's better for it
           # to be large enough to make any bugs obvious.
-          state.tShift[nextLine] = -1337
+          state.tShift[nextLine] = -1
           nextLine += 1
         end
 

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

@@ -17,6 +17,9 @@ module MarkdownIt
           # it's considered a lazy continuation regardless of what's there
           (nextLine += 1) && next if (state.tShift[nextLine] - state.blkIndent > 3)
 
+          # quirk for blockquotes, this line should already be checked by that rule
+          (nextLine += 1) && next if state.tShift[nextLine] < 0
+
           # Some tags can terminate paragraph without empty line.
           terminate = false
           0.upto(terminatorRules.length - 1) do |i|

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

@@ -33,10 +33,12 @@ module MarkdownIt
         terminatorRules = state.md.block.ruler.getRules('reference')
 
         while nextLine < endLine && !state.isEmpty(nextLine)
-          nextLine += 1
           # this would be a code block normally, but after paragraph
           # it's considered a lazy continuation regardless of what's there
-          next if (state.tShift[nextLine] - state.blkIndent > 3)
+          (nextLine += 1) && next if (state.tShift[nextLine] - state.blkIndent > 3)
+
+          # quirk for blockquotes, this line should already be checked by that rule
+          (nextLine += 1) && next if state.tShift[nextLine] < 0
 
           # Some tags can terminate paragraph without empty line.
           terminate = false
@@ -47,6 +49,7 @@ module MarkdownIt
             end
           end
           break if (terminate)
+          nextLine += 1
         end
 
         str      = state.getLines(startLine, nextLine, state.blkIndent, false).strip
@@ -140,11 +143,16 @@ module MarkdownIt
           return false
         end
 
+        label = normalizeReference(str.slice(1...labelEnd))
+        if label == ''
+          # CommonMark 0.20 disallows empty labels
+          return false
+        end
+
         # Reference can not terminate anything. This check is for safety only.
         # istanbul ignore if
         return true if (silent)
 
-        label = normalizeReference(str.slice(1...labelEnd))
         if (state.env[:references].nil?)
           state.env[:references] = {}
         end

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

@@ -150,7 +150,7 @@ module MarkdownIt
         # Opt: don't use push queue for single line
         if (line + 1) == line_end
           first = @bMarks[line] + [@tShift[line], indent].min
-          last = keepLastLF ? @bMarks[line_end] : @eMarks[line_end - 1]
+          last  = @eMarks[line_end - 1] + (keepLastLF ? 1 : 0)
           return @src.slice(first...last)
         end
 

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

@@ -14,15 +14,21 @@ module MarkdownIt
 
       #------------------------------------------------------------------------------
       def self.escapedSplit(str)
-        result  = []
-        pos     = 0
-        max     = str.length
-        escapes = 0
-        lastPos = 0
-        ch      = str.charCodeAt(pos)
+        result       = []
+        pos          = 0
+        max          = str.length
+        escapes      = 0
+        lastPos      = 0
+        backTicked   = false
+        lastBackTick = 0
+        
+        ch           = str.charCodeAt(pos)
 
         while (pos < max)
-          if (ch == 0x7c && (escapes % 2 == 0))     # '|'
+          if (ch == 0x60 && (escapes % 2 == 0))  # `
+            backTicked   = !backTicked
+            lastBackTick = pos
+          elsif (ch == 0x7c && (escapes % 2 == 0) && !backTicked)     # '|'
             result.push(str[lastPos...pos])
             lastPos = pos + 1
           elsif (ch == 0x5c)   # '\'
@@ -32,6 +38,12 @@ module MarkdownIt
           end
 
           pos += 1
+          # If there was an un-closed backtick, go back to just after
+          # the last backtick, but as if it was a normal character
+          if (pos == max && backTicked)
+            backTicked = false
+            pos = lastBackTick + 1
+          end
           ch   = str.charCodeAt(pos)
         end
 

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

@@ -1,7 +1,5 @@
 # Simple typographyc replacements
 #
-# '' → ‘’
-# "" → “”. Set '«»' for Russian, '„“' for German, empty to disable
 # (c) (C) → ©
 # (tm) (TM) → ™
 # (r) (R) → ®

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

@@ -105,15 +105,27 @@ module MarkdownIt
                 break if (stack[j][:level] < thisLevel)
                 if (item[:single] == isSingle && stack[j][:level] == thisLevel)
                   item = stack[j]
-                  if (isSingle)
-                    tokens[item[:token]].content = replaceAt(tokens[item[:token]].content, item[:pos], state.md.options[:quotes][2])
-                    token.content = replaceAt(token.content, t.begin(0), state.md.options[:quotes][3])
+                  if isSingle
+                    openQuote  = state.md.options[:quotes][2]
+                    closeQuote = state.md.options[:quotes][3]
                   else
-                    tokens[item[:token]].content = replaceAt(tokens[item[:token]].content, item[:pos], state.md.options[:quotes][0])
-                    token.content = replaceAt(token.content, t.begin(0), state.md.options[:quotes][1])
+                    openQuote  = state.md.options[:quotes][0]
+                    closeQuote = state.md.options[:quotes][1]
                   end
-                  # stack.length = j
-                  stack = (j < stack.length ? stack.slice(0, j) : stack.fill(nil, stack.length...(j)))
+                  
+                  # replace token.content *before* tokens[item.token].content,
+                  # because, if they are pointing at the same token, replaceAt
+                  # could mess up indices when quote length != 1
+                  token.content = replaceAt(token.content, t.begin(0), closeQuote)
+                  tokens[item[:token]].content = replaceAt(tokens[item[:token]].content, item[:pos], openQuote)
+
+                  pos += closeQuote.length - 1
+                  pos += (openQuote.length - 1) if item[:token] == i
+
+                  text = token.content
+                  max  = text.length
+                  
+                  stack = (j < stack.length ? stack.slice(0, j) : stack.fill(nil, stack.length...(j)))  # stack.length = j
                   continue_outer_loop = true    # continue OUTER;
                   break
                 end

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

@@ -9,11 +9,11 @@ module MarkdownIt
       # "start" should point at a valid marker
       #------------------------------------------------------------------------------
       def self.scanDelims(state, start)
-        pos       = start
-        can_open  = true
-        can_close = true
-        max       = state.posMax
-        marker    = state.src.charCodeAt(start)
+        pos            = start
+        left_flanking  = true
+        right_flanking = true
+        max            = state.posMax
+        marker         = state.src.charCodeAt(start)
 
         # treat beginning of the line as a whitespace
         lastChar = start > 0 ? state.src.charCodeAt(start - 1) : 0x20
@@ -22,10 +22,6 @@ module MarkdownIt
           pos += 1
         end
 
-        if (pos >= max)
-          can_open = false
-        end
-
         count = pos - start
 
         # treat end of the line as a whitespace
@@ -38,27 +34,28 @@ module MarkdownIt
         isNextWhiteSpace = isWhiteSpace(nextChar)
 
         if (isNextWhiteSpace)
-          can_open = false
+          left_flanking = false
         elsif (isNextPunctChar)
           if (!(isLastWhiteSpace || isLastPunctChar))
-            can_open = false
+            left_flanking = false
           end
         end
 
         if (isLastWhiteSpace)
-          can_close = false
+          right_flanking = false
         elsif (isLastPunctChar)
           if (!(isNextWhiteSpace || isNextPunctChar))
-            can_close = false
+            right_flanking = false
           end
         end
 
         if (marker == 0x5F) # _
-          if (can_open && can_close)
-            # "_" inside a word can neither open nor close an emphasis
-            can_open  = false
-            can_close = isNextPunctChar
-          end
+          # "_" inside a word can neither open nor close an emphasis
+          can_open  = left_flanking  && (!right_flanking || isLastPunctChar)
+          can_close = right_flanking && (!left_flanking  || isNextPunctChar)
+        else
+          can_open  = left_flanking
+          can_close = right_flanking
         end
 
         return { can_open: can_open, can_close: can_close, delims: count }

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

@@ -1,5 +1,5 @@
 module MotionMarkdownIt
 
-  VERSION = '4.1.0.2'
+  VERSION = '4.2.2.0'
 
 end

data/spec/motion-markdown-it/bench_mark_spec.rb

@@ -14,7 +14,7 @@ files.each do |file|
 
   # results = Benchmark.bmbm do |b|
   results = Benchmark.bm do |b|
-    b.report("motion-markdown-it 0.1.0") do
+    b.report("motion-markdown-it #{MotionMarkdownIt::VERSION}") do
       parser = MarkdownIt::Parser.new({ html: true, linkify: true, typographer: true })
       runs.times { parser.render(data) }
     end

data/spec/motion-markdown-it/misc_spec.rb

@@ -4,7 +4,7 @@ describe 'API' do
   it 'constructor' do
     expect {
       MarkdownIt::Parser.new('bad preset')
-    }.to raise_error
+    }.to raise_error(StandardError)
 
     # options should override preset
     md = MarkdownIt::Parser.new(:commonmark, { html: false })
@@ -23,7 +23,7 @@ describe 'API' do
 
     expect {
       md.configure
-    }.to raise_error
+    }.to raise_error(StandardError)
   end
 
   class TestPlugin
@@ -131,11 +131,11 @@ describe 'API' do
     md = MarkdownIt::Parser.new
     expect {
       md.enable([ 'link', 'code', 'invalid' ])
-    }.to raise_error
+    }.to raise_error(StandardError)
 
     expect {
       md.disable([ 'link', 'code', 'invalid' ])
-    }.to raise_error
+    }.to raise_error(StandardError)
 
     expect {
       md.enable([ 'link', 'code' ])
@@ -301,3 +301,30 @@ describe 'maxNesting' do
   end
 
 end
+
+#------------------------------------------------------------------------------
+describe 'smartquotes' do
+  md = MarkdownIt::Parser.new({
+    typographer: true,
+
+    # all strings have different length to make sure
+    # we didn't accidentally count the wrong one
+    quotes: [ '[[[', ']]', '(((((', '))))' ]
+  })
+
+  #------------------------------------------------------------------------------
+  it 'Should support multi-character quotes' do
+    expect(md.render('"foo" \'bar\'')).to eq "<p>[[[foo]] (((((bar))))</p>\n"
+  end
+
+  #------------------------------------------------------------------------------
+  it 'Should support nested multi-character quotes' do
+    expect(md.render('"foo \'bar\' baz"')).to eq "<p>[[[foo (((((bar)))) baz]]</p>\n"
+  end
+
+  #------------------------------------------------------------------------------
+  it 'Should support multi-character quotes in different tags' do
+    expect(md.render('"a *b \'c *d* e\' f* g"')).to eq "<p>[[[a <em>b (((((c <em>d</em> e)))) f</em> g]]</p>\n"
+  end
+
+end

data/spec/motion-markdown-it/utils_spec.rb

@@ -26,7 +26,7 @@ describe 'Utils' do
     expect(assign({ a: 1 }, nil, { b: 2 })).to eq ({ a: 1, b: 2 })
     expect {
       assign({}, 123)
-    }.to raise_error
+    }.to raise_error(StandardError)
   end
 
   #------------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-markdown-it
 version: !ruby/object:Gem::Version
-  version: 4.1.0.2
+  version: 4.2.2.0
 platform: ruby
 authors:
 - Brett Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdurl-rb