coradoc 0.1.0 → 0.2.0

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,13 +30,37 @@ 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
@@ -64,17 +89,12 @@ module Coradoc
             repeat(1).as(:cols) >> line_ending
         end
 
-        # Extended
-        def word
-          (match("[a-zA-Z0-9_-]") | str(".") | str("*") | match("@")).repeat(1)
-        end
-
         def empty_cell_content
           str("|").absent? >> literal_space.as(:text)
         end
 
         def cell_content
-          str("|").absent? >> literal_space? >> words.as(:text)
+          str("|").absent? >> literal_space? >> rich_texts.as(:text)
         end
 
         def literal_space
@@ -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)
         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/{bibdata.rb → document_attributes.rb}

@@ -1,15 +1,15 @@
 module Coradoc
   module Parser
     module Asciidoc
-      module Bibdata
+      module DocumentAttributes
         include Coradoc::Parser::Asciidoc::Base
 
-        # Bibdata
-        def bibdatas
-          bibdata.repeat(1)
+        # DocumentAttributes
+        def document_attributess
+          document_attributes.repeat(1)
         end
 
-        def bibdata
+        def document_attributes
           str(":") >> attribute_name.as(:key) >> str(":") >>
           space? >> attribute_value.as(:value) >> line_ending
         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,14 +10,14 @@ 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

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

data/lib/coradoc/transformer.rb

@@ -8,7 +8,7 @@ module Coradoc
       title: simple(:title),
       author: simple(:author),
       revision: simple(:revision)) do
-      Document::Header.new(title, author: author, revision: revision)
+      Element::Header.new(title, author: author, revision: revision)
     end
 
     # Author
@@ -16,35 +16,41 @@ module Coradoc
       first_name: simple(:first_name),
       last_name: simple(:last_name),
       email: simple(:email)) do
-      Document::Author.new(first_name, last_name, email)
+      Element::Author.new(first_name, last_name, email)
     end
 
     # Revision
     rule(number: simple(:number), date: simple(:date), remark: simple(:remark)) do
-      Document::Revision.new(number, date: date, remark: remark)
+      Element::Revision.new(number, date: date, remark: remark)
     end
 
     # Text Element
-    rule(text: simple(:text)) { Document::TextElement.new(text) }
+    rule(text: simple(:text)) { Element::TextElement.new(text) }
     rule(id: simple(:id), text: simple(:text)) do
-      Document::TextElement.new(text, id: id)
+      Element::TextElement.new(text, id: id)
     end
 
     rule(text: simple(:text), break: simple(:line_break)) do
-      Document::TextElement.new(text, line_break: line_break)
+      Element::TextElement.new(text, line_break: line_break)
     end
 
     rule(id: simple(:id), text: simple(:text), break: simple(:line_break)) do
-      Document::TextElement.new(text, id: id, line_break: line_break)
+      Element::TextElement.new(text, id: id, line_break: line_break)
     end
 
+    # Paragraph
+    rule(paragraph: simple(:paragraph)) { paragraph }
+    rule(lines: sequence(:lines)) { Element::Paragraph.new(lines) }
+    rule(meta: simple(:meta), lines: sequence(:lines)) do
+      Element::Paragraph.new(lines, meta: meta)
+    end
 
     # Title Element
     rule(
       level: simple(:level),
       text: simple(:text),
       break: simple(:line_break)) do
-        Document::Title.new(text, level, line_break: line_break)
+        Element::Title.new(text, level, line_break: line_break)
     end
 
     rule(
@@ -52,23 +58,19 @@ module Coradoc
       level: simple(:level),
       text: simple(:text),
       break: simple(:line_break)) do
-        Document::Title.new(text, level, line_break: line_break, id: name)
+        Element::Title.new(text, level, line_break: line_break, id: name)
     end
 
-    # Paragraph
-    rule(paragraph: sequence(:paragraph)) do
-      Document::Paragraph.new(paragraph)
-    end
 
     # Section
-    # rule(title: simple(:title)) { Document::Section.new(title) }
+    # rule(title: simple(:title)) { Element::Section.new(title) }
     #
     # rule(id: simple(:id), title: simple(:title), content:)
     rule(
       id: simple(:id),
       title: simple(:title),
       sections: sequence(:sections)) do
-      Document::Section.new(title, id: id, sections: sections)
+      Element::Section.new(title, id: id, sections: sections)
     end
 
     rule(
@@ -76,7 +78,7 @@ module Coradoc
       title: simple(:title),
       contents: sequence(:contents),
       sections: simple(:sections)) do
-      Document::Section.new(title, id: id, contents: contents, sections: sections)
+      Element::Section.new(title, id: id, contents: contents, sections: sections)
     end
 
     rule(
@@ -84,37 +86,37 @@ module Coradoc
       title: simple(:title),
       contents: sequence(:contents),
       sections: sequence(:sections)) do
-        Document::Section.new(title, id: id, contents: contents, sections: sections)
+        Element::Section.new(title, id: id, contents: contents, sections: sections)
     end
 
     rule(example: sequence(:example)) do
-      Document::Block.new("", type: "example", lines: example)
+      Element::Core.new("", type: "example", lines: example)
     end
 
     # rule(title: simple(:title), paragraphs: sequence(:paragraphs)) do
-    #   Document::Section.new(title, paragraphs: paragraphs)
+    #   Element::Section.new(title, paragraphs: paragraphs)
     # end
     #
     # rule(title: simple(:title), blocks: sequence(:blocks)) do
-    #   Document::Section.new(title, blocks: blocks)
+    #   Element::Section.new(title, blocks: blocks)
     # end
     #
     # # Admonition
     # rule(admonition: simple(:admonition)) { admonition }
     # rule(type: simple(:type), text: simple(:text), break: simple(:line_break)) do
-    #   Document::Admonition.new(text, type.to_s, line_break: line_break)
+    #   Element::Admonition.new(text, type.to_s, line_break: line_break)
     # end
     #
     # # Block
     # rule(title: simple(:title), lines: sequence(:lines)) do
-    #   Document::Block.new(title, lines: lines)
+    #   Element::Block.new(title, lines: lines)
     # end
     #
     # rule(
     #   title: simple(:title),
     #   delimiter: simple(:delimiter),
     #   lines: sequence(:lines)) do
-    #     Document::Block.new(title, lines: lines, delimiter: delimiter)
+    #     Element::Block.new(title, lines: lines, delimiter: delimiter)
     #   end
     #
     # rule(
@@ -122,51 +124,52 @@ module Coradoc
     #   title: simple(:title),
     #   delimiter: simple(:delimiter),
     #   lines: sequence(:lines)) do
-    #     Document::Block.new(title, lines: lines, delimiter: delimiter, type: type)
+    #     Element::Block.new(title, lines: lines, delimiter: delimiter, type: type)
     #   end
     #
     # rule(attributes: simple(:attributes), lines: sequence(:lines)) do
-    #   Document::Block.new(nil, lines: lines, attributes: attributes)
+    #   Element::Block.new(nil, lines: lines, attributes: attributes)
     # end
     #
     # Attribute
     rule(key: simple(:key), value: simple(:value)) do
-      Document::Attribute.new(key, value)
+      Element::Attribute.new(key, value)
     end
 
     rule(key: simple(:key), value: simple(:value), break: simple(:line_break)) do
-      Document::Attribute.new(key, value, line_break: line_break)
+      Element::Attribute.new(key, value, line_break: line_break)
     end
 
-    rule(line_break: simple(:line_break)) { Document::LineBreak.new(line_break) }
+    rule(line_break: simple(:line_break)) { Element::LineBreak.new(line_break) }
 
-    rule(bibdata: sequence(:bibdata)) do
-      Document::Bibdata.new(bibdata)
+    rule(document_attributes: sequence(:document_attributes)) do
+      Element::DocumentAttributes.new(document_attributes)
     end
 
     # Table
     rule(table: simple(:table)) { table }
-    rule(cols: sequence(:cols)) { Document::Table::Row.new(cols) }
+    rule(cols: sequence(:cols)) { Element::Table::Row.new(cols) }
     rule(title: simple(:title), rows: sequence(:rows)) do
-      Document::Table.new(title, rows)
+      Element::Table.new(title, rows)
     end
 
     # List
     rule(list: simple(:list)) { list }
-    rule(unnumbered: sequence(:list_items)) do
-      Document::List::Unnumbered.new(list_items)
+    rule(unordered: sequence(:list_items)) do
+      Element::List::Unordered.new(list_items)
     end
 
     # Highlight
-    rule(highlight: simple(:text)) { Document::Highlight.new(text) }
+    rule(highlight: simple(:text)) { Element::Highlight.new(text) }
 
     # Glossaries
     rule(glossaries: sequence(:glossaries)) do
-      Document::Glossaries.new(glossaries)
+      Element::Glossaries.new(glossaries)
     end
 
     rule(header: simple(:header)) { header }
     rule(section: simple(:section)) { section }
+
     rule(document: sequence(:elements)) do
       Document.from_ast(elements)
     end

data/lib/coradoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coradoc
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/coradoc.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-require "parslet"
-require "coradoc/version"
+require "pathname"
 
-require "coradoc/parser"
-require "coradoc/transformer"
+require "parslet"
+require_relative "coradoc/version"
+require_relative "coradoc/parser"
+require_relative "coradoc/transformer"
+require_relative "coradoc/generator"
 
 module Coradoc
   class Error < StandardError; end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: coradoc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 - Abu Nashir
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -108,6 +108,7 @@ files:
 - ".docker/docker-compose.yml"
 - ".docker/readme.md"
 - ".hound.yml"
+- ".pryrc.sample"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -120,26 +121,59 @@ files:
 - docker-compose.yml
 - lib/coradoc.rb
 - lib/coradoc/document.rb
-- lib/coradoc/document/admonition.rb
-- lib/coradoc/document/attribute.rb
-- lib/coradoc/document/author.rb
-- lib/coradoc/document/base.rb
-- lib/coradoc/document/bibdata.rb
-- lib/coradoc/document/block.rb
-- lib/coradoc/document/header.rb
-- lib/coradoc/document/list.rb
-- lib/coradoc/document/paragraph.rb
-- lib/coradoc/document/revision.rb
-- lib/coradoc/document/section.rb
-- lib/coradoc/document/table.rb
-- lib/coradoc/document/text_element.rb
-- lib/coradoc/document/title.rb
+- lib/coradoc/element/admonition.rb
+- lib/coradoc/element/attribute.rb
+- lib/coradoc/element/attribute_list.rb
+- lib/coradoc/element/audio.rb
+- lib/coradoc/element/author.rb
+- lib/coradoc/element/base.rb
+- lib/coradoc/element/block.rb
+- lib/coradoc/element/block/core.rb
+- lib/coradoc/element/block/example.rb
+- lib/coradoc/element/block/literal.rb
+- lib/coradoc/element/block/quote.rb
+- lib/coradoc/element/block/side.rb
+- lib/coradoc/element/block/sourcecode.rb
+- lib/coradoc/element/break.rb
+- lib/coradoc/element/document_attributes.rb
+- lib/coradoc/element/header.rb
+- lib/coradoc/element/image.rb
+- lib/coradoc/element/image/block_image.rb
+- lib/coradoc/element/image/core.rb
+- lib/coradoc/element/image/inline_image.rb
+- lib/coradoc/element/inline.rb
+- lib/coradoc/element/inline/anchor.rb
+- lib/coradoc/element/inline/bold.rb
+- lib/coradoc/element/inline/cross_reference.rb
+- lib/coradoc/element/inline/hard_line_break.rb
+- lib/coradoc/element/inline/highlight.rb
+- lib/coradoc/element/inline/image.rb
+- lib/coradoc/element/inline/italic.rb
+- lib/coradoc/element/inline/link.rb
+- lib/coradoc/element/inline/monospace.rb
+- lib/coradoc/element/inline/quotation.rb
+- lib/coradoc/element/inline/subscript.rb
+- lib/coradoc/element/inline/superscript.rb
+- lib/coradoc/element/list.rb
+- lib/coradoc/element/list/core.rb
+- lib/coradoc/element/list/definition.rb
+- lib/coradoc/element/list/ordered.rb
+- lib/coradoc/element/list/unordered.rb
+- lib/coradoc/element/list_item.rb
+- lib/coradoc/element/paragraph.rb
+- lib/coradoc/element/revision.rb
+- lib/coradoc/element/section.rb
+- lib/coradoc/element/table.rb
+- lib/coradoc/element/text_element.rb
+- lib/coradoc/element/title.rb
+- lib/coradoc/element/video.rb
+- lib/coradoc/generator.rb
 - lib/coradoc/legacy_parser.rb
 - lib/coradoc/oscal.rb
 - lib/coradoc/parser.rb
 - lib/coradoc/parser/asciidoc/base.rb
