asciidoctor-htmlbook 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68420eba44be59d8ae3fea93a02d13416f5f18233c49c95438c6e381f6d19035
-  data.tar.gz: 75cad414ceefed3898346561a600ad8b8d7095e767a58f835f521276fc8b6394
+  metadata.gz: 84191fe5cc45f3e8edc81303b20799f6a44ed3774cfd6dfd2f7245bd2a242099
+  data.tar.gz: cf845626c0e4fbedccbcc6038a9096364939a54209d5cd7ff866596c6b3d6ef0
 SHA512:
-  metadata.gz: 2c13ebcab599dac5a574b5e634d3fd562fb6b7ce933c0b69e6fccc3802a9057e2cbe1c867388d3cf80bf64b8d8943640c189e118933dccba30804a3e8798fdba
-  data.tar.gz: 8aa6a5ff99cdf3471c2c21416e099c0fc0b6e8cf0bf15bec4c69a324cedc763c5a7963e24c1ed22e45bb32a06987945ce85c5b4e7fa2c05937c83f3d5e36e989
+  metadata.gz: 38badaa8c38b42a6c99954f2b1c478fa8658d5d40c196cea664e0ad5128a387fa29b0b198abd7bc60986b18e2b2600cb41d39653de894b724b4522ade57ef300
+  data.tar.gz: dfdd788a982e8c1e4bdc32eeaac3b0464867ca6c41e241f1da8eb3858e80d8ae12eb77f13dee33ca37668b85e2c634030085aadd41bd8c07e9ca3843de8d31da

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
-before_install: gem install bundler -v 1.13.7
+before_install: gem install bundler -v 2.0.2

data/CHANGELOG.adoc

@@ -1,5 +1,12 @@
 == master
 
+== v0.0.5
+
+- Fix body h1
+- Fix toclevel type error
+- Rename `*_to_liquid` methods to `*_to_hash` in converter.rb
+- Use toc attribute instead of section name
+
 == v0.0.4
 
 - Update to asciidoctor 2.0

data/README.adoc

@@ -102,11 +102,6 @@ Asciidoctor.convert '*This* is Asciidoctor.', backend: 'htmlbook', header_footer
 
 You can overwrite default templates by adding `:template_dir` option:
 
-[source, console]
-----
-$ asciidoctor-htmlbook -T path/to/templates basic-example.adoc
-----
-
 [source, ruby]
 ----
 Asciidoctor.convert '*This* is Asciidoctor.', backend: 'htmlbook', template_dir: 'path/to/templates'
@@ -119,23 +114,6 @@ asciidoctor-htmlbook template do not compatible with asciidoctor built-in templa
 View link:./templates[] for more info.
 --
 
-== Add Table of Contents
-
-Asciidoctor-htmlbook ignore `:toc:` attribute in Asciidoctor, instead you can use toc section:
-
-[source, asciidoc]
---
-[preface]
-== Preface
-
-[toc]
-== Table of Contents
-
-== Chapter
---
-
-So that you can control position of toc.
-
 == Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/rake` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/asciidoctor-htmlbook.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "asciidoctor", "~> 2.0"
   spec.add_runtime_dependency "liquid", "~> 4.0"
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/asciidoctor/htmlbook/converter.rb

@@ -7,20 +7,13 @@ module Asciidoctor
 
       def initialize(backend, options = {})
         super
-        @template_dirs = (options[:template_dirs] || []).push(DEFAULT_TEMPLATE_PATH)
+        init_backend_traits outfilesuffix: '.html'
+        @template_dirs = (options[:template_dirs] || []).prepend(DEFAULT_TEMPLATE_PATH)
         @templates = {}
       end
 
-      def convert(node, transform = nil, options = {})
-        template = if (node.node_name == 'document' && transform == 'embedded')
-          get_template('embedded')
-        elsif node.node_name == 'section' && node.sectname == 'toc'
-          get_template('toc')
-        else
-          get_template(node.node_name)
-        end
-
-        template.render 'node' => node_to_liquid(node)
+      def convert(node, transform = node.node_name, options = {})
+        get_template(transform).render 'node' => node_to_hash(node)
       end
 
       private
@@ -28,7 +21,7 @@ module Asciidoctor
       def get_template(name)
         return @templates[name] if @templates[name]
 
-        @template_dirs.each do |template_dir|
+        @template_dirs.reverse.each do |template_dir|
           path = File.join template_dir, "#{name}.html"
           if File.exist?(path)
             @templates[name] = Liquid::Template.parse(File.read(path))
@@ -43,48 +36,36 @@ module Asciidoctor
         @templates[name]
       end
 
-      def node_to_liquid(node)
+      def node_to_hash(node)
         case node
         when Asciidoctor::Document
-          document_to_liquid(node)
+          document_to_hash(node)
         when Asciidoctor::Section
-          section_to_liquid(node)
+          section_to_hash(node)
         when Asciidoctor::Block
-          block_to_liquid(node)
+          block_to_hash(node)
         when Asciidoctor::List
-          list_to_liquid(node)
+          list_to_hash(node)
         when Asciidoctor::Table
-          table_to_liquid(node)
+          table_to_hash(node)
         when Asciidoctor::Inline
-          inline_to_liquid(node)
+          inline_to_hash(node)
         else
-          raise "Uncatch type #{node} #{node.attributes}"
+          raise "Uncatched type #{node} #{node.attributes}"
         end
       end
 
-      def abstract_node_to_liquid(node)
+      def abstract_node_to_hash(node)
         {
           'context' => node.context.to_s,
           'node_name' => node.node_name,
           'id' => node.id,
-          'attributes' => node.attributes,
-          'document' => document_info(node.document)
-        }
-      end
-
-      def document_info(document)
-        @document_info ||= {
-          'references' => {
-            'refs' => document.references[:refs].map { |refid, node|
-              [refid, { 'xreftext' => node.xreftext }]
-            }.to_h
-          },
-          'attributes' => document.attributes
+          'attributes' => node.attributes
         }
       end
 
-      def abstract_block_to_liquid(node)
-        abstract_node_to_liquid(node).merge({
+      def abstract_block_to_hash(node)
+        abstract_node_to_hash(node).merge!({
           'level' => node.level,
           'title' => node.title,
           'caption' => node.caption,
@@ -95,16 +76,18 @@ module Asciidoctor
         })
       end
 
-      def document_to_liquid(node)
-        abstract_block_to_liquid(node).merge({
+      def document_to_hash(node)
+        abstract_block_to_hash(node).merge!({
           'header' => {
             'title' => (node.header && node.header.title)
-          }
+          },
+          'title' => node.attributes['doctitle'],
+          'toc' => outline(node)
         })
       end
 
-      def section_to_liquid(node)
-        attributes = abstract_block_to_liquid(node).merge({
+      def section_to_hash(node)
+        abstract_block_to_hash(node).merge!({
           'index' => node.index,
           'number' => node.number,
           'sectname' => (node.sectname == 'section' ? "sect#{node.level}" : node.sectname),
@@ -112,30 +95,24 @@ module Asciidoctor
           'numbered' => node.numbered,
           'sectnum' => node.sectnum
         })
-
-        if node.sectname == 'toc'
-          attributes['content'] = outline(node.document)
-        end
-
-        attributes
       end
 
-      def block_to_liquid(node)
-        abstract_block_to_liquid(node).merge({
+      def block_to_hash(node)
+        abstract_block_to_hash(node).merge!({
           'blockname' => node.blockname
         })
       end
 
       def outline(node)
-        result = ""
-        if node.sections.any? && node.level < (node.document.attributes['toclevels'] || 2)
+        result = ''
+        if node.sections.any? && node.level < (node.document.attributes['toclevels'] || 2).to_i
           result << "<ol>"
           node.sections.each do |section|
             next if section.sectname == 'toc'
 
             result << "<li>"
             result << %Q(<a href="##{section.id}">)
-            result << "#{section.sectnum} " if section.numbered && section.level < (node.document.attributes['sectnumlevels'] || 3)
+            result << "#{section.sectnum} " if section.numbered && section.level < (node.document.attributes['sectnumlevels'] || 3).to_i
             result << section.title
             result << "</a>"
             result << outline(section)
@@ -146,43 +123,43 @@ module Asciidoctor
         result
       end
 
-      def list_to_liquid(node)
+      def list_to_hash(node)
         case node.context
         when :dlist
-          abstract_block_to_liquid(node).merge({
+          abstract_block_to_hash(node).merge!({
             'items' => node.items.map { |terms, item|
               {
-                'terms' => terms.map {|term| listitem_to_liquid(term) },
-                'description' => listitem_to_liquid(item)
+                'terms' => terms.map {|term| listitem_to_hash(term) },
+                'description' => listitem_to_hash(item)
               }
             }
           })
         else
-          abstract_block_to_liquid(node).merge({
-            'items' => node.blocks.map { |item| listitem_to_liquid(item) }
+          abstract_block_to_hash(node).merge!({
+            'items' => node.blocks.map { |item| listitem_to_hash(item) }
           })
         end
       end
 
-      def listitem_to_liquid(node)
-        abstract_block_to_liquid(node).merge({
+      def listitem_to_hash(node)
+        abstract_block_to_hash(node).merge!({
           'text' => (node.text? ? node.text : nil)
         })
       end
 
-      def table_to_liquid(node)
-        abstract_block_to_liquid(node).merge({
+      def table_to_hash(node)
+        abstract_block_to_hash(node).merge!({
           'columns' => node.columns,
           'rows' => {
-            'head' => node.rows.head.map { |row| row.map {|cell| cell_to_liquid(cell) } },
-            'body' => node.rows.body.map { |row| row.map {|cell| cell_to_liquid(cell) } },
-            'foot' => node.rows.foot.map { |row| row.map {|cell| cell_to_liquid(cell) } }
+            'head' => node.rows.head.map { |row| row.map {|cell| cell_to_hash(cell) } },
+            'body' => node.rows.body.map { |row| row.map {|cell| cell_to_hash(cell) } },
+            'foot' => node.rows.foot.map { |row| row.map {|cell| cell_to_hash(cell) } }
           }
         })
       end
 
-      def cell_to_liquid(node)
-        abstract_node_to_liquid(node).merge({
+      def cell_to_hash(node)
+        abstract_node_to_hash(node).merge!({
           'text' => node.text,
           'content' => node.content,
           'style' => node.style,
@@ -191,9 +168,9 @@ module Asciidoctor
         })
       end
 
-      def inline_to_liquid(node)
-        abstract_node_to_liquid(node).merge({
-          'text' => node.text,
+      def inline_to_hash(node)
+        abstract_node_to_hash(node).merge!({
+          'text' => node.text || node.document.references[:refs][node.attributes['refid']]&.xreftext || "[#{node.attributes['refid']}]",
           'type' => node.type.to_s,
           'target' => node.target,
           'xreftext' => node.xreftext

data/lib/asciidoctor/htmlbook/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Htmlbook
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/templates/document.html

@@ -2,9 +2,16 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>{{ node.header.title }}</title>
+    {% if node.title %}<title>{{ node.title }}</title>{% endif %}
   </head>
   <body data-type="book">
+    {% if node.title %}<h1>{{ node.title }}</h1>{% endif %}
+    {% if node.attributes.toc %}
+      <nav data-type="toc">
+        <h1>{{ node.attributes.toc-title }}</h1>
+        {{ node.toc }}
+      </nav>
+    {% endif %}
     {{ node.content }}
   </body>
 </html>

data/templates/embedded.html

@@ -1 +1,8 @@
+{% if node.title %}<h1>{{ node.title }}</h1>{% endif %}
+{% if node.attributes.toc %}
+  <nav data-type="toc">
+    <h1>{{ node.attributes.toc-title }}</h1>
+    {{ node.toc }}
+  </nav>
+{% endif %}
 {{ node.content }}

data/templates/inline_anchor.html

@@ -1,12 +1,6 @@
 {% case node.type %}
 {% when 'xref' %}
-  {% if node.text %}
     <a data-type="xref" href="{{ node.target }}">{{ node.text }}</a>
-  {% elsif node.document.references.refs[node.attributes.refid] %}
-    <a data-type="xref" href="{{ node.target }}">{{ node.document.references.refs[node.attributes.refid].xreftext }}</a>
-  {% else %}
-    <a data-type="xref" href="{{ node.target }}">[{{ node.attributes.refid }}]</a>
-  {% endif %}
 {% when 'ref' %}
   <a id="{{ node.id }}"></a>
 {% when 'link' %}

data/templates/section.html

@@ -1,9 +1,9 @@
 {% case node.sectname %}
-{% when 'sect0' %}
-  <section id="{{node.id}}" data-type="part">
+{% when 'part' %}
+  <div id="{{node.id}}" data-type="part">
     <h1>{% if node.numbered %}{{ node.sectnum }} {% endif %}{{ node.title }}</h1>
     {{ node.content }}
-  </section>
+  </div>
 {% when 'sect1' %}
   <section id="{{node.id}}" data-type="chapter">
     <h1>{% if node.numbered %}{{ node.sectnum }} {% endif %}{{ node.title }}</h1>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-htmlbook
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,6 @@ files:
 - templates/stem.html
 - templates/table.html
 - templates/thematic_break.html
-- templates/toc.html
 - templates/ulist.html
 - templates/verse.html
 - templates/video.html

data/templates/toc.html

@@ -1,4 +0,0 @@
-<nav id="{{ node.id }}" data-type="toc">
-  <h1>{{ node.document.attributes.toc-title }}</h1>
-  {{ node.content }}
-</nav>