asciidoctor 1.5.2 → 1.5.3

data/lib/asciidoctor/path_resolver.rb

@@ -303,7 +303,6 @@ class PathResolver
   # any parent references resolved and self references removed and enforces
   # that the resolved path be contained within the jail, if provided
   def system_path target, start, jail = nil, opts = {}
-    recover = opts.fetch :recover, true
     if jail
       unless is_root? jail
         raise ::SecurityError, %(Jail is not an absolute path: #{jail})
@@ -325,7 +324,7 @@ class PathResolver
           return expand_path start
         end
       else
-        return system_path start, jail, jail 
+        return system_path start, jail, jail, opts
       end
     end
   
@@ -343,7 +342,7 @@ class PathResolver
     elsif is_root? start
       start = posixfy start
     else
-      start = system_path start, jail, jail
+      start = system_path start, jail, jail, opts
     end
   
     # both jail and start have been posixfied at this point
@@ -374,7 +373,7 @@ class PathResolver
         if jail
           if resolved_segments.length > jail_segments.length
             resolved_segments.pop
-          elsif !recover
+          elsif !(recover ||= (opts.fetch :recover, true))
             raise ::SecurityError, %(#{opts[:target_name] || 'path'} #{target} refers to location outside jail: #{jail} (disallowed in safe mode))
           elsif !warned
             warn %(asciidoctor: WARNING: #{opts[:target_name] || 'path'} has illegal reference to ancestor of jail, auto-recovering)
@@ -411,21 +410,18 @@ class PathResolver
 
     unless start.nil_or_empty? || (is_web_root? target)
       target = %(#{start}#{SLASH}#{target})
-      if (target.include? ':') && UriSniffRx =~ target
-        uri_prefix = $~[0]
+      if (uri_prefix = Helpers.uri_prefix target)
         target = target[uri_prefix.length..-1]
       end
     end
 
     # use this logic instead if we want to normalize target if it contains a URI
     #unless is_web_root? target
-    #  if preserve_uri_target && (target.include? ':') && UriSniffRx =~ target
-    #    uri_prefix = $~[0]
+    #  if preserve_uri_target && (uri_prefix = Helpers.uri_prefix target)
     #    target = target[uri_prefix.length..-1]
     #  elsif !start.nil_or_empty?
     #    target = %(#{start}#{SLASH}#{target})
-    #    if (target.include? ':') && UriSniffRx =~ target
-    #      uri_prefix = $~[0]
+    #    if (uri_prefix = Helpers.uri_prefix target)
     #      target = target[uri_prefix.length..-1]
     #    end
     #  end

data/lib/asciidoctor/reader.rb

@@ -438,7 +438,7 @@ class Reader
       break_on_blank_lines = options[:break_on_blank_lines]
       break_on_list_continuation = options[:break_on_list_continuation]
     end
-    skip_line_comments = options[:skip_line_comments]
+    skip_comments = options[:skip_line_comments]
     line_read = false
     line_restored = false
     
@@ -466,7 +466,7 @@ class Reader
           line_restored = true
         end
       else
-        unless skip_line_comments && line.start_with?('//') && CommentLineRx =~ line
+        unless skip_comments && line.start_with?('//') && CommentLineRx =~ line
           result << line
           line_read = true
         end
@@ -578,8 +578,8 @@ class PreprocessorReader < Reader
       result.pop while (last = result[-1]) && last.empty?
     end
 
-    if (indent = opts.fetch(:indent, nil))
-      Parser.reset_block_indent! result, indent.to_i
+    if opts[:indent]
+      Parser.adjust_indentation! result, opts[:indent], (@document.attr 'tabsize')
     end
 
     result
@@ -753,11 +753,14 @@ class PreprocessorReader < Reader
         end
 
         lhs = resolve_expr_val expr_match[1]
-        # regex enforces a restrict set of math-related operations
-        op = expr_match[2]
         rhs = resolve_expr_val expr_match[3]
 
-        skip = !(lhs.send op.to_sym, rhs)
+        # regex enforces a restricted set of math-related operations
+        if (op = expr_match[2]) == '!='
+          skip = lhs.send :==, rhs
+        else
+          skip = !(lhs.send op.to_sym, rhs)
+        end
       end
     end
 
@@ -838,7 +841,7 @@ class PreprocessorReader < Reader
         else
           ::File.join @dir, target
         end
-      elsif target.include?(':') && UriSniffRx =~ target
+      elsif Helpers.uriish? target
         unless @document.attributes.has_key? 'allow-uri-read'
           replace_line %(link:#{target}[])
           return true
@@ -849,7 +852,7 @@ class PreprocessorReader < Reader
         if @document.attributes.has_key? 'cache-uri'
           # caching requires the open-uri-cached gem to be installed
           # processing will be automatically aborted if these libraries can't be opened
-          Helpers.require_library 'open-uri/cached', 'open-uri-cached'
+          Helpers.require_library 'open-uri/cached', 'open-uri-cached' unless defined? ::OpenURI::Cache
         elsif !::RUBY_ENGINE_OPAL
           # autoload open-uri
           ::OpenURI
@@ -1126,65 +1129,65 @@ class PreprocessorReader < Reader
   # Examples
   #
   #   expr = '"value"'
-  #   resolve_expr_val(expr)
+  #   resolve_expr_val expr
   #   # => "value"
   #
   #   expr = '"value'
-  #   resolve_expr_val(expr)
+  #   resolve_expr_val expr
   #   # => "\"value"
   #
   #   expr = '"{undefined}"'
-  #   resolve_expr_val(expr)
+  #   resolve_expr_val expr
   #   # => ""
   #
   #   expr = '{undefined}'
-  #   resolve_expr_val(expr)
+  #   resolve_expr_val expr
   #   # => nil
   #
   #   expr = '2'
-  #   resolve_expr_val(expr)
+  #   resolve_expr_val expr
   #   # => 2
   #
   #   @document.attributes['name'] = 'value'
   #   expr = '"{name}"'
-  #   resolve_expr_val(expr)
+  #   resolve_expr_val expr
   #   # => "value"
   #
   # Returns The value of the expression, coerced to the appropriate type
-  def resolve_expr_val(str)
-    val = str
-    type = nil
-
-    if val.start_with?('"') && val.end_with?('"') ||
-        val.start_with?('\'') && val.end_with?('\'')
-      type = :string
+  def resolve_expr_val val
+    if ((val.start_with? '"') && (val.end_with? '"')) ||
+        ((val.start_with? '\'') && (val.end_with? '\''))
+      quoted = true
       val = val[1...-1]
+    else
+      quoted = false
     end
 
     # QUESTION should we substitute first?
+    # QUESTION should we also require string to be single quoted (like block attribute values?)
     if val.include? '{'
-      val = @document.sub_attributes val
+      val = @document.sub_attributes val, :attribute_missing => 'drop'
     end
 
-    unless type == :string
+    if quoted
+      val
+    else
       if val.empty?
-        val = nil
-      elsif val.strip.empty?
-        val = ' '
+        nil
       elsif val == 'true'
-        val = true
+        true
       elsif val == 'false'
-        val = false
-      elsif val.include?('.')
-        val = val.to_f
+        false
+      elsif val.rstrip.empty?
+        ' '
+      elsif val.include? '.'
+        val.to_f
       else
         # fallback to coercing to integer, since we
         # require string values to be explicitly quoted
-        val = val.to_i
+        val.to_i
       end
     end
-
-    val
   end
 
   def include_processors?

data/lib/asciidoctor/stylesheets.rb

@@ -6,7 +6,6 @@ module Asciidoctor
 # QUESTION create method for user stylesheet?
 class Stylesheets
   DEFAULT_STYLESHEET_NAME = 'asciidoctor.css'
-  #DEFAULT_CODERAY_STYLE = 'asciidoctor'
   DEFAULT_PYGMENTS_STYLE = 'default'
   STYLESHEETS_DATA_PATH = ::File.join DATA_PATH, 'stylesheets'
 
@@ -45,9 +44,10 @@ class Stylesheets
   #
   # returns the [String] CodeRay stylesheet data
   def coderay_stylesheet_data
-    # NOTE use the following two lines to load a built-in theme instead
-    # Helpers.require_library 'coderay'
-    # ::CodeRay::Encoders[:html]::CSS.new(:default).stylesheet
+    # NOTE use the following lines to load a built-in theme instead
+    # unless load_coderay.nil?
+    #   ::CodeRay::Encoders[:html]::CSS.new(:default).stylesheet
+    # end
     @coderay_stylesheet_data ||= ::IO.read(::File.join(STYLESHEETS_DATA_PATH, 'coderay-asciidoctor.css')).chomp
   end
 
@@ -62,16 +62,19 @@ class Stylesheets
   end
 
   def pygments_stylesheet_name style = nil
-    style ||= DEFAULT_PYGMENTS_STYLE
-    %(pygments-#{style}.css)
+    %(pygments-#{style || DEFAULT_PYGMENTS_STYLE}.css)
   end
 
   # Public: Generate the Pygments stylesheet with the specified style.
   #
   # returns the [String] Pygments stylesheet data
   def pygments_stylesheet_data style = nil
-    style ||= DEFAULT_PYGMENTS_STYLE
-    (@pygments_stylesheet_data ||= load_pygments)[style] ||= ::Pygments.css '.listingblock .pygments', :classprefix => 'tok-', :style => style
+    if load_pygments
+      (@pygments_stylesheet_data ||= {})[style || DEFAULT_PYGMENTS_STYLE] ||=
+          ::Pygments.css '.listingblock .pygments', :classprefix => 'tok-', :style => (style || DEFAULT_PYGMENTS_STYLE)
+    else
+      '/* Pygments styles disabled. Pygments is not available. */'
+    end
   end
 
   def embed_pygments_stylesheet style = nil
@@ -84,9 +87,12 @@ class Stylesheets
     ::File.open(::File.join(target_dir, pygments_stylesheet_name(style)), 'w') {|f| f.write pygments_stylesheet_data(style) }
   end
 
+  #def load_coderay
+  #  (defined? ::CodeRay) ? true : !(Helpers.require_library 'coderay', true, :ignore).nil?
+  #end
+
   def load_pygments
-    Helpers.require_library 'pygments', 'pygments.rb' unless defined? ::Pygments
-    {}
+    (defined? ::Pygments) ? true : !(Helpers.require_library 'pygments', 'pygments.rb', :ignore).nil?
   end
 end
 end

data/lib/asciidoctor/substitutors.rb

@@ -80,7 +80,7 @@ module Substitutors
     elsif subs == :normal
       subs = SUBS[:normal]
     elsif expand
-      if subs.is_a? ::Symbol
+      if ::Symbol === subs
         subs = COMPOSITE_SUBS[subs] || [subs]
       else
         effective_subs = []
@@ -98,7 +98,7 @@ module Substitutors
 
     return source if subs.empty?
 
-    text = (multiline = source.is_a? ::Array) ? (source * EOL) : source
+    text = (multiline = ::Array === source) ? source * EOL : source
 
     if (has_passthroughs = subs.include? :macros)
       text = extract_passthroughs text
@@ -108,7 +108,7 @@ module Substitutors
     subs.each do |type|
       case type
       when :specialcharacters
-        text = sub_specialcharacters text
+        text = sub_specialchars text
       when :quotes
         text = sub_quotes text
       when :attributes
@@ -138,7 +138,7 @@ module Substitutors
   #
   # returns - A String with normal substitutions performed
   def apply_normal_subs(lines)
-    apply_subs lines.is_a?(::Array) ? (lines * EOL) : lines
+    apply_subs(::Array === lines ? lines * EOL : lines)
   end
 
   # Public: Apply substitutions for titles.
@@ -356,12 +356,12 @@ module Substitutors
   # text - The String text to process
   #
   # returns The String text with special characters replaced
-  def sub_specialcharacters(text)
+  def sub_specialchars(text)
     SUPPORTS_GSUB_RESULT_HASH ?
       text.gsub(SPECIAL_CHARS_PATTERN, SPECIAL_CHARS) :
       text.gsub(SPECIAL_CHARS_PATTERN) { SPECIAL_CHARS[$&] }
   end
-  alias :sub_specialchars :sub_specialcharacters
+  alias :sub_specialcharacters :sub_specialchars
 
   # Public: Substitute quoted text (includes emphasis, strong, monospaced, etc)
   #
@@ -448,7 +448,7 @@ module Substitutors
     return data if data.nil_or_empty?
 
     # normalizes data type to an array (string becomes single-element array)
-    if (string_data = String === data)
+    if (string_data = ::String === data)
       data = [data]
     end
 
@@ -520,7 +520,7 @@ module Substitutors
       result << line unless reject || (reject_if_empty && line.empty?)
     end
 
-    string_data ? (result * EOL) : result
+    string_data ? result * EOL : result
   end
 
   # Public: Substitute inline macros (e.g., links, images, etc)
@@ -632,7 +632,7 @@ module Substitutors
     # TODO this handling needs some cleanup
     if (extensions = @document.extensions) && extensions.inline_macros? # && found[:macroish]
       extensions.inline_macros.each do |extension|
-        result = result.gsub(extension.config[:regexp]) {
+        result = result.gsub(extension.instance.regexp) {
           # alias match for Ruby 1.8.7 compat
           m = $~
           # honor the escape
@@ -678,7 +678,7 @@ module Substitutors
           @document.register(:images, target)
         end
         attrs = parse_attributes(raw_attrs, posattrs)
-        attrs['alt'] ||= File.basename(target, File.extname(target))
+        attrs['alt'] ||= Helpers.basename(target, true).tr('_-', ' ')
         Inline.new(self, :image, nil, :type => type, :target => target, :attributes => attrs).convert
       }
     end
@@ -828,10 +828,10 @@ module Substitutors
         end
 
         if text.empty?
-          text = if @document.attr? 'hide-uri-scheme'
-            target.sub UriSniffRx, ''
+          if @document.attr? 'hide-uri-scheme'
+            text = target.sub UriSniffRx, ''
           else
-            target
+            text = target
           end
 
           if attrs
@@ -1069,6 +1069,9 @@ module Substitutors
 
         if id.include? '#'
           path, fragment = id.split('#')
+        # QUESTION perform this check and throw it back if it fails?
+        #elsif (start_chr = id.chr) == '.' || start_chr == '/'
+        #  next m[0][1..-1]
         else
           path = nil
           fragment = id
@@ -1318,8 +1321,7 @@ module Substitutors
     return [] if subs.nil_or_empty?
     candidates = nil
     modifiers_present = SubModifierSniffRx =~ subs
-    subs.split(',').each do |val|
-      key = val.strip
+    subs.tr(' ', '').split(',').each do |key|
       modifier_operation = nil
       if modifiers_present
         if (first = key.chr) == '+'
@@ -1394,10 +1396,34 @@ module Substitutors
   # process_callouts - a Boolean flag indicating whether callout marks should be substituted
   #
   # returns the highlighted source code, if a source highlighter is defined
-  # on the document, otherwise the unprocessed text
-  def highlight_source(source, process_callouts, highlighter = nil)
-    highlighter ||= @document.attributes['source-highlighter']
-    Helpers.require_library highlighter, (highlighter == 'pygments' ? 'pygments.rb' : highlighter)
+  # on the document, otherwise the source with verbatim substituions applied
+  def highlight_source source, process_callouts, highlighter = nil
+    case (highlighter ||= @document.attributes['source-highlighter'])
+    when 'coderay'
+      unless (highlighter_loaded = defined? ::CodeRay) || @document.attributes['coderay-unavailable']
+        if (Helpers.require_library 'coderay', true, :warn).nil?
+          # prevent further attempts to load CodeRay
+          @document.set_attr 'coderay-unavailable', true
+        else
+          highlighter_loaded = true
+        end
+      end
+    when 'pygments'
+      unless (highlighter_loaded = defined? ::Pygments) || @document.attributes['pygments-unavailable']
+        if (Helpers.require_library 'pygments', 'pygments.rb', :warn).nil?
+          # prevent further attempts to load Pygments
+          @document.set_attr 'pygments-unavailable', true
+        else
+          highlighter_loaded = true
+        end
+      end
+    else
+      # unknown highlighting library (something is misconfigured if we arrive here)
+      highlighter_loaded = false
+    end
+
+    return sub_source source, process_callouts unless highlighter_loaded
+
     lineno = 0
     callout_on_last = false
     if process_callouts
@@ -1428,13 +1454,21 @@ module Substitutors
     end
 
     linenums_mode = nil
+    highlight_lines = nil
 
     case highlighter
     when 'coderay'
+      if (linenums_mode = (attr? 'linenums') ? (@document.attributes['coderay-linenums-mode'] || :table).to_sym : nil)
+        if attr? 'highlight', nil, false
+          highlight_lines = resolve_lines_to_highlight(attr 'highlight', nil, false)
+        end
+      end
       result = ::CodeRay::Duo[attr('language', :text, false).to_sym, :html, {
           :css => (@document.attributes['coderay-css'] || :class).to_sym,
-          :line_numbers => (linenums_mode = ((attr? 'linenums') ? (@document.attributes['coderay-linenums-mode'] || :table).to_sym : nil)),
-          :line_number_anchors => false}].highlight source
+          :line_numbers => linenums_mode,
+          :line_number_anchors => false,
+          :highlight_lines => highlight_lines,
+          :bold_every => false}].highlight source
     when 'pygments'
       lexer = ::Pygments::Lexer[attr('language', nil, false)] || ::Pygments::Lexer['text']
       opts = { :cssclass => 'pyhl', :classprefix => 'tok-', :nobackground => true }
@@ -1442,6 +1476,11 @@ module Substitutors
         opts[:noclasses] = true
         opts[:style] = (@document.attributes['pygments-style'] || Stylesheets::DEFAULT_PYGMENTS_STYLE)
       end
+      if attr? 'highlight', nil, false
+        unless (highlight_lines = resolve_lines_to_highlight(attr 'highlight', nil, false)).empty?
+          opts[:hl_lines] = highlight_lines * ' '
+        end
+      end
       if attr? 'linenums'
         # TODO we could add the line numbers in ourselves instead of having to strip out the junk
         # FIXME move these regular expressions into constants
@@ -1505,6 +1544,44 @@ module Substitutors
     end
   end
 
+  # e.g., highlight="1-5, !2, 10" or highlight=1-5;!2,10
+  def resolve_lines_to_highlight spec
+    lines = []
+    spec.delete(' ').split(DataDelimiterRx).map do |entry|
+      negate = false
+      if entry.start_with? '!'
+        entry = entry[1..-1]
+        negate = true
+      end
+      if entry.include? '-'
+        s, e = entry.split '-', 2
+        line_nums = (s.to_i..e.to_i).to_a
+        if negate
+          lines -= line_nums
+        else
+          lines.concat line_nums
+        end
+      else
+        if negate
+          lines.delete entry.to_i
+        else
+          lines << entry.to_i
+        end
+      end
+    end
+    lines.sort.uniq
+  end
+
+  # Public: Apply verbatim substitutions on source (for use when highlighting is disabled).
+  #
+  # source - the source code String on which to apply verbatim substitutions
+  # process_callouts - a Boolean flag indicating whether callout marks should be substituted
+  #
+  # returns the substituted source
+  def sub_source source, process_callouts
+    return process_callouts ? sub_callouts(sub_specialchars(source)) : sub_specialchars(source)
+  end
+
   # Internal: Lock-in the substitutions for this block
   #
   # Looks for an attribute named "subs". If present, resolves the