motion-markdown-it 4.4.0 → 8.4.1

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

@@ -0,0 +1,40 @@
+# Merge adjacent text nodes into one, and re-calculate all token levels
+#------------------------------------------------------------------------------
+module MarkdownIt
+  module RulesInline
+    class TextCollapse
+
+      #------------------------------------------------------------------------------
+      def self.text_collapse(state)
+        level   = 0
+        tokens  = state.tokens
+        max     = state.tokens.length
+
+        last = curr = 0
+        while curr < max
+          # re-calculate levels
+          level += tokens[curr].nesting
+          tokens[curr].level = level
+
+          if tokens[curr].type == 'text' &&
+              curr + 1 < max &&
+              tokens[curr + 1].type == 'text'
+
+            # collapse two adjacent text nodes
+            tokens[curr + 1].content = tokens[curr].content + tokens[curr + 1].content
+          else
+            tokens[last] = tokens[curr] if curr != last
+
+            last += 1
+          end
+
+          curr += 1
+        end
+
+        if curr != last
+          tokens.slice!(last..max)
+        end
+      end
+    end
+  end
+end

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

@@ -111,7 +111,52 @@ module MarkdownIt
         @attrs = [ attrData ]
       end
     end
-    
+
+    # Token.attrSet(name, value)
+    #
+    # Set `name` attribute to `value`. Override old value if exists.
+    #------------------------------------------------------------------------------
+    def attrSet(name, value)
+      idx      = attrIndex(name)
+      attrData = [ name, value ]
+
+      if idx < 0
+        attrPush(attrData)
+      else
+        @attrs[idx] = attrData
+      end
+    end
+
+    # Token.attrGet(name)
+    #
+    # Get the value of attribute `name`, or null if it does not exist.
+    #------------------------------------------------------------------------------
+    def attrGet(name)
+      idx    = attrIndex(name)
+      value  = nil
+
+      if idx >= 0
+        value = @attrs[idx][1]
+      end
+
+      return value
+    end
+
+    # Token.attrJoin(name, value)
+    #
+    # Join value to existing attribute via space. Or create new attribute if not
+    # exists. Useful to operate with token classes.
+    #------------------------------------------------------------------------------
+    def attrJoin(name, value)
+      idx = attrIndex(name)
+
+      if idx < 0
+        attrPush([ name, value ])
+      else
+        @attrs[idx][1] = @attrs[idx][1] + ' ' + value
+      end
+    end
+
     #------------------------------------------------------------------------------
     def to_json
       {

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

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

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

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-describe "markdown-it" do 
+describe "markdown-it" do
 
   parser    = MarkdownIt::Parser.new({ html: true, langPrefix: '', typographer: true, linkify: true })
   datadir   = File.join(File.dirname(__FILE__), 'fixtures', 'markdown-it')
@@ -14,5 +14,5 @@ describe "markdown-it" do
         define_test(t, parser)
       end
     end
-  end  
+  end
 end

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

@@ -49,7 +49,7 @@ describe 'API' do
   it 'highlight' do
     md = MarkdownIt::Parser.new({
       highlight: lambda do |str, obj|
-        return '==' + str + '=='
+        return '<pre><code>==' + str + '==</code></pre>'
       end
     })
 
@@ -59,7 +59,7 @@ describe 'API' do
   #------------------------------------------------------------------------------
   it 'highlight escape by default' do
     md = MarkdownIt::Parser.new({highlight: lambda {|value, obj| return nil }})
-    
+
     # assert.strictEqual(md.render("```\n&\n```"), "<pre><code>&amp;\n</code></pre>\n");
     expect(md.render("```\n&\n```")).to eq "<pre><code>&amp;\n</code></pre>\n"
   end
@@ -68,7 +68,7 @@ describe 'API' do
   it 'force hardbreaks' do
     md = MarkdownIt::Parser.new({ breaks: false })
     expect(md.render("a\nb")).to eq "<p>a\nb</p>\n"
-    
+
     md.set({ breaks: true })
     expect(md.render("a\nb")).to eq "<p>a<br>\nb</p>\n"
     md.set({ xhtmlOut: true })
@@ -157,6 +157,13 @@ describe 'API' do
     expect(md.renderInline('_foo_')).to eq '<em>foo</em>'
   end
 
+  it 'input type check' do
+    md = MarkdownIt::Parser.new
+
+    expect {
+      md.render(nil)
+    }.to raise_error('Input data should be a String')
+  end
 end
 
 
@@ -213,8 +220,8 @@ describe 'Misc' do
 
     md.enable('emphasis')
 
-    expect(md.render('___foo___')).to eq "<p><strong><em>foo</em></strong></p>\n"
-    expect(md.renderInline('___foo___')).to eq '<strong><em>foo</em></strong>'
+    expect(md.render('___foo___')).to eq "<p><em><strong>foo</strong></em></p>\n"
+    expect(md.renderInline('___foo___')).to eq '<em><strong>foo</strong></em>'
   end
 
   #------------------------------------------------------------------------------
@@ -234,6 +241,26 @@ describe 'Misc' do
   #   assert.strictEqual(md.render('[foo](bar)'), '<p><a href="bar" target="_blank">foo</a></p>\n');
   # end
 
+  # TODO ------------------------------------------------------------------------------
+  # it 'Should normalize CR to LF' do
+  #   var md = markdownit();
+  #
+  #   assert.strictEqual(
+  #     md.render('# test\r\r - hello\r - world\r'),
+  #     md.render('# test\n\n - hello\n - world\n')
+  #   );
+  # end
+
+  # TODO ------------------------------------------------------------------------------
+  # it 'Should normalize CR+LF to LF' do
+  #   var md = markdownit();
+  #
+  #   assert.strictEqual(
+  #     md.render('# test\r\n\r\n - hello\r\n - world\r\n'),
+  #     md.render('# test\n\n - hello\n - world\n')
+  #   );
+  # end
+
 end
 
 
@@ -248,7 +275,7 @@ describe 'Url normalization' do
       expect(/example\.com/ =~ url).to_not eq nil
       return 'LINK'
     end
-    
+
     md.normalizeLinkText = lambda do |url|
       expect(/example\.com/ =~ url).to_not eq nil
       return 'TEXT'
@@ -281,25 +308,29 @@ describe 'Links validation' do
     expect(md.render('[test](http://example.com)')).to eq "<p>[test](http://example.com)</p>\n"
     expect(md.render('![test](http://example.com)')).to eq "<p>![test](http://example.com)</p>\n"
   end
-
 end
 
 
 #------------------------------------------------------------------------------
 describe 'maxNesting' do
 
-  #------------------------------------------------------------------------------
-  it 'Inline parser should not nest above limit' do
-    md = MarkdownIt::Parser.new({ maxNesting: 2 })
-    expect(md.render('*foo *bar *baz* bar* foo*')).to eq "<p><em>foo <em>bar *baz* bar</em> foo</em></p>\n"
-  end
-
   #------------------------------------------------------------------------------
   it 'Block parser should not nest above limit' do
     md = MarkdownIt::Parser.new({ maxNesting: 2 })
     expect(md.render(">foo\n>>bar\n>>>baz")).to eq "<blockquote>\n<p>foo</p>\n<blockquote></blockquote>\n</blockquote>\n"
   end
 
+  it 'Inline parser should not nest above limit' do
+    md = MarkdownIt::Parser.new({ maxNesting: 1 })
+
+    expect(md.render('[`foo`]()')).to eq "<p><a href=\"\">`foo`</a></p>\n"
+  end
+
+  it 'Inline nesting coverage' do
+    md = MarkdownIt::Parser.new({ maxNesting: 2 })
+
+    expect(md.render('[[[[[[[[[[[[[[[[[[foo]()')).to eq "<p>[[[[[[[[[[[[[[[[[[foo]()</p>\n"
+  end
 end
 
 #------------------------------------------------------------------------------
@@ -326,5 +357,50 @@ describe 'smartquotes' do
   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
+
+#------------------------------------------------------------------------------
+describe 'Token attributes' do
+
+  #------------------------------------------------------------------------------
+  it '.attrJoin' do
+    md = MarkdownIt::Parser.new
+
+    tokens = md.parse('```', {})
+    t      = tokens[0]
+
+    t.attrJoin('class', 'foo')
+    t.attrJoin('class', 'bar')
+
+    expect(md.renderer.render(tokens, md.options, {})).to eq "<pre><code class=\"foo bar\"></code></pre>\n"
+  end
+
+  #------------------------------------------------------------------------------
+  it '.attrSet' do
+    md = MarkdownIt::Parser.new
+
+    tokens = md.parse('```', {})
+    t      = tokens[0]
+
+    t.attrSet('class', 'foo')
+
+    expect(md.renderer.render(tokens, md.options, {})).to eq "<pre><code class=\"foo\"></code></pre>\n"
+
+    t.attrSet('class', 'bar')
+
+    expect(md.renderer.render(tokens, md.options, {})).to eq "<pre><code class=\"bar\"></code></pre>\n"
+  end
+
+  it '.attrGet' do
+    md = MarkdownIt::Parser.new
+
+    tokens = md.parse('```', {})
+    t      = tokens[0]
+
+    expect(t.attrGet('myattr')).to eq nil
+
+    t.attrSet('myattr', 'myvalue')
+
+    expect(t.attrGet('myattr')).to eq 'myvalue'
+  end
+end

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

@@ -18,7 +18,7 @@ def get_tests(specfile)
   tests          = []
   header_re      = /#+ /
   filename       = File.basename(specfile)
-  
+
   File.open(specfile) do |specf|
     specf.each_line do |line|
       line_number += 1

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 # make sure to have `--require spec_helper` in `.rspec` to have the
-# spec_helper.rb included automatically in spec files   
-require 'byebug'
-require 'benchmark'
+# spec_helper.rb included automatically in spec files
+require 'pry-byebug'
 require 'motion-markdown-it/testgen_helper'
 require 'motion-markdown-it'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-markdown-it
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 8.4.1
 platform: ruby
 authors:
 - Brett Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdurl-rb
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bacon-expect
   requirement: !ruby/object:Gem::Requirement
@@ -81,8 +81,8 @@ files:
 - 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/url_schemas.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
 - lib/motion-markdown-it/helpers/parse_link_label.rb
 - lib/motion-markdown-it/helpers/parse_link_title.rb
@@ -116,6 +116,7 @@ files:
 - lib/motion-markdown-it/rules_core/state_core.rb
 - lib/motion-markdown-it/rules_inline/autolink.rb
 - lib/motion-markdown-it/rules_inline/backticks.rb
+- lib/motion-markdown-it/rules_inline/balance_pairs.rb
 - lib/motion-markdown-it/rules_inline/emphasis.rb
 - lib/motion-markdown-it/rules_inline/entity.rb
 - lib/motion-markdown-it/rules_inline/escape.rb
@@ -126,9 +127,9 @@ files:
 - lib/motion-markdown-it/rules_inline/state_inline.rb
 - lib/motion-markdown-it/rules_inline/strikethrough.rb
 - lib/motion-markdown-it/rules_inline/text.rb
+- lib/motion-markdown-it/rules_inline/text_collapse.rb
 - lib/motion-markdown-it/token.rb
 - lib/motion-markdown-it/version.rb
-- spec/motion-markdown-it/bench_mark_spec.rb
 - spec/motion-markdown-it/commonmark_spec.rb
 - spec/motion-markdown-it/markdown_it_spec.rb
 - spec/motion-markdown-it/misc_spec.rb
@@ -157,17 +158,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby version markdown-it
 test_files:
-- spec/motion-markdown-it/bench_mark_spec.rb
+- spec/spec_helper.rb
+- spec/motion-markdown-it/token_spec.rb
 - spec/motion-markdown-it/commonmark_spec.rb
-- spec/motion-markdown-it/markdown_it_spec.rb
-- spec/motion-markdown-it/misc_spec.rb
-- spec/motion-markdown-it/ruler_spec.rb
 - spec/motion-markdown-it/testgen_helper.rb
-- spec/motion-markdown-it/token_spec.rb
 - spec/motion-markdown-it/utils_spec.rb
-- spec/spec_helper.rb
+- spec/motion-markdown-it/misc_spec.rb
+- spec/motion-markdown-it/ruler_spec.rb
+- spec/motion-markdown-it/markdown_it_spec.rb

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

@@ -1,173 +0,0 @@
-# List of valid url schemas, accorting to commonmark spec
-# http://jgm.github.io/CommonMark/spec.html#autolinks
-#------------------------------------------------------------------------------
-module MarkdownIt
-
-  URL_SCHEMAS = [
-    'coap',
-    'doi',
-    'javascript',
-    'aaa',
-    'aaas',
-    'about',
-    'acap',
-    'cap',
-    'cid',
-    'crid',
-    'data',
-    'dav',
-    'dict',
-    'dns',
-    'file',
-    'ftp',
-    'geo',
-    'go',
-    'gopher',
-    'h323',
-    'http',
-    'https',
-    'iax',
-    'icap',
-    'im',
-    'imap',
-    'info',
-    'ipp',
-    'iris',
-    'iris.beep',
-    'iris.xpc',
-    'iris.xpcs',
-    'iris.lwz',
-    'ldap',
-    'mailto',
-    'mid',
-    'msrp',
-    'msrps',
-    'mtqp',
-    'mupdate',
-    'news',
-    'nfs',
-    'ni',
-    'nih',
-    'nntp',
-    'opaquelocktoken',
-    'pop',
-    'pres',
-    'rtsp',
-    'service',
-    'session',
-    'shttp',
-    'sieve',
-    'sip',
-    'sips',
-    'sms',
-    'snmp',
-    'soap.beep',
-    'soap.beeps',
-    'tag',
-    'tel',
-    'telnet',
-    'tftp',
-    'thismessage',
-    'tn3270',
-    'tip',
-    'tv',
-    'urn',
-    'vemmi',
-    'ws',
-    'wss',
-    'xcon',
-    'xcon-userid',
-    'xmlrpc.beep',
-    'xmlrpc.beeps',
-    'xmpp',
-    'z39.50r',
-    'z39.50s',
-    'adiumxtra',
-    'afp',
-    'afs',
-    'aim',
-    'apt',
-    'attachment',
-    'aw',
-    'beshare',
-    'bitcoin',
-    'bolo',
-    'callto',
-    'chrome',
-    'chrome-extension',
-    'com-eventbrite-attendee',
-    'content',
-    'cvs',
-    'dlna-playsingle',
-    'dlna-playcontainer',
-    'dtn',
-    'dvb',
-    'ed2k',
-    'facetime',
-    'feed',
-    'finger',
-    'fish',
-    'gg',
-    'git',
-    'gizmoproject',
-    'gtalk',
-    'hcp',
-    'icon',
-    'ipn',
-    'irc',
-    'irc6',
-    'ircs',
-    'itms',
-    'jar',
-    'jms',
-    'keyparc',
-    'lastfm',
-    'ldaps',
-    'magnet',
-    'maps',
-    'market',
-    'message',
-    'mms',
-    'ms-help',
-    'msnim',
-    'mumble',
-    'mvn',
-    'notes',
-    'oid',
-    'palm',
-    'paparazzi',
-    'platform',
-    'proxy',
-    'psyc',
-    'query',
-    'res',
-    'resource',
-    'rmi',
-    'rsync',
-    'rtmp',
-    'secondlife',
-    'sftp',
-    'sgn',
-    'skype',
-    'smb',
-    'soldat',
-    'spotify',
-    'ssh',
-    'steam',
-    'svn',
-    'teamspeak',
-    'things',
-    'udp',
-    'unreal',
-    'ut2004',
-    'ventrilo',
-    'view-source',
-    'webcal',
-    'wtai',
-    'wyciwyg',
-    'xfire',
-    'xri',
-    'ymsgr'
-  ]
-
-end