HTML document work

exe/reverse_adoc

@@ -28,6 +28,18 @@ OptionParser.new do |opts|
     Coradoc::ReverseAdoc.config.unknown_tags = v
   end
 
+  opts.on("-r", "--require RUBYMODULE", "Require additional Ruby file") do |v|
+    require v
+  end
+
+  opts.on("--track-time", "Track time spent on each step") do
+    Coradoc::ReverseAdoc.config.track_time = true
+  end
+
+  opts.on("--split-sections LEVEL", "Split sections up to LEVEL") do |i|
+    Coradoc::ReverseAdoc.config.split_sections = i.to_i
+  end
+
   opts.on("-v", "--version", "Version information") do |_v|
     puts "reverse_adoc: v#{Coradoc::ReverseAdoc::VERSION}"
     exit
@@ -54,6 +66,10 @@ if Coradoc::ReverseAdoc.config.external_images && Coradoc::ReverseAdoc.config.de
   raise "The -e | --external-images feature must be used with -o | --output. Exiting."
 end
 
+if Coradoc::ReverseAdoc.config.split_sections && Coradoc::ReverseAdoc.config.destination.nil?
+  raise "The --split_sections feature must be used with -o | --output. Exiting."
+end
+
 # Read from STDIN
 adoc_content = Coradoc::ReverseAdoc.convert(input_content)
 
@@ -64,7 +80,12 @@ unless Coradoc::ReverseAdoc.config.destination
 end
 
 # Write output to Coradoc::ReverseAdoc.config.destination
-FileUtils.mkdir_p(File.dirname(Coradoc::ReverseAdoc.config.destination))
-File.open(Coradoc::ReverseAdoc.config.destination, "w") do |file|
-  file.write(adoc_content)
+adoc_content = {nil => adoc_content} unless adoc_content.is_a? Hash
+
+adoc_content.each do |file, content|
+  destination = Coradoc::ReverseAdoc.config.destination
+  destdir = File.dirname(destination)
+  filename = file ? "#{destdir}/#{file}" : destination
+  FileUtils.mkdir_p(File.dirname(filename))
+  File.write(filename, content)
 end

lib/coradoc/document.rb

@@ -1,3 +1,4 @@
+require_relative "element/base"
 require_relative "element/title"
 require_relative "element/block"
 require_relative "element/section"

lib/coradoc/element/admonition.rb

@@ -1,7 +1,7 @@
 module Coradoc
   module Element
-    class Admonition
-      attr_reader :type, :content, :line_break
+    class Admonition < Base
+      attr_accessor :type, :content, :line_break
 
       def initialize(content, type, options = {})
         @content = content

lib/coradoc/element/attribute.rb

@@ -1,7 +1,7 @@
 module Coradoc
   module Element
-    class Attribute
-      attr_reader :key, :value
+    class Attribute < Base
+      attr_accessor :key, :value
 
       def initialize(key, value, _options = {})
         @key = key.to_s

lib/coradoc/element/attribute_list.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class AttributeList
-      attr_reader :positional, :named, :rejected_positional, :rejected_named
+    class AttributeList < Base
+      attr_accessor :positional, :named, :rejected_positional, :rejected_named
+
+      declare_children :positional, :named
 
       def initialize(*positional, **named)
         @positional = positional || []

lib/coradoc/element/audio.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class Audio
-      attr_reader :id, :title, :src, :options, :anchor
+    class Audio < Base
+      attr_accessor :id, :title, :src, :options, :anchor, :attributes
+
+      declare_children :id, :title, :anchor, :attributes
 
       def initialize(title, options = {})
         @title = title

lib/coradoc/element/author.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class Author
-      attr_reader :email, :last_name, :first_name
+    class Author < Base
+      attr_accessor :email, :last_name, :first_name
+
+      declare_children :email, :last_name, :first_name
 
       def initialize(first_name, last_name, email, middle_name = nil)
         @first_name = first_name

lib/coradoc/element/base.rb

@@ -1,15 +1,78 @@
 module Coradoc
   module Element
     class Base
-      # attr_reader :document_attributes
+      # The idea here, is that HTML content generators may often introduce
+      # a lot of unnecessary markup, that only makes sense in the HTML+CSS
+      # context. The idea is that certain cases can be simplified, making it
+      # so that the result is equivalent, but much simpler, allowing us to
+      # generate a nicer AsciiDoc syntax for those cases.
+      def simplify_block_content(content)
+        content = Array(content)
+        collected_content = []
+        content.each do |i|
+          case i
+          when Coradoc::Element::Section
+            return content unless i.safe_to_collapse?
 
-      # def initialize(asciidoc)
-      #   @document_attributes = extract_document_attributes(asciidoc)
-      # end
+            simplified = simplify_block_content(i.contents)
 
