coradoc 0.3.0 → 1.0.0

data/lib/coradoc/element/inline/italic.rb

@@ -1,18 +1,23 @@
 module Coradoc
   module Element
     module Inline
-      class Italic
+      class Italic < Base
         attr_accessor :content, :unconstrained
 
-        def initialize(content, unconstrained = true)
+        declare_children :content
+
+        def initialize(content, unconstrained: true)
           @content = content
           @unconstrained = unconstrained
         end
 
         def to_adoc
           content = Coradoc::Generator.gen_adoc(@content)
-          doubled = @unconstrained ? "_" : ""
-          "#{content[/^\s+/]}#{doubled}_#{content.strip}_#{doubled}#{content[/\s+$/]}"
+          if @unconstrained
+            "__#{content}__"
+          else
+            "_#{content}_"
+          end
         end
       end
     end

data/lib/coradoc/element/inline/link.rb

@@ -1,23 +1,39 @@
+require "uri"
+
 module Coradoc
   module Element
     module Inline
-      class Link
-        attr_reader :path, :title, :name
+      class Link < Base
+        attr_accessor :path, :title, :name, :right_constrain
+
+        declare_children :path, :title, :name
 
         def initialize(options = {})
           @path = options.fetch(:path, nil)
           @title = options.fetch(:title, nil)
           @name = options.fetch(:name, nil)
+          @right_constrain = options.fetch(:right_constrain, false)
         end
 
         def to_adoc
