coradoc 1.1.2 → 1.1.4

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

@@ -0,0 +1,161 @@
+module Coradoc
+  module Parser
+    module Asciidoc
+      module Text
+
+        def space?
+          space.maybe
+        end
+
+        def space
+          str(' ').repeat(1)
+        end
+
+        def text
+          match("[^\n]").repeat(1)
+        end
+
+        def line_start?
+          match('^[^\n]').present?
+        end
+
+        def line_ending
+          str("\n") #| match('[\z]')# | match('$')
+        end
+
+        def eof?
+          any.absent?
+        end
+
+        def line_end
+          str("\n") | str("\r\n") | eof?
+        end
+
+        def endline
+          newline | any.absent?
+        end
+
+        # def endline_single
+        #   newline_single | any.absent?
+        # end
+
+        def newline
+          (str("\n") | str("\r\n")).repeat(1)
+        end
+
+        def newline_single
+          (str("\n") | str("\r\n"))
+        end
+
+        def keyword
+          (match('[a-zA-Z0-9_\-.,]') | str(".")).repeat(1)
+        end
+
+        def empty_line
+          match("^\n")
+        end
+
+        def digit
+          match("[0-9]")
+        end
+
+        def digits
+          match("[0-9]").repeat(1)
+        end
+
+        def word
+          match("[a-zA-Z0-9_-]").repeat(1)
+        end
+
+        def words
+          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
+
+        def special_character
+          match("^[*:=-]") | str("[#") | str("[[")
+        end
+
+        def date
+          digit.repeat(2, 4) >> str("-") >>
+            digit.repeat(1, 2) >> str("-") >> digit.repeat(1, 2)
+        end
+
+        def attr_name
+          match("[^\t\s]").repeat(1)
+        end
+
+        def file_path
+          match('[^\[]').repeat(1)
+        end
+
+        def include_directive
+          (str("include::") >> 
+            file_path.as(:path) >>
+            attribute_list >>
+          (newline | str("")).as(:line_break)
+          ).as(:include)
+        end
+
+        def inline_image
+          (str("image::") >> 
+            file_path.as(:path) >>
+            attribute_list >>
+          (line_ending)
+          ).as(:inline_image)
+        end
+
+        def block_image
+          (block_id.maybe >>
+            block_title.maybe >>
+            (attribute_list >> newline).maybe >>
+            match('^i') >> str("mage::") >>
+            file_path.as(:path) >>
+            attribute_list(:attribute_list_macro) >>
+            newline.as(:line_break)
+            ).as(:block_image)
+        end
+
+        def comment_line
+          tag.absent? >>
+          (str('//') >> str("/").absent? >>
+            space? >>
+            text.as(:comment_text)
+            ).as(:comment_line)
+        end
+
+        def tag
+          (str('//') >> str('/').absent? >>
+            space? >>
+            (str('tag') | str('end')).as(:prefix) >>
+            str('::') >> str(':').absent? >>
+            match('[^\[]').repeat(1).as(:name) >>
+            attribute_list >>
+            line_ending.maybe.as(:line_break)
+            ).as(:tag)
+        end
+
+        def comment_block
+          ( str('////') >> line_ending >>
+          ((line_ending >> str('////')).absent? >> any
+            ).repeat.as(:comment_text) >> 
+          line_ending >> str('////')
+          ).as(:comment_block)
+        end
+      end
+    end
+  end
+end
+
+

data/lib/coradoc/parser/base.rb

@@ -1,36 +1,12 @@
+require "digest"
 require "parslet"
 require "parslet/convenience"
 
-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::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
+    class Base < Coradoc::Parser::Asciidoc::Base
 
       root :document
       rule(:document) do
@@ -43,8 +19,8 @@ module Coradoc
           tag |
           comment_block |
           comment_line |
-          block.as(:block) |
-          section.as(:section) |
+          block |
+          section |
           include_directive |
           document_attributes |
           list |

data/lib/coradoc/transformer.rb

@@ -156,27 +156,25 @@ module Coradoc
       )
     }
 
