asciidoctor-htmlbook 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6253feaef2c1aaacf514ecbaa67d5f7f189d1220
-  data.tar.gz: 95ffa7913b589d55699219f51e7161f13706102b
+SHA256:
+  metadata.gz: 68420eba44be59d8ae3fea93a02d13416f5f18233c49c95438c6e381f6d19035
+  data.tar.gz: 75cad414ceefed3898346561a600ad8b8d7095e767a58f835f521276fc8b6394
 SHA512:
-  metadata.gz: 4125934edc5ac7efcb26b54e674a01cb676180b41915056f0ddf2bc985357ec464af6322be24c1cbad755fbaba9545e3e5adca903a7d360bcf36a8c32cb24b93
-  data.tar.gz: 3b156de47c90a083d28dc0677db2f0adae658df2888c357cee12feed2f95790511dc0045fe403a4fae902006a610fd5e41e29df9648f84b85a5c4d13a7dc5986
+  metadata.gz: 2c13ebcab599dac5a574b5e634d3fd562fb6b7ce933c0b69e6fccc3802a9057e2cbe1c867388d3cf80bf64b8d8943640c189e118933dccba30804a3e8798fdba
+  data.tar.gz: 8aa6a5ff99cdf3471c2c21416e099c0fc0b6e8cf0bf15bec4c69a324cedc763c5a7963e24c1ed22e45bb32a06987945ce85c5b4e7fa2c05937c83f3d5e36e989

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
+  - 2.4
+  - 2.5
+  - 2.6
 before_install: gem install bundler -v 1.13.7

data/CHANGELOG.adoc

@@ -0,0 +1,5 @@
+== master
+
+== v0.0.4
+
+- Update to asciidoctor 2.0

data/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Rei
+Copyright (c) 2019 Rei
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/asciidoctor-htmlbook.gemspec

@@ -21,11 +21,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "asciidoctor", "~> 1.5"
-  spec.add_runtime_dependency "thread_safe", "~> 0.3.5"
+  spec.add_runtime_dependency "asciidoctor", "~> 2.0"
   spec.add_runtime_dependency "liquid", "~> 4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/asciidoctor/htmlbook/converter.rb

@@ -68,12 +68,18 @@ module Asciidoctor
           'node_name' => node.node_name,
           'id' => node.id,
           'attributes' => node.attributes,
-          'document' => {
-            'references' => {
-              'ids' => node.document.references[:ids]
-            },
-            'attributes' => node.document.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
         }
       end
 
@@ -84,7 +90,8 @@ module Asciidoctor
           'caption' => node.caption,
           'captioned_title' => node.captioned_title,
           'style' => node.style,
-          'content' => node.content
+          'content' => node.content,
+          'xreftext' => node.xreftext
         })
       end
 
@@ -100,7 +107,7 @@ module Asciidoctor
         attributes = abstract_block_to_liquid(node).merge({
           'index' => node.index,
           'number' => node.number,
-          'sectname' => node.sectname,
+          'sectname' => (node.sectname == 'section' ? "sect#{node.level}" : node.sectname),
           'special' => node.special,
           'numbered' => node.numbered,
           'sectnum' => node.sectnum
@@ -188,7 +195,8 @@ module Asciidoctor
         abstract_node_to_liquid(node).merge({
           'text' => node.text,
           'type' => node.type.to_s,
-          'target' => node.target
+          'target' => node.target,
+          'xreftext' => node.xreftext
         })
       end
     end

data/lib/asciidoctor/htmlbook/version.rb

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

data/templates/audio.html

@@ -1,6 +1,6 @@
 <audio src="{{ node.attributes.target }}"
        controls="controls"
-       {% if node.attributes.options contains 'autoplay' %}autoplay="autoplay"{% endif %}
-       {% if node.attributes.options contains 'loop' %}loop="loop"{% endif %}>
+       {% if node.attributes.autoplay-option %}autoplay="autoplay"{% endif %}
+       {% if node.attributes.loop-option %}loop="loop"{% endif %}>
   <em>Sorry, the &lt;auido&gt; element not supported in your reading system.</em>
 </audio>

data/templates/inline_anchor.html

@@ -2,17 +2,17 @@
 {% when 'xref' %}
   {% if node.text %}
     <a data-type="xref" href="{{ node.target }}">{{ node.text }}</a>
-  {% elsif node.document.references.ids[node.attributes.refid] %}
-    <a data-type="xref" href="{{ node.target }}">{{ node.document.references.ids[node.attributes.refid] }}</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.target }}"></a>
+  <a id="{{ node.id }}"></a>
 {% when 'link' %}
   <a href="{{ node.target }}"
      {% if node.attributes.title %}title="{{ node.attributes.title }}"{% endif %}
      {% if node.attributes.window %}target="{{ node.attributes.window }}"{% endif %} >{{ node.text }}</a>
 {% when 'bibref' %}
-  <a id="{{ node.target }}"></a>[{{ node.target }}]
+  <a id="{{ node.id }}"></a>[{{ node.xreftext | default: node.id }}]
 {% endcase %}

data/templates/video.html

@@ -3,7 +3,7 @@
        {% if node.attributes.width %}width="{{ node.attributes.width }}"{% endif %}
        {% if node.attributes.height %}height="{{ node.attributes.height }}"{% endif %}
        {% if node.attributes.poster %}poster="{{ node.attributes.poster }}"{% endif %}
-       {% if node.attributes.options contains 'autoplay' %}autoplay="autoplay"{% endif %}
-       {% if node.attributes.options contains 'loop' %}loop="loop"{% endif %}>
+       {% if node.attributes.autoplay-option  %}autoplay="autoplay"{% endif %}
+       {% if node.attributes.loop-option %}loop="loop"{% endif %}>
   <em>Sorry, the &lt;video&gt; element not supported in your reading system.</em>
 </video>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-htmlbook
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,9 +91,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.adoc
 - CODE_OF_CONDUCT.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.adoc
 - Rakefile
 - asciidoctor-htmlbook.gemspec
@@ -169,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Asciidoctor HTMLBook is an Asciidoctor backend for converting AsciiDoc documents