asciidoctor 1.5.7.1 → 1.5.8

data/test/parser_test.rb

@@ -96,189 +96,6 @@ context "Parser" do
     end
   end
 
-  test "collect unnamed attribute" do
-    attributes = {}
-    line = 'quote'
-    expected = {1 => 'quote'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect unnamed attribute double-quoted" do
-    attributes = {}
-    line = '"quote"'
-    expected = {1 => 'quote'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect empty unnamed attribute double-quoted" do
-    attributes = {}
-    line = '""'
-    expected = {1 => ''}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect unnamed attribute double-quoted containing escaped quote" do
-    attributes = {}
-    line = '"ba\"zaar"'
-    expected = {1 => 'ba"zaar'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect unnamed attribute single-quoted" do
-    attributes = {}
-    line = '\'quote\''
-    expected = {1 => 'quote'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect empty unnamed attribute single-quoted" do
-    attributes = {}
-    line = '\'\''
-    expected = {1 => ''}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect unnamed attribute single-quoted containing escaped quote" do
-    attributes = {}
-    line = '\'ba\\\'zaar\''
-    expected = {1 => 'ba\'zaar'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect unnamed attribute with dangling delimiter" do
-    attributes = {}
-    line = 'quote , '
-    expected = {1 => 'quote'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect unnamed attribute in second position after empty attribute" do
-    attributes = {}
-    line = ', John Smith'
-    expected = {1 => nil, 2 => 'John Smith'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect unnamed attributes" do
-    attributes = {}
-    line = "first, second one, third"
-    expected = {1 => 'first', 2 => 'second one', 3 => 'third'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect named attribute" do
-    attributes = {}
-    line = 'foo=bar'
-    expected = {'foo' => 'bar'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect named attribute double-quoted" do
-    attributes = {}
-    line = 'foo="bar"'
-    expected = {'foo' => 'bar'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test 'collect named attribute with double-quoted empty value' do
-    attributes = {}
-    line = 'height=100,caption="",link="images/octocat.png"'
-    expected = {'height' => '100', 'caption' => '', 'link' => 'images/octocat.png'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect named attribute single-quoted" do
-    attributes = {}
-    line = 'foo=\'bar\''
-    expected = {'foo' => 'bar'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test 'collect named attribute with single-quoted empty value' do
-    attributes = {}
-    line = "height=100,caption='',link='images/octocat.png'"
-    expected = {'height' => '100', 'caption' => '', 'link' => 'images/octocat.png'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect named attributes unquoted" do
-    attributes = {}
-    line = "first=value, second=two, third=3"
-    expected = {'first' => 'value', 'second' => 'two', 'third' => '3'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect named attributes quoted" do
-    attributes = {}
-    line = "first='value', second=\"value two\", third=three"
-    expected = {'first' => 'value', 'second' => 'value two', 'third' => 'three'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect named attributes quoted containing non-semantic spaces" do
-    attributes = {}
-    line = "     first    =     'value', second     =\"value two\"     , third=       three      "
-    expected = {'first' => 'value', 'second' => 'value two', 'third' => 'three'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect mixed named and unnamed attributes" do
-    attributes = {}
-    line = "first, second=\"value two\", third=three, Sherlock Holmes"
-    expected = {1 => 'first', 'second' => 'value two', 'third' => 'three', 4 => 'Sherlock Holmes'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect options attribute" do
-    attributes = {}
-    line = "quote, options='opt1,opt2 , opt3'"
-    expected = {1 => 'quote', 'options' => 'opt1,opt2,opt3', 'opt1-option' => '', 'opt2-option' => '', 'opt3-option' => ''}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect opts attribute as options" do
-    attributes = {}
-    line = "quote, opts='opt1,opt2 , opt3'"
-    expected = {1 => 'quote', 'options' => 'opt1,opt2,opt3', 'opt1-option' => '', 'opt2-option' => '', 'opt3-option' => ''}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes)
-    assert_equal expected, attributes
-  end
-
-  test "collect and rekey unnamed attributes" do
-    attributes = {}
-    line = "first, second one, third, fourth"
-    expected = {1 => 'first', 2 => 'second one', 3 => 'third', 4 => 'fourth', 'a' => 'first', 'b' => 'second one', 'c' => 'third'}
-    Asciidoctor::AttributeList.new(line).parse_into(attributes, ['a', 'b', 'c'])
-    assert_equal expected, attributes
-  end
-
-  test "rekey positional attributes" do
-    attributes = {1 => 'source', 2 => 'java'}
-    expected = {1 => 'source', 2 => 'java', 'style' => 'source', 'language' => 'java'}
-    Asciidoctor::AttributeList.rekey(attributes, ['style', 'language', 'linenums'])
-    assert_equal expected, attributes
-  end
-
   test 'parse style attribute with id and role' do
     attributes = {1 => 'style#id.role'}
     style = Asciidoctor::Parser.parse_style_attribute(attributes)
@@ -542,6 +359,26 @@ context "Parser" do
     assert_equal 'Scherer, Jr.', doc.attributes['lastname']
   end
 
+  test 'use explicit authorinitials if set after implicit author line' do
+    input = <<-EOS.chomp
+Jean-Claude Van Damme
+:authorinitials: JCVD
+    EOS
+    doc = empty_document
+    parse_header_metadata input, doc
+    assert_equal 'JCVD', doc.attributes['authorinitials']
+  end
+
+  test 'use explicit authorinitials if set after author attribute' do
+    input = <<-EOS.chomp
+:author: Jean-Claude Van Damme
+:authorinitials: JCVD
+    EOS
+    doc = empty_document
+    parse_header_metadata input, doc
+    assert_equal 'JCVD', doc.attributes['authorinitials']
+  end
+
   test 'sets authorcount to 0 if document has no authors' do
     input = ''
     doc = empty_document
@@ -603,6 +440,34 @@ v0.0.7, 2013-12-18: The first release you can stand on
     assert_equal 'The first release you can stand on', metadata['revremark']
   end
 
+  test 'parse rev number, data, and remark as attribute references' do
+    input = <<-EOS
+Author Name
+v{project-version}, {release-date}: {release-summary}
+    EOS
+    metadata, _ = parse_header_metadata input
+    assert_equal 9, metadata.size
+    assert_equal '{project-version}', metadata['revnumber']
+    assert_equal '{release-date}', metadata['revdate']
+    assert_equal '{release-summary}', metadata['revremark']
+  end
+
+  test 'should resolve attribute references in rev number, data, and remark' do
+    input = <<-EOS
+= Document Title
+Author Name
+{project-version}, {release-date}: {release-summary}
+    EOS
+    doc = document_from_string input, :attributes => {
+      'project-version' => '1.0.1',
+      'release-date' => '2018-05-15',
+      'release-summary' => 'The one you can count on!'
+    }
+    assert_equal '1.0.1', (doc.attr 'revnumber')
+    assert_equal '2018-05-15', (doc.attr 'revdate')
+    assert_equal 'The one you can count on!', (doc.attr 'revremark')
+  end
+
   test "parse rev date" do
     input = <<-EOS
 Ryan Waldron
@@ -859,4 +724,19 @@ devtmpfs                3.9G       0     3.9G     0%    /dev
     assert_equal expected, lines
   end
 
+  test 'should warn if inline anchor is already in use' do
+    input = <<-EOS
+[#in-use]
+A paragraph with an id.
+
+Another paragraph
+[[in-use]]that uses an id
+which is already in use.
+    EOS
+
+    using_memory_logger do |logger|
+      document_from_string input
+      assert_message logger, :WARN, '<stdin>: line 5: id assigned to anchor already in use: in-use', Hash
+    end
+  end
 end

data/test/paths_test.rb

@@ -276,10 +276,27 @@ context 'Path Resolver' do
       assert_equal '/usr/share/assets/stylesheet.css', @resolver.system_path('assets/stylesheet.css', '/usr/share')
     end
 
-    test 'resolves absolute UNC path if start is absolute and target is relative' do
+    test 'File.dirname preserves UNC path root on Windows' do
+      assert_equal File.dirname('\\\\server\\docs\\file.html'), '\\\\server\\docs'
+    end if windows?
+
+    test 'File.dirname preserves posix-style UNC path root on Windows' do
+      assert_equal File.dirname('//server/docs/file.html'), '//server/docs'
+    end if windows?
+
+    test 'resolves UNC path if start is absolute and target is relative' do
       assert_equal '//QA/c$/users/asciidoctor/assets/stylesheet.css', @resolver.system_path('assets/stylesheet.css', '//QA/c$/users/asciidoctor')
     end
 
+    test 'resolves UNC path if target is UNC path' do
+      @resolver.file_separator = '\\'
+      assert_equal '//server/docs/output.html', @resolver.system_path('\\\\server\\docs\\output.html')
+    end
+
+    test 'resolves UNC path if target is posix-style UNC path' do
+      assert_equal '//server/docs/output.html', @resolver.system_path('//server/docs/output.html')
+    end
+
     test 'resolves relative target relative to current directory if start is empty' do
       pwd = File.expand_path(Dir.pwd)
       assert_equal "#{pwd}/images/tiger.png", @resolver.system_path('images/tiger.png', '')
@@ -330,11 +347,11 @@ context 'Path Resolver' do
       assert_equal 'part1/chapter1/section1.adoc', @resolver.relative_path(filename, JAIL)
     end
 
-    test 'should resolve relative path to filename if does not share common root with base directory' do
-      filename = '/docs/partials'
+    test 'should resolve relative path to filename outside of base directory' do
+      filename = '/home/shared/partials'
       base_dir = '/home/user/docs'
       result = @resolver.relative_path filename, base_dir
-      assert_equal filename, result
+      assert_equal '../../shared/partials', result
     end
 
     test 'should resolve relative path relative to base dir in unsafe mode' do

data/test/preamble_test.rb

@@ -16,7 +16,7 @@ Preamble paragraph 1.
 
 Section paragraph 1.
     EOS
-    result = render_string(input)
+    result = convert_string(input)
     assert_xpath '//p', result, 2
     assert_xpath '//*[@id="preamble"]', result, 1
     assert_xpath '//*[@id="preamble"]//p', result, 1
@@ -35,7 +35,7 @@ Preface content.
 
 Section content.
     EOS
-    result = render_string input, :backend => :docbook
+    result = convert_string input, :backend => :docbook
     assert_xpath '//preface/title', result, 1
     title_node = xmlnodes_at_xpath '//preface/title', result, 1
     assert_equal '', title_node.text
@@ -53,7 +53,7 @@ Preface content.
 
 Section content.
     EOS
-    result = render_string input, :backend => :docbook
+    result = convert_string input, :backend => :docbook
     assert_xpath '//preface/title[text()="Preface"]', result, 1
   end
 
@@ -69,7 +69,7 @@ Preamble paragraph 2.
 
 Section paragraph 1.
     EOS
-    result = render_string(input)
+    result = convert_string(input)
     assert_xpath '//p', result, 3
     assert_xpath '//*[@id="preamble"]', result, 1
     assert_xpath '//*[@id="preamble"]//p', result, 2
@@ -83,7 +83,7 @@ Section paragraph 1.
 
 paragraph
     EOS
-    result = render_string(input)
+    result = convert_string(input)
     assert_xpath '//p', result, 1
     assert_xpath '//*[@id="content"]/*[@class="paragraph"]/p', result, 1
     assert_xpath '//*[@id="content"]/*[@class="paragraph"]/following-sibling::*', result, 0
@@ -97,7 +97,7 @@ paragraph
 
 Section paragraph 1.
     EOS
-    result = render_string(input)
+    result = convert_string(input)
     assert_xpath '//p', result, 1
     assert_xpath '//*[@id="preamble"]', result, 0
     assert_xpath '//h2[@id="_first_section"]', result, 1
@@ -111,7 +111,7 @@ Preamble paragraph 1.
 
 Section paragraph 1.
     EOS
-    result = render_string(input)
+    result = convert_string(input)
     assert_xpath '//p', result, 2
     assert_xpath '//*[@id="preamble"]', result, 0
     assert_xpath '//h2[@id="_first_section"]/preceding::p', result, 1
@@ -150,7 +150,7 @@ The axe came swinging.
       assert_xpath %{//*[@id="preamble"]//p[text() = "Back then#{decode_char 8230}#{decode_char 8203}"]}, output, 1
   end
 
-  test 'should render table of contents in preamble if toc-placement attribute value is preamble' do
+  test 'should output table of contents in preamble if toc-placement attribute value is preamble' do
     input = <<-EOS
 = Article
 :toc:
@@ -167,7 +167,7 @@ It was a dark and stormy night...
 They couldn't believe their eyes when...
       EOS
 
-    output = render_string input
+    output = convert_string input
     assert_xpath '//*[@id="preamble"]/*[@id="toc"]', output, 1
   end
 end

data/test/reader_test.rb

@@ -783,7 +783,7 @@ include::#{url}[]
         EOS
         expect = /\{"name": "asciidoctor"\}/
         output = using_test_webserver do
-          render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
+          convert_string_to_embedded input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
         end
 
         refute_nil output
@@ -797,7 +797,7 @@ include::fixtures/outer-include.adoc[]
 ....
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expected = 'first line of outer
 
 first line of middle
@@ -820,7 +820,7 @@ include::#{url}[]
 ....
         EOS
         output = using_test_webserver do
-          render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
+          convert_string_to_embedded input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
         end
 
         expected = 'first line of outer
@@ -848,7 +848,7 @@ include::#{include_url}[]
         begin
           using_memory_logger do |logger|
             result = using_test_webserver do
-              render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
+              convert_string_to_embedded input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
             end
             assert_includes result, %(Unresolved directive in #{include_url} - include::#{nested_include_url}[])
             assert_message logger, :ERROR, %(#{include_url}: line 1: include uri not readable: http://#{resolve_localhost}:9876/fixtures/#{nested_include_url}), Hash
@@ -867,7 +867,7 @@ include::#{url}[tag=init,indent=0]
 ----
         EOS
         output = using_test_webserver do
-          render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
+          convert_string_to_embedded input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
         end
 
         expected = '<code class="language-ruby" data-lang="ruby">def initialize breed
@@ -887,7 +887,7 @@ include::#{url}[]
         begin
           using_memory_logger do |logger|
             output = using_test_webserver do
-              render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
+              convert_string_to_embedded input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
             end
             refute_nil output
             assert_match(/Unresolved directive/, output)
@@ -903,7 +903,7 @@ include::#{url}[]
 include::fixtures/include-file.asciidoc[lines=1;3..4;6..-1]
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         assert_match(/first line/, output)
         refute_match(/second line/, output)
         assert_match(/third line/, output)
@@ -920,7 +920,7 @@ include::fixtures/include-file.asciidoc[lines=1;3..4;6..-1]
 include::fixtures/include-file.asciidoc[lines="1, 3..4 , 6 .. -1"]
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         assert_match(/first line/, output)
         refute_match(/second line/, output)
         assert_match(/third line/, output)
@@ -932,6 +932,23 @@ include::fixtures/include-file.asciidoc[lines="1, 3..4 , 6 .. -1"]
         assert_match(/last line of included content/, output)
       end
 
+      test 'include directive supports implicit endless range' do
+        input = <<-EOS
+include::fixtures/include-file.asciidoc[lines=6..]
+        EOS
+
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
+        refute_match(/first line/, output)
+        refute_match(/second line/, output)
+        refute_match(/third line/, output)
+        refute_match(/fourth line/, output)
+        refute_match(/fifth line/, output)
+        assert_match(/sixth line/, output)
+        assert_match(/seventh line/, output)
+        assert_match(/eighth line/, output)
+        assert_match(/last line of included content/, output)
+      end
+
       test 'include directive ignores empty lines attribute' do
         input = <<-EOS
 ++++
@@ -939,7 +956,7 @@ include::fixtures/include-file.asciidoc[lines=]
 ++++
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         assert_includes output, 'first line of included content'
         assert_includes output, 'last line of included content'
       end
@@ -949,7 +966,7 @@ include::fixtures/include-file.asciidoc[lines=]
 include::fixtures/include-file.asciidoc[tag=snippetA]
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         assert_match(/snippetA content/, output)
         refute_match(/snippetB content/, output)
         refute_match(/non-tagged content/, output)
@@ -961,7 +978,7 @@ include::fixtures/include-file.asciidoc[tag=snippetA]
 include::fixtures/include-file.asciidoc[tags=snippetA;snippetB]
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         assert_match(/snippetA content/, output)
         assert_match(/snippetB content/, output)
         refute_match(/non-tagged content/, output)
@@ -995,7 +1012,7 @@ include::fixtures/#{filename}[tag=snippet,indent=0]
           input = <<-EOS
 include::#{tmp_include_path}[tag=include-me]
           EOS
-          output = render_embedded_string input, :safe => :safe, :base_dir => tmp_include_dir
+          output = convert_string_to_embedded input, :safe => :safe, :base_dir => tmp_include_dir
           assert_includes output, 'included line'
           refute_includes output, 'do not include'
         ensure
@@ -1003,6 +1020,26 @@ include::#{tmp_include_path}[tag=include-me]
         end 
       end
 
+      test 'include directive finds closing tag on last line of file without a trailing newline' do
+        begin
+          tmp_include = Tempfile.new %w(include- .adoc)
+          tmp_include_dir, tmp_include_path = File.split tmp_include.path
+          tmp_include.write %(line not included\ntag::include-me[]\nline included\nend::include-me[])
+          tmp_include.close
+          input = <<-EOS
+include::#{tmp_include_path}[tag=include-me]
+          EOS
+          using_memory_logger do |logger|
+            output = convert_string_to_embedded input, :safe => :safe, :base_dir => tmp_include_dir
+            assert_empty logger.messages
+            assert_includes output, 'line included'
+            refute_includes output, 'line not included'
+          end
+        ensure
+          tmp_include.close!
+        end 
+      end
+
       test 'include directive does not select lines with tag directives within selected tag region' do
         input = <<-EOS
 ++++
@@ -1010,7 +1047,7 @@ include::fixtures/include-file.asciidoc[tags=snippet]
 ++++
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expect = %(snippetA content
 
 non-tagged content
@@ -1026,7 +1063,7 @@ include::fixtures/tagged-class-enclosed.rb[tags=all;!bark]
 ----
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expected = %(class Dog
   def initialize breed
     @breed = breed
@@ -1042,7 +1079,7 @@ include::fixtures/tagged-class.rb[tags=**]
 ----
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expected = %(class Dog
   def initialize breed
     @breed = breed
@@ -1066,7 +1103,7 @@ include::fixtures/tagged-class.rb[tags=**;!bark]
 ----
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expected = %(class Dog
   def initialize breed
     @breed = breed
@@ -1082,7 +1119,7 @@ include::fixtures/tagged-class-enclosed.rb[tags=*]
 ----
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expected = %(class Dog
   def initialize breed
     @breed = breed
@@ -1106,7 +1143,7 @@ include::fixtures/tagged-class-enclosed.rb[tags=*;!init]
 ----
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expected = %(class Dog
 
   def bark
@@ -1127,7 +1164,7 @@ include::fixtures/tagged-class.rb[tags=!*]
 ----
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expected = %(class Dog
 end)
         assert_includes output, expected
@@ -1141,7 +1178,7 @@ include::fixtures/tagged-class.rb[tags=bark;!bark-other]
 ----
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         expected = %(def bark
   if @breed == 'beagle'
     'woof woof woof woof woof'
@@ -1156,7 +1193,7 @@ include::fixtures/include-file.asciidoc[tag=no-such-tag]
         EOS
 
         using_memory_logger do |logger|
-          render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+          convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
           assert_message logger, :WARN, %(~<stdin>: line 1: tag 'no-such-tag' not found in include file), Hash
         end
       end
@@ -1169,7 +1206,7 @@ include::fixtures/include-file.asciidoc[tags=no-such-tag-b;no-such-tag-a]
         EOS
 
         using_memory_logger do |logger|
-          render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+          convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
           # NOTE Ruby 1.8 swaps the order of the list for some silly reason
           expected_tags = ::RUBY_MIN_VERSION_1_9 ? 'no-such-tag-b, no-such-tag-a' : 'no-such-tag-a, no-such-tag-b'
           assert_message logger, :WARN, %(~<stdin>: line 2: tags '#{expected_tags}' not found in include file), Hash
@@ -1184,7 +1221,7 @@ include::fixtures/unclosed-tag.adoc[tag=a]
         EOS
 
         using_memory_logger do |logger|
-          result = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+          result = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
           assert_equal 'a', result
           assert_message logger, :WARN, %(~<stdin>: line 2: detected unclosed tag 'a' starting at line 2 of include file), Hash
           refute_nil logger.messages[0][:message][:include_location]
@@ -1200,7 +1237,7 @@ include::fixtures/mismatched-end-tag.adoc[tags=a;b]
 
         inc_path = File.join DIRNAME, 'fixtures/mismatched-end-tag.adoc'
         using_memory_logger do |logger|
-          result = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+          result = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
           assert_equal %(a\nb), result
           assert_message logger, :WARN, %(<stdin>: line 2: mismatched end tag (expected 'b' but found 'a') at line 5 of include file: #{inc_path}), Hash
           refute_nil logger.messages[0][:message][:include_location]
@@ -1216,7 +1253,7 @@ include::fixtures/unexpected-end-tag.adoc[tags=a]
 
         inc_path = File.join DIRNAME, 'fixtures/unexpected-end-tag.adoc'
         using_memory_logger do |logger|
-          result = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+          result = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
           assert_equal 'a', result
           assert_message logger, :WARN, %(<stdin>: line 2: unexpected end tag 'a' at line 4 of include file: #{inc_path}), Hash
           refute_nil logger.messages[0][:message][:include_location]
@@ -1231,7 +1268,7 @@ include::fixtures/include-file.xml[#{attr_name}=]
 ++++
           EOS
 
-          output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+          output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
           assert_match(/(?:tag|end)::/, output, 2)
         end
       end
@@ -1241,7 +1278,7 @@ include::fixtures/include-file.xml[#{attr_name}=]
 include::fixtures/include-file.asciidoc[lines=1, tags=snippetA;snippetB]
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         assert_match(/first line of included content/, output)
         refute_match(/snippetA content/, output)
         refute_match(/snippetB content/, output)
@@ -1255,11 +1292,24 @@ include::fixtures/basic-docinfo.xml[lines=2..3, indent=0]
 ----
         EOS
 
-        output = render_embedded_string input, :safe => :safe, :base_dir => DIRNAME
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
         result = xmlnodes_at_xpath('//pre', output, 1).text
         assert_equal "<year>2013</year>\n<holder>Acme™, Inc.</holder>", result
       end
 
+      test 'should substitute attribute references in attrlist' do
+        input = <<-EOS
+:name-of-tag: snippetA
+include::fixtures/include-file.asciidoc[tag={name-of-tag}]
+        EOS
+
+        output = convert_string_to_embedded input, :safe => :safe, :base_dir => DIRNAME
+        assert_match(/snippetA content/, output)
+        refute_match(/snippetB content/, output)
+        refute_match(/non-tagged content/, output)
+        refute_match(/included content/, output)
+      end
+
       test 'should fall back to built-in include directive behavior when not handled by include processor' do
         input = <<-EOS
 include::fixtures/include-file.asciidoc[]