-          link = @path.to_s&.match?(URI::DEFAULT_PARSER.make_regexp) ? @path : "link:#{@path}"
-          link << if @name.to_s.empty?
+          link = @path
+          unless @path.to_s&.match?(URI::DEFAULT_PARSER.make_regexp)
+            link = "link:#{link}"
+          end
+
+          name_empty = @name.to_s.empty?
+          title_empty = @title.to_s.empty?
+          valid_empty_name_link = link.start_with?(%r{https?://})
+
+          link << if name_empty && !title_empty
                     "[#{@title}]"
-                  else
+                  elsif !name_empty
                     "[#{@name}]"
+                  elsif valid_empty_name_link && !right_constrain
+                    ""
+                  else
+                    "[]"
                   end
-          link.prepend(" ")
           link
         end
       end

data/lib/coradoc/element/inline/monospace.rb

@@ -1,18 +1,23 @@
 module Coradoc
   module Element
     module Inline
-      class Monospace
+      class Monospace < Base
         attr_accessor :content, :constrained
 
-        def initialize(content, unconstrained = true)
+        declare_children :content
+
+        def initialize(content, unconstrained: true)
           @content = content
           @unconstrained = unconstrained
         end
 
         def to_adoc
           content = Coradoc::Generator.gen_adoc(@content)
-          doubled = @unconstrained ? "`" : ""
-          "#{doubled}`#{content}`#{doubled}"
+          if @unconstrained
+            "``#{content}``"
+          else
+            "`#{content}`"
+          end
         end
       end
     end

data/lib/coradoc/element/inline/quotation.rb

@@ -1,9 +1,11 @@
 module Coradoc
   module Element
     module Inline
-      class Quotation
+      class Quotation < Base
         attr_accessor :content
 
+        declare_children :content
+
         def initialize(content)
           @content = content
         end

data/lib/coradoc/element/inline/subscript.rb

@@ -1,16 +1,18 @@
 module Coradoc
   module Element
     module Inline
-      class Subscript
+      class Subscript < Base
         attr_accessor :content
 
+        declare_children :content
+
         def initialize(content)
           @content = content
         end
 
         def to_adoc
           content = Coradoc::Generator.gen_adoc(@content)
-          "#{content[/^\s*/]}~#{content.strip}~#{content[/\s*$/]}"
+          "~#{content}~"
         end
       end
     end

data/lib/coradoc/element/inline/superscript.rb

@@ -1,16 +1,18 @@
 module Coradoc
   module Element
     module Inline
-      class Superscript
+      class Superscript < Base
         attr_accessor :content
 
+        declare_children :content
+
         def initialize(content)
           @content = content
         end
 
         def to_adoc
           content = Coradoc::Generator.gen_adoc(@content)
-          "#{content[/^\s*/]}^#{content.strip}^#{content[/\s*$/]}"
+          "^#{content}^"
         end
       end
     end

data/lib/coradoc/element/list/core.rb

@@ -4,29 +4,32 @@ require_relative "core"
 module Coradoc
   module Element
     module List
-      class Core
-        attr_reader :items, :prefix, :id, :ol_count, :anchor
+      class Core < Base
+        attr_accessor :items, :prefix, :id, :ol_count, :anchor
+
+        declare_children :items, :anchor, :id
 
         def initialize(items, options = {})
           @items = items
           @items = [@items] unless @items.is_a?(Array)
           @id = options.fetch(:id, nil)
           @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
-          @ol_count = options.fetch(:ol_count, 0)
-          @attrs = options.fetch(:attrs, nil)
+          @ol_count = options.fetch(:ol_count, 1)
+          @attrs = options.fetch(:attrs, AttributeList.new)
         end
 
         def to_adoc
+          anchor = @anchor.nil? ? "" : @anchor.to_adoc.to_s
+          attrs = @attrs.to_adoc(false).to_s
           content = "\n"
           @items.each do |item|
             c = Coradoc::Generator.gen_adoc(item)
             if !c.empty?
               content << prefix.to_s
+              content << " " if c[0]!=" "
               content << c
             end
           end
-          anchor = @anchor.nil? ? "" : @anchor.to_adoc.to_s
-          attrs = @attrs.nil? ? "" : @attrs.to_adoc.to_s
           "\n#{anchor}#{attrs}" + content
         end
       end

data/lib/coradoc/element/list/definition.rb

@@ -2,6 +2,25 @@ module Coradoc
   module Element
     module List
       class Definition < Core
+        attr_accessor :items, :delimiter
+
+        def initialize(items, options = {})
+          @items = items
+          @delimiter = options.fetch(:delimiter, "::")
+          # super(items, options)
+        end
+
+        def prefix
+          @delimiter
+        end
+
+        def to_adoc
+          content = "\n"
+          @items.each do |item|
+            content << item.to_adoc(@delimiter)
+          end
+          content
+        end
       end
     end
   end

data/lib/coradoc/element/list/ordered.rb

@@ -7,7 +7,7 @@ module Coradoc
         end
 
         def prefix
-          "." * [@ol_count, 0].max
+          "." * [@ol_count, 1].max
         end
       end
     end

data/lib/coradoc/element/list/unordered.rb

@@ -7,7 +7,7 @@ module Coradoc
         end
 
         def prefix
-          "*" * [@ol_count, 0].max
+          "*" * [@ol_count, 1].max
         end
       end
     end

data/lib/coradoc/element/list.rb

@@ -6,6 +6,7 @@ module Coradoc
 end
 
 require_relative "list_item"
+require_relative "list_item_definition"
 require_relative "list/core"
 require_relative "list/ordered"
 require_relative "list/unordered"

data/lib/coradoc/element/list_item.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class ListItem
-      attr_reader :id
+    class ListItem < Base
+      attr_accessor :id
+
+      declare_children :content, :id, :anchor
 
       def initialize(content, options = {})
         @content = content
@@ -11,7 +13,10 @@ module Coradoc
 
       def to_adoc
         anchor = @anchor.nil? ? "" : @anchor.to_adoc.to_s
-        content = Coradoc::Generator.gen_adoc(@content).chomp
+        content = Array(@content).map do |subitem|
+          Coradoc::Generator.gen_adoc(subitem).chomp
+        end.join("\n+\n")
+
         " #{anchor}#{content.chomp}\n"
       end
     end

data/lib/coradoc/element/list_item_definition.rb

@@ -0,0 +1,32 @@
+module Coradoc
+  module Element
+    class ListItemDefinition < Base
+      attr_accessor :id, :terms, :contents
+
+      declare_children :id, :terms, :contents
+
+      def initialize(terms, contents, options = {})
+        @terms = terms
+        @contents = contents
+        @id = options.fetch(:id, nil)
+        @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
+      end
+
+      def to_adoc(delimiter)
+        anchor = @anchor.nil? ? "" : @anchor.to_adoc.to_s
+        content = ""
+        if (@terms.is_a?(Array) && @terms.size == 1) || !@terms.is_a?(Array)
+          t = Coradoc::Generator.gen_adoc(@terms)
+          content << "#{anchor}#{t}#{delimiter} "
+        else
+          @terms.map do |term|
+            t = Coradoc::Generator.gen_adoc(term)
+            content << "#{t}#{delimiter}\n"
+          end
+        end
+        d = Coradoc::Generator.gen_adoc(@contents)
+        content << "#{d}\n"
+      end
+    end
+  end
+end

data/lib/coradoc/element/paragraph.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class Paragraph
-      attr_reader :content, :anchor, :tdsinglepara
+    class Paragraph < Base
+      attr_accessor :content, :anchor, :tdsinglepara
+
+      declare_children :content, :anchor
 
       def initialize(content, options = {})
         @content = content

data/lib/coradoc/element/revision.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class Revision
-      attr_reader :number, :date, :remark
+    class Revision < Base
+      attr_accessor :number, :date, :remark
+
+      declare_children :number, :date, :remark
 
       def initialize(number, options = {})
         @number = number

data/lib/coradoc/element/section.rb

@@ -1,11 +1,14 @@
 module Coradoc
   module Element
-    class Section
-      attr_reader :id, :title, :contents, :sections
+    class Section < Base
+      attr_accessor :id, :title, :contents, :sections
+
+      declare_children :id, :title, :contents, :sections
 
       def initialize(title, options = {})
         @title = title
         @id = options.fetch(:id, nil)
+        @id = nil if @id == ""
         @contents = options.fetch(:contents, [])
         @sections = options.fetch(:sections, [])
         @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
@@ -23,14 +26,28 @@ module Coradoc
 
       def to_adoc
         anchor = @anchor.nil? ? "" : "#{@anchor.to_adoc}\n"
+        title = Coradoc::Generator.gen_adoc(@title)
         content = Coradoc::Generator.gen_adoc(@contents)
-        "\n#{anchor}" << content << "\n"
+        sections = Coradoc::Generator.gen_adoc(@sections)
+
+        # A block of " +\n"s isn't parsed correctly. It needs to start
+        # with something.
+        content = "&nbsp;#{content}" if content.start_with?(" +\n")
+
+        "\n#{anchor}" << title << content << sections << "\n"
+      end
+
+      # Check for cases when Section is simply an equivalent of an empty <DIV>
+      # HTML element and if it happens inside some other block element, can be
+      # safely collapsed.
+      def safe_to_collapse?
+        @title.nil? && @id.nil? && @sections.empty?
       end
 
       private
 
       def extract_glossaries
-        contents.select { |c| c if c.is_a?(Coradoc::Element::Glossaries) }.first
+        contents.grep(Coradoc::Element::Glossaries).first
       end
     end
   end

data/lib/coradoc/element/table.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class Table
-      attr_reader :title, :rows, :content, :id
+    class Table < Base
+      attr_accessor :title, :rows, :content, :id
+
+      declare_children :title, :rows, :id
 
       def initialize(title, rows, options = {})
         @rows = rows
@@ -20,8 +22,10 @@ module Coradoc
         "\n\n#{anchor}#{attrs}#{title}|===\n" << content << "\n|===\n"
       end
 
-      class Row
-        attr_reader :columns, :header
+      class Row < Base
+        attr_accessor :columns, :header
+
+        declare_children :columns
 
         def initialize(columns, header = false)
           @columns = columns
@@ -32,9 +36,15 @@ module Coradoc
           @header
         end
 
+        def asciidoc?
+          @columns.any?(&:asciidoc?)
+        end
+
         def to_adoc
-          content = Coradoc::Generator.gen_adoc(@columns).rstrip
+          delim = asciidoc? ? "\n" : " "
+          content = @columns.map { |col| Coradoc::Generator.gen_adoc(col) }.join(delim)
           result  = "#{content}\n"
+          result << "\n" if asciidoc?
           table_header_row? ? result + underline_for : result
         end
 
@@ -43,23 +53,30 @@ module Coradoc
         end
       end
 
-      class Cell
-        attr_reader :anchor
+      class Cell < Base
+        attr_accessor :content, :anchor, :id, :colrowattr, :alignattr, :style
+
+        declare_children :content, :anchor, :id
 
         def initialize(options = {})
+          super()
           @id = options.fetch(:id, nil)
           @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
           @colrowattr = options.fetch(:colrowattr, "")
           @alignattr = options.fetch(:alignattr, "")
           @style = options.fetch(:style, "")
           @content = options.fetch(:content, "")
-          @delim = options.fetch(:delim, "")
+        end
+
+        def asciidoc?
+          @style.include?("a")
         end
 
         def to_adoc
           anchor = @anchor.nil? ? "" : @anchor.to_adoc.to_s
-          content = Coradoc::Generator.gen_adoc(@content)
-          "#{@colrowattr}#{@alignattr}#{@style}| #{anchor}#{content}#{@delim}"
+          content = simplify_block_content(@content)
+          content = Coradoc::Generator.gen_adoc(content)
+          "#{@colrowattr}#{@alignattr}#{@style}| #{anchor}#{content}"
         end
       end
     end

data/lib/coradoc/element/text_element.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class TextElement
-      attr_reader :id, :content, :line_break
+    class TextElement < Base
+      attr_accessor :id, :content, :line_break
+
+      declare_children :content
 
       def initialize(content, options = {})
         @content = content # .to_s
@@ -10,22 +12,60 @@ module Coradoc
       end
 
       def to_adoc
-        Coradoc::Generator.gen_adoc(@content)
+        Coradoc::Generator.gen_adoc(treat_text_to_adoc(@content))
+      end
+
+      def treat_text_to_adoc(text)
+        text = preserve_nbsp(text)
+        text = remove_border_newlines(text)
+        text = remove_inner_newlines(text)
+        text = self.class.escape_keychars(text)
+
+        text = preserve_keychars_within_backticks(text)
+        escape_links(text)
+      end
+
+      def preserve_nbsp(text)
+        text.gsub(/\u00A0/, "&nbsp;")
+      end
+
+      def escape_links(text)
+        text.gsub(/<<([^ ][^>]*)>>/, "\\<<\\1>>")
+      end
+
+      def remove_border_newlines(text)
+        text.gsub(/\A\n+/, "").gsub(/\n+\z/, "")
+      end
+
+      def remove_inner_newlines(text)
+        text.tr("\n\t", " ").squeeze(" ")
+      end
+
+      def preserve_keychars_within_backticks(text)
+        text.gsub(/`.*?`/) do |match|
+          match.gsub('\_', "_").gsub('\*', "*")
+        end
+      end
+
+      def self.escape_keychars(string)
+        subs = { "*" => '\*', "_" => '\_' }
+        string
+          .gsub(/((?<=\s)[\*_]+)|[\*_]+(?=\s)/) do |n|
+          n.chars.map do |char|
+            subs[char]
+          end.join
+        end
       end
     end
-  end
 
-  module Element
-    class LineBreak
+    class LineBreak < Base
       attr_reader :line_break
 
       def initialize(line_break)
         @line_break = line_break
       end
     end
-  end
 
-  module Element
     class Highlight < Element::TextElement
     end
   end

data/lib/coradoc/element/title.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class Title
-      attr_reader :id, :content, :line_break
+    class Title < Base
+      attr_accessor :id, :content, :line_break, :style, :level_int
+
+      declare_children :id, :content
 
       def initialize(content, level, options = {})
         @level_int = level
@@ -10,6 +12,7 @@ module Coradoc
         @id = options.fetch(:id, nil)
         @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
         @line_break = options.fetch(:line_break, "")
+        @style = options.fetch(:style, nil)
       end
 
       def level
@@ -19,21 +22,38 @@ module Coradoc
       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("")
+        <<~HERE
+
+        #{anchor}#{style_str}#{level_str} #{content}
+        HERE
+      end
+
+      def level_str
+        if @level_int <= 5
+          "=" * (@level_int + 1)
+        else
+          "======"
+        end
+      end
+
+      def style_str
+        style = [@style]
+        style << "level=#{@level_int}" if @level_int > 5
+        style = style.compact.join(",")
+
+        "[#{style}]\n" unless style.empty?
       end
 
       alias :text :content
 
       private
 
-      attr_reader :level_str
-
       def level_from_string
         case @level_int
         when 2 then :heading_two
         when 3 then :heading_three
         when 4 then :heading_four
+        when 5 then :heading_five
         else :unknown
         end
       end

data/lib/coradoc/element/video.rb

@@ -1,23 +1,50 @@
 module Coradoc
   module Element
-    class Video
-      attr_reader :id, :title, :src, :options
+    class Video < Base
+      attr_accessor :id, :title, :src, :options
+
+      declare_children :id, :anchor, :attributes
 
       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')
+        @attributes = options.fetch(:attributes, AttributeList.new)
+        if @attributes.any?
+          @attributes.validate_positional(VALIDATORS_POSITIONAL)
+          @attributes.validate_named(VALIDATORS_NAMED)
+        end
       end
 
       def to_adoc
         anchor = @anchor.nil? ? "" : "#{@anchor.to_adoc}\n"
         title = ".#{@title}\n" unless @title.empty?
-        attrs = @attributes.empty? ? "\[\]" : @attributes.to_adoc
+        attrs = @attributes.to_adoc
         [anchor, title, "video::", @src, attrs].join("")
       end
+
+      extend AttributeList::Matchers
+      VALIDATORS_POSITIONAL = [
+        [:alt, String],
+        [:width, Integer],
+        [:height, Integer],
+      ]
+
+      VALIDATORS_NAMED = {
+        title: String,
+        poster: String,
+        width: Integer,
+        height: Integer,
+        start: Integer,
+        end: Integer,
+        theme: one("dark", "light"),
+        lang: /[a-z]{2,3}(?:-[A-Z]{2})?/,
+        list: String,
+        playlist: String,
+        options: many("autoplay", "loop", "modest",
+                      "nocontrols", "nofullscreen", "muted"),
+      }
     end
   end
 end