-      # def extract_document_attributes(asciidoc)
-      #   @document_attributes ||= DocumentAttributes.new(asciidoc.attributes)
-      # end
+            if simplified && !simplified.empty?
+              collected_content << simplified
+            end
+          else
+            collected_content << i
+          end
+        end
+
+        collected_content = collected_content.compact
+
+        # We can safely do this optimization only if there's just one other
+        # element inside this structure.
+        if collected_content.length <= 1
+          collected_content
+        else
+          content
+        end
+      end
+
+      def self.declare_children(*children)
+        @children = (@children || []).dup + children
+      end
+
+      def self.visit(element, &block)
+        element = yield element, :pre
+        element = if element.respond_to? :visit
+                    element.visit(&block)
+                  elsif element.is_a? Array
+                    element.map { |child| visit(child, &block) }.flatten.compact
+                  elsif element.is_a? Hash
+                    element.to_h do |k, v|
+                      [visit(k, &block), visit(v, &block)]
+                    end
+                  else
+                    element
+                  end
+        yield element, :post
+      end
+
+      def self.children_accessors
+        @children || []
+      end
+
+      def children_accessors
+        self.class.children_accessors
+      end
+
+      def visit(&block)
+        children_accessors.each do |accessor|
+          child = public_send(accessor)
+          result = self.class.visit(child, &block)
+          if result != child
+            public_send(:"#{accessor}=", result)
+          end
+        end
+        self
+      end
     end
   end
 end

lib/coradoc/element/block/core.rb

@@ -3,8 +3,10 @@
 module Coradoc
   module Element
     module Block
-      class Core
-        attr_reader :title, :lines, :attributes, :lang, :id
+      class Core < Base
+        attr_accessor :title, :lines, :attributes, :lang, :id
+
+        declare_children :title, :lines, :attributes, :lang, :id
 
         def initialize(title, options = {})
           @title = title

lib/coradoc/element/break.rb

@@ -1,7 +1,7 @@
 module Coradoc
   module Element
     module Break
-      class ThematicBreak
+      class ThematicBreak < Base
         def to_adoc
           "\n* * *\n"
         end

lib/coradoc/element/document_attributes.rb

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

lib/coradoc/element/header.rb

@@ -1,7 +1,9 @@
 module Coradoc
   module Element
-    class Header
-      attr_reader :title, :author, :revision
+    class Header < Base
+      attr_accessor :title, :author, :revision
+
+      declare_children :title
 
       def initialize(title, options = {})
         @title = title

lib/coradoc/element/image/block_image.rb

@@ -2,8 +2,8 @@ module Coradoc
   module Element
     module Image
       class BlockImage < Core
-        def initialize(title, id, src, options = ())
-          super(title, id, src, options)
+        def initialize(title, id, src, options = {})
+          super
           @colons = "::"
         end
 

lib/coradoc/element/image/core.rb

@@ -1,10 +1,12 @@
 module Coradoc
   module Element
     module Image
-      class Core
-        attr_reader :title, :id, :src, :attributes
+      class Core < Base
+        attr_accessor :title, :id, :src, :attributes
 
-        def initialize(title, id, src, options = ())
+        declare_children :id, :src, :title, :attributes
+
+        def initialize(title, id, src, options = {})
           @title = title
           @id = id
           @anchor = @id.nil? ? nil : Coradoc::Element::Inline::Anchor.new(@id)

lib/coradoc/element/image/inline_image.rb

@@ -2,8 +2,8 @@ module Coradoc
   module Element
     module Image
       class InlineImage < Core
-        def initialize(title, id, src, options = ())
-          super(title, id, src, options)
+        def initialize(title, id, src, options = {})
+          super
           @colons = ":"
         end
       end

lib/coradoc/element/inline/anchor.rb

@@ -1,8 +1,10 @@
 module Coradoc
   module Element
     module Inline
-      class Anchor
-        attr_reader :id
+      class Anchor < Base
+        attr_accessor :id
+
+        declare_children :id
 
         def initialize(id)
           @id = id

lib/coradoc/element/inline/bold.rb

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

lib/coradoc/element/inline/cross_reference.rb

@@ -1,8 +1,10 @@
 module Coradoc
   module Element
     module Inline
-      class CrossReference
-        attr_reader :href, :name
+      class CrossReference < Base
+        attr_accessor :href, :name
+
+        declare_children :href, :name
 
         def initialize(href, name = nil)
           @href = href

lib/coradoc/element/inline/hard_line_break.rb

@@ -1,7 +1,7 @@
 module Coradoc
   module Element
     module Inline
-      class HardLineBreak
+      class HardLineBreak < Base
         def to_adoc
           " +\n"
         end

lib/coradoc/element/inline/highlight.rb

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

lib/coradoc/element/inline/italic.rb

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