asciidoctor 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec7900aac00c81a12784dcbb8b50fe83084e3d520c2c680779b259dbf9a6f8f1
-  data.tar.gz: 3b54226a56beb58044ce34b008affde322631ec524f865595c5a1be2ed02b16b
+  metadata.gz: 9066105e2eb3a4a1eef1b7e03730a3daa81e6b0abcfebef789e5c02e4a070db8
+  data.tar.gz: 902d0e58872adbafcd81a6faa7373b4e207ad5596ec37f3d1a01a6e83fabfac2
 SHA512:
-  metadata.gz: 96e57a742f978398f3152a057a865211441dcfad9daff9b1666f8360d663069d6b45e683e20873eafe3cde527c3cdde1a6cfe929aba0e1fb45db71a88064c8be
-  data.tar.gz: 8e798546816dc70277be8cd1a8766b124cddd931fd09a6c28e83d4737d248651e510fd81de5c516f303faf9a979d71bb41dd62c30b34916a9612449b6646d35c
+  metadata.gz: a77b68c94c63ba1f783cc1e2af7ead46415a8f49f85195f7367f94506b12d1ad19310b142249d534cc61513633ba4ba8e931e744922f4a3bfe92e9b0e9e4d97d
+  data.tar.gz: d0a13bb0dfe883cb0a8e6ae949e3f6178de75f57d6d6a35f90ee5954f8b85faa6c76b0c3244a07aca43478daab789a33b3f780faa1e083b27bba5a1eb9f5cf74

data/CHANGELOG.adoc

@@ -13,6 +13,19 @@ endif::[]
 This document provides a high-level view of the changes introduced in Asciidoctor by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.0.6 (2019-04-04) - @mojavelinux
+
+Bug Fixes::
+
+  * assume implicit AsciiDoc extension on interdoc xref macro target with no extension (e.g., `document#`); restores 1.5.x behavior (#3231)
+  * don't fail to load application if call to Dir.home fails; use a rescue with fallback values (#3238)
+  * Helpers.rootname should only consider final path segment when dropping file extension
+
+Improvements::
+
+  * implement Helpers.extname as a more efficient and flexible File.extname method
+  * check for AsciiDoc file extension using end_with? instead of resolving the extname and using a lookup
+
 == 2.0.5 (2019-04-01) - @mojavelinux
 
 Bug Fixes::

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.5, 2019-04-01
+v2.0.6, 2019-04-04
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.5
+:release-version: 2.0.6
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-fr.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.5, 2019-04-01
+v2.0.6, 2019-04-04
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.5
+:release-version: 2.0.6
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-jp.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.5, 2019-04-01
+v2.0.6, 2019-04-04
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.5
+:release-version: 2.0.6
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-zh_CN.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.5, 2019-04-01
+v2.0.6, 2019-04-04
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.5
+:release-version: 2.0.6
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.5, 2019-04-01
+v2.0.6, 2019-04-04
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.5
+:release-version: 2.0.6
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/lib/asciidoctor.rb

@@ -185,7 +185,8 @@ module Asciidoctor
   DATA_DIR = ::File.join ROOT_DIR, 'data'
 
   # The user's home directory, as best we can determine it
-  USER_HOME = ::Dir.home
+  # IMPORTANT this rescue is required for running Asciidoctor on GitHub.com
+  USER_HOME = ::Dir.home rescue (::ENV['HOME'] || ::Dir.pwd)
 
   # The newline character used for output; stored in constant table as an optimization
   LF = ?\n
@@ -248,7 +249,8 @@ module Asciidoctor
     'asciidoc' => '.adoc'
   }
 
-  # Set of file extensions recognized as AsciiDoc documents (stored as a truth hash)
+  # A map of file extensions that are recognized as AsciiDoc documents
+  # TODO .txt should be deprecated
   ASCIIDOC_EXTENSIONS = {
     '.adoc' => true,
     '.asciidoc' => true,
@@ -1278,7 +1280,7 @@ module Asciidoctor
       # TODO cli checks if input path can be read and is file, but might want to add check to API too
       attrs['docfile'] = input_path = ::File.absolute_path input.path
       attrs['docdir'] = ::File.dirname input_path
-      attrs['docname'] = Helpers.basename input_path, (attrs['docfilesuffix'] = ::File.extname input_path)
+      attrs['docname'] = Helpers.basename input_path, (attrs['docfilesuffix'] = Helpers.extname input_path)
       source = input.read
     elsif input.respond_to? :read
       # NOTE tty, pipes & sockets can't be rewound, but can't be sniffed easily either

data/lib/asciidoctor/abstract_node.rb

@@ -280,11 +280,9 @@ class AbstractNode
   # Returns A String reference or data URI for an icon image
   def icon_uri name
     if attr? 'icon'
-      # Ruby 2.3 requires the extra brackets around the attr method call
-      if (::File.extname (icon = (attr 'icon'))).empty?
-        # QUESTION should we be adding the extension if the icon is an absolute URI?
-        icon = %(#{icon}.#{@document.attr 'icontype', 'png'})
-      end
+      icon = attr 'icon'
+      # QUESTION should we be adding the extension if the icon is an absolute URI?
+      icon = %(#{icon}.#{@document.attr 'icontype', 'png'}) unless Helpers.extname? icon
     else
       icon = %(#{name}.#{@document.attr 'icontype', 'png'})
     end
@@ -359,9 +357,12 @@ class AbstractNode
   #
   # Returns A String data URI containing the content of the target image
   def generate_data_uri(target_image, asset_dir_key = nil)
-    ext = ::File.extname target_image
-    # QUESTION what if ext is empty?
-    mimetype = (ext == '.svg' ? 'image/svg+xml' : %(image/#{ext.slice 1, ext.length}))
+    if (ext = Helpers.extname target_image, nil)
+      mimetype = ext == '.svg' ? 'image/svg+xml' : %(image/#{ext.slice 1, ext.length})
+    else
+      mimetype = 'application/octet-stream'
+    end
+
     if asset_dir_key
       image_path = normalize_system_path(target_image, @document.attr(asset_dir_key), nil, target_name: 'image')
     else

data/lib/asciidoctor/converter/html5.rb

@@ -105,9 +105,12 @@ class Converter::Html5Converter < Converter::Base
     result << %(<meta name="copyright" content="#{node.attr 'copyright'}"#{slash}>) if node.attr? 'copyright'
     if node.attr? 'favicon'
       if (icon_href = node.attr 'favicon').empty?
-        icon_href, icon_type = 'favicon.ico', 'image/x-icon'
+        icon_href = 'favicon.ico'
+        icon_type = 'image/x-icon'
+      elsif (icon_ext = Helpers.extname icon_href, nil)
+        icon_type = icon_ext == '.ico' ? 'image/x-icon' : %(image/#{icon_ext.slice 1, icon_ext.length})
       else
-        icon_type = (icon_ext = ::File.extname icon_href) == '.ico' ? 'image/x-icon' : %(image/#{icon_ext.slice 1, icon_ext.length})
+        icon_type = 'image/x-icon'
       end
       result << %(<link rel="icon" type="#{icon_type}" href="#{icon_href}"#{slash}>)
     end

data/lib/asciidoctor/document.rb

@@ -310,7 +310,7 @@ class Document < AbstractBlock
         attr_overrides[key.downcase] = val
       end
       if (to_file = options[:to_file])
-        attr_overrides['outfilesuffix'] = ::File.extname to_file
+        attr_overrides['outfilesuffix'] = Helpers.extname to_file
       end
       # safely resolve the safe mode from const, int or string
       if !(safe_mode = options[:safe])

data/lib/asciidoctor/helpers.rb

@@ -159,7 +159,7 @@ module Helpers
 
   # Public: Removes the file extension from filename and returns the result
   #
-  # filename - The String file name to process
+  # filename - The String file name to process; expected to be a posix path
   #
   # Examples
   #
@@ -168,7 +168,11 @@ module Helpers
   #
   # Returns the String filename with the file extension removed
   def self.rootname filename
-    filename.slice 0, ((filename.rindex '.') || filename.length)
+    if (last_dot_idx = filename.rindex '.')
+      (filename.index '/', last_dot_idx) ? filename : (filename.slice 0, last_dot_idx)
+    else
+      filename
+    end
   end
 
   # Public: Retrieves the basename of the filename, optionally removing the extension, if present
@@ -188,12 +192,48 @@ module Helpers
   # Returns the String filename with leading directories removed and, if specified, the extension removed
   def self.basename filename, drop_ext = nil
     if drop_ext
-      ::File.basename filename, (drop_ext == true ? (::File.extname filename) : drop_ext)
+      ::File.basename filename, (drop_ext == true ? (extname filename) : drop_ext)
     else
       ::File.basename filename
     end
   end
 
+  # Public: Returns whether this path has a file extension.
+  #
+  # path - The path String to check; expects a posix path
+  #
+  # Returns true if the path has a file extension, false otherwise
+  def self.extname? path
+    (last_dot_idx = path.rindex '.') && !(path.index '/', last_dot_idx)
+  end
+
+  # Public: Retrieves the file extension of the specified path. The file extension is the portion of the path in the
+  # last path segment starting from the last period.
+  #
+  # This method differs from File.extname in that it gives us control over the fallback value and is more efficient.
+  #
+  # path     - The path String in which to look for a file extension
+  # fallback - The fallback String to return if no file extension is present (optional, default: '')
+  #
+  # Returns the String file extension (with the leading dot included) or the fallback value if the path has no file extension.
+  if ::File::ALT_SEPARATOR
+    def self.extname path, fallback = ''
+      if (last_dot_idx = path.rindex '.')
+        (path.index '/', last_dot_idx) || (path.index ::File::ALT_SEPARATOR, last_dot_idx) ? fallback : (path.slice last_dot_idx, path.length)
+      else
+        fallback
+      end
+    end
+  else
+    def self.extname path, fallback = ''
+      if (last_dot_idx = path.rindex '.')
+        (path.index '/', last_dot_idx) ? fallback : (path.slice last_dot_idx, path.length)
+      else
+        fallback
+      end
+    end
+  end
+
   # Internal: Make a directory, ensuring all parent directories exist.
   def self.mkdir_p dir
     unless ::File.directory? dir

data/lib/asciidoctor/reader.rb

@@ -686,20 +686,20 @@ class PreprocessorReader < Reader
         (@dir = file.dup).path = (dir = ::File.dirname file.path) == '/' ? '' : dir
         file = file.to_s
       end
-      path ||= ::File.basename file
+      @path = (path ||= ::File.basename file)
       # only process lines in AsciiDoc files
-      @process_lines = ASCIIDOC_EXTENSIONS[::File.extname file]
+      if (@process_lines = file.end_with?(*ASCIIDOC_EXTENSIONS.keys))
+        @includes[path.slice 0, (path.rindex '.')] = attributes['partial-option'] ? nil : true
+      end
     else
       @dir = '.'
       # we don't know what file type we have, so assume AsciiDoc
       @process_lines = true
-    end
-
-    if path
-      @path = path
-      @includes[Helpers.rootname path] = attributes['partial-option'] ? nil : true if @process_lines
-    else
-      @path = '<stdin>'
+      if (@path = path)
+        @includes[Helpers.rootname path] = attributes['partial-option'] ? nil : true
+      else
+        @path = '<stdin>'
+      end
     end
 
     @lineno = lineno

data/lib/asciidoctor/substitutors.rb

@@ -751,20 +751,26 @@ module Substitutors
               path = refid.chop
             end
             if macro
-              src2src = (path = path.slice 0, path.length - 5) if path.end_with? '.adoc'
-            elsif (last_dot_idx = path.rindex '.') && ASCIIDOC_EXTENSIONS[path.slice last_dot_idx, path.length]
-              src2src = (path = path.slice 0, last_dot_idx)
+              if path.end_with? '.adoc'
+                src2src = path = path.slice 0, path.length - 5
+              elsif !(Helpers.extname? path)
+                src2src = path
+              end
+            elsif path.end_with?(*ASCIIDOC_EXTENSIONS.keys)
+              src2src = path = path.slice 0, (path.rindex '.')
             else
               src2src = path
             end
           else
             target, fragment = refid, (refid.slice 1, refid.length)
           end
-        elsif macro && (refid.include? '.')
+        elsif macro
           if refid.end_with? '.adoc'
-            src2src = (path = refid.slice 0, refid.length - 5)
-          else
+            src2src = path = refid.slice 0, refid.length - 5
+          elsif Helpers.extname? refid
             path = refid
+          else
+            fragment = refid
           end
         else
           fragment = refid

data/lib/asciidoctor/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Asciidoctor
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.5
-.\"      Date: 2019-04-01
+.\" Generator: Asciidoctor 2.0.6
+.\"      Date: 2019-04-04
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.5
+.\"    Source: Asciidoctor 2.0.6
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2019-04-01" "Asciidoctor 2.0.5" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2019-04-04" "Asciidoctor 2.0.6" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 2.0.5
+:man source: Asciidoctor 2.0.6
 :page-layout: base
 
 == NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath