coradoc 0.1.0 → 0.3.0

data/lib/coradoc/element/text_element.rb

@@ -0,0 +1,32 @@
+module Coradoc
+  module Element
+    class TextElement
+      attr_reader :id, :content, :line_break
+
+      def initialize(content, options = {})
+        @content = content # .to_s
+        @id = options.fetch(:id, nil)
+        @line_break = options.fetch(:line_break, "")
+      end
+
+      def to_adoc
+        Coradoc::Generator.gen_adoc(@content)
+      end
+    end
+  end
+
+  module Element
+    class LineBreak
+      attr_reader :line_break
+
+      def initialize(line_break)
+        @line_break = line_break
+      end
+    end
+  end
+
+  module Element
+    class Highlight < Element::TextElement
+    end
+  end
+end

data/lib/coradoc/{document → element}/title.rb

@@ -1,12 +1,14 @@
 module Coradoc
-  module Document
+  module Element
     class Title
       attr_reader :id, :content, :line_break
 
       def initialize(content, level, options = {})
-        @level_str = level
-        @content = content.to_s
-        @id = options.fetch(:id, nil).to_s
+        @level_int = level
+        @level_int = level.length if level.is_a?(String)
+        @content = content
+        @id = options.fetch(:id, nil)
+        @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
         @line_break = options.fetch(:line_break, "")
       end
 
@@ -14,6 +16,13 @@ module Coradoc
         @level ||= level_from_string
       end
 
+      def to_adoc
+        anchor = @anchor.nil? ? "" : "#{@anchor.to_adoc}\n"
+        content = Coradoc::Generator.gen_adoc(@content)
+        level_str = "=" * (@level_int + 1)
+        ["\n", anchor, level_str, " ", content, "\n"].join("")
+      end
+
       alias :text :content
 
       private
@@ -21,7 +30,7 @@ module Coradoc
       attr_reader :level_str
 
       def level_from_string
-        case @level_str.length
+        case @level_int
         when 2 then :heading_two
         when 3 then :heading_three
         when 4 then :heading_four

data/lib/coradoc/element/video.rb

@@ -0,0 +1,23 @@
+module Coradoc
+  module Element
+    class Video
+      attr_reader :id, :title, :src, :options
+
+      def initialize(title, options = {})
+        @title = title
+        @id = options.fetch(:id, nil)
+        @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
+        @src = options.fetch(:src, "")
+        @attributes = options.fetch(:attributes, [])
+        # @attributes.add_valid_named('opts')
+      end
+
+      def to_adoc
+        anchor = @anchor.nil? ? "" : "#{@anchor.to_adoc}\n"
+        title = ".#{@title}\n" unless @title.empty?
+        attrs = @attributes.empty? ? "\[\]" : @attributes.to_adoc
+        [anchor, title, "video::", @src, attrs].join("")
+      end
+    end
+  end
+end

data/lib/coradoc/generator.rb

@@ -0,0 +1,17 @@
+module Coradoc
+  class Generator
+    def self.gen_adoc(content)
+      if content.is_a?(Array)
+        content.map do |elem|
+          Coradoc::Generator.gen_adoc(elem)
+        end.join("")
+      elsif content.respond_to? :to_adoc
+        content.to_adoc
+      elsif content.is_a?(String)
+        content
+      elsif content.nil?
+        ""
+      end
+    end
+  end
+end

data/lib/coradoc/legacy_parser.rb

@@ -23,8 +23,8 @@ module Coradoc
 
     rule(:text_line) do
       special_character.absent? >>
-      match("[^\n]").repeat(1).as(:text) >>
-      line_ending.as(:break)
+        match("[^\n]").repeat(1).as(:text) >>
+        line_ending.as(:break)
     end
 
     # Common Helpers
@@ -33,67 +33,67 @@ module Coradoc
 
     # Document
     rule(:document) do
-       (
-         bibdata.repeat(1).as(:bibdata) |
-         section.as(:section) |
-         header.as(:header) |
-         block_with_title.as(:block) |
-         empty_line.repeat(1) |
-         any.as(:unparsed)
-       ).repeat(1).as(:document)
+      (
+        document_attributes.repeat(1).as(:document_attributes) |
+        section.as(:section) |
+        header.as(:header) |
+        block_with_title.as(:block) |
+        empty_line.repeat(1) |
+        any.as(:unparsed)
+      ).repeat(1).as(:document)
     end
 
     # Header
     rule(:header) do
       match("=") >> space? >> text.as(:title) >> newline >>
-      author.maybe.as(:author) >> revision.maybe.as(:revision)
+        author.maybe.as(:author) >> revision.maybe.as(:revision)
     end
 
     rule(:author) do
       words.as(:first_name) >> str(",") >> space? >> words.as(:last_name) >>
-      space? >> str("<") >> email.as(:email) >> str(">") >> endline
+        space? >> str("<") >> email.as(:email) >> str(">") >> endline
     end
 
     rule(:revision) do
       (word >> (str(".") >> word).maybe).as(:number) >>
-      str(",") >> space? >> word.as(:date) >>
-      str(":") >> space? >> words.as(:remark) >> newline
+        str(",") >> space? >> word.as(:date) >>
+        str(":") >> space? >> words.as(:remark) >> newline
     end
 
-    # Bibdata
-    rule(:bibdata) do
+    # DocumentAttributes
+    rule(:document_attributes) do
       str(":") >> attribute_name.as(:key) >> str(":") >>
-      space? >> attribute_value.as(:value) >> endline
+        space? >> attribute_value.as(:value) >> endline
     end
 
     # Section
     rule(:section) do
       heading.as(:title) >>
-      (list.as(:list) |
-       blocks.as(:blocks) |
-       paragraphs.as(:paragraphs)).maybe
+        (list.as(:list) |
+         blocks.as(:blocks) |
+         paragraphs.as(:paragraphs)).maybe
     end
 
     # Heading
     rule(:heading) do
       (anchor_name >> newline).maybe >>
-      match("=").repeat(2, 8).as(:level) >>
-      space? >> text.as(:text) >> endline.as(:break)
+        match("=").repeat(2, 8).as(:level) >>
+        space? >> text.as(:text) >> endline.as(:break)
     end
 
     rule(:anchor_name) { str("[#") >> keyword.as(:name) >> str("]") }
 
     # List
     rule(:list) do
-      unnumbered_list.as(:unnumbered) |
-        definition_list.as(:definition) | numbered_list.as(:numbered)
+      unordered_list.as(:unordered) |
+        definition_list.as(:definition) | ordered_list.as(:ordered)
     end
 
-    rule(:numbered_list) { nlist_item.repeat(1) }
-    rule(:unnumbered_list) { ulist_item.repeat(1) }
+    rule(:ordered_list) { olist_item.repeat(1) }
+    rule(:unordered_list) { ulist_item.repeat(1) }
     rule(:definition_list) { dlist_item.repeat(1) }
 
-    rule(:nlist_item) { match("\.") >> space >> text_line }
+    rule(:olist_item) { match("\.") >> space >> text_line }
     rule(:ulist_item) { match("\\*") >> space >> text_line }
     rule(:dlist_item) do
       str("term") >> space >> digits >> str("::") >> space >> text_line
@@ -110,51 +110,51 @@ module Coradoc
     rule(:block_type) { str("[") >> keyword.as(:type) >> str("]") >> newline }
 
     rule(:block_attribute) do
-      str("[")  >> keyword.as(:key) >>
-      str("=") >> keyword.as(:value) >> str("]")
+      str("[") >> keyword.as(:key) >>
+        str("=") >> keyword.as(:value) >> str("]")
     end
 
     rule(:simple_block) do
       block_attribute.as(:attributes) >> newline >>
-      text_line.repeat(1).as(:lines)
+        text_line.repeat(1).as(:lines)
     end
 
     rule(:open_block) do
       block_title >>
-      block_type >>
-      str("--").as(:delimiter) >> newline >>
-      text_line.repeat.as(:lines) >>
-      str("--") >> line_ending
+        block_type >>
+        str("--").as(:delimiter) >> newline >>
+        text_line.repeat.as(:lines) >>
+        str("--") >> line_ending
     end
 
     rule(:example_block) do
       block_title >>
-      block_type >>
-      str("====").as(:delimiter) >> newline >>
-      text_line.repeat(1).as(:lines) >>
-      str("====") >> newline
+        block_type >>
+        str("====").as(:delimiter) >> newline >>
+        text_line.repeat(1).as(:lines) >>
+        str("====") >> newline
     end
 
     rule(:sidebar_block) do
       block_title >>
-      block_type.maybe >>
-      str("****").as(:delimiter) >> newline >>
-      text_line.repeat(1).as(:lines) >>
-      str("****") >> newline
+        block_type.maybe >>
+        str("****").as(:delimiter) >> newline >>
+        text_line.repeat(1).as(:lines) >>
+        str("****") >> newline
     end
 
     rule(:source_block) do
       block_title >>
-      str("----").as(:delimiter) >> newline >>
-      text_line.repeat(1).as(:lines) >>
-      str("----") >> newline
+        str("----").as(:delimiter) >> newline >>
+        text_line.repeat(1).as(:lines) >>
+        str("----") >> newline
     end
 
     rule(:quote_block) do
       block_title >>
-      str("____").as(:delimiter) >> newline >>
-      text_line.repeat.as(:lines) >>
-      str("____") >> newline
+        str("____").as(:delimiter) >> newline >>
+        text_line.repeat.as(:lines) >>
+        str("____") >> newline
     end
 
     rule(:block_with_title) do

data/lib/coradoc/oscal.rb

@@ -13,7 +13,10 @@ module Coradoc
     end
 
     def to_oscal
-      {"metadata" => _doc.bibdata.to_hash, "groups" => sections_as_groups}
+      {
+        "metadata" => _doc.document_attributes.to_hash,
+        "groups" => sections_as_groups,
+      }
     end
 
     private
@@ -55,7 +58,7 @@ module Coradoc
     def build_oscal_sub_parts(contents)
       if contents.length > 1
         parts = contents.select do |content|
-          content if content.is_a?(Coradoc::Document::Paragraph)
+          content if content.is_a?(Coradoc::Element::Paragraph)
         end
 
         parts.map do |part|
@@ -77,9 +80,7 @@ module Coradoc
     end
 
     def build_oscal_prose(paragraph)
-      if paragraph
-        paragraph.texts.join(" ")
-      end
+      paragraph&.texts&.join(" ")
     end
   end
 end

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

@@ -26,31 +26,18 @@ module Coradoc
           match["\r\n"].repeat(1)
         end
 
-        # def line_break
-        #   match["\r\n"]
-        # end
-
         def keyword
           (match("[a-zA-Z0-9_-]") | str(".")).repeat(1)
         end
 
-        # def text_line
-        #   special_character.absent? >>
-        #   match("[^\n]").repeat(1).as(:text) >>
-        #   line_ending.as(:break)
-        # end
-
-        # rule(:space) { match('\s') }
-        # rule(:space?) { spaces.maybe }
-        # rule(:spaces) { space.repeat(1) }
         def empty_line
           match("^\n")
         end
-        #
 
-        #
-        # rule(:inline_element) { text }
-        # rule(:text) { match("[^\n]").repeat(1) }
+        def digit
+          match("[0-9]")
+        end
+
         def digits
           match("[0-9]").repeat(1)
         end
@@ -63,6 +50,14 @@ module Coradoc
           word >> (space? >> word).repeat
         end
 
+        def rich_texts
+          rich_text >> (space? >> rich_text).repeat
+        end
+
+        def rich_text
+          (match("[a-zA-Z0-9_-]") | str(".") | str("*") | match("@")).repeat(1)
+        end
+
         def email
           word >> str("@") >> word >> str(".") >> word
         end
@@ -78,6 +73,11 @@ module Coradoc
         def special_character
           match("^[*_:=-]") | str("[#") | str("[[")
         end
+
+        def date
+          digit.repeat(2, 4) >> str("-") >>
+            digit.repeat(1, 2) >> str("-") >> digit.repeat(1, 2)
+        end
       end
     end
   end

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

@@ -5,7 +5,8 @@ module Coradoc
         include Coradoc::Parser::Asciidoc::Base
 
         def paragraph
-          text_line.repeat(1)
+          paragraph_meta.as(:meta).maybe >>
+            text_line.repeat(1).as(:lines)
         end
 
         def glossaries
@@ -14,13 +15,13 @@ module Coradoc
 
         # List
         def list
-          unnumbered_list.as(:unnumbered) |
-            definition_list.as(:definition) | numbered_list.as(:numbered)
+          unordered_list.as(:unordered) |
+            definition_list.as(:definition) | ordered_list.as(:ordered)
         end
 
         def contents
           (
-            example_block.as(:example) |
+            block.as(:block) |
             list.as(:list) |
             table.as(:table) |
             highlight.as(:highlight) |
@@ -29,18 +30,42 @@ module Coradoc
           ).repeat(1)
         end
 
+        def block
+          sidebar_block | example_block | source_block | quote_block
+        end
+
+        def source_block
+          block_style("-", 2)
+        end
+
+        def quote_block
+          block_style("_")
+        end
+
+        def sidebar_block
+          block_style("*")
+        end
+
         def example_block
-          str("[example]") >> newline >>
-          str("=").repeat(4).capture(:delimiter) >> newline >>
-          dynamic do |source, context|
-            (str(context.captures[:delimiter]).absent? >> text.as(:text) >> endline).repeat(1) >>
-            str(context.captures[:delimiter]) >> endline
-          end
+          block_style("=")
+        end
+
+        def block_style(delimiter = "*", repeater = 4)
+          block_title.maybe >>
+            newline.maybe >>
+            block_type.maybe >>
+            str(delimiter).repeat(repeater).as(:delimiter) >> newline >>
+            text_line.repeat(1).as(:lines) >>
+            str(delimiter).repeat(repeater) >> newline
+        end
+
+        def block_type
+          str("[") >> keyword.as(:type) >> str("]") >> newline
         end
 
         def highlight
           text_id >> newline >>
-          underline >> highlight_text >> newline
+            underline >> highlight_text >> newline
         end
 
         def underline
@@ -54,19 +79,14 @@ module Coradoc
         # Table
         def table
           block_title >>
-          str("|===") >> line_ending >>
-          table_row.repeat(1).as(:rows) >>
-          str("|===") >> line_ending
+            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
-
-        # Extended
-        def word
-          (match("[a-zA-Z0-9_-]") | str(".") | str("*") | match("@")).repeat(1)
+          (literal_space? >> str("|") >> (cell_content | empty_cell_content))
+            .repeat(1).as(:cols) >> line_ending
         end
 
         def empty_cell_content
@@ -74,11 +94,11 @@ module Coradoc
         end
 
         def cell_content
-          str("|").absent? >> literal_space? >> words.as(:text)
+          str("|").absent? >> literal_space? >> rich_texts.as(:text)
         end
 
         def literal_space
-          (match[' '] | match[' \t']).repeat(1)
+          (match[" "] | match[' \t']).repeat(1)
         end
 
         # Override
@@ -93,7 +113,7 @@ module Coradoc
         # Text
         def text_line
           (asciidoc_char_with_id.absent? | text_id) >> literal_space? >>
-          text.as(:text) >> line_ending.as(:break)
+            text.as(:text) >> line_ending.as(:break)
         end
 
         def asciidoc_char
@@ -109,16 +129,22 @@ module Coradoc
             str("[#") >> keyword.as(:id) >> str("]")
         end
 
+        def paragraph_meta
+          str("[") >>
+            keyword.as(:key) >> str("=") >>
+            word.as(:value) >> str("]") >> newline
+        end
+
         def glossary
           keyword.as(:key) >> str("::") >> space? >>
-          text.as(:value) >> line_ending.as(:break)
+            text.as(:value) >> line_ending.as(:break)
         end
 
-        def numbered_list
-          nlist_item.repeat(1)
+        def ordered_list
+          olist_item.repeat(1)
         end
 
-        def unnumbered_list
+        def unordered_list
           (ulist_item >> newline.maybe).repeat(1)
         end
 
@@ -126,7 +152,7 @@ module Coradoc
           dlist_item.repeat(1)
         end
 
-        def nlist_item
+        def olist_item
           match("\.") >> space >> text_line
         end
 

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

@@ -0,0 +1,19 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module DocumentAttributes
+        include Coradoc::Parser::Asciidoc::Base
+
+        # DocumentAttributes
+        def document_attributess
+          document_attributes.repeat(1)
+        end
+
+        def document_attributes
+          str(":") >> attribute_name.as(:key) >> str(":") >>
+            space? >> attribute_value.as(:value) >> line_ending
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require "coradoc/parser/asciidoc/base"
+require_relative "base"
 
 module Coradoc
   module Parser
@@ -6,23 +6,26 @@ module Coradoc
       module Header
         include Coradoc::Parser::Asciidoc::Base
 
-        # Header
         def header
-          match("=") >> space? >> text.as(:title) >> newline >>
-          author.maybe.as(:author) >> revision.maybe.as(:revision)
+          header_title >>
+            author.maybe.as(:author) >>
+            revision.maybe.as(:revision) >> newline.maybe
+        end
+
+        def header_title
+          match("=") >> space? >> text.as(:title) >> newline
         end
 
-        # Author
         def author
-          words.as(:first_name) >> str(",") >> space? >> words.as(:last_name) >>
-          space? >> str("<") >> email.as(:email) >> str(">") >> endline
+          words.as(:first_name) >> str(",") >>
+            space? >> words.as(:last_name) >>
+            space? >> str("<") >> email.as(:email) >> str(">") >> newline
         end
 
-        # Revision
         def revision
           (word >> (str(".") >> word).maybe).as(:number) >>
-          str(",") >> space? >> word.as(:date) >>
-          str(":") >> space? >> words.as(:remark) >> newline
+            str(",") >> space? >> date.as(:date) >> str(":") >>
+            space? >> words.as(:remark) >> newline
         end
       end
     end

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

@@ -1,5 +1,5 @@
-require "coradoc/parser/asciidoc/base"
-require "coradoc/parser/asciidoc/content"
+require_relative "base"
+require_relative "content"
 
 module Coradoc
   module Parser
@@ -10,20 +10,20 @@ module Coradoc
 
         def section_block(level = 2)
           section_id.maybe >>
-          section_title(level).as(:title) >>
-          contents.as(:contents).maybe
+            section_title(level).as(:title) >>
+            contents.as(:contents).maybe
         end
 
         # Section id
         def section_id
           (str("[[") >> keyword.as(:id) >> str("]]") |
-           str("[#") >> keyword.as(:id) >> str("]")) >> newline
+            str("[#") >> keyword.as(:id) >> str("]")) >> newline
         end
 
         # Heading
         def section_title(level = 2, max_level = 8)
           match("=").repeat(level, max_level).as(:level) >>
-          space? >> text.as(:text) >> endline.as(:break)
+            space? >> text.as(:text) >> endline.as(:break)
         end
 
         # section

data/lib/coradoc/parser/base.rb

@@ -1,21 +1,21 @@
 require "parslet"
 require "parslet/convenience"
 
-require "coradoc/parser/asciidoc/header"
-require "coradoc/parser/asciidoc/bibdata"
-require "coradoc/parser/asciidoc/section"
+require_relative "asciidoc/header"
+require_relative "asciidoc/document_attributes"
+require_relative "asciidoc/section"
 
 module Coradoc
   module Parser
     class Base < Parslet::Parser
       include Coradoc::Parser::Asciidoc::Header
-      include Coradoc::Parser::Asciidoc::Bibdata
+      include Coradoc::Parser::Asciidoc::DocumentAttributes
       include Coradoc::Parser::Asciidoc::Section
 
       root :document
       rule(:document) do
         (
-          bibdatas.as(:bibdata) |
+          document_attributess.as(:document_attributes) |
           section.as(:section) |
           header.as(:header) |
           empty_line.as(:line_break) |

data/lib/coradoc/parser.rb

@@ -1,4 +1,4 @@
-require "coradoc/parser/base"
+require_relative "parser/base"
 
 module Coradoc
   module Parser