coradoc 1.1.0 → 1.1.2

data/lib/coradoc/parser/asciidoc/list.rb

@@ -0,0 +1,81 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module List
+
+        def list
+          (
+          unordered_list |
+             ordered_list # definition_list |
+            ).as(:list)
+        end
+
+        def ordered_list(nesting_level = 1)
+          attrs = (attribute_list >> newline).maybe
+          r = olist_item(nesting_level)
+          if nesting_level <= 8
+            r = r | ordered_list(nesting_level + 1)
+          end
+          attrs >> r.repeat(1).as(:ordered)
+        end
+
+        def unordered_list(nesting_level = 1)
+          attrs = (attribute_list >> newline).maybe
+          r = ulist_item(nesting_level)
+          if nesting_level <= 8
+            r = r | unordered_list(nesting_level + 1)
+          end
+          attrs >> r.repeat(1).as(:unordered)
+        end
+
+        def definition_list(delimiter = "::")
+          (attribute_list >> newline).maybe >>
+          dlist_item(delimiter).as(:definition_list).repeat(1) >>
+          dlist_item(delimiter).absent?
+        end
+
+        def olist_item(nesting_level = 1)
+          nl2 = nesting_level - 1
+          marker = match(/^\./)
+          marker = marker >>  str(".").repeat(nl2, nl2) if nl2 > 0
+          str("").as(:list_item) >> 
+          marker.as(:marker) >> str(".").absent? >>
+          match("\n").absent? >> space >> text_line(true)
+        end
+
+        def ulist_item(nesting_level = 1)
+          nl2 = nesting_level - 1
+          marker = match(/^\*/)
+          marker = marker >>  str("*").repeat(nl2, nl2) if nl2 > 0
+          str("").as(:list_item) >>
+          marker.as(:marker) >> str("*").absent? >>
+          str(' [[[').absent? >>
+          match("\n").absent? >> space >> text_line(true)
+        end
+
+        def dlist_delimiter
+          (str("::") | str(":::") | str("::::") | str(";;")
+            ).as(:delimiter)
+        end
+
+        def dlist_term(delimiter)
+          (match("[^\n:]").repeat(1) #>> empty_line.repeat(0)
+            ).as(:term) >> dlist_delimiter
+        end
+
+        def dlist_definition
+          (text #>> empty_line.repeat(0)
+            ).as(:definition) >> line_ending >> empty_line.repeat(0)
+        end
+
+        def dlist_item(delimiter)
+          (((dlist_term(delimiter).as(:terms).repeat(1) >> line_ending >>
+            empty_line.repeat(0)).repeat(1) >>
+            dlist_definition)  |
+            (dlist_term(delimiter).repeat(1,1).as(:terms) >> space >> dlist_definition)
+            ).as(:definition_list_item).repeat(1)
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/parser/asciidoc/paragraph.rb

@@ -0,0 +1,33 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module Paragraph
+
+        def paragraph_text_line
+          (asciidoc_char_with_id.absent? | text_id ) >>
+          literal_space? >>
+          (text_formatted.as(:text) # >>
+          ) | term | term2
+        end
+
+        def paragraph
+          ( block_id.maybe >>
+            block_title.maybe >>
+            (attribute_list >> newline).maybe >>
+            (paragraph_text_line.repeat(1,1) >> any.absent? |
+              (paragraph_text_line >> newline_single.as(:line_break)).repeat(1) >>
+              (paragraph_text_line.repeat(1,1)).repeat(0,1)
+            ).as(:lines) >>
+            newline.repeat(0)
+          ).as(:paragraph)
+        end
+
+        def paragraph_attributes
+          str("[") >>
+            keyword.as(:key) >> str("=") >>
+            word.as(:value) >> str("]") >> newline
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/parser/asciidoc/section.rb

@@ -1,15 +1,34 @@
-require_relative "base"
-require_relative "content"
-
 module Coradoc
   module Parser
     module Asciidoc
       module Section
-        include Coradoc::Parser::Asciidoc::Base
-        include Coradoc::Parser::Asciidoc::Content
+
+        def contents
+          (
+            citation |
+            term | term2 |
+            bib_entry |
+            block_image |
+            tag |
+            comment_block |
+            comment_line |
+            include_directive |
+            admonition_line |
+            block.as(:block) |
+            table.as(:table) |
+            highlight.as(:highlight) |
+            glossaries.as(:glossaries) |
+            paragraph |
+            list |
+            empty_line.as(:line_break)
+          ).repeat(1)
+        end
 
         def section_block(level = 2)
+          return nil if level > 8
+          (attribute_list >> newline).maybe >>
           section_id.maybe >>
+          (attribute_list >> newline).maybe >>
             section_title(level).as(:title) >>
             contents.as(:contents).maybe
         end
@@ -23,37 +42,23 @@ module Coradoc
         # Heading
         def section_title(level = 2, max_level = 8)
           match("=").repeat(level, max_level).as(:level) >>
-            space? >> text.as(:text) >> endline.as(:break)
+            str('=').absent? >>
+            space? >> text.as(:text) >> endline.as(:line_break)
         end
 
         # section
-        def section
-          section_block >> second_level_section.repeat.maybe.as(:sections)
-        end
-
-        def sub_section(level)
-          newline.maybe >> section_block(level)
-        end
-
-        def second_level_section
-          sub_section(3) >> third_level_section.repeat.maybe.as(:sections)
+        def section(level = 2)
+          r = section_block(level) 
+          if level < 8
+            r = r >> section(level + 1).as(:section).repeat(0).as(:sections)
+          end
+          if level == 2
+            (r).as(:section)
+          else
+            r
+          end
         end
 
-        def third_level_section
-          sub_section(4) >> fourth_level_section.repeat.maybe.as(:sections)
-        end
-
-        def fourth_level_section
-          sub_section(5) >> fifth_level_section.repeat.maybe.as(:sections)
-        end
-
-        def fifth_level_section
-          sub_section(6) >> sixth_level_section.repeat.maybe.as(:sections)
-        end
-
-        def sixth_level_section
-          sub_section(7) >> sub_section(8).repeat.maybe.as(:sections)
-        end
       end
     end
   end

data/lib/coradoc/parser/asciidoc/table.rb

@@ -0,0 +1,32 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module Table
+        # include Coradoc::Parser::Asciidoc::Base
+
+        def table
+          block_id.maybe >>
+          (attribute_list >> newline).maybe >>
+          block_title.maybe >>
+          (attribute_list >> newline).maybe >>
+            str("|===") >> line_ending >>
+            table_row.repeat(1).as(:rows) >>
+            str("|===") >> line_ending
+        end
+
+        def table_row
+          (literal_space? >> str("|") >> (cell_content | empty_cell_content))
+            .repeat(1).as(:cols) >> line_ending
+        end
+
+        def empty_cell_content
+          str("|").absent? >> literal_space.as(:text)
+        end
+
+        def cell_content
+          str("|").absent? >> literal_space? >> rich_texts.as(:text)
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/parser/asciidoc/term.rb

@@ -0,0 +1,23 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module Term
+        def term_type
+          (str("alt") | str("deprecated") | str("domain")).as(:term_type)
+        end
+
+        def term
+          term_type >> str(':[') >>
+          match('[^\]]').repeat(1).as(:term) >>
+          str("]") >> str("\n").repeat(1).as(:line_break)
+        end
+
+        def term2
+          match('^\[') >> term_type >> str(']#') >>
+          match('[^\#]').repeat(1).as(:term2) >> str('#') >>
+          str("\n").repeat(1).as(:line_break)
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/parser/base.rb

@@ -1,22 +1,55 @@
 require "parslet"
 require "parslet/convenience"
 
-require_relative "asciidoc/header"
+require_relative "asciidoc/attribute_list"
+require_relative "asciidoc/base"
+require_relative "asciidoc/block"
+require_relative "asciidoc/citation"
+require_relative "asciidoc/content"
 require_relative "asciidoc/document_attributes"
+require_relative "asciidoc/header"
+require_relative "asciidoc/inline"
+require_relative "asciidoc/list"
+require_relative "asciidoc/paragraph"
 require_relative "asciidoc/section"
+require_relative "asciidoc/table"
+require_relative "asciidoc/term"
 
 module Coradoc
   module Parser
     class Base < Parslet::Parser
-      include Coradoc::Parser::Asciidoc::Header
+      include Coradoc::Parser::Asciidoc::AttributeList
+      include Coradoc::Parser::Asciidoc::Base
+      include Coradoc::Parser::Asciidoc::Block
+      include Coradoc::Parser::Asciidoc::Citation
+      include Coradoc::Parser::Asciidoc::Content
       include Coradoc::Parser::Asciidoc::DocumentAttributes
+      include Coradoc::Parser::Asciidoc::Header
+      include Coradoc::Parser::Asciidoc::Inline
+      include Coradoc::Parser::Asciidoc::List
+      include Coradoc::Parser::Asciidoc::Paragraph
       include Coradoc::Parser::Asciidoc::Section
+      include Coradoc::Parser::Asciidoc::Table
+      include Coradoc::Parser::Asciidoc::Term
 
       root :document
       rule(:document) do
         (
-          document_attributess.as(:document_attributes) |
+          admonition_line |
+          bib_entry |
+          block_image |
+          term | term2 |
+          citation |
+          tag |
+          comment_block |
+          comment_line |
+          block.as(:block) |
           section.as(:section) |
+          include_directive |
+          document_attributes |
+          list |
+          table.as(:table) |
+          paragraph |
           header.as(:header) |
           empty_line.as(:line_break) |
           any.as(:unparsed)
@@ -25,7 +58,9 @@ module Coradoc
 
       def self.parse(filename)
         content = File.read(filename)
-        new.parse_with_debug(content)
+        new.parse(content)
+      rescue Parslet::ParseFailed => e
+        puts e.parse_failure_cause.ascii_tree
       end
     end
   end

data/lib/coradoc/reverse_adoc.rb

@@ -1,30 +1,18 @@
-# frozen_string_literal: true
+warn <<~WARN
+  Deprecated: coradoc/reverse_adoc has been renamed to coradoc/input/html.
+  | Please update your references from:
+  |   require 'coradoc/reverse_adoc'
+  | To:
+  |   require 'coradoc/input/html'
+  |
+  | You are referencing an old require here:
+  |   #{caller.join("\n|   ")}
+  |
+  | Please also ensure that you replace all references to Coradoc::ReverseAdoc
+  | in your code with Coradoc::Input::HTML.
+WARN
 
-require "digest"
-require "nokogiri"
-require_relative "../coradoc"
-require_relative "reverse_adoc/errors"
-require_relative "reverse_adoc/cleaner"
-require_relative "reverse_adoc/config"
-require_relative "reverse_adoc/converters"
-require_relative "reverse_adoc/converters/base"
-require_relative "reverse_adoc/html_converter"
-require_relative "reverse_adoc/plugin"
-require_relative "reverse_adoc/postprocessor"
+require 'coradoc'
+require 'coradoc/input/html'
 
-
-module Coradoc::ReverseAdoc
-  def self.convert(input, options = {})
-    Coradoc::ReverseAdoc::HtmlConverter.convert(input, options)
-  end
-
-  def self.config
-    @config ||= Config.new
-    yield @config if block_given?
-    @config
-  end
-
-  def self.cleaner
-    @cleaner ||= Cleaner.new
-  end
-end
+Coradoc::ReverseAdoc = Coradoc::Input::HTML