asciidoctor-epub3 1.5.0.alpha.8 → 1.5.0.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56913840726d5e371d1feb61094894bffeec6b28edd87b2dbfc0ef227732b5af
-  data.tar.gz: 584b561949668e02bb4634f70475e168db89586cb2e63607821c42573395236e
+  metadata.gz: d8c660366a3ffa12ff1f0b2638413c240da220d07949a69493f4743c42287f5c
+  data.tar.gz: 229d4a8ea185962d0c9fb7563423905fad27c62a6a20a126e44aabb935da0c98
 SHA512:
-  metadata.gz: d52c30ad5805c595e675b6b69f4bf8e5cef89a0f6143d5438d88c144c33579151f8c58c3bfc6a5119214e7f1eb38ea21585b36e663f87dc7c311650dae918007
-  data.tar.gz: 3e82757ae00356c2932f506bbacd57d89032da96187dac11f51e080d0712d942c97e0801e03e9ec123eb29daff5dff4f3dfb3c2b03d0b3312a99541bb6560d07
+  metadata.gz: 3c2c23900d2e5d2c08b16ccb2d0e80e62f3f3da8623a3cc84dae1d65620fd4ff64675124d8a08be2aa4da2c6043d7399e131e1a2a6b582b8d23ada23c4c598ad
+  data.tar.gz: 6097d5e1f9a1942bd8933b23c94b26cff099025345cf030296584d848ebbbaade4669c14bcf369ab07fd65a8ecba736d9bfded24cc2d62930501c0883ada6d7a

data/.yardopts

@@ -0,0 +1,12 @@
+--charset UTF-8
+--readme README.adoc
+--hide-api private
+--plugin tomdoc
+--title "Asciidoctor EPUB3 API Documentation"
+--output-dir rdoc
+lib/**/*.rb
+-
+CHANGELOG.adoc
+CONTRIBUTING.adoc
+LICENSE.adoc
+NOTICE.adoc

data/CHANGELOG.adoc

