pot_markdown 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc4198215a42e5cd6a0036b8a54a0c26b81cbd2b
-  data.tar.gz: b8ffad58b41b1a57cfdca3da7a593c2711fbfab5
+  metadata.gz: 25749f2c547bae4016ee64ba355ca02196fdb602
+  data.tar.gz: 7418b2154bc42f8befd82dacf38e7b3841c1c06e
 SHA512:
-  metadata.gz: ab1aa42c91f747191b806c75c8116b309d53b655cc015b3b51c1e6a9598e8c5f358a5aba7a4312eed00d2a862ae8cf12d31342cd9872a41839168613637bf13c
-  data.tar.gz: 8207218248059fc0a5d6ba3062d0ed2c9e76b4524147425fcfd54e85f33276d46278d4dcdaa741ad365a2ff43c84773dbd1e66fc2e1ea290979d1a5dcf391b47
+  metadata.gz: 25877400f6b2a83947387aabd20f16158770ecb35685369b4df861b61a3c1dfcd4d8a2eba8b0cdc5d76c206bc7bd9cc92216f2e7208b4fada401f52be3cc1977
+  data.tar.gz: bb66231610f8e01e1175672b58ff8a72b3891d826bd4d5c843ee884a2f51fd797a3da8a590bbd68262e0037366675b34a7432f5c9f1d4dc652d4ce2415ff657c

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
     - tmp/**/*
     - vendor/**/*
     - test/files/**/*
+    - lib/kramdown/parser/pot_markdown/table.rb
 
 AsciiComments:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,12 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-02-28 03:04:33 +0900 using RuboCop version 0.37.2.
+# on 2016-03-12 02:43:19 +0900 using RuboCop version 0.37.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
+# Offense count: 6
 Metrics/AbcSize:
-  Max: 35
-
+  Max: 33

data/lib/kramdown/parser/pot_markdown/atx_header.rb

@@ -0,0 +1,24 @@
+module Kramdown
+  module Parser
+    class PotMarkdown
+      def parse_atx_header
+        # ↓ removed in pot_markdown
+        # return false if !after_block_boundary?
+
+        start_line_number = @src.current_line_number
+        @src.check(ATX_HEADER_MATCH)
+        level = @src[1]
+        text = @src[2].to_s.strip
+        id = @src[3]
+        return false if text.empty?
+
+        @src.pos += @src.matched_size
+        el = new_block_el(:header, nil, nil, level: level.length, raw_text: text, location: start_line_number)
+        add_text(text, el)
+        el.attr['id'] = id if id
+        @tree.children << el
+        true
+      end
+    end
+  end
+end

data/lib/kramdown/parser/pot_markdown/code_block.rb

