motion-markdown-it 4.2.2.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25f046cd230dec30329ee31997f8d1c4820e888
-  data.tar.gz: 989cfb0a87fd1efbbc4f332e63aff23e4a1c3349
+  metadata.gz: cb7bc35a96283f575397326f35cc15789b4700fe
+  data.tar.gz: feacd41709859ddb7b8fd30f288af2a53c80c562
 SHA512:
-  metadata.gz: 08c3e0baeb9071852ea680700f33222ece16cec1a8edc5e33c1b8c56cc2c8efb1442a439e8c4ca1838bdec1adb47e21072f50c1eb4496c0172d4da39c5337ff2
-  data.tar.gz: a3a58cdd184efba1d5820d5a8b10e75efa8205f5d938e0f9b87c709320fb8f71c9a899999eecd203004b98fb6f309250746e245da1cfba49c2996af1d15eb375
+  metadata.gz: d64baed7b2ed7ecadc4b3a31b9d723502ab564e08871401b0d9b2d7dfeb017e12c09656692639f6d1b5dc911a0cc4605c8d832181e2c5b05c43d0e725c6edec0
+  data.tar.gz: 6dc2d585c57113b580d398c9370db04a22c7cb8c8470af53857c8a1b5df67601368c4aa557cf4b791201a3cef7e1a7d063190857d059f24508a546d6b77ac874

data/README.md

@@ -1,10 +1,12 @@
 # motion-markdown-it
 
 [![Gem Version](https://badge.fury.io/rb/motion-markdown-it.svg)](http://badge.fury.io/rb/motion-markdown-it)
+[![Build Status](https://travis-ci.org/digitalmoksha/motion-markdown-it.svg?branch=master)](https://travis-ci.org/digitalmoksha/motion-markdown-it)
 
+https://travis-ci.org/digitalmoksha/motion-markdown-it.svg?branch=master
 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.2.2
+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.4.0
 
 __[Javascript Live demo](https://markdown-it.github.io)__
 
@@ -22,7 +24,7 @@ The benefit of this project, for me at least, is to have a standardized CommonMa
 
 ## Performance
 
-Performance is still an issue.  While it performs reasonably well with small to medium files, it degrades for large files.  Work in progres...
+Performance is still an issue.  While it performs reasonably well with small to medium files, it degrades for large files.  Work in progress...
 
 ## Table of content
 

data/lib/motion-markdown-it.rb

@@ -10,7 +10,7 @@ if defined?(Motion::Project::Config)
   require 'linkify-it-rb'
   require 'mdurl-rb'
   require 'uc.micro-rb'
-  
+
 else
   
   require 'mdurl-rb'

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

@@ -2,59 +2,66 @@
 # http://jgm.github.io/CommonMark/spec.html#html-blocks
 #------------------------------------------------------------------------------
 module MarkdownIt
-  HTML_BLOCKS = {}
-
-  [
+  HTML_BLOCKS = [
+    'address',
     'article',
     'aside',
-    'button',
+    'base',
+    'basefont',
     'blockquote',
     'body',
-    'canvas',
     'caption',
+    'center',
     'col',
     'colgroup',
     'dd',
+    'details',
+    'dialog',
+    'dir',
     'div',
     'dl',
     'dt',
-    'embed',
     'fieldset',
     'figcaption',
     'figure',
     'footer',
     'form',
+    'frame',
+    'frameset',
     'h1',
-    'h2',
-    'h3',
-    'h4',
-    'h5',
-    'h6',
+    'head',
     'header',
-    'hgroup',
     'hr',
-    'iframe',
+    'html',
+    'legend',
     'li',
-    'map',
-    'object',
+    'link',
+    'main',
+    'menu',
+    'menuitem',
+    'meta',
+    'nav',
+    'noframes',
     'ol',
-    'output',
+    'optgroup',
+    'option',
     'p',
+    'param',
     'pre',
-    'progress',
-    'script',
     'section',
-    'style',
+    'source',
+    'title',
+    'summary',
     'table',
     'tbody',
     'td',
-    'textarea',
     'tfoot',
     'th',
-    'tr',
     'thead',
-    'ul',
-    'video'
-  ].each { |name| HTML_BLOCKS[name] = true }
+    'title',
+    'tr',
+    'track',
+    'ul'
+  ].freeze
 
 end

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

@@ -23,6 +23,8 @@ module MarkdownIt
 
       HTML_TAG_RE     = Regexp.new('^(?:' + OPEN_TAG + '|' + CLOSE_TAG + '|' + COMMENT +
                             '|' + PROCESSING + '|' + DECLARATION + '|' + CDATA + ')')
+
+      HTML_OPEN_CLOSE_TAG_RE = Regexp.new('^(?:' + OPEN_TAG + '|' + CLOSE_TAG + ')')
     end
   end
 end

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

@@ -25,10 +25,11 @@ module MarkdownIt
     #------------------------------------------------------------------------------
     def self.fence(tokens, idx, options, env, renderer)
       token     = tokens[idx]
+      info      = token.info ? unescapeAll(token.info).strip : ''
       langName  = ''
 
-      if !token.info.empty?
-        langName = unescapeAll(token.info.strip.split(/\s+/)[0])
+      if !info.empty?
+        langName = info.split(/\s+/)[0]
         token.attrPush([ 'class', options[:langPrefix] + langName ])
       end
 

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

@@ -4,66 +4,69 @@ module MarkdownIt
   module RulesBlock
     class HtmlBlock
 
-      HTML_TAG_OPEN_RE  = /^<([a-zA-Z][a-zA-Z0-9]{0,14})[\s\/>]/
-      HTML_TAG_CLOSE_RE = /^<\/([a-zA-Z][a-zA-Z0-9]{0,14})[\s>]/
-
-      #------------------------------------------------------------------------------
-      def self.isLetter(ch)
-        lc = ch | 0x20; # to lower case
-        return (lc >= 0x61) && (lc <= 0x7a)  # >= a and <= z
-      end
+      HTML_OPEN_CLOSE_TAG_RE = MarkdownIt::Common::HtmlRe::HTML_OPEN_CLOSE_TAG_RE
+
+      # An array of opening and corresponding closing sequences for html tags,
+      # last argument defines whether it can terminate a paragraph or not
+      #
+      HTML_SEQUENCES = [
+        [ /^<(script|pre|style)(?=(\s|>|$))/i, /<\/(script|pre|style)>/i, true ],
+        [ /^<!--/,        /-->/,   true ],
+        [ /^<\?/,         /\?>/,   true ],
+        [ /^<![A-Z]/,     />/,     true ],
+        [ /^<!\[CDATA\[/, /\]\]>/, true ],
+        [ Regexp.new('^</?(' + MarkdownIt::HTML_BLOCKS.join('|') + ')(?=(\\s|/?>|$))', 'i'), /^$/, true ],
+        [ Regexp.new(HTML_OPEN_CLOSE_TAG_RE.source + '\\s*$'),  /^$/, false ]
+      ];
 
       #------------------------------------------------------------------------------
       def self.html_block(state, startLine, endLine, silent)
-        pos   = state.bMarks[startLine]
+        pos   = state.bMarks[startLine] + state.tShift[startLine]
         max   = state.eMarks[startLine]
-        shift = state.tShift[startLine]
-
-        pos += shift
 
         return false if !state.md.options[:html]
-        return false if shift > 3 || (pos + 2) >= max
         return false if state.src.charCodeAt(pos) != 0x3C    # < 
 
-        ch = state.src.charCodeAt(pos + 1)
+        lineText = state.src.slice(pos...max)
 
-        if ch == 0x21 || ch == 0x3F #  ! or ?
-          # Directive start / comment start / processing instruction start
-          return true if silent
-
-        elsif ch == 0x2F || isLetter(ch)  # /
-
-          # Probably start or end of tag
-          if ch == 0x2F   # \
-            # closing tag
-            match = state.src.slice(pos...max).match(HTML_TAG_CLOSE_RE)
-            return false if (!match)
-          else
-            # opening tag
-            match = state.src.slice(pos...max).match(HTML_TAG_OPEN_RE)
-            return false if !match
-          end
-
-          # Make sure tag name is valid
-          return false if HTML_BLOCKS[match[1].downcase] != true
-          return true if silent
+        i = 0
+        while i < HTML_SEQUENCES.length
+          break if HTML_SEQUENCES[i][0].match(lineText)
+          i += 1
+        end
+        
+        return false if i == HTML_SEQUENCES.length
 
-        else
-          return false
+        if silent
+          # true if this sequence can be a terminator, false otherwise
+          return HTML_SEQUENCES[i][2]
         end
 
-        # If we are here - we detected HTML block.
-        # Let's roll down till empty line (block end).
         nextLine = startLine + 1
-        while nextLine < state.lineMax && !state.isEmpty(nextLine)
-          nextLine += 1
+
+        # If we are here - we detected HTML block.
+        # Let's roll down till block end.
+        if !HTML_SEQUENCES[i][1].match(lineText)
+          while nextLine < endLine
+            break if state.tShift[nextLine] < state.blkIndent
+
+            pos = state.bMarks[nextLine] + state.tShift[nextLine]
+            max = state.eMarks[nextLine]
+            lineText = state.src.slice(pos...max)
+
+            if HTML_SEQUENCES[i][1].match(lineText)
+              nextLine += 1 if lineText.length != 0
+              break
+            end
+            nextLine += 1
+          end
         end
 
         state.line = nextLine
 
         token         = state.push('html_block', '', 0)
-        token.map     = [ startLine, state.line ]
-        token.content = state.getLines(startLine, nextLine, 0, true)
+        token.map     = [ startLine, nextLine ]
+        token.content = state.getLines(startLine, nextLine, state.blkIndent, true)
 
         return true
       end

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

@@ -32,8 +32,9 @@ module MarkdownIt
       # or -1 on fail.
       #------------------------------------------------------------------------------
       def self.skipOrderedListMarker(state, startLine)
-        pos = state.bMarks[startLine] + state.tShift[startLine]
-        max = state.eMarks[startLine]
+        start = state.bMarks[startLine] + state.tShift[startLine]
+        pos   = start
+        max   = state.eMarks[startLine]
 
         # List marker should have at least 2 chars (digit + dot)
         return -1 if (pos + 1 >= max)
@@ -52,6 +53,11 @@ module MarkdownIt
           pos += 1
 
           if (ch >= 0x30 && ch <= 0x39) #  >= 0 && <= 9
+
+            # List marker should have no more than 9 digits
+            # (prevents integer overflow in browsers)
+            return -1 if pos - start >= 10
+
             next
           end
 
@@ -114,7 +120,7 @@ module MarkdownIt
           start       = state.bMarks[startLine] + state.tShift[startLine]
           markerValue = state.src[start, posAfterMarker - start - 1].to_i
           token       = state.push('ordered_list_open', 'ol', 1)
-          if (markerValue > 1)
+          if (markerValue != 1)
             token.attrs = [ [ 'start', markerValue ] ]
           end
 

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

@@ -138,6 +138,19 @@ module MarkdownIt
           pos += 1
         end
 
+        if (pos < max && str.charCodeAt(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
+            title = ''
+            pos = destEndPos
+            lines = destEndLineNo
+            while (pos < max && str.charCodeAt(pos) == 0x20)  # space
+              pos += 1
+            end
+          end
+        end
+
         if (pos < max && str.charCodeAt(pos) != 0x0A)
           # garbage at the end of the line
           return false

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

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

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

@@ -1,44 +1,44 @@
-require 'kramdown'
-
-runs          = 50
-files         = ['mdsyntax.text', 'mdbasics.text']
-benchmark_dir = File.join(File.dirname(__FILE__), '../../benchmark')
-
-puts
-puts "Running tests on #{Time.now.strftime("%Y-%m-%d")} under #{RUBY_DESCRIPTION}"
-
-files.each do |file|
-  data = File.read(File.join(benchmark_dir, file))
-  puts
-  puts "==> Test using file #{file} and #{runs} runs"
-
-  # results = Benchmark.bmbm do |b|
-  results = Benchmark.bm do |b|
-    b.report("motion-markdown-it #{MotionMarkdownIt::VERSION}") do
-      parser = MarkdownIt::Parser.new({ html: true, linkify: true, typographer: true })
-      runs.times { parser.render(data) }
-    end
-    b.report("kramdown #{Kramdown::VERSION}") { runs.times { Kramdown::Document.new(data).to_html } }
-    # b.report("markdown-it 4.0.1 JS") { runs.times { NSApplication.sharedApplication.delegate.markdown_it(data) } }
-    # b.report(" hoedown 3.0.1") do
-    #   runs.times do
-    #     document = HoedownDocument.new
-    #     document.initWithHtmlRendererWithFlags(FLAGS)
-    #     html = document.renderMarkdownString(data)
-    #   end
-    # end
-  end
-
-  # puts
-  # puts "Real time of X divided by real time of kramdown"
-  # kd = results.shift.real
-  # %w[hoedown].each do |name|
-  #   puts name.ljust(19) << (results.shift.real/kd).round(4).to_s
-  # end
-end
-
-describe "Benchmark Test" do
-  it "benchmarks with mdsyntax.text and mdbasics.text" do
-    expect(true).to eq true
-  end
-end
+# require 'kramdown'
+#
+# runs          = 50
+# files         = ['mdsyntax.text', 'mdbasics.text']
+# benchmark_dir = File.join(File.dirname(__FILE__), '../../benchmark')
+#
+# puts
+# puts "Running tests on #{Time.now.strftime("%Y-%m-%d")} under #{RUBY_DESCRIPTION}"
+#
+# files.each do |file|
+#   data = File.read(File.join(benchmark_dir, file))
+#   puts
+#   puts "==> Test using file #{file} and #{runs} runs"
+#
+#   # results = Benchmark.bmbm do |b|
+#   results = Benchmark.bm do |b|
+#     b.report("motion-markdown-it #{MotionMarkdownIt::VERSION}") do
+#       parser = MarkdownIt::Parser.new({ html: true, linkify: true, typographer: true })
+#       runs.times { parser.render(data) }
+#     end
+#     b.report("kramdown #{Kramdown::VERSION}") { runs.times { Kramdown::Document.new(data).to_html } }
+#     # b.report("markdown-it 4.0.1 JS") { runs.times { NSApplication.sharedApplication.delegate.markdown_it(data) } }
+#     # b.report(" hoedown 3.0.1") do
+#     #   runs.times do
+#     #     document = HoedownDocument.new
+#     #     document.initWithHtmlRendererWithFlags(FLAGS)
+#     #     html = document.renderMarkdownString(data)
+#     #   end
+#     # end
+#   end
+#
+#   # puts
+#   # puts "Real time of X divided by real time of kramdown"
+#   # kd = results.shift.real
+#   # %w[hoedown].each do |name|
+#   #   puts name.ljust(19) << (results.shift.real/kd).round(4).to_s
+#   # end
+# end
+#
+# describe "Benchmark Test" do
+#   it "benchmarks with mdsyntax.text and mdbasics.text" do
+#     expect(true).to eq true
+#   end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-markdown-it
 version: !ruby/object:Gem::Version
-  version: 4.2.2.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Brett Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdurl-rb
@@ -46,9 +46,23 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bacon-expect
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"