motion-markdown-it 8.4.1.1 → 9.0.1

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

@@ -45,9 +45,9 @@ module MarkdownIt
         pushPending unless @pending.empty?
 
         token       = Token.new(type, tag, nesting);
-        @level     -= 1 if nesting < 0
+        @level     -= 1 if nesting < 0 # closing tag
         token.level = @level
-        @level     += 1 if nesting > 0
+        @level     += 1 if nesting > 0 # opening tag
 
         @pendingLevel = @level
         @tokens.push(token)
@@ -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))
@@ -113,4 +113,4 @@ module MarkdownIt
       end
     end
   end
-end
+end

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/rules_inline/text_collapse.rb

@@ -1,4 +1,10 @@
+# Clean up tokens after emphasis and strikethrough postprocessing:
 # Merge adjacent text nodes into one, and re-calculate all token levels
+#
+# This is necessary because initially emphasis delimiter markers (*, _, ~)
+# are treated as their own separate text tokens. Then emphasis rule either
+# leaves them as text (needed to merge with adjacent text) or turns them
+# into opening/closing tags (which messes up levels inside).
 #------------------------------------------------------------------------------
 module MarkdownIt
   module RulesInline
@@ -12,9 +18,11 @@ module MarkdownIt
 
         last = curr = 0
         while curr < max
-          # re-calculate levels
-          level += tokens[curr].nesting
+          # re-calculate levels after emphasis/strikethrough turns some text nodes
+          # into opening/closing tags
+          level -= 1 if tokens[curr].nesting < 0 # closing tag
           tokens[curr].level = level
+          level += 1 if tokens[curr].nesting > 0 # opening tag
 
           if tokens[curr].type == 'text' &&
               curr + 1 < max &&

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

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

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/spec/spec_helper.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: motion-markdown-it
 version: !ruby/object:Gem::Version
-  version: 8.4.1.1
+  version: 9.0.1
 platform: ruby
 authors:
 - Brett Walker
 - Vitaly Puzrin
 - Alex Kocharin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdurl-rb
@@ -46,28 +46,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: bacon-expect
+  name: motion-expect
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: Ruby/RubyMotion version of markdown-it
 email: github@digitalmoksha.com
 executables: []
@@ -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
@@ -142,7 +141,7 @@ homepage: https://github.com/digitalmoksha/motion-markdown-it
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,9 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.3.23
+signing_key:
 specification_version: 4
 summary: Ruby version markdown-it
 test_files:

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