-    rule(bold_constrained: {
-      content: simple(:text)
-    }){
+    rule(bold_constrained: sequence(:text)){
       Element::Inline::Bold.new(text, unconstrained: false)
     }
 
-    rule(bold_unconstrained: {content: simple(:text)}) {
+    rule(bold_unconstrained: sequence(:text)) {
       Element::Inline::Bold.new(text, unconstrained: true)
     }
 
-    rule(highlight_constrained: {content: simple(:text)}) {
+    rule(highlight_constrained: sequence(:text)) {
       Element::Inline::Highlight.new(text, unconstrained: false)
     }
-    rule(highlight_unconstrained: {content: simple(:text)}) {
+    rule(highlight_unconstrained: sequence(:text)) {
       Element::Inline::Highlight.new(text, unconstrained: true)
     }
 
-    rule(italic_constrained: {content: simple(:text)}) {
+    rule(italic_constrained: sequence(:text)) {
       Element::Inline::Italic.new(text, unconstrained: false)
     }
-    rule(italic_unconstrained: {content: simple(:text)}) {
+    rule(italic_unconstrained: sequence(:text)) {
       Element::Inline::Italic.new(text, unconstrained: true)
     }
 
@@ -300,25 +298,24 @@ module Coradoc
         if attribute_list
           if (attribute_list.positional == [] &&
            attribute_list.named.keys[0] == "reviewer")
-            Element::Block::ReviewerComment.new(
-              opts
-              )
+            Element::Block::ReviewerComment.new(opts)
           elsif (attribute_list.positional[0] == "sidebar" &&
             attribute_list.named == {})
-            Element::Block::Side.new(
-              opts
-            )
+            Element::Block::Side.new(opts)
+          else
+            Element::Block::Side.new(opts)
           end
         else
+          Element::Block::Side.new(opts)
         end
       elsif delimiter_c == "="
         Element::Block::Example.new(title, opts)
       elsif delimiter_c == "+"
         Element::Block::Pass.new(opts)
-      elsif delimiter_c == "-"
-        if (attribute_list.positional[0] == "quote")
-          Element::Block::Quote.new(title, opts)
-        end
+      elsif delimiter_c == "-" && delimiter.size == 2
+        Element::Block::Open.new(title, opts)
+      elsif delimiter_c == "-"&& delimiter.size >= 4
+        Element::Block::SourceCode.new(title, opts)
       elsif delimiter_c == "_"
         Element::Block::Quote.new(title, opts)
       end
@@ -379,28 +376,15 @@ module Coradoc
       Element::Table.new(title, rows, opts)
     end
 
-    rule(list_item: simple(:list_item),
-      marker: simple(:marker),
-      text: simple(:text),
-      line_break: simple(:line_break)) do
-      Element::ListItem.new(
-        text,
-        marker: marker.to_s,
-        line_break: line_break
-        )
-    end
-
-    rule(list_item: simple(:list_item),
-      marker: simple(:marker),
-      id: simple(:id),
-      text: simple(:text),
-      line_break: simple(:line_break)) do
+    rule(list_item: subtree(:list_item)) do
+      marker = list_item[:marker]
+      id = list_item[:id]
+      text = list_item[:text]
+      attached = list_item[:attached]
+      nested = list_item[:nested]
+      line_break = list_item[:line_break]
       Element::ListItem.new(
-        text,
-        id: id,
-        marker: marker.to_s,
-        line_break: line_break
-        )
+        text, id:, marker:, attached:, nested:, line_break: )
     end
 
 

data/lib/coradoc/version.rb

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

data/utils/round_trip.rb

@@ -30,7 +30,7 @@ adoc_files.each do |file_path|
     generated_adoc = Coradoc::Generator.gen_adoc(doc)
     cleaned_adoc = Coradoc::Input::HTML.cleaner.tidy(generated_adoc)
     File.open("#{file_path}.roundtrip","w"){|f| f.write(cleaned_adoc)}
-    `diff -B #{file_path} #{file_path}.roundtrip > #{file_path}.roundtrip.diff`
+    `diff -BNaur #{file_path} #{file_path}.roundtrip > #{file_path}.roundtrip.diff`
   # rescue
     # puts "unsuccessful..."
   # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marcel
@@ -293,7 +293,9 @@ files:
 - lib/coradoc/element/block.rb
 - lib/coradoc/element/block/core.rb
 - lib/coradoc/element/block/example.rb
+- lib/coradoc/element/block/listing.rb
 - lib/coradoc/element/block/literal.rb
+- lib/coradoc/element/block/open.rb
 - lib/coradoc/element/block/pass.rb
 - lib/coradoc/element/block/quote.rb
 - lib/coradoc/element/block/reviewer_comment.rb
@@ -410,6 +412,7 @@ files:
 - lib/coradoc/parser/asciidoc/section.rb
 - lib/coradoc/parser/asciidoc/table.rb
 - lib/coradoc/parser/asciidoc/term.rb
+- lib/coradoc/parser/asciidoc/text.rb
 - lib/coradoc/parser/base.rb
 - lib/coradoc/reverse_adoc.rb
 - lib/coradoc/transformer.rb