hamdown_core 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e09fb9def3ca4225b54b91fdf00fd78deb1c89c0b066e3a70c97e31e99a0c91
-  data.tar.gz: 902d448c467dc0978c588a6d847a2a4ff8644f6dd8ec66e0a9950c2bdd22dcaf
+  metadata.gz: 6795f7bf5f3a006d7b20f07596503d70e3912b567aceb7179164335405752fb2
+  data.tar.gz: b9f66727409c5fff800a8db0a19d16f9b5d3d073470e78f699b81caad917f198
 SHA512:
-  metadata.gz: ce384aa4492c9ccffddbaae57dedc083557a8e33511ac548211d6187e832966d41ac3e67c3c077b37d98cd2e412c4d7d2798dfdaccc3f1415048f5c6e93b1cf4
-  data.tar.gz: 87877b212812dfa8b235de83bf7dec76613fe65a7e26db7c02b7b67b93cdc22a3b30a7d44b91f04f71936b14fccfaf00cb24ae97489f967cdfb7dabef8ac7746
+  metadata.gz: 9905f6d3da2e838fc073ab52c8ece27d064a426bb51cfb77bbc4c134e37d49f0cc8475a0ff28a3f7fe2bf372c72002037c5310e5e051be93b19d972f3cd4f56b
+  data.tar.gz: d57d27a4ae097f7ee0dda7fb96f553121dc4298062fa5c9bf701650a91d106a490e93a36b5c297bbfca754c0e12549e8af62938fd6965fc284f05f6b653bda90

data/README.md

@@ -62,3 +62,4 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 - Fix code by Rubocop
 - To write tests
+- add code markdown block feature

data/input.hd

@@ -1,30 +1,18 @@
-%div.container
-  = "first"
-  # HamdownCore or hamdown_core
 
-  %div.container2
-    = "first.2"
-    # Helo sdf sdf
-    sdf sdf sdfs df %sd sdf %sdfsdfs
-    asd sdf sdf sdf sdfs dfsf
 
+<h3 id="and-some-lists">And some lists</h3>
+<h4 id="unordered-list">Unordered list</h4>
 
+<ul>
+  <li>ULItem 1</li>
+  <li>ULItem 2</li>
+</ul>
 
-= "second"
-<!--This means we can use HTML elements in Markdown, such as the comment
-element, and they won't be affected by a markdown parser. However, if you
-create an HTML element in your markdown file, you cannot use markdown syntax
-within that element's contents.-->
+<ol>
+  <li>OLItem 1</li>
+  <li>OLItem 2</li>
+</ol>
 
-= "third"
-# This is an <h1>
 
-## This is an <h2>
+<h4 id="ordered-list">Ordered list</h4>
 
-= 'and just test'
-hello it is just text
-
-text text text
-text text
-
-lololo

data/lib/hamdown_core/ast.rb

@@ -134,7 +134,7 @@ module HamdownCore
       end
     end
 
-    Text = Struct.new(:text, :escape_html, :filename, :lineno) do
+    BaseText = Struct.new(:text, :escape_html, :filename, :lineno) do
       def initialize(*)
         super
         if escape_html.nil?
@@ -151,6 +151,9 @@ module HamdownCore
       end
     end
 
+    class Text < BaseText; end
+
+    # markdown
     class MdHeader < Text; end
     class MdList < Text; end
     class MdQuote < Text; end
@@ -159,6 +162,72 @@ module HamdownCore
     class MdLinkTitle < Text; end
     class MdLink < Text; end
 