-- lib/coradoc/parser/asciidoc/bibdata.rb
 - lib/coradoc/parser/asciidoc/content.rb
+- lib/coradoc/parser/asciidoc/document_attributes.rb
 - lib/coradoc/parser/asciidoc/header.rb
 - lib/coradoc/parser/asciidoc/section.rb
 - lib/coradoc/parser/base.rb
@@ -152,7 +186,7 @@ licenses:
 metadata:
   homepage_uri: https://www.metanorma.org
   source_code_uri: https://github.com/metanorma/coradoc
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -167,8 +201,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: AsciiDoc parser for metanorma
 test_files: []

data/lib/coradoc/document/author.rb

@@ -1,11 +0,0 @@
-module Coradoc
-  class Document::Author
-    attr_reader :email, :last_name, :first_name
-
-    def initialize(first_name, last_name, email)
-      @email = email
-      @last_name = last_name
-      @first_name = first_name
-    end
-  end
-end

data/lib/coradoc/document/base.rb

@@ -1,17 +0,0 @@
-module Coradoc
-  module Document
-    class Base
-      attr_reader :bibdata
-
-      def initialize(asciidoc)
-        @bibdata = extract_bibdata(asciidoc)
-      end
-
-      private
-
-      def extract_bibdata(asciidoc)
-        @bibdata ||= BibData.new(asciidoc.attributes)
-      end
-    end
-  end
-end

data/lib/coradoc/document/block.rb

@@ -1,34 +0,0 @@
-module Coradoc
-  class Document::Block
-    attr_reader :title, :lines, :attributes
-
-    def initialize(title, options = {})
-      @title = title
-      @lines = options.fetch(:lines, [])
-      @type_str = options.fetch(:type, nil)
-      @delimiter = options.fetch(:delimiter, "")
-      @attributes = options.fetch(:attributes, {})
-    end
-
-    def type
-      @type ||= defined_type || type_from_delimiter
-    end
-
-    private
-
-    def defined_type
-      if @type_str
-        @type_str.to_s.to_sym
-      end
-    end
-
-    def type_from_delimiter
-      case @delimiter
-      when "____" then :quote
-      when "****" then :side
-      when "----" then :source
-      when "====" then :example
-      else nil end
-    end
-  end
-end

data/lib/coradoc/document/header.rb

@@ -1,11 +0,0 @@
-module Coradoc
-  class Document::Header
-    attr_reader :title, :author, :revision
-
-    def initialize(title, options = {})
-      @title = title
-      @author = options.fetch(:author, nil)
-      @revision = options.fetch(:revision, nil)
-    end
-  end
-end