asciidoctor-multipage 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64a5fbb964951f440f2fa2c0d49cb1df7ace58be958a0e1f4ce280dca9e4591
-  data.tar.gz: 51c273c008afa11caad90d1b808e65919e2764f092891cd6d149934dcce322ae
+  metadata.gz: 1536862b822c7ec9f66f5f53f3b6a9bad7f6983ee5ff1f5c742e718a3cb66a76
+  data.tar.gz: f612e848167857d28c7c42f4684355e7082a45379038a5265e472797dae99b11
 SHA512:
-  metadata.gz: fc96577284cc71802f971196a99536f2ba3fc87dc97dad4833f40722cb8844819ca5b9132e2f1e63adf16701a9a987d1a14e89c76944b264ff8438f63775ec3e
-  data.tar.gz: dfee8f462b3cb3d81c9384f04e96fbdcb7c9c621ebdda69152d8dabd8fe55597d34315794aa0065d4d30edc07cf71e02abf3b5433191249e74e9c512ab6f697c
+  metadata.gz: c652de15f77d2c32e7574b7edf9351e49623170aada76a8c577b16ade65db6294660fb07dbebe27095b5500167c804a4a3ac70d82383d3d56a84ca9d4c1aeed8
+  data.tar.gz: 8db9f9e909ae211891384483624affd6f7c78ada48d78c27b7bb1667c5da4300ab3bc257c233912c1495505d412a7402275579f569bd3524e6f7011f1debb4f2

data/lib/asciidoctor-multipage.rb

@@ -17,6 +17,7 @@ class Asciidoctor::AbstractNode
       node_tree << current
       current = current.parent
     end
+    node_tree << current
     if node_tree.include?(self) ||
        node_tree.include?(self.parent)
       return true
@@ -77,16 +78,16 @@ class Asciidoctor::Section
   def sectnum(delimiter = '.', append = nil)
     append ||= (append == false ? '' : delimiter)
     if @level == 1