@@ -0,0 +1,35 @@
+module Kramdown
+  module Parser
+    class PotMarkdown
+      FENCED_CODEBLOCK_MATCH = /^(([~`]){3,})\s*?((\w[\w\:\.-]*)(?:\?\S*)?)?\s*?\n(.*?)^\1\2*\s*?\n/m
+
+      def parse_codeblock_fenced
+        if @src.check(self.class::FENCED_CODEBLOCK_MATCH)
+          start_line_number = @src.current_line_number
+          @src.pos += @src.matched_size
+          el = new_block_el(:codeblock, @src[5], nil, location: start_line_number)
+          lang = @src[3].to_s.strip
+          unless lang.empty?
+            lang, filename = lang.split(':', 2)
+            if filename.nil? && lang.include?('.')
+              filename = lang
+              lang = Rouge::Lexer.guess_by_filename(filename).name.match(/[^\:]+\z/).to_s.downcase
+            end
+            el.options[:lang] = lang
+            el.attr['data-lang'] = lang
+            if filename
+              el.attr['class'] = "language-#{lang} has-filename"
+              el.attr['data-filename'] = filename
+            else
+              el.attr['class'] = "language-#{lang}"
+            end
+          end
+          @tree.children << el
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/kramdown/parser/pot_markdown/table.rb

@@ -0,0 +1,161 @@
+module Kramdown
+  module Parser
+    class PotMarkdown
+      TABLE_SEP_LINE = /^([+|: -]*?-[+|: -]*?)[ \t]*\n/
+      TABLE_HSEP_ALIGN = /[ ]?(:?)-+(:?)[ ]?/
+      TABLE_FSEP_LINE = /^[+|: =]*?=[+|: =]*?[ \t]*\n/
+      TABLE_ROW_LINE = /^(.*?)[ \t]*\n/
+      TABLE_PIPE_CHECK = /(?:^\|)/
+      TABLE_LINE = /#{TABLE_PIPE_CHECK}.*?\|\s*\n/
+      TABLE_START = /^#{OPT_SPACE}(?=\S)#{TABLE_LINE}/
+
+      def parse_table_pot
+        return false unless after_block_boundary?
+
+        saved_pos = @src.save_pos
+        orig_pos = @src.pos
+        table = new_block_el(:table, nil, nil, alignment: [], location: @src.current_line_number)
+        leading_pipe = (@src.check(TABLE_LINE) =~ /^\s*\|/)
+        @src.scan(TABLE_SEP_LINE)
+
+        rows = []
+        has_footer = false
+        columns = 0
+
+        add_container = lambda do |type, force|
+          if !has_footer || type != :tbody || force
+            cont = Element.new(type)
+            cont.children = rows
+            rows = []
+            table.children << cont
+          end
+        end
+
+        until @src.eos?
+          break unless @src.check(TABLE_LINE)
+          if @src.scan(TABLE_SEP_LINE)
+            if rows.empty?
+              # nothing to do, ignoring multiple consecutive separator lines
+            elsif table.options[:alignment].empty? && !has_footer
+              add_container.call(:thead, false)
+              table.options[:alignment] = @src[1].scan(TABLE_HSEP_ALIGN).map do |left, right|
+                (left.empty? && right.empty? && :default) || (right.empty? && :left) || (left.empty? && :right) || :center
+              end
+            else # treat as normal separator line
+              add_container.call(:tbody, false)
+            end
+          elsif @src.scan(TABLE_FSEP_LINE)
+            add_container.call(:tbody, true) unless rows.empty?
+            has_footer = true
+          elsif @src.scan(TABLE_ROW_LINE)
+            trow = Element.new(:tr)
+
+            # parse possible code spans on the line and correctly split the line into cells
+            env = save_env
+            cells = []
+            @src[1].split(/(<code.*?>.*?<\/code>)/).each_with_index do |str, i|
+              if i.odd?
+                (cells.empty? ? cells : cells.last) << str
+              else
+                reset_env(src: Kramdown::Utils::StringScanner.new(str, @src.current_line_number))
+                root = Element.new(:root)
+                parse_spans(root, nil, [:codespan])
+
+                root.children.each do |c|
+                  if c.type == :raw_text
+                    # Only on Ruby 1.9: f, *l = c.value.split(/(?<!\\)\|/).map {|t| t.gsub(/\\\|/, '|')}
+                    f, *l = c.value.split(/\\\|/, -1).map { |t| t.split(/\|/, -1) }.inject([]) do |memo, t|
+                      memo.last << "|#{t.shift}" if memo.size > 0
+                      memo.concat(t)
+                    end
+                    (cells.empty? ? cells : cells.last) << f
+                    cells.concat(l)
+                  else
+                    delim = (c.value.scan(/`+/).max || '') + '`'
+                    tmp = "#{delim}#{' ' if delim.size > 1}#{c.value}#{' ' if delim.size > 1}#{delim}"
+                    (cells.empty? ? cells : cells.last) << tmp
+                  end
+                end
+              end
+            end
+            restore_env(env)
+
+            cells.shift if leading_pipe && cells.first.strip.empty?
+            cells.pop if cells.last.strip.empty?
+            cells.each do |cell_text|
+              tcell = Element.new(:td)
+              tcell.children << Element.new(:raw_text, cell_text.strip)
+              trow.children << tcell
+            end
+            columns = [columns, cells.length].max
+            rows << trow
+          else
+            break
+          end
+        end
+
+        unless before_block_boundary?
+          @src.revert_pos(saved_pos)
+          return false
+        end
+
+        # Parse all lines of the table with the code span parser
+        env = save_env
+        l_src = ::Kramdown::Utils::StringScanner.new(extract_string(orig_pos...(@src.pos - 1), @src),
+                                                     @src.current_line_number)
+        reset_env(src: l_src)
+        root = Element.new(:root)
+        parse_spans(root, nil, [:codespan, :span_html])
+        restore_env(env)
+
+        # Check if each line has at least one unescaped pipe that is not inside a code span/code
+        # HTML element
+        # Note: It doesn't matter that we parse *all* span HTML elements because the row splitting
+        # algorithm above only takes <code> elements into account!
+        pipe_on_line = false
+        while (c = root.children.shift)
+          lines = c.value.split(/\n/)
+          if c.type == :codespan
+            if lines.size > 2 || (lines.size == 2 && !pipe_on_line)
+              break
+            elsif lines.size == 2 && pipe_on_line
+              pipe_on_line = false
+            end
+          else
+            break if lines.size > 1 && !pipe_on_line && lines.first !~ /^#{TABLE_PIPE_CHECK}/
+            pipe_on_line = (lines.size > 1 ? false : pipe_on_line) || (lines.last =~ /^#{TABLE_PIPE_CHECK}/)
+          end
+        end
+        @src.revert_pos(saved_pos) && (return false) unless pipe_on_line
+
+        add_container.call(has_footer ? :tfoot : :tbody, false) unless rows.empty?
+
+        unless table.children.any? { |el| el.type == :tbody }
+          warning("Found table without body on line #{table.options[:location]} - ignoring it")
+          @src.revert_pos(saved_pos)
+          return false
+        end
+
+        # adjust all table rows to have equal number of columns, same for alignment defs
+        table.children.each do |kind|
+          kind.children.each do |row|
+            (columns - row.children.length).times do
+              row.children << Element.new(:td)
+            end
+          end
+        end
+        if table.options[:alignment].length > columns
+          table.options[:alignment] = table.options[:alignment][0...columns]
+        else
+          table.options[:alignment] += [:default] * (columns - table.options[:alignment].length)
+        end
+
+        @tree.children << table
+
+        true
+      end
+
+      define_parser(:table_pot, TABLE_START)
+    end
+  end
+end

data/lib/kramdown/parser/pot_markdown.rb

@@ -6,85 +6,15 @@ module Kramdown
     class PotMarkdown < Kramdown::Parser::GFM
       def initialize(source, options)
         super
-        @span_parsers << :strikethrough_pot unless methods.include?(:parse_strikethrough_gfm)
-      end
-
-      def parse_atx_header
-        # ↓ removed in pot_markdown
-        # return false if !after_block_boundary?
-
-        start_line_number = @src.current_line_number
-        @src.check(ATX_HEADER_MATCH)
-        level = @src[1]
-        text = @src[2].to_s.strip
-        id = @src[3]
-        return false if text.empty?
-
-        @src.pos += @src.matched_size
-        el = new_block_el(:header, nil, nil, level: level.length, raw_text: text, location: start_line_number)
-        add_text(text, el)
-        el.attr['id'] = id if id
-        @tree.children << el
-        true
-      end
-
-      FENCED_CODEBLOCK_MATCH = /^(([~`]){3,})\s*?((\w[\w\:\.-]*)(?:\?\S*)?)?\s*?\n(.*?)^\1\2*\s*?\n/m
 
-      def parse_codeblock_fenced
-        if @src.check(self.class::FENCED_CODEBLOCK_MATCH)
-          start_line_number = @src.current_line_number
-          @src.pos += @src.matched_size
-          el = new_block_el(:codeblock, @src[5], nil, location: start_line_number)
-          lang = @src[3].to_s.strip
-          unless lang.empty?
-            lang, filename = lang.split(':', 2)
-            if filename.nil? && lang.include?('.')
-              filename = lang
-              lang = Rouge::Lexer.guess_by_filename(filename).name.match(/[^\:]+\z/).to_s.downcase
-            end
-            el.options[:lang] = lang
-            el.attr['data-lang'] = lang
-            if filename
-              el.attr['class'] = "language-#{lang} has-filename"
-              el.attr['data-filename'] = filename
-            else
-              el.attr['class'] = "language-#{lang}"
-            end
-          end
-          @tree.children << el
-          true
-        else
-          false
-        end
+        # replace table
+        @block_parsers.insert(@block_parsers.index(:table), :table_pot)
+        @block_parsers.delete(:table)
       end
 
-      unless instance_methods.include?(:parse_strikethrough_gfm)
-        STRIKETHROUGH_POT_DELIMITER = /~~/
-
-        def parse_strikethrough_pot
-          start_line_number = @src.current_line_number
-          result = @src.scan(STRIKETHROUGH_POT_DELIMITER)
-          saved_pos = @src.save_pos
-
-          if @src.pre_match =~ /\s\Z/ && @src.match?(/\s/)
-            add_text(result)
-            return
-          end
-
-          text = @src.scan_until(/#{result}/)
-          if text
-            text.sub!(/#{result}\Z/, '')
-            del = Element.new(:html_element, 'del', {}, category: :span, line: start_line_number)
-            del.children << Element.new(:text, text, category: :span, line: start_line_number)
-            @tree.children << del
-          else
-            @src.revert_pos(saved_pos)
-            add_text(result)
-          end
-        end
-
-        define_parser(:strikethrough_pot, STRIKETHROUGH_POT_DELIMITER, '~')
-      end
+      require 'kramdown/parser/pot_markdown/atx_header'
+      require 'kramdown/parser/pot_markdown/code_block'
+      require 'kramdown/parser/pot_markdown/table'
     end
   end
 end

data/lib/pot_markdown/version.rb

@@ -1,3 +1,3 @@
 module PotMarkdown
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/pot_markdown.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'html-pipeline', '~> 2.0'
-  spec.add_dependency 'kramdown', '~> 1.9'
+  spec.add_dependency 'kramdown', '~> 1.10'
   spec.add_dependency 'rouge'
   spec.add_dependency 'gemoji'
   spec.add_dependency 'rinku'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pot_markdown
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ru_shalm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +223,9 @@ files:
 - bin/console
 - bin/setup
 - lib/kramdown/parser/pot_markdown.rb
+- lib/kramdown/parser/pot_markdown/atx_header.rb
+- lib/kramdown/parser/pot_markdown/code_block.rb
+- lib/kramdown/parser/pot_markdown/table.rb
 - lib/pot_markdown.rb
 - lib/pot_markdown/filters/checkbox_filter.rb
 - lib/pot_markdown/filters/markdown_filter.rb