mato 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd113838ab44d0b792e313dbbd87ea0f15aed0fe
-  data.tar.gz: 74113f53d71ab9114cee1d316d0500bafdf24f8e
+  metadata.gz: 2a90e7f93e54d37654d73461b98bb894e5ac5ba2
+  data.tar.gz: 79023df2717584da84317c669a0368674ed31bc8
 SHA512:
-  metadata.gz: 434e444ea0a41f79b997bdb4cf10b555cfa5f4cd3da204e831bc8268ac21cdce2e7471031515b7710baeeff10a6780f2e4f7b78f12f3cb35c53f1d27e401f21a
-  data.tar.gz: 14a67e122aafc2234b021343fb968b539691c69862adf89e4d471df3d29e8dae264f27c761f2d3d25ed48f460a4cdca2aad980c956dc7326763b9e35b194c33a
+  metadata.gz: 9c43c85c5b67a41a7c9a27434863920fd68365b0ab4facf4b053ab5174b5db5d931d249dac09f0f77cdb990273ccc7a923a0c1129e27353429d9341723fdc00b
+  data.tar.gz: 4f87d7a392f7d9b0a53453a92c1cef0f496d14f99c3520c34e89ae8bdb436ddda781d8f661dbc325cddc1e05ff38eddcbcdd441299fc5064f262c8673d1f470c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # The revision history of Mato
 
+## v1.2.0 - 2017/08/28
+
+https://github.com/bitjourney/mato/compare/v1.1.0...v1.2.0
+
+* *Experimental*: `Mato::Processor#convert` to convert X-flavored markdown to CommonMark
+  * Currently only `flavor: :redcarpet` is supported
+
 ## v1.1.0 - 2017/08/24
 
 https://github.com/bitjourney/mato/compare/v1.0.3...v1.1.0

data/Gemfile

@@ -9,7 +9,7 @@ gem "rouge", ">= 2.0"
 gem "sanitize", ">= 3.0"
 
 gem "bundler", ">= 1.14"
-gem "rake", ">= 10.0"
 gem "m"
 gem "minitest"
 gem "minitest-power_assert"
+gem "rake", ">= 10.0"

data/lib/mato.rb

@@ -4,6 +4,7 @@
 require_relative "./mato/version"
 require_relative "./mato/config"
 require_relative "./mato/processor"
+require_relative "./mato/converter"
 
 # filter classes
 require_relative "./mato/html_filters/token_link"

data/lib/mato/converter.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'set'
+
+# Convert X-flavored markdown to CommonMark
+module Mato
+  class Converter
+
+    FLAVORES = Set.new([
+                         :redcarpet, # legacy GFM uses it
+                       ]).freeze
+
+    attr_reader :processor
+    attr_reader :content
+    attr_reader :flavor
+
+    # @return [Array<String>]
+    attr_reader :content_lines
+
+    def initialize(processor, content, flavor)
+      unless FLAVORES.include?(flavor)
+        raise "Unsupported flavor #{flavor.inspect}, it must be one of: #{FLAVORES.map(&:inspect).join(' ')}"
+      end
+
+      @processor = processor
+      @content = content
+      @content_lines = content.split(/\n/)
+      @flavor = flavor
+    end
+
+    def run
+      # @type [CommonMarker::Node]
+      document = processor.parse_markdown(content)
+
+      convert_headings!(document)
+
+      content_lines.join("\n").tap do |c|
+        # fixup newlines removed by String#split
+        content.scan(/\n+\z/) do |matched|
+          c << matched
+        end
+      end
+    end
+
+    def convert_headings!(document)
+      document.walk.select do |node|
+        node.type == :text &&
+          node.sourcepos[:start_column] == 1 &&
+          node.parent.type == :paragraph &&
+          node.parent.parent.type == :document
+      end.reverse.each do |node|
+        replacement = node.string_content.gsub(/\A(#+)(?=\S)/, '\1 ')
+
+        if node.string_content != replacement
+          pos = node.sourcepos
+          content_lines[pos[:start_line] - 1][(pos[:start_column] - 1)...pos[:end_column]] = replacement
+        end
+      end
+    end
+  end
+end

data/lib/mato/html_filters/bare_inline_element.rb

@@ -8,19 +8,18 @@
 module Mato
   module HtmlFilters
     class BareInlineElement
-      STANDALONE_ININE_ELEMENTS = Set.new([
-        "img",
-        "input",
-        "textarea",
-      ])
+      STANDALONE_INLINE_ELEMENTS = Set.new([
+                                             "img",
+                                             "input",
+                                             "textarea",
+                                           ])
 
       def call(doc)
         doc.children.each do |node|
-          if STANDALONE_ININE_ELEMENTS.include?(node.name)
-            parent = Nokogiri::HTML.fragment('<p/>')
-            parent.child.add_child(node.dup)
-            node.replace(parent)
-          end
+          next unless STANDALONE_INLINE_ELEMENTS.include?(node.name)
+          parent = Nokogiri::HTML.fragment('<p/>')
+          parent.child.add_child(node.dup)
+          node.replace(parent)
         end
       end
     end

data/lib/mato/processor.rb

@@ -59,5 +59,9 @@ module Mato
     def parse_html(html)
       config.html_parser.parse(html)
     end
+
+    def convert(content, flavor:)
+      Mato::Converter.new(self, content, flavor).run
+    end
   end
 end

data/lib/mato/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mato
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mato
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - FUJI Goro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -61,6 +61,7 @@ files:
 - lib/mato/anchor_builder.rb
 - lib/mato/concerns/html_node_checkable.rb
 - lib/mato/config.rb
+- lib/mato/converter.rb
 - lib/mato/document.rb
 - lib/mato/html_filters/bare_inline_element.rb
 - lib/mato/html_filters/mention_link.rb