-      %(#{@number}#{append})
+      %(#{@numeral}#{append})
     elsif @level > 1
       if @parent.class == Asciidoctor::Section ||
          (@mplevel && @parent.class == Asciidoctor::Document)
-        %(#{@parent.sectnum(delimiter)}#{@number}#{append})
+        %(#{@parent.sectnum(delimiter)}#{@numeral}#{append})
       else
-        %(#{@number}#{append})
+        %(#{@numeral}#{append})
       end
     else # @level == 0
-      %(#{Asciidoctor::Helpers.int_to_roman @number}#{append})
+      %(#{Asciidoctor::Helpers.int_to_roman @numeral}#{append})
     end
   end
 end
@@ -117,15 +118,11 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
     page << block
   end
 
-  def convert(node, transform = nil, opts = {})
-    transform ||= node.node_name
-    opts.empty? ? (send transform, node) : (send transform, node, opts)
-  end
-
   # Process Document (either the original full document or a processed page)
-  def document(node)
+  def convert_document(node)
     if node.processed
-      # This node can now be handled by Html5Converter.
+      # This node (an individual page) can now be handled by
+      # Html5Converter.
       super
     else
       # This node is the original full document which has not yet been
@@ -151,6 +148,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       # Set multipage chunk types
       set_multipage_attrs(node)
 
+      # FIXME: This can result in a duplicate ID without a warning.
       # Set the "id" attribute for the Document, using the "docname", which is
       # based on the file name. Then register the document ID using the
       # document title. This allows cross-references to refer to (1) the
@@ -198,14 +196,15 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
 
   # Process Document in embeddable mode (either the original full document or a
   # processed page)
-  def embedded(node)
+  def convert_embedded(node)
     if node.processed
-      # This node can now be handled by Html5Converter.
+      # This node (an individual page) can now be handled by
+      # Html5Converter.
       super
     else
       # This node is the original full document which has not yet been
-      # processed; it can be handled by document().
-      document(node)
+      # processed; it can be handled by convert_document().
+      convert_document(node)
     end
   end
 
@@ -221,7 +220,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
         previous_page = pages[page_index-1]
         parent_page = page.parent
         home_page = doc
-        # NOTE, there are some non-breaking spaces (U+00A0) below.
+        # NOTE: There are some non-breaking spaces (U+00A0) below, in
+        # the "links <<" lines and "links.join" line.
         if previous_page != parent_page
           links << %(← Previous: <<#{previous_page.id}>>)
         end
@@ -242,12 +242,11 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
   end
 
   # Generate the actual HTML outline for the TOC. This method is analogous to
-  # Html5Converter outline().
+  # Html5Converter convert_outline().
   def generate_outline(node, opts = {})
-    # This is the same as Html5Converter outline()
     return unless node.sections?
-    sectnumlevels = opts[:sectnumlevels] || (node.document.attr 'sectnumlevels', 3).to_i
-    toclevels = opts[:toclevels] || (node.document.attr 'toclevels', 2).to_i
+    sectnumlevels = opts[:sectnumlevels] || (node.document.attributes['sectnumlevels'] || 3).to_i
+    toclevels = opts[:toclevels] || (node.document.attributes['toclevels'] || 2).to_i
     sections = node.sections
     result = [%(<ul class="sectlevel#{sections[0].level}">)]
     sections.each do |section|
@@ -282,12 +281,12 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       end
       result << %(<li><a href="#{link}">#{stitle}</a>)
 
-      # Finish in a manner similar to Html5Converter outline()
+      # Finish in a manner similar to Html5Converter convert_outline()
       if slevel < toclevels &&
          (child_toc_level = generate_outline section,
-                                        :toclevels => toclevels,
-                                        :secnumlevels => sectnumlevels,
-                                        :page_id => opts[:page_id])
+                                             toclevels: toclevels,
+                                             secnumlevels: sectnumlevels,
+                                             page_id: opts[:page_id])
         result << child_toc_level
       end
       result << '</li>'
@@ -298,7 +297,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
 
   # Include chapter pages in cross-reference links. This method overrides for
   # the :xref node type only.
-  def inline_anchor(node)
+  def convert_inline_anchor(node)
     if node.type == :xref
       # This is the same as super...
       if (path = node.attributes['path'])
@@ -369,7 +368,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
       new_section.title = node.title
       new_section.mplevel = node.mplevel
       new_parent << new_section
-      new_parent.sections.last.number = node.number
+      new_parent.sections.last.numeral = node.numeral
       new_parent = new_section
       node.sections.each do |section|
         new_outline_doc(section, new_parent: new_parent,
@@ -379,8 +378,9 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
     return new_document
   end
 
-  # Override Html5Converter outline() to return a custom TOC outline
-  def outline(node, opts = {})
+  # Override Html5Converter convert_outline() to return a custom TOC
+  # outline.
+  def convert_outline(node, opts = {})
     doc = node.document
     # Find this node in the @@full_outline skeleton document
     page_node = @@full_outline.find_by(id: node.id).first
@@ -424,7 +424,7 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
 
   # Process a Section. Each Section will either be split off into its own page
   # or processed as normal by Html5Converter.
-  def section(node)
+  def convert_section(node)
     doc = node.document
     if doc.processed
       # This node can now be handled by Html5Converter.
@@ -491,7 +491,8 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
     doc = node.document
     node.mplevel = :root if node.class == Asciidoctor::Document
     node.sections.each do |section|
-      # Check custom multipage-level attribute on section
+      # Check custom multipage-level attribute on section; warn and
+      # discard if invalid
       if section.attr?('multipage-level', nil, false) &&
          section.attr('multipage-level').to_i <
          node.attr('multipage-level').to_i
@@ -499,15 +500,15 @@ class MultipageHtml5Converter < Asciidoctor::Converter::Html5Converter
                     %(section cannot be less than the parent section value)
         section.set_attr('multipage-level', nil)
       end
-      # Propogate custom multipage-level value to child node
+      # Propagate custom multipage-level value to child node
       if !section.attr?('multipage-level', nil, false) &&
          node.attr('multipage-level') != doc.attr('multipage-level')
         section.set_attr('multipage-level', node.attr('multipage-level'))
       end
       # Set section type
-      if section.level < section.attr('multipage-level').to_i
+      if section.level < section.attr('multipage-level', nil, true).to_i
         section.mplevel = :branch
-      elsif section.level == section.attr('multipage-level').to_i
+      elsif section.level == section.attr('multipage-level', nil, true).to_i
         section.mplevel = :leaf
       else
         section.mplevel = :content

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-multipage
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - Owen T. Heisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +70,22 @@ dependencies:
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+        version: 2.0.11
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.5.7.1
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: An Asciidoctor extension that generates HTML output using multiple pages
 email:
 - writer@owenh.net