coradoc 1.1.5 → 1.1.7

data/lib/coradoc/input/html/converters/base.rb

@@ -1,103 +1,107 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Base
-      # Default implementation to convert a given Nokogiri node
-      # to an AsciiDoc script.
-      # Can be overriden by subclasses.
-      def convert(node, state = {})
-        Coradoc::Generator.gen_adoc(to_coradoc(node, state))
-      end
-
-      # Note: treat_children won't run plugin hooks
-      def treat_children(node, state)
-        node.children.map do |child|
-          treat(child, state)
-        end.join
-      end
-
-      def treat(node, state)
-        Converters.process(node, state)
-      end
-
-      def treat_children_coradoc(node, state)
-        node.children.map do |child|
-          treat_coradoc(child, state)
-        end.flatten.reject { |x| x.to_s.empty? }
-      end
-
-      def treat_coradoc(node, state)
-        Converters.process_coradoc(node, state)
-      end
-
-      def extract_title(node)
-        title = Coradoc::Element::TextElement.escape_keychars(
-          node["title"].to_s,
-        )
-        title.empty? ? "" : %[ #{title}]
-      end
-
-      def node_has_ancestor?(node, name)
-        case name
-        when String
-          node.ancestors.map(&:name).include?(name)
-        when Array
-          (node.ancestors.map(&:name) & name).any?
-        end
-      end
-
-      def textnode_before_end_with?(node, str)
-        return nil unless [String, Regexp].include?(str.class)
-        return nil if str.is_a?(String) && str.empty?
-
-        str = /#{Regexp.escape(str)}/ if str.is_a?(String)
-        str = /(?:#{str})\z/
-
-        node2 = node.at_xpath("preceding-sibling::node()[1]")
-        node2.respond_to?(:text) && node2.text.match?(str)
-      end
-
-      def textnode_after_start_with?(node, str)
-        return nil unless [String, Regexp].include?(str.class)
-        return nil if str.is_a?(String) && str.empty?
-
-        str = /#{Regexp.escape(str)}/ if str.is_a?(String)
-        str = /\A(?:#{str})/
-
-        node2 = node.at_xpath("following-sibling::node()[1]")
-        node2.respond_to?(:text) && node2.text.match?(str)
-      end
-
-      def extract_leading_trailing_whitespace(node)
-        node.text =~ /^(\s+)/
-        leading_whitespace = $1
-        if !leading_whitespace.nil?
-          first_text = node.at_xpath("./text()[1]")
-          first_text.replace(first_text.text.lstrip) if first_text
-          leading_whitespace = " "
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Base
+          # Default implementation to convert a given Nokogiri node
+          # to an AsciiDoc script.
+          # Can be overriden by subclasses.
+          def convert(node, state = {})
+            Coradoc::Generator.gen_adoc(to_coradoc(node, state))
+          end
+
+          # Note: treat_children won't run plugin hooks
+          def treat_children(node, state)
+            node.children.map do |child|
+              treat(child, state)
+            end.join
+          end
+
+          def treat(node, state)
+            Converters.process(node, state)
+          end
+
+          def treat_children_coradoc(node, state)
+            node.children.map do |child|
+              treat_coradoc(child, state)
+            end.flatten.reject { |x| x.to_s.empty? }
+          end
+
+          def treat_coradoc(node, state)
+            Converters.process_coradoc(node, state)
+          end
+
+          def extract_title(node)
+            title = Coradoc::Element::TextElement.escape_keychars(
+              node["title"].to_s,
+            )
+            title.empty? ? "" : %[ #{title}]
+          end
+
+          def node_has_ancestor?(node, name)
+            case name
+            when String
+              node.ancestors.map(&:name).include?(name)
+            when Array
+              (node.ancestors.map(&:name) & name).any?
+            end
+          end
+
+          def textnode_before_end_with?(node, str)
+            return nil unless [String, Regexp].include?(str.class)
+            return nil if str.is_a?(String) && str.empty?
+
+            str = /#{Regexp.escape(str)}/ if str.is_a?(String)
+            str = /(?:#{str})\z/
+
+            node2 = node.at_xpath("preceding-sibling::node()[1]")
+            node2.respond_to?(:text) && node2.text.match?(str)
+          end
+
+          def textnode_after_start_with?(node, str)
+            return nil unless [String, Regexp].include?(str.class)
+            return nil if str.is_a?(String) && str.empty?
+
+            str = /#{Regexp.escape(str)}/ if str.is_a?(String)
+            str = /\A(?:#{str})/
+
+            node2 = node.at_xpath("following-sibling::node()[1]")
+            node2.respond_to?(:text) && node2.text.match?(str)
+          end
+
+          def extract_leading_trailing_whitespace(node)
+            node.text =~ /^(\s+)/
+            leading_whitespace = $1
+            if !leading_whitespace.nil?
+              first_text = node.at_xpath("./text()[1]")
+              first_text&.replace(first_text.text.lstrip)
+              leading_whitespace = " "
+            end
+            node.text =~ /(\s+)$/
+            trailing_whitespace = $1
+            if !trailing_whitespace.nil?
+              last_text = node.at_xpath("./text()[last()]")
+              last_text&.replace(last_text.text.rstrip)
+              trailing_whitespace = " "
+            end
+            [leading_whitespace, trailing_whitespace]
+          end
+
+          def unconstrained_before?(node)
+            before = node.at_xpath("preceding::node()[1]")
+
+            before &&
+              !before.text.strip.empty? &&
+              before.text[-1]&.match?(/\w/)
+          end
+
+          def unconstrained_after?(node)
+            after = node.at_xpath("following::node()[1]")
+
+            after && !after.text.strip.empty? &&
+              after.text[0]&.match?(/\w|,|;|"|\.\?!/)
+          end
         end
-        node.text =~ /(\s+)$/
-        trailing_whitespace = $1
-        if !trailing_whitespace.nil?
-          last_text = node.at_xpath("./text()[last()]")
-          last_text.replace(last_text.text.rstrip) if last_text
-          trailing_whitespace = " "
-        end
-        [leading_whitespace, trailing_whitespace]
-      end
-
-      def unconstrained_before?(node)
-        before = node.at_xpath("preceding::node()[1]")
-
-        before &&
-          !before.text.strip.empty? &&
-          before.text[-1]&.match?(/\w/)
-      end
-
-      def unconstrained_after?(node)
-        after = node.at_xpath("following::node()[1]")
-
-        after && !after.text.strip.empty? &&
-          after.text[0]&.match?(/\w|,|;|"|\.\?!/)
       end
     end
   end

data/lib/coradoc/input/html/converters/blockquote.rb

@@ -1,18 +1,22 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Blockquote < Base
-      def to_coradoc(node, state = {})
-        node["id"]
-        cite = node["cite"]
-        attributes = Coradoc::Element::AttributeList.new
-        attributes.add_positional("quote", cite) if !cite.nil?
-        content = treat_children(node, state).strip
-        content = Coradoc::Input::HTML.cleaner.remove_newlines(content)
-        Coradoc::Element::Block::Quote.new(nil, lines: content,
-                                                attributes: attributes)
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Blockquote < Base
+          def to_coradoc(node, state = {})
+            node["id"]
+            cite = node["cite"]
+            attributes = Coradoc::Element::AttributeList.new
+            attributes.add_positional("quote", cite) if !cite.nil?
+            content = treat_children(node, state).strip
+            content = Coradoc::Input::Html.cleaner.remove_newlines(content)
+            Coradoc::Element::Block::Quote.new(nil, lines: content,
+                                                    attributes: attributes)
+          end
+        end
+
+        register :blockquote, Blockquote.new
       end
     end
-
-    register :blockquote, Blockquote.new
   end
 end

data/lib/coradoc/input/html/converters/br.rb

@@ -1,11 +1,15 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Br < Base
-      def to_coradoc(_node, _state = {})
-        Coradoc::Element::Inline::HardLineBreak.new
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Br < Base
+          def to_coradoc(_node, _state = {})
+            Coradoc::Element::Inline::HardLineBreak.new
+          end
+        end
+
+        register :br, Br.new
       end
     end
-
-    register :br, Br.new
   end
 end

data/lib/coradoc/input/html/converters/bypass.rb

@@ -1,77 +1,81 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Bypass < Base
-      def to_coradoc(node, state = {})
-        treat_children_coradoc(node, state)
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Bypass < Base
+          def to_coradoc(node, state = {})
+            treat_children_coradoc(node, state)
+          end
+        end
+
+        register :document, Bypass.new
+        register :html,     Bypass.new
+        register :body,     Bypass.new
+        register :span,     Bypass.new
+        register :thead,    Bypass.new
+        register :tbody,    Bypass.new
+        register :tfoot,    Bypass.new
+        register :abbr, Bypass.new
+        register :acronym,    Bypass.new
+        register :address,    Bypass.new
+        register :applet, Bypass.new
+        register :map, Bypass.new
+        register :area, Bypass.new
+        register :bdi,    Bypass.new
+        register :bdo,    Bypass.new
+        register :big,    Bypass.new
+        register :button,    Bypass.new
+        register :canvas,    Bypass.new
+        register :data, Bypass.new
+        register :datalist, Bypass.new
+        register :del,    Bypass.new
+        register :ins,    Bypass.new
+        register :dfn,    Bypass.new
+        register :dialog, Bypass.new
+        register :embed, Bypass.new
+        register :fieldset, Bypass.new
+        register :font, Bypass.new
+        register :footer, Bypass.new
+        register :form, Bypass.new
+        register :frame, Bypass.new
+        register :frameset, Bypass.new
+        register :header,    Bypass.new
+        register :iframe,    Bypass.new
+        register :input,    Bypass.new
+        register :label,    Bypass.new
+        register :legend, Bypass.new
+        register :main,    Bypass.new
+        register :menu,    Bypass.new
+        register :menulist, Bypass.new
+        register :meter, Bypass.new
+        register :nav, Bypass.new
+        register :noframes,    Bypass.new
+        register :noscript,    Bypass.new
+        register :object, Bypass.new
+        register :optgroup, Bypass.new
+        register :option,    Bypass.new
+        register :output,    Bypass.new
+        register :param, Bypass.new
+        register :picture, Bypass.new
+        register :progress, Bypass.new
+        register :ruby, Bypass.new
+        register :rt,    Bypass.new
+        register :rp,    Bypass.new
+        register :s, Bypass.new
+        register :select, Bypass.new
+        register :small, Bypass.new
+        register :span, Bypass.new
+        register :strike, Bypass.new
+        register :details,    Bypass.new
+        register :section,    Bypass.new
+        register :summary,    Bypass.new
+        register :svg, Bypass.new
+        register :template,    Bypass.new
+        register :textarea,    Bypass.new
+        register :track, Bypass.new
+        register :u, Bypass.new
+        register :wbr, Bypass.new
       end
     end
-
-    register :document, Bypass.new
-    register :html,     Bypass.new
-    register :body,     Bypass.new
-    register :span,     Bypass.new
-    register :thead,    Bypass.new
-    register :tbody,    Bypass.new
-    register :tfoot,    Bypass.new
-    register :abbr, Bypass.new
-    register :acronym,    Bypass.new
-    register :address,    Bypass.new
-    register :applet, Bypass.new
-    register :map, Bypass.new
-    register :area, Bypass.new
-    register :bdi,    Bypass.new
-    register :bdo,    Bypass.new
-    register :big,    Bypass.new
-    register :button,    Bypass.new
-    register :canvas,    Bypass.new
-    register :data, Bypass.new
-    register :datalist, Bypass.new
-    register :del,    Bypass.new
-    register :ins,    Bypass.new
-    register :dfn,    Bypass.new
-    register :dialog, Bypass.new
-    register :embed, Bypass.new
-    register :fieldset, Bypass.new
-    register :font, Bypass.new
-    register :footer, Bypass.new
-    register :form, Bypass.new
-    register :frame, Bypass.new
-    register :frameset, Bypass.new
-    register :header,    Bypass.new
-    register :iframe,    Bypass.new
-    register :input,    Bypass.new
-    register :label,    Bypass.new
-    register :legend, Bypass.new
-    register :main,    Bypass.new
-    register :menu,    Bypass.new
-    register :menulist, Bypass.new
-    register :meter, Bypass.new
-    register :nav, Bypass.new
-    register :noframes,    Bypass.new
-    register :noscript,    Bypass.new
-    register :object, Bypass.new
-    register :optgroup, Bypass.new
-    register :option,    Bypass.new
-    register :output,    Bypass.new
-    register :param, Bypass.new
-    register :picture, Bypass.new
-    register :progress, Bypass.new
-    register :ruby, Bypass.new
-    register :rt,    Bypass.new
-    register :rp,    Bypass.new
-    register :s, Bypass.new
-    register :select, Bypass.new
-    register :small, Bypass.new
-    register :span, Bypass.new
-    register :strike, Bypass.new
-    register :details,    Bypass.new
-    register :section,    Bypass.new
-    register :summary,    Bypass.new
-    register :svg, Bypass.new
-    register :template,    Bypass.new
-    register :textarea,    Bypass.new
-    register :track, Bypass.new
-    register :u, Bypass.new
-    register :wbr, Bypass.new
   end
 end

data/lib/coradoc/input/html/converters/code.rb

@@ -1,19 +1,23 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Code < Markup
-      def coradoc_class
-        Coradoc::Element::Inline::Monospace
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Code < Markup
+          def coradoc_class
+            Coradoc::Element::Inline::Monospace
+          end
+
+          def markup_ancestor_tag_names
+            %w[code tt kbd samp var]
+          end
+        end
 
-      def markup_ancestor_tag_names
-        %w[code tt kbd samp var]
+        register :code, Code.new
+        register :tt, Code.new
+        register :kbd, Code.new
+        register :samp, Code.new
+        register :var, Code.new
       end
     end
-
-    register :code, Code.new
-    register :tt, Code.new
-    register :kbd, Code.new
-    register :samp, Code.new
-    register :var, Code.new
   end
 end

data/lib/coradoc/input/html/converters/div.rb

@@ -1,15 +1,19 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Div < Base
-      def to_coradoc(node, state = {})
-        id = node["id"]
-        contents = treat_children_coradoc(node, state)
-        Coradoc::Element::Section.new(nil, id: id, contents: contents)
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Div < Base
+          def to_coradoc(node, state = {})
+            id = node["id"]
+            contents = treat_children_coradoc(node, state)
+            Coradoc::Element::Section.new(nil, id: id, contents: contents)
+          end
+        end
+
+        register :div,     Div.new
+        register :article, Div.new
+        register :center,  Div.new
       end
     end
-
-    register :div,     Div.new
-    register :article, Div.new
-    register :center,  Div.new
   end
 end

data/lib/coradoc/input/html/converters/dl.rb

@@ -1,55 +1,62 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Dl < Base
-      def to_coradoc(node, state = {})
-        items = process_dl(node, state)
-        items2 = items.map do |item|
-          Coradoc::Element::ListItemDefinition.new(item[:name], item[:value])
-        end
-        Coradoc::Element::List::Definition.new(items2, delimiter: "::")
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Dl < Base
+          def to_coradoc(node, state = {})
+            items = process_dl(node, state)
+            items2 = items.map do |item|
+              Coradoc::Element::ListItemDefinition.new(item[:name],
+                                                       item[:value])
+            end
+            Coradoc::Element::List::Definition.new(items2, delimiter: "::")
+          end
 
-      def process_dl(node, state = {})
-        groups = []
-        current = {name: [], value: []}
+          def process_dl(node, state = {})
+            groups = []
+            current = { name: [], value: [] }
 
-        seen_dd = false
-        child = node.at_xpath("*[1]")
-        grandchild = nil
-        while !child.nil?
-          if child.name == "div"
-            grandchild = child.at_xpath("*[1]")
-            while !grandchild.nil?
-              groups, current, seen_dd = process_dt_or_dd(groups, current, seen_dd, grandchild, state)
-              grandchild = grandchild.at_xpath("following-sibling::*[1]")
+            seen_dd = false
+            child = node.at_xpath("*[1]")
+            grandchild = nil
+            while !child.nil?
+              if child.name == "div"
+                grandchild = child.at_xpath("*[1]")
+                while !grandchild.nil?
+                  groups, current, seen_dd = process_dt_or_dd(groups, current,
+                                                              seen_dd, grandchild, state)
+                  grandchild = grandchild.at_xpath("following-sibling::*[1]")
+                end
+              elsif ["dt", "dd"].include?(child.name)
+                groups, current, seen_dd = process_dt_or_dd(groups, current,
+                                                            seen_dd, child, state)
+              end
+              child = child.at_xpath("following-sibling::*[1]")
+              if current[:name].any? && current[:value].any?
+                groups << current
+              end
             end
-          elsif ["dt", "dd"].include?(child.name)
-            groups, current, seen_dd = process_dt_or_dd(groups, current, seen_dd, child, state)
-          end
-          child = child.at_xpath("following-sibling::*[1]")
-          if current[:name].any? && current[:value].any?
-            groups << current
+            groups
           end
-        end
-        groups
-      end
 
-      def process_dt_or_dd(groups, current, seen_dd, subnode, state = {})
-        if subnode.name == "dt"
-          if seen_dd
-            # groups << current
-            current = {name: [], value: []}
-            seen_dd = false
+          def process_dt_or_dd(groups, current, seen_dd, subnode, state = {})
+            if subnode.name == "dt"
+              if seen_dd
+                # groups << current
+                current = { name: [], value: [] }
+                seen_dd = false
+              end
+              current[:name] += treat_children_coradoc(subnode, state)
+            elsif subnode.name == "dd"
+              current[:value] += treat_children_coradoc(subnode, state)
+              seen_dd = true
+            end
+            [groups, current, seen_dd]
           end
-          current[:name] += treat_children_coradoc(subnode, state)
-        elsif subnode.name == "dd"
-          current[:value] += treat_children_coradoc(subnode, state)
-          seen_dd = true
         end
-        [groups, current, seen_dd]
+
+        register :dl, Dl.new
       end
     end
-
-    register :dl, Dl.new
   end
 end

data/lib/coradoc/input/html/converters/drop.rb

@@ -1,22 +1,26 @@
-module Coradoc::Input::HTML
-  module Converters
-    class Drop < Base
-      def to_coradoc(node, state = {})
-        convert(node, state)
-      end
+module Coradoc
+  module Input
+    module Html
+      module Converters
+        class Drop < Base
+          def to_coradoc(node, state = {})
+            convert(node, state)
+          end
+
+          def convert(_node, _state = {})
+            ""
+          end
+        end
 
-      def convert(_node, _state = {})
-        ""
+        register :caption, Drop.new
+        register :figcaption, Drop.new
+        register :title, Drop.new
+        register :link, Drop.new
+        register :style, Drop.new
+        register :meta, Drop.new
+        register :script, Drop.new
+        register :comment, Drop.new
       end
     end
-
-    register :caption, Drop.new
-    register :figcaption, Drop.new
-    register :title, Drop.new
-    register :link, Drop.new
-    register :style, Drop.new
-    register :meta, Drop.new
-    register :script, Drop.new
-    register :comment, Drop.new
   end
 end