asciidoctor 1.5.4 → 1.5.5

data/lib/asciidoctor/substitutors.rb

@@ -363,54 +363,50 @@ module Substitutors
   end
   alias :sub_specialcharacters :sub_specialchars
 
-  # Public: Substitute quoted text (includes emphasis, strong, monospaced, etc)
-  #
-  # text - The String text to process
-  #
-  # returns The converted String text
-  def sub_quotes(text)
-    if ::RUBY_ENGINE_OPAL
-      result = text
-      QUOTE_SUBS[@document.compat_mode].each {|type, scope, pattern|
-        result = result.gsub(pattern) { convert_quoted_text $~, type, scope }
-      }
-    else
+  if RUBY_ENGINE == 'opal'
+    def sub_quotes text
+      QUOTE_SUBS[@document.compat_mode].each do |type, scope, pattern|
+        text = text.gsub(pattern) { convert_quoted_text $~, type, scope }
+      end
+      text
+    end
+
+    def sub_replacements text
+      REPLACEMENTS.each do |pattern, replacement, restore|
+        text = text.gsub(pattern) { do_replacement $~, replacement, restore }
+      end
+      text
+    end
+  else
+    # Public: Substitute quoted text (includes emphasis, strong, monospaced, etc)
+    #
+    # text - The String text to process
+    #
+    # returns The converted String text
+    def sub_quotes text
       # NOTE interpolation is faster than String#dup
-      result = %(#{text})
+      text = %(#{text})
       # NOTE using gsub! here as an MRI Ruby optimization
-      QUOTE_SUBS[@document.compat_mode].each {|type, scope, pattern|
-        result.gsub!(pattern) { convert_quoted_text $~, type, scope }
-      }
+      QUOTE_SUBS[@document.compat_mode].each do |type, scope, pattern|
+        text.gsub!(pattern) { convert_quoted_text $~, type, scope }
+      end
+      text
     end
 
-    result
-  end
-
-  # Public: Substitute replacement characters (e.g., copyright, trademark, etc)
-  #
-  # text - The String text to process
-  #
-  # returns The String text with the replacement characters substituted
-  def sub_replacements(text)
-    if ::RUBY_ENGINE_OPAL
-      result = text
-      REPLACEMENTS.each {|pattern, replacement, restore|
-        result = result.gsub(pattern) {
-          do_replacement $~, replacement, restore
-        }
-      }
-    else
+    # Public: Substitute replacement characters (e.g., copyright, trademark, etc)
+    #
+    # text - The String text to process
+    #
+    # returns The String text with the replacement characters substituted
+    def sub_replacements text
       # NOTE interpolation is faster than String#dup
-      result = %(#{text})
+      text = %(#{text})
       # NOTE Using gsub! as optimization
-      REPLACEMENTS.each {|pattern, replacement, restore|
-        result.gsub!(pattern) {
-          do_replacement $~, replacement, restore
-        }
-      }
+      REPLACEMENTS.each do |pattern, replacement, restore|
+        text.gsub!(pattern) { do_replacement $~, replacement, restore }
+      end
+      text
     end
-
-    result
   end
 
   # Internal: Substitute replacement text for matched location
@@ -642,6 +638,8 @@ module Substitutors
 
           target = m[1]
           attributes = if extension.config[:format] == :short
+            # TODO if content_model is :attributes, set target to nil and parse attributes
+            # maybe if content_model is :text, we should put content into text attribute
             {}
           else
             if extension.config[:content_model] == :attributes
@@ -1403,7 +1401,7 @@ module Substitutors
       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
+          @document.set_attr 'coderay-unavailable', ''
         else
           highlighter_loaded = true
         end
@@ -1412,7 +1410,7 @@ module Substitutors
       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
+          @document.set_attr 'pygments-unavailable', ''
         else
           highlighter_loaded = true
         end
@@ -1460,7 +1458,7 @@ module Substitutors
     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)
+          highlight_lines = resolve_highlight_lines(attr 'highlight', nil, false)
         end
       end
       result = ::CodeRay::Duo[attr('language', :text, false).to_sym, :html, {
@@ -1477,7 +1475,7 @@ module Substitutors
         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?
+        unless (highlight_lines = resolve_highlight_lines(attr 'highlight', nil, false)).empty?
           opts[:hl_lines] = highlight_lines * ' '
         end
       end
@@ -1545,7 +1543,7 @@ module Substitutors
   end
 
   # e.g., highlight="1-5, !2, 10" or highlight=1-5;!2,10
-  def resolve_lines_to_highlight spec
+  def resolve_highlight_lines spec
     lines = []
     spec.delete(' ').split(DataDelimiterRx).map do |entry|
       negate = false

data/lib/asciidoctor/table.rb

@@ -77,9 +77,11 @@ class Table < AbstractBlock
 
     # smell like we need a utility method here
     # to resolve an integer width from potential bogus input
-    pcwidth = attributes['width']
-    pcwidth_intval = pcwidth.to_i.abs
-    if pcwidth_intval == 0 && pcwidth != '0' || pcwidth_intval > 100
+    if (pcwidth = attributes['width'])
+      if (pcwidth_intval = pcwidth.to_i) > 100 || pcwidth_intval < 1
+        pcwidth_intval = 100 unless pcwidth_intval == 0 && (pcwidth == '0' || pcwidth == '0%')
+      end
+    else
       pcwidth_intval = 100
     end
     @attributes['tablepcwidth'] = pcwidth_intval
@@ -88,6 +90,8 @@ class Table < AbstractBlock
       @attributes['tableabswidth'] ||=
           ((@attributes['tablepcwidth'].to_f / 100) * @document.attributes['pagewidth']).round
     end
+
+    attributes['orientation'] = 'landscape' if attributes.key? 'rotate-option'
   end
 
   # Internal: Returns whether the current row being processed is
@@ -99,16 +103,16 @@ class Table < AbstractBlock
   # Internal: Creates the Column objects from the column spec
   #
   # returns nothing
-  def create_columns col_specs
+  def create_columns colspecs
     cols = []
     width_base = 0
-    col_specs.each do |col_spec|
-      width_base += col_spec['width']
-      cols << (Column.new self, cols.size, col_spec)
+    colspecs.each do |colspec|
+      width_base += colspec['width']
+      cols << (Column.new self, cols.size, colspec)
     end
     unless (@columns = cols).empty?
       @attributes['colcount'] = cols.size
-      assign_col_widths(width_base == 0 ? nil : width_base)
+      assign_column_widths(width_base == 0 ? nil : width_base)
     end
     nil
   end
@@ -123,7 +127,7 @@ class Table < AbstractBlock
   # width_base - the total of the relative column values used for calculating percentage widths (default: nil)
   #
   # returns nothing
-  def assign_col_widths width_base = nil
+  def assign_column_widths width_base = nil
     pf = 10.0 ** 4 # precision factor (multipler / divisor) for managing precision of calculated result
     total_width = col_pcwidth = 0
 
@@ -301,10 +305,10 @@ class Table::ParserContext
 
   # Public: Get the expected column count for a row
   #
-  # col_count is the number of columns to pull into a row
+  # colcount is the number of columns to pull into a row
   # A value of -1 means we use the number of columns found
-  # in the first line as the col_count
-  attr_reader :col_count
+  # in the first line as the colcount
+  attr_reader :colcount
 
   # Public: The String buffer of the currently open cell
   attr_accessor :buffer
@@ -334,12 +338,12 @@ class Table::ParserContext
       attributes['separator'] || Table::DEFAULT_DELIMITERS[@format]
     end
     @delimiter_re = /#{Regexp.escape @delimiter}/
-    @col_count = table.columns.empty? ? -1 : table.columns.size
+    @colcount = table.columns.empty? ? -1 : table.columns.size
     @buffer = ''
-    @cell_specs = []
+    @cellspecs = []
     @cell_open = false
     @active_rowspans = [0]
-    @col_visits = 0
+    @column_visits = 0
     @current_row = []
     @linenum = -1
   end
@@ -392,17 +396,17 @@ class Table::ParserContext
   # when the cell is being closed.
   #
   # returns The cell spec Hash captured from parsing the previous cell
-  def take_cell_spec()
-    @cell_specs.shift
+  def take_cellspec
+    @cellspecs.shift
   end
 
   # Public: Puts a cell spec onto the stack. Cell specs precede the delimiter, so a
   # stack is used to carry over the spec to the next cell.
   #
   # returns nothing
-  def push_cell_spec(cell_spec = {})
+  def push_cellspec(cellspec = {})
     # this shouldn't be nil, but we check anyway
-    @cell_specs << (cell_spec || {})
+    @cellspecs << (cellspec || {})
     nil
   end
 
@@ -443,8 +447,8 @@ class Table::ParserContext
   # by the next cell.
   #
   # returns nothing
-  def close_open_cell(next_cell_spec = {})
-    push_cell_spec next_cell_spec
+  def close_open_cell(next_cellspec = {})
+    push_cellspec next_cellspec
     close_cell(true) if cell_open?
     advance
     nil
@@ -459,17 +463,16 @@ class Table::ParserContext
     cell_text = @buffer.strip
     @buffer = ''
     if @format == 'psv'
-      cell_spec = take_cell_spec
-      if cell_spec
-        repeat = cell_spec.fetch('repeatcol', 1)
-        cell_spec.delete('repeatcol')
+      cellspec = take_cellspec
+      if cellspec
+        repeat = cellspec.delete('repeatcol') || 1
       else
         warn %(asciidoctor: ERROR: #{@last_cursor.line_info}: table missing leading separator, recovering automatically)
-        cell_spec = {}
+        cellspec = {}
         repeat = 1
       end
     else
-      cell_spec = nil
+      cellspec = nil
       repeat = 1
       if @format == 'csv'
         if !cell_text.empty? && cell_text.include?('"')
@@ -487,9 +490,9 @@ class Table::ParserContext
 
     1.upto(repeat) do |i|
       # TODO make column resolving an operation
-      if @col_count == -1
+      if @colcount == -1
         @table.columns << (column = Table::Column.new(@table, @table.columns.size + i - 1))
-        if cell_spec && (cell_spec.key? 'colspan') && (extra_cols = cell_spec['colspan'].to_i - 1) > 0
+        if cellspec && (cellspec.key? 'colspan') && (extra_cols = cellspec['colspan'].to_i - 1) > 0
           offset = @table.columns.size
           extra_cols.times do |j|
             @table.columns << Table::Column.new(@table, offset + j)
@@ -503,16 +506,16 @@ class Table::ParserContext
         end
       end
 
-      cell = Table::Cell.new(column, cell_text, cell_spec, @last_cursor)
+      cell = Table::Cell.new(column, cell_text, cellspec, @last_cursor)
       @last_cursor = @reader.cursor
       unless !cell.rowspan || cell.rowspan == 1
         activate_rowspan(cell.rowspan, (cell.colspan || 1))
       end
-      @col_visits += (cell.colspan || 1)
+      @column_visits += (cell.colspan || 1)
       @current_row << cell
       # don't close the row if we're on the first line and the column count has not been set explicitly
-      # TODO perhaps the col_count/linenum logic should be in end_of_row? (or a should_end_row? method)
-      close_row if end_of_row? && (@col_count != -1 || @linenum > 0 || (eol && i == repeat))
+      # TODO perhaps the colcount/linenum logic should be in end_of_row? (or a should_end_row? method)
+      close_row if end_of_row? && (@colcount != -1 || @linenum > 0 || (eol && i == repeat))
     end
     @cell_open = false
     nil
@@ -526,8 +529,8 @@ class Table::ParserContext
     @table.rows.body << @current_row
     # don't have to account for active rowspans here
     # since we know this is first row
-    @col_count = @col_visits if @col_count == -1
-    @col_visits = 0
+    @colcount = @column_visits if @colcount == -1
+    @column_visits = 0
     @current_row = []
     @active_rowspans.shift
     @active_rowspans[0] ||= 0
@@ -548,13 +551,13 @@ class Table::ParserContext
 
   # Public: Check whether we've met the number of effective columns for the current row.
   def end_of_row?
-    @col_count == -1 || effective_col_visits == @col_count
+    @colcount == -1 || effective_column_visits == @colcount
   end
 
   # Public: Calculate the effective column visits, which consists of the number of
   # cells plus any active rowspans.
-  def effective_col_visits
-    @col_visits + @active_rowspans[0]
+  def effective_column_visits
+    @column_visits + @active_rowspans[0]
   end
 
   # Internal: Advance to the next line (which may come after the parser begins processing

data/lib/asciidoctor/version.rb

@@ -1,3 +1,3 @@
 module Asciidoctor
-  VERSION = '1.5.4'
+  VERSION = '1.5.5'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 1.5.4
-.\"      Date: 2016-01-05
+.\" Generator: Asciidoctor 1.5.5
+.\"      Date: 2016-10-05
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 1.5.4
+.\"    Source: Asciidoctor 1.5.5
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2016-01-05" "Asciidoctor 1.5.4" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2016-10-05" "Asciidoctor 1.5.5" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -191,6 +191,13 @@ Print program version number.
 .sp
 \f[CR]\-v\fP can also be used if no other flags or arguments are present.
 .RE
+.SH "ENVIRONMENT"
+.sp
+\fBAsciidoctor\fP honors the SOURCE_DATE_EPOCH environment variable.
+If this variable is assigned an integer value, that value is used as the epoch of all input documents and as the local date and time.
+See \c
+.URL "https://reproducible\-builds.org/specs/source\-date\-epoch/" "" " "
+for more information about this environment variable.
 .SH "EXIT STATUS"
 .sp
 \fB0\fP

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 1.5.4
+:man source: Asciidoctor 1.5.5
 :page-layout: base
 
 == NAME
@@ -144,6 +144,12 @@ Matching templates found in subsequent directories override ones previously disc
 +
 `-v` can also be used if no other flags or arguments are present.
 
+== ENVIRONMENT
+
+*Asciidoctor* honors the SOURCE_DATE_EPOCH environment variable.
+If this variable is assigned an integer value, that value is used as the epoch of all input documents and as the local date and time.
+See https://reproducible-builds.org/specs/source-date-epoch/ for more information about this environment variable.
+
 == EXIT STATUS
 
 *0*::

data/test/attributes_test.rb

@@ -124,6 +124,58 @@ content
       assert result.include? '<em>big</em>foot'
     end
 
+    test 'should limit maximum size of attribute value if safe mode is SECURE' do
+      expected = 'a' * 4096
+      input = <<-EOS
+:name: #{'a' * 5000}
+
+{name}
+      EOS
+
+      result = render_embedded_string input, :doctype => :inline
+      assert_equal expected, result
+      assert_equal 4096, result.bytesize
+    end
+
+    test 'should handle multibyte characters when limiting attribute value size' do
+      expected = '日本'
+      input = <<-EOS
+:name: 日本語
+
+{name}
+      EOS
+
+      result = render_embedded_string input, :doctype => :inline, :attributes => { 'max-attribute-value-size' => 6 }
+      assert_equal expected, result
+      assert_equal 6, result.bytesize
+    end
+
+    test 'should not mangle multibyte characters when limiting attribute value size' do
+      expected = '日本'
+      input = <<-EOS
+:name: 日本語
+
+{name}
+      EOS
+
+      result = render_embedded_string input, :doctype => :inline, :attributes => { 'max-attribute-value-size' => 8 }
+      assert_equal expected, result
+      assert_equal 6, result.bytesize
+    end
+
+    test 'should allow maximize size of attribute value to be disabled' do
+      expected = 'a' * 5000
+      input = <<-EOS
+:name: #{'a' * 5000}
+
+{name}
+      EOS
+
+      result = render_embedded_string input, :doctype => :inline, :attributes => { 'max-attribute-value-size' => nil }
+      assert_equal expected, result
+      assert_equal 5000, result.bytesize
+    end
+
     test 'resolves user-home attribute if safe mode is less than SERVER' do
       input = <<-EOS
 :imagesdir: {user-home}/etc/images