@@ -5,21 +5,29 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 1.5.0.alpha.9 (2019-04-04) - @mojavelinux
+
+* allow converter to be used with Asciidoctor 2 (#185)
+* upgrade gepub (and, indirectly, nokogiri) (#177)
+* add support for start attribute on ordered list
+* don't add end mark to chapter when publication-type is book (#163)
+* drop unsupported versions of Ruby from CI matrix
+
 == 1.5.0.alpha.8 (2018-02-20) - @mojavelinux
 
-* Include inline images in EPUB3 archive (#5)
-* Allow chapter to begin with level-1 section title by adding support for negative leveloffset (#107)
-* Don't transform the chapter title to uppercase (rely on CSS only) (#97)
-* Set correct mimetype for TTF files (#120)
-* Implement support for the custom xrefstyle for references within a chapter (#132)
-* Show correct path of front cover image and the current document when missing (#124)
-* Retain ID of block image (#141)
-* Retain ID of example block (#143)
-* Retain ID of admonition block (#146)
-* Transfer role specified on block image to output (#145)
-* Handle nil response from pygments.rb (#156)
-* Invert the colors for the chapter title (use black on white) (#96)
-* Darken font on Kindle Paperwhite devices (#67)
+* include inline images in EPUB3 archive (#5)
+* allow chapter to begin with level-1 section title by adding support for negative leveloffset (#107)
+* don't transform the chapter title to uppercase (rely on CSS only) (#97)
+* set correct mimetype for TTF files (#120)
+* implement support for the custom xrefstyle for references within a chapter (#132)
+* show correct path of front cover image and the current document when missing (#124)
+* retain ID of block image (#141)
+* retain ID of example block (#143)
+* retain ID of admonition block (#146)
+* transfer role specified on block image to output (#145)
+* handle nil response from pygments.rb (#156)
+* invert the colors for the chapter title (use black on white) (#96)
+* darken font on Kindle Paperwhite devices (#67)
 
 == 1.5.0.alpha.7 (2017-04-18) - @mojavelinux
 

data/LICENSE.adoc

@@ -1,6 +1,6 @@
 .The MIT License
 ....
-Copyright (C) 2014-2018 OpenDevise Inc. and the Asciidoctor Project
+Copyright (C) 2014-2019 OpenDevise Inc. and the Asciidoctor Project
 
 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/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}: A _native_ EPUB3 converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v1.5.0.alpha.8, 2018-02-20
+v1.5.0.alpha.9, 2019-04-04
 // Settings:
 :experimental:
 :idprefix:
@@ -404,7 +404,7 @@ The master document is assumed to be a book and each chapter an article.
 
 |publication-type
 |Used to control the inclusion of special content in the generated HTML.
-If set to a value other than book, the byline information (author and avatar) is included below the chapter header.
+If set to a value other than book, the byline information (author and avatar) is included below the chapter header and a typographic end mark is added at the end of the last paragraph.
 Suggested values include: book (default), anthology, magazine, journal, article.
 |===
 
@@ -777,11 +777,33 @@ To see all of the workarounds and why we chose certain style options, check out
 * `text-rendering: optimizeLegibility` causes file to be rejected by KFP (and causes the text to disappear in some previewers)
 * Kindle Direct Publishing (KDP) strips out select font-related CSS rules (e.g., `font-family`) under certain conditions (for reasons that have proved nearly impossible to reverse engineer); the known workaround is to add a layer of indirection by using `@import` to hide the CSS files from the script
 
+=== Kindle Direct Publishing
+
+If you want to publish your book to the Amazon Kindle store, and have your styles and fonts preserved, you must use https://kdp.amazon.com[Kindle Direct Publishing].
+No other method of publishing to the Amazon Kindle store will leave your book intact.
+
+This workflow also allows you to preview the book the way your readers will see it.
+So it's a good way to acceptance test your custom styles to discover which ones are honored and which ones are ignored.
+
+==== Look Inside
+
+The Amazon Kindle store offers a “Look Inside” feature for reader.
+This so-called feature aims to gives readers a glimpse at the contents of the book.
+Sadly, it does no such thing.
+Instead, it shows pages from the legacy MOBI document that kindlegen adds to your e-book file, not the higher fidelity KF8 document.
+This means the preview won't look at all like what the Kindle reader or application will actually show.
+Custom fonts, font-based icons, and most styles will be missing.
+
+This situation is unfortunate for authors.
+What we recommend is to complain loudly to Amazon that they are hurting your sales by displaying a crippled version of your product.
+Tell them that under no circumstances should they show an altered version of your product.
+Another option is to contact Amazon to opt-out of this program.
+
 === Send to Kindle
 
 WARNING: Don't use it!
 
-{uri-send-to-kindle}[“Send to Kindle”] is a tempting choice for transferring MOBI files to a Kindle device.
+{uri-send-to-kindle}[Send to Kindle] is a tempting choice for transferring MOBI files to a Kindle device.
 However, it's utterly broken.
 If you use this tool, don't be surprised if you see missing font-based icons, default fonts, and other font and style errors in your manuscript.
 It's known to strip out all the font files and break the encoding of the document.
@@ -792,18 +814,6 @@ Once transferred, Whispersync will detect the new file (usually looking in the B
 It's important to note that “Send to Kindle” is not reflective of the experience readers will have when shopping in the Kindle store.
 If you use Kindle Direct Publishing (KDP) to publish your book, the integrity of your book will be preserved (to the degree that Amazon allows).
 
-=== Look Inside
-
-The Amazon Kindle store has a “Look Inside” feature, which aims to gives readers a glimpse at the contents of the book.
-Sadly, it does no such thing.
-Instead, it shows pages from the legacy MOBI document that kindlegen adds to your e-book file, not the higher fidelity KF8 document.
-Therefore, the preview won't look at all like what the Kindle reader or application will actually show.
-Custom fonts, font-based icons, and most styles will be missing.
-
-This situation is unfortunate for authors.
-What I recommend is to complain loudly to Amazon that they are hurting your sales by displaying a crippled version of your product.
-Another option is to contact Amazon to opt-out of this so-called feature.
-
 ////
 head-stop (default '.')
 stack-head role (run-in is default)
@@ -953,7 +963,7 @@ endif::[]
 
 == Copyright
 
-Copyright (C) 2014-2018 OpenDevise Inc. and the Asciidoctor Project.
+Copyright (C) 2014-2019 OpenDevise Inc. and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 
 For the full text of the license, see the <<LICENSE#,LICENSE>> file.

data/asciidoctor-epub3.gemspec

@@ -16,27 +16,24 @@ An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/M
   s.homepage = 'https://github.com/asciidoctor/asciidoctor-epub3'
   s.license = 'MIT'
 
-  s.required_ruby_version = '>= 1.9.3'
+  # NOTE required ruby version is informational only; it's not enforced since it can't be overridden and can cause builds to break
+  #s.required_ruby_version = '>= 2.3.0'
 
   files = begin
     (result = Open3.popen3('git ls-files -z') {|_, out| out.read }.split %(\0)).empty? ? Dir['**/*'] : result
   rescue
     Dir['**/*']
   end
-  s.files = files.grep %r/^(?:(?:data\/(?:fonts|images|styles)|lib)\/.+|Gemfile|Rakefile|(?:CHANGELOG|LICENSE|NOTICE|README)\.adoc|#{s.name}\.gemspec)$/
+  s.files = files.grep %r/^(?:(?:data\/(?:fonts|images|styles)|lib)\/.+|Gemfile|Rakefile|(?:CHANGELOG|LICENSE|NOTICE|README)\.adoc|\.yardopts|#{s.name}\.gemspec)$/
   s.executables = %w(asciidoctor-epub3 adb-push-ebook)
   s.test_files = s.files.grep(/^(?:test|spec|feature)\/.*$/)
 
   s.require_paths = ['lib']
 
-  s.has_rdoc = true
-  s.rdoc_options = ['--charset=UTF-8', '--title="Asciidoctor EPUB3"', '--main=README.adoc', '-ri']
-  s.extra_rdoc_files = ['CHANGELOG.adoc', 'LICENSE.adoc', 'NOTICE.adoc', 'README.adoc']
+  s.add_development_dependency 'rake', '~> 12.3.2'
 
-  s.add_development_dependency 'rake'
-  #s.add_development_dependency 'rdoc', '~> 4.1.0'
-
-  s.add_runtime_dependency 'asciidoctor', '~> 1.5.0'
-  s.add_runtime_dependency 'gepub', '~> 0.6.9.2'
+  s.add_runtime_dependency 'asciidoctor', '>= 1.5.0', '< 3.0.0'
+  s.add_runtime_dependency 'gepub', '~> 1.0.2'
   s.add_runtime_dependency 'thread_safe', '~> 0.3.6'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 1.1.5'
 end

data/lib/asciidoctor-epub3/converter.rb

@@ -50,14 +50,15 @@ class ContentConverter
 
   register_for 'epub3-xhtml5'
 
-  EOL = %(\n)
+  LF = ?\n
   NoBreakSpace = ' '
   ThinNoBreakSpace = ' '
   RightAngleQuote = '›'
   CalloutStartNum = %(\u2460)
 
-  XmlElementRx = /<\/?.+?>/
   CharEntityRx = /&#(\d{2,6});/
+  XmlElementRx = /<\/?.+?>/
+  TrailingPunctRx = /[[:punct:]]$/
 
   FromHtmlSpecialCharsMap = {
     '&lt;' => '<',
@@ -97,6 +98,7 @@ class ContentConverter
 
   def document node
     docid = node.id
+    pubtype = node.attr 'publication-type', 'book'
 
     if (doctitle = node.doctitle partition: true, use_fallback: true).subtitle?
       title = %(#{doctitle.main} )
@@ -110,33 +112,33 @@ class ContentConverter
     doctitle_sanitized = (node.doctitle sanitize: true, use_fallback: true).to_s
     subtitle_formatted = subtitle.split.map {|w| %(<b>#{w}</b>) } * ' '
 
-    if (node.attr 'publication-type', 'book') == 'book'
-      byline = nil
+    if pubtype == 'book'
+      byline = ''
     else
       author = node.attr 'author'
       username = node.attr 'username', 'default'
       imagesdir = (node.references[:spine].attr 'imagesdir', '.').chomp '/'
-      imagesdir = (imagesdir == '.' ? nil : %(#{imagesdir}/))
-      byline = %(<p class="byline"><img src="#{imagesdir}avatars/#{username}.jpg"/> <b class="author">#{author}</b></p>#{EOL})
+      imagesdir = imagesdir == '.' ? '' : %(#{imagesdir}/)
+      byline = %(<p class="byline"><img src="#{imagesdir}avatars/#{username}.jpg"/> <b class="author">#{author}</b></p>#{LF})
     end
 
-    mark_last_paragraph node
+    mark_last_paragraph node unless pubtype == 'book'
     content = node.content
 
     # NOTE must run after content is resolved
     # TODO perhaps create dynamic CSS file?
     if @icon_names.empty?
-      icon_css_head = icon_css_scoped = nil
+      icon_css_head = icon_css_scoped = ''
     else
       icon_defs = @icon_names.map {|name|
         %(.i-#{name}::before { content: "#{FontIconMap[name.tr('-', '_').to_sym]}"; })
-      } * EOL
+      } * LF
       icon_css_head = %(<style>
 #{icon_defs}
 </style>
 )
       # NOTE Namo Pubtree requires icon CSS to be repeated inside <body> (or in a linked stylesheet); wrap in div to hide from Aldiko
-      icon_css_scoped = (node.attr? 'ebook-format', 'kf8') ? nil : %(<div style="display: none" aria-hidden="true"><style scoped="scoped">
+      icon_css_scoped = (node.attr? 'ebook-format', 'kf8') ? '' : %(<div style="display: none" aria-hidden="true"><style scoped="scoped">
 #{icon_defs}
 </style></div>
 )
@@ -188,7 +190,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 </body>
 </html>'
 
-    lines * EOL
+    lines * LF
   end
 
   # NOTE embedded is used for AsciiDoc table cell content
@@ -198,13 +200,13 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 
   def section node
     hlevel = node.level + 1
-    epub_type_attr = node.special ? %( epub:type="#{node.sectname}") : nil
+    epub_type_attr = node.special ? %( epub:type="#{node.sectname}") : ''
     div_classes = [%(sect#{node.level}), node.role].compact
     title = node.title
     title_sanitized = xml_sanitize title
     if node.document.header? || node.level != 1 || node != node.document.first_section
       %(<section class="#{div_classes * ' '}" title="#{title_sanitized}"#{epub_type_attr}>
-<h#{hlevel} id="#{node.id}">#{title}</h#{hlevel}>#{(content = node.content).empty? ? nil : %[
+<h#{hlevel} id="#{node.id}">#{title}</h#{hlevel}>#{(content = node.content).empty? ? '' : %[
 #{content}]}
 </section>)
     else
@@ -247,8 +249,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
     role = node.role
     # stack-head is the alternative to the default, inline-head (where inline means "run-in")
     head_stop = node.attr 'head-stop', (role && (node.has_role? 'stack-head') ? nil : '.')
-    # FIXME promote regexp to constant
-    head = node.title? ? %(<strong class="head">#{title = node.title}#{head_stop && title !~ /[[:punct:]]$/ ? head_stop : nil}</strong> ) : nil
+    head = node.title? ? %(<strong class="head">#{title = node.title}#{head_stop && title !~ TrailingPunctRx ? head_stop : ''}</strong> ) : ''
     if role
       node.set_option 'hardbreaks' if node.has_role? 'signature'
       %(<p class="#{role}">#{head}#{node.content}</p>)
@@ -267,7 +268,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
   end
 
   def admonition node
-    id_attr = node.id ? %( id="#{node.id}") : nil
+    id_attr = node.id ? %( id="#{node.id}") : ''
     if node.title?
       title = node.title
       title_sanitized = xml_sanitize title
@@ -276,7 +277,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 )
     else
       title_attr = %( title="#{node.caption}")
-      title_el = nil
+      title_el = ''
     end
 
     type = node.attr 'name'
@@ -296,9 +297,9 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
   end
 
   def example node
-    id_attr = node.id ? %( id="#{node.id}") : nil
+    id_attr = node.id ? %( id="#{node.id}") : ''
     title_div = node.title? ? %(<div class="example-title">#{node.title}</div>
-) : nil
+) : ''
     %(<div#{id_attr} class="example">
 #{title_div}<div class="example-content">
 #{convert_content node}
@@ -308,7 +309,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 
   def floating_title node
     tag_name = %(h#{node.level + 1})
-    id_attribute = node.id ? %( id="#{node.id}") : nil
+    id_attribute = node.id ? %( id="#{node.id}") : ''
     %(<#{tag_name}#{id_attribute} class="#{['discrete', node.role].compact * ' '}">#{node.title}</#{tag_name}>)
   end
 
@@ -317,7 +318,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
     figure_classes << 'coalesce' if node.option? 'unbreakable'
     pre_classes = node.style == 'source' ? ['source', %(language-#{node.attr 'language'})] : ['screen']
     title_div = node.title? ? %(<figcaption>#{node.captioned_title}</figcaption>
-) : nil
+) : ''
     # patches conums to fix extra or missing leading space
     # TODO remove patch once upgrading to Asciidoctor 1.5.6
     %(<figure class="#{figure_classes * ' '}">
@@ -356,7 +357,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       footer_content << %(<span class="context">#{node.title}</span>)
     end
 
-    footer_tag = footer_content.empty? ? nil : %(
+    footer_tag = footer_content.empty? ? '' : %(
 <footer>~ #{footer_content * ' '}</footer>)
     content = (convert_content node).strip.
       sub(OpenParagraphTagRx, '<p><span class="open-quote">“</span>').
@@ -383,7 +384,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
     end
 
     footer_tag = footer_content.size > 0 ? %(
-<span class="attribution">~ #{footer_content * ', '}</span>) : nil
+<span class="attribution">~ #{footer_content * ', '}</span>) : ''
     %(<div#{id_attr}#{class_attr}>
 <pre>#{node.content}#{footer_tag}</pre>
 </div>)
@@ -399,8 +400,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       title_el = %(<h2>#{title}</h2>
 )
     else
-      title_attr = nil
-      title_el = nil
+      title_attr = title_el = ''
     end
 
     %(<aside class="#{classes * ' '}"#{title_attr} epub:type="sidebar">
@@ -413,7 +413,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
   def table node
     lines = [%(<div class="table">)]
     lines << %(<div class="content">)
-    table_id_attr = node.id ? %( id="#{node.id}") : nil
+    table_id_attr = node.id ? %( id="#{node.id}") : ''
     frame_class = {
       'all' => 'table-framed',
       'topbot' => 'table-framed-topbot',
@@ -435,7 +435,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
     unless (node.option? 'autowidth') && !(node.attr? 'width', nil, false)
       table_styles << %(width: #{node.attr 'tablepcwidth'}%)
     end
-    table_style_attr = table_styles.size > 0 ? %( style="#{table_styles * '; '}") : nil
+    table_style_attr = table_styles.size > 0 ? %( style="#{table_styles * '; '}") : ''
 
     lines << %(<table#{table_id_attr}#{table_class_attr}#{table_style_attr}>)
     lines << %(<caption>#{node.captioned_title}</caption>) if node.title?
@@ -483,10 +483,10 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
             if (halign = cell.attr 'valign') && halign != 'top'
               cell_classes << 'valign-top'
             end
-            cell_class_attr = cell_classes.size > 0 ? %( class="#{cell_classes * ' '}") : nil
-            cell_colspan_attr = cell.colspan ? %( colspan="#{cell.colspan}") : nil
-            cell_rowspan_attr = cell.rowspan ? %( rowspan="#{cell.rowspan}") : nil
-            cell_style_attr = (node.document.attr? 'cellbgcolor') ? %( style="background-color: #{node.document.attr 'cellbgcolor'}") : nil
+            cell_class_attr = cell_classes.size > 0 ? %( class="#{cell_classes * ' '}") : ''
+            cell_colspan_attr = cell.colspan ? %( colspan="#{cell.colspan}") : ''
+            cell_rowspan_attr = cell.rowspan ? %( rowspan="#{cell.rowspan}") : ''
+            cell_style_attr = (node.document.attr? 'cellbgcolor') ? %( style="background-color: #{node.document.attr 'cellbgcolor'}") : ''
             lines << %(<#{cell_tag_name}#{cell_class_attr}#{cell_colspan_attr}#{cell_rowspan_attr}#{cell_style_attr}>#{cell_content}</#{cell_tag_name}>)
           end
           lines << '</tr>'
@@ -497,7 +497,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
     lines << '</table>
 </div>
 </div>'
-    lines * EOL
+    lines * LF
   end
 
   def colist node
@@ -522,18 +522,18 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       subject_stop = node.attr 'subject-stop', (role && (node.has_role? 'stack') ? nil : ':')
       # QUESTION should we just use itemized-list and ordered-list as the class here? or just list?
       div_classes = [%(#{style}-list), role].compact
-      list_class_attr = (node.option? 'brief') ? ' class="brief"' : nil
+      list_class_attr = (node.option? 'brief') ? ' class="brief"' : ''
       lines << %(<div class="#{div_classes * ' '}">
-<#{list_tag_name}#{list_class_attr}#{list_tag_name == 'ol' && (node.option? 'reversed') ? ' reversed="reversed"' : nil}>)
+<#{list_tag_name}#{list_class_attr}#{list_tag_name == 'ol' && (node.option? 'reversed') ? ' reversed="reversed"' : ''}>)
       node.items.each do |subjects, dd|
         # consists of one term (a subject) and supporting content
         subject = [*subjects].first.text
         subject_plain = xml_sanitize subject, :plain
-        subject_element = %(<strong class="subject">#{subject}#{subject_stop && subject_plain !~ /[[:punct:]]$/ ? subject_stop : nil}</strong>)
+        subject_element = %(<strong class="subject">#{subject}#{subject_stop && subject_plain !~ TrailingPunctRx ? subject_stop : ''}</strong>)
         lines << '<li>'
         if dd
           # NOTE: must wrap remaining text in a span to help webkit justify the text properly
-          lines << %(<span class="principal">#{subject_element}#{dd.text? ? %[ <span class="supporting">#{dd.text}</span>] : nil}</span>)
+          lines << %(<span class="principal">#{subject_element}#{dd.text? ? %[ <span class="supporting">#{dd.text}</span>] : ''}</span>)
           lines << dd.content if dd.blocks?
         else
           lines << %(<span class="principal">#{subject_element}</span>)
@@ -565,19 +565,19 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       lines << '</dl>
 </div>'
     end
-    lines * EOL
+    lines * LF
   end
 
-  # TODO support start attribute
   def olist node
     complex = false
     div_classes = ['ordered-list', node.style, node.role].compact
     ol_classes = [node.style, ((node.option? 'brief') ? 'brief' : nil)].compact
-    ol_class_attr = ol_classes.empty? ? nil : %( class="#{ol_classes * ' '}")
-    id_attribute = node.id ? %( id="#{node.id}") : nil
+    ol_class_attr = ol_classes.empty? ? '' : %( class="#{ol_classes * ' '}")
+    ol_start_attr = (node.attr? 'start') ? %( start="#{node.attr 'start'}") : ''
+    id_attribute = node.id ? %( id="#{node.id}") : ''
     lines = [%(<div#{id_attribute} class="#{div_classes * ' '}">)]
     lines << %(<h3 class="list-heading">#{node.title}</h3>) if node.title?
-    lines << %(<ol#{ol_class_attr}#{(node.option? 'reversed') ? ' reversed="reversed"' : nil}>)
+    lines << %(<ol#{ol_class_attr}#{ol_start_attr}#{(node.option? 'reversed') ? ' reversed="reversed"' : ''}>)
     node.items.each do |item|
       lines << %(<li>
 <span class="principal">#{item.text}</span>)
@@ -593,15 +593,15 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
     end
     lines << '</ol>
 </div>'
-    lines * EOL
+    lines * LF
   end
 
   def ulist node
     complex = false
     div_classes = ['itemized-list', node.style, node.role].compact
     ul_classes = [node.style, ((node.option? 'brief') ? 'brief' : nil)].compact
-    ul_class_attr = ul_classes.empty? ? nil : %( class="#{ul_classes * ' '}")
-    id_attribute = node.id ? %( id="#{node.id}") : nil
+    ul_class_attr = ul_classes.empty? ? '' : %( class="#{ul_classes * ' '}")
+    id_attribute = node.id ? %( id="#{node.id}") : ''
     lines = [%(<div#{id_attribute} class="#{div_classes * ' '}">)]
     lines << %(<h3 class="list-heading">#{node.title}</h3>) if node.title?
     lines << %(<ul#{ul_class_attr}>)
@@ -620,7 +620,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
     end
     lines << '</ul>
 </div>'
-    lines * EOL
+    lines * LF
   end
 
   def image node
@@ -660,7 +660,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 <div class="content">
 <img src="#{node.image_uri node.attr('target')}" #{img_attrs * ' '}/>
 </div>#{node.title? ? %[
-<figcaption>#{node.captioned_title}</figcaption>] : nil}
+<figcaption>#{node.captioned_title}</figcaption>] : ''}
 </figure>)
   end
 
@@ -688,7 +688,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
           refid = %(#{refid}##{refid})
           id_attr = %( id="xref--#{refdoc_id}")
         end
-        id_attr = nil unless @xrefs_seen.add? refid
+        id_attr = '' unless @xrefs_seen.add? refid
         refdoc = doc.references[:spine_items].find {|it| refdoc_id == (it.id || (it.attr 'docname')) }
         if refdoc
           # QUESTION should we invoke xreftext for references in other documents?
@@ -703,7 +703,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
           warn %(asciidoctor: WARNING: #{::File.basename(doc.attr 'docfile')}: invalid reference to anchor in unknown chapter: #{refdoc_id})
         end
       else
-        id_attr = (@xrefs_seen.add? refid) ? %( id="xref-#{refid}") : nil
+        id_attr = (@xrefs_seen.add? refid) ? %( id="xref-#{refid}") : ''
         if (refs = doc.references[:refs])
           if ::Asciidoctor::AbstractNode === (ref = refs[refid])
             xreftext = text || ref.xreftext((@xrefstyle ||= (doc.attr 'xrefstyle')))

data/lib/asciidoctor-epub3/packager.rb

@@ -8,6 +8,7 @@ module Epub3
 module GepubBuilderMixin
   DATA_DIR = ::File.expand_path(::File.join ::File.dirname(__FILE__), '..', '..', 'data')
   SAMPLES_DIR = ::File.join DATA_DIR, 'samples'
+  LF = ?\n
   CharEntityRx = ContentConverter::CharEntityRx
   XmlElementRx = ContentConverter::XmlElementRx
   FromHtmlSpecialCharsMap = ContentConverter::FromHtmlSpecialCharsMap
@@ -327,7 +328,7 @@ body > svg {
     lines << %(</nav>
 </body>
 </html>)
-    lines * EOL
+    lines * LF
   end
 
   def nav_level items, depth, state = {}
@@ -353,7 +354,7 @@ body > svg {
       state.delete :content_doc_href if item.context == :document
     end
     lines << '</ol>'
-    lines * EOL
+    lines * LF
   end
 
   # NOTE gepub doesn't support building a ncx TOC with depth > 1, so do it ourselves
@@ -379,7 +380,7 @@ body > svg {
     lines[0] = lines[0].sub '%{depth}', %(<meta name="dtb:depth" content="#{state[:max_depth]}"/>)
     lines << %(</navMap>
 </ncx>)
-    lines * EOL
+    lines * LF
   end
 
   def ncx_level items, depth, state = {}
@@ -405,7 +406,7 @@ body > svg {
       lines << %(</navPoint>)
       state.delete :content_doc_href if item.context == :document
     end
-    lines * EOL
+    lines * LF
   end
 
   def collect_keywords doc, spine

data/lib/asciidoctor-epub3/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Epub3
-  VERSION = '1.5.0.alpha.8'
+  VERSION = '1.5.0.alpha.9'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-epub3
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.8
+  version: 1.5.0.alpha.9
 platform: ruby
 authors:
 - Dan Allen
@@ -9,50 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: gepub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9.2
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9.2
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +73,32 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.6
-description: |
-  An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book archives.
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+description: 'An extension for Asciidoctor that converts AsciiDoc documents to EPUB3
+  and KF8/MOBI (Kindle) e-book archives.
+
+'
 email: dan@opendevise.com
 executables:
 - asciidoctor-epub3
 - adb-push-ebook
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.adoc
-- LICENSE.adoc
-- NOTICE.adoc
-- README.adoc
+extra_rdoc_files: []
 files:
+- ".yardopts"
 - CHANGELOG.adoc
 - Gemfile
 - LICENSE.adoc
@@ -147,26 +166,21 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--charset=UTF-8"
-- --title="Asciidoctor EPUB3"
-- "--main=README.adoc"
-- "-ri"
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book formats