+    # html
+    HtmlList = Struct.new(:children, :text, :filename, :lineno) do
+      include HasChildren
+
+      def to_h
+        super.merge(type: 'html_list')
+      end
+    end
+    class HtmlOlList < HtmlList
+      def ol_list?
+        true
+      end
+      def html_list?
+        true
+      end
+    end
+    class HtmlUlList < HtmlList
+      def ol_list?
+        false
+      end
+      def html_list?
+        true
+      end
+    end
+
+    class HtmlListItem < BaseText
+      def html_list_item?
+        true
+      end
+      def markdownable?
+        false
+      end
+      def to_ol_list_item!
+        node = HtmlOlListItem.new
+        node.filename = filename
+        node.lineno = lineno
+        node.text = text
+        node
+      end
+      def to_ul_list_item!
+        node = HtmlUlListItem.new
+        node.filename = filename
+        node.lineno = lineno
+        node.text = text
+        node
+      end
+    end
+    class HtmlOlListItem < HtmlListItem
+      def text
+        str = super.gsub('<li>', '').gsub('</li>', '')
+        "1. #{str}"
+      end
+    end
+    class HtmlUlListItem < HtmlListItem
+      def text
+        str = super.gsub('<li>', '').gsub('</li>', '')
+        "* #{str}"
+      end
+    end
+
+    class HtmlListEnd < BaseText
+      def markdownable?
+        false
+      end
+    end
+
     Filter = Struct.new(:name, :texts, :filename, :lineno) do
       def initialize(*)
         super

data/lib/hamdown_core/parser.rb

@@ -8,7 +8,6 @@ require_relative 'line_parser'
 require_relative 'ruby_multiline'
 require_relative 'script_parser'
 require_relative 'utils'
-require 'pry'
 
 module HamdownCore
   class Parser
@@ -76,8 +75,13 @@ module HamdownCore
       'link_with_title' => /^[^!]\[[^\[\]]*?\]\([^\s]*\s\".*\"\)/
       # codeblock # nesting within plain text is illegal
     }
-    # bold, italic, b_italic, monospace
-    # paragraphs !
+
+    HTML = {
+      'list_ol_root' => /^ *<ol>/,
+      'list_ul_root' => /^ *<ul>/,
+      'list_end' => /^ *<\/(ul|ol)>/,
+      'list_item' => /^ *<li>.*<\/li>$/
+    }
 
     def parse_line(line)
       text, indent = @indent_tracker.process(line, @line_parser.lineno)
@@ -107,6 +111,14 @@ module HamdownCore
         parse_md_link(text)
       when MARKDOWN['link_title']
         parse_md_link(text, true)
+      when HTML['list_ol_root']
+        parse_html_list(text, :ol)
+      when HTML['list_ul_root']
+        parse_html_list(text, :ul)
+      when HTML['list_end']
+        parse_html_list_end(text)
+      when HTML['list_item']
+        parse_html_list_item(text)
       else
         std_parse_line(text, indent)
       end
@@ -180,6 +192,24 @@ module HamdownCore
       @ast << create_node(Ast::MdList) { |t| t.text = text }
     end
 
+    def parse_html_list(text, type)
+      if type == :ol
+        @ast << create_node(Ast::HtmlOlList) { |t| t.text = text }
+      elsif type == :ul
+        @ast << create_node(Ast::HtmlUlList) { |t| t.text = text }
+      else
+        raise 'undefined html list type'
+      end
+    end
+
+    def parse_html_list_item(text)
+      @ast << create_node(Ast::HtmlListItem) { |t| t.text = text }
+    end
+
+    def parse_html_list_end(text)
+      @ast << create_node(Ast::HtmlListEnd) { |t| t.text = text }
+    end
+
     def parse_md_quote(text)
       @ast << create_node(Ast::MdQuote) { |t| t.text = text }
     end

data/lib/hamdown_core/transformer.rb

@@ -29,8 +29,18 @@ module HamdownCore
             node = transform(node)
           end
 
+          if node.respond_to?(:html_list?) and node.html_list?
+            filter = if node.ol_list?
+              create_filter(node.children.map(&:to_ol_list_item!))
+            else
+              create_filter(node.children.map(&:to_ul_list_item!))
+            end
+            node = filter
+          end
+
           new_root_node << node
         end
+
         if collected_nodes.size > 0
           filter = create_filter(collected_nodes)
           collected_nodes = []

data/lib/hamdown_core/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module HamdownCore
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamdown_core
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips