RubyGems - asciidoctor-htmlbook - Versions diffs - 0.0.5 → 0.0.6 - Mend

asciidoctor-htmlbook 0.0.5 → 0.0.6

Files changed (25) hide show

checksums.yaml +4 -4
data/.travis.yml +2 -1
data/CHANGELOG.adoc +6 -0
data/lib/asciidoctor/htmlbook/converter.rb +6 -6
data/lib/asciidoctor/htmlbook/version.rb +1 -1
data/templates/admonition.html +1 -1
data/templates/audio.html +2 -1
data/templates/colist.html +1 -1
data/templates/dlist.html +1 -1
data/templates/document.html +14 -2
data/templates/embedded.html +13 -1
data/templates/example.html +1 -1
data/templates/image.html +1 -1
data/templates/listing.html +1 -1
data/templates/literal.html +1 -1
data/templates/olist.html +1 -1
data/templates/paragraph.html +1 -1
data/templates/preamble.html +1 -1
data/templates/quote.html +1 -1
data/templates/stem.html +1 -1
data/templates/table.html +1 -1
data/templates/ulist.html +1 -1
data/templates/verse.html +1 -1
data/templates/video.html +2 -1
metadata +2 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84191fe5cc45f3e8edc81303b20799f6a44ed3774cfd6dfd2f7245bd2a242099
-  data.tar.gz: cf845626c0e4fbedccbcc6038a9096364939a54209d5cd7ff866596c6b3d6ef0
+  metadata.gz: d1b2813a5e3da56201a661fc6c80aecc9fa45ae21a244a54f38355f76c1cadc6
+  data.tar.gz: ede7d28533940663055d38fd49af004e6d7f0337a4d3ef02668b1436bea8ec67
 SHA512:
-  metadata.gz: 38badaa8c38b42a6c99954f2b1c478fa8658d5d40c196cea664e0ad5128a387fa29b0b198abd7bc60986b18e2b2600cb41d39653de894b724b4522ade57ef300
-  data.tar.gz: dfdd788a982e8c1e4bdc32eeaac3b0464867ca6c41e241f1da8eb3858e80d8ae12eb77f13dee33ca37668b85e2c634030085aadd41bd8c07e9ca3843de8d31da
+  metadata.gz: c7438d871f950ae8b87f48e325e36464fc4da40f00eccae703d7a7b6412d8da89489a0d1ec279d0d9949227c902c5866810761ff76476b4a65ad392a30fa01b4
+  data.tar.gz: 07ce39b8e15869c78add96ad11c2fdfe579823f4e8e2f3cebb34f6aee116689978a4f3287e0c92791a50e8a887f5461ed87f63d7b7961292b82bb60eabb3bb22

data/.travis.yml CHANGED

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

data/CHANGELOG.adoc CHANGED

@@ -1,5 +1,11 @@
 == master
+== v0.0.6
+- Add id attribute for all block node
+- Add subtitle and author
+- fix ruby 2.4 compatibility
 == v0.0.5
 - Fix body h1

data/lib/asciidoctor/htmlbook/converter.rb CHANGED

@@ -8,7 +8,7 @@ module Asciidoctor
       def initialize(backend, options = {})
         super
         init_backend_traits outfilesuffix: '.html'
-        @template_dirs = (options[:template_dirs] || []).prepend(DEFAULT_TEMPLATE_PATH)
+        @template_dirs = (options[:template_dirs] || []).unshift(DEFAULT_TEMPLATE_PATH)
         @templates = {}
       end
@@ -77,12 +77,12 @@ module Asciidoctor
       end
       def document_to_hash(node)
+        title = node.attributes['doctitle'] && node.doctitle(partition: true)
         abstract_block_to_hash(node).merge!({
-          'header' => {
-            'title' => (node.header && node.header.title)
-          },
-          'title' => node.attributes['doctitle'],
-          'toc' => outline(node)
+          'title' => title&.main,
+          'subtitle' => title&.subtitle,
+          'outline' => outline(node),
+          'authors' => node.authors.map { |author| author.to_h.map { |key, value| [key.to_s, value] }.to_h }
         })
       end

data/lib/asciidoctor/htmlbook/version.rb CHANGED

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

data/templates/admonition.html CHANGED

@@ -1,4 +1,4 @@
-<div data-type="{{ node.attributes.name }}">
+<div {% if node.id %}id="{{ node.id }}"{% endif %} data-type="{{ node.attributes.name }}">
   {% if node.title %}<h5>{{ node.title }}</h5>{% endif %}
   {{ node.content }}
 </div>

data/templates/audio.html CHANGED

@@ -1,4 +1,5 @@
-<audio src="{{ node.attributes.target }}"
+<audio {% if node.id %}id="{{ node.id }}"{% endif %}
+       src="{{ node.attributes.target }}"
        controls="controls"
        {% if node.attributes.autoplay-option %}autoplay="autoplay"{% endif %}
        {% if node.attributes.loop-option %}loop="loop"{% endif %}>

data/templates/colist.html CHANGED

@@ -1,4 +1,4 @@
-<ul data-type="colist">
+<ul {% if node.id %}id="{{ node.id }}"{% endif %} data-type="colist">
   {% for item in node.items %}
     <li>
       <a data-type="callout" id="colist-{{ item.attributes.coids }}" href="#callout-{{ item.attributes.coids }}">{{ item.attributes.coids | split: '-' | last }}</a>

data/templates/dlist.html CHANGED

@@ -1,4 +1,4 @@
-<dl>
+<dl {% if node.id %}id="{{ node.id }}"{% endif %}>
   {% for item in node.items %}
     {% for term in item.terms %}
       <dt>{{ term.text }}</dt>

data/templates/document.html CHANGED

@@ -5,13 +5,25 @@
     {% if node.title %}<title>{{ node.title }}</title>{% endif %}
   </head>
   <body data-type="book">
-    {% if node.title %}<h1>{{ node.title }}</h1>{% endif %}
+    {% if node.title %}
+      {% if node.subtitle or node.anthors.size > 0 %}<header>{% endif %}
+        <h1>{{ node.title }}</h1>
+        {% if node.subtitle %}<p data-type="subtitle">{{ node.subtitle }}</p>{% endif %}
+        {% if node.authors.size > 0 %}
+          {% for author in node.authors %}
+            <p data-type="author">{{ author.name }}</p>
+          {% endfor %}
+        {% endif %}
+      {% if node.subtitle or node.authors.size > 0 %}</header>{% endif %}
+    {% endif %}
     {% if node.attributes.toc %}
       <nav data-type="toc">
         <h1>{{ node.attributes.toc-title }}</h1>
-        {{ node.toc }}
+        {{ node.outline }}
       </nav>
     {% endif %}
     {{ node.content }}
   </body>
 </html>

data/templates/embedded.html CHANGED

@@ -1,8 +1,20 @@
-{% if node.title %}<h1>{{ node.title }}</h1>{% endif %}
+{% if node.title %}
+  {% if node.subtitle or node.anthors.size > 0 %}<header>{% endif %}
+    <h1>{{ node.title }}</h1>
+    {% if node.subtitle %}<p data-type="subtitle">{{ node.subtitle }}</p>{% endif %}
+    {% if node.authors.size > 0 %}
+      {% for author in node.authors %}
+        <p data-type="author">{{ author.name }}</p>
+      {% endfor %}
+    {% endif %}
+  {% if node.subtitle or node.authors.size > 0 %}</header>{% endif %}
+{% endif %}
 {% if node.attributes.toc %}
   <nav data-type="toc">
     <h1>{{ node.attributes.toc-title }}</h1>
     {{ node.toc }}
   </nav>
 {% endif %}
 {{ node.content }}

data/templates/example.html CHANGED

@@ -1,4 +1,4 @@
-<div data-type="example">
+<div {% if node.id %}id="{{ node.id }}"{% endif %} data-type="example">
   {% if node.title %}<h5>{{ node.captioned_title }}</h5>{% endif %}
   {{ node.content }}
 </div>

data/templates/image.html CHANGED

@@ -1,4 +1,4 @@
-<figure>
+<figure {% if node.id %}id="{{ node.id }}"{% endif %}>
   {% if node.attributes.link %}<a href="{{ node.attributes.link }}">{% endif %}
     <img src="{{ node.attributes.target }}"
          {% if node.attributes.alt %}alt="{{ node.attributes.alt }}"{% endif %}

data/templates/listing.html CHANGED

@@ -1,4 +1,4 @@
-<figure>
+<figure {% if node.id %}id="{{ node.id }}"{% endif %}>
   {% if node.title %}<figcaption>{{ node.title }}</figcaption>{% endif %}
   <pre data-type="programlisting"
        {% if node.attributes.language %}data-code-language="{{ node.attributes.language }}"{% endif %}

data/templates/literal.html CHANGED

	@@ -1 +1 @@
1	- <pre>{{ node.content }}</pre>
1	+ <pre {% if node.id %}id="{{ node.id }}"{% endif %}>{{ node.content }}</pre>

data/templates/olist.html CHANGED

@@ -1,4 +1,4 @@
-<ol>
+<ol {% if node.id %}id="{{ node.id }}"{% endif %}>
   {% for item in node.items %}
     <li>
       <p>{{ item.text }}</p>

data/templates/paragraph.html CHANGED

	@@ -1 +1 @@
1	- <p>{{ node.content }}</p>
1	+ <p {% if node.id %}id="{{ node.id }}"{% endif %}>{{ node.content }}</p>

data/templates/preamble.html CHANGED

@@ -1,3 +1,3 @@
-<section data-type="preamble">
+<section {% if node.id %}id="{{ node.id }}"{% endif %} data-type="preamble">
   {{ node.content }}
 </section>

data/templates/quote.html CHANGED

@@ -1,4 +1,4 @@
-<blockquote>
+<blockquote {% if node.id %}id="{{ node.id }}"{% endif %}>
   {{ node.content }}
   {% if node.attributes.attribution %}
     <p data-type="attribution">{{ node.attributes.attribution }}</p>

data/templates/stem.html CHANGED

@@ -1,4 +1,4 @@
-<div data-type="equation">
+<div {% if node.id %}id="{{ node.id }}"{% endif %} data-type="equation">
   {% if node.title %}<h5>{{ node.title }}</h5>{% endif %}
   {% case node.style %}
   {% when 'latexmath' %}

data/templates/table.html CHANGED

@@ -1,4 +1,4 @@
-<table>
+<table {% if node.id %}id="{{ node.id }}"{% endif %}>
   {% if node.title %}
     <caption>{{ node.captioned_title }}</caption>
   {% endif %}

data/templates/ulist.html CHANGED

@@ -1,4 +1,4 @@
-<ul>
+<ul {% if node.id %}id="{{ node.id }}"{% endif %}>
   {% for item in node.items %}
     <li>
       <p>{{ item.text }}</p>

data/templates/verse.html CHANGED

@@ -1,4 +1,4 @@
-<blockquote>
+<blockquote {% if node.id %}id="{{ node.id }}"{% endif %}>
   <pre>{{ node.content }}</pre>
   {% if node.attributes.attribution %}
     <p data-type="attribution">{{ node.attributes.attribution }}</p>

data/templates/video.html CHANGED

@@ -1,4 +1,5 @@
-<video src="{{ node.attributes.target }}"
+<video {% if node.id %}id="{{ node.id }}"{% endif %}
+       src="{{ node.attributes.target }}"
        controls="controls"
        {% if node.attributes.width %}width="{{ node.attributes.width }}"{% endif %}
        {% if node.attributes.height %}height="{{ node.attributes.height }}"{% endif %}

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-htmlbook
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Rei
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor