asciidoctor 0.1.1 → 0.1.2

data/test/lexer_test.rb

@@ -154,7 +154,15 @@ context "Lexer" do
   test "collect options attribute" do
     attributes = {}
     line = "quote, options='opt1,opt2 , opt3'"
-    expected = {1 => 'quote', 'options' => 'opt1,opt2 , opt3', 'opt1-option' => nil, 'opt2-option' => nil, 'opt3-option' => nil}
+    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
@@ -176,16 +184,19 @@ context "Lexer" do
 
   test "parse author first" do
     metadata, = parse_header_metadata 'Stuart'
-    assert_equal 3, metadata.size
-    assert_equal 'Stuart', metadata['author']
+    assert_equal 5, metadata.size
+    assert_equal 1, metadata['authorcount']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Stuart', metadata['firstname']
     assert_equal 'S', metadata['authorinitials']
   end
 
   test "parse author first last" do
     metadata, = parse_header_metadata 'Yukihiro Matsumoto'
-    assert_equal 4, metadata.size
+    assert_equal 6, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Yukihiro Matsumoto', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Yukihiro', metadata['firstname']
     assert_equal 'Matsumoto', metadata['lastname']
     assert_equal 'YM', metadata['authorinitials']
@@ -193,8 +204,10 @@ context "Lexer" do
 
   test "parse author first middle last" do
     metadata, = parse_header_metadata 'David Heinemeier Hansson'
-    assert_equal 5, metadata.size
+    assert_equal 7, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'David Heinemeier Hansson', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'David', metadata['firstname']
     assert_equal 'Heinemeier', metadata['middlename']
     assert_equal 'Hansson', metadata['lastname']
@@ -203,8 +216,10 @@ context "Lexer" do
 
   test "parse author first middle last email" do
     metadata, = parse_header_metadata 'David Heinemeier Hansson <rails@ruby-lang.org>'
-    assert_equal 6, metadata.size
+    assert_equal 8, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'David Heinemeier Hansson', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'David', metadata['firstname']
     assert_equal 'Heinemeier', metadata['middlename']
     assert_equal 'Hansson', metadata['lastname']
@@ -214,8 +229,10 @@ context "Lexer" do
 
   test "parse author first email" do
     metadata, = parse_header_metadata 'Stuart <founder@asciidoc.org>'
-    assert_equal 4, metadata.size
+    assert_equal 6, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Stuart', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Stuart', metadata['firstname']
     assert_equal 'founder@asciidoc.org', metadata['email']
     assert_equal 'S', metadata['authorinitials']
@@ -223,8 +240,10 @@ context "Lexer" do
 
   test "parse author first last email" do
     metadata, = parse_header_metadata 'Stuart Rackham <founder@asciidoc.org>'
-    assert_equal 5, metadata.size
+    assert_equal 7, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Stuart Rackham', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Stuart', metadata['firstname']
     assert_equal 'Rackham', metadata['lastname']
     assert_equal 'founder@asciidoc.org', metadata['email']
@@ -233,8 +252,10 @@ context "Lexer" do
 
   test "parse author with hyphen" do
     metadata, = parse_header_metadata 'Tim Berners-Lee <founder@www.org>'
-    assert_equal 5, metadata.size
+    assert_equal 7, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Tim Berners-Lee', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Tim', metadata['firstname']
     assert_equal 'Berners-Lee', metadata['lastname']
     assert_equal 'founder@www.org', metadata['email']
@@ -243,8 +264,10 @@ context "Lexer" do
 
   test "parse author with single quote" do
     metadata, = parse_header_metadata 'Stephen O\'Grady <founder@redmonk.com>'
-    assert_equal 5, metadata.size
+    assert_equal 7, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Stephen O\'Grady', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Stephen', metadata['firstname']
     assert_equal 'O\'Grady', metadata['lastname']
     assert_equal 'founder@redmonk.com', metadata['email']
@@ -253,8 +276,10 @@ context "Lexer" do
 
   test "parse author with dotted initial" do
     metadata, = parse_header_metadata 'Heiko W. Rupp <hwr@example.de>'
-    assert_equal 6, metadata.size
+    assert_equal 8, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Heiko W. Rupp', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Heiko', metadata['firstname']
     assert_equal 'W.', metadata['middlename']
     assert_equal 'Rupp', metadata['lastname']
@@ -264,8 +289,10 @@ context "Lexer" do
 
   test "parse author with underscore" do
     metadata, = parse_header_metadata 'Tim_E Fella'
-    assert_equal 4, metadata.size
+    assert_equal 6, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Tim E Fella', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Tim E', metadata['firstname']
     assert_equal 'Fella', metadata['lastname']
     assert_equal 'TF', metadata['authorinitials']
@@ -273,8 +300,10 @@ context "Lexer" do
 
   test "parse author condenses whitespace" do
     metadata, = parse_header_metadata '   Stuart       Rackham     <founder@asciidoc.org>'
-    assert_equal 5, metadata.size
+    assert_equal 7, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Stuart Rackham', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Stuart', metadata['firstname']
     assert_equal 'Rackham', metadata['lastname']
     assert_equal 'founder@asciidoc.org', metadata['email']
@@ -283,15 +312,26 @@ context "Lexer" do
 
   test "parse invalid author line becomes author" do
     metadata, = parse_header_metadata '   Stuart       Rackham, founder of AsciiDoc   <founder@asciidoc.org>'
-    assert_equal 3, metadata.size
+    assert_equal 5, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Stuart Rackham, founder of AsciiDoc <founder@asciidoc.org>', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
     assert_equal 'Stuart Rackham, founder of AsciiDoc <founder@asciidoc.org>', metadata['firstname']
     assert_equal 'S', metadata['authorinitials']
   end
 
+  test 'parse multiple authors' do
+    metadata, = parse_header_metadata 'Doc Writer <doc.writer@asciidoc.org>; John Smith <john.smith@asciidoc.org>'
+    assert_equal 2, metadata['authorcount']
+    assert_equal 'Doc Writer, John Smith', metadata['authors']
+    assert_equal 'Doc Writer', metadata['author']
+    assert_equal 'Doc Writer', metadata['author_1']
+    assert_equal 'John Smith', metadata['author_2']
+  end
+
   test "parse rev number date remark" do
     metadata, = parse_header_metadata "Ryan Waldron\nv0.0.7, 2013-12-18: The first release you can stand on"
-    assert_equal 7, metadata.size
+    assert_equal 9, metadata.size
     assert_equal '0.0.7', metadata['revnumber']
     assert_equal '2013-12-18', metadata['revdate']
     assert_equal 'The first release you can stand on', metadata['revremark']
@@ -299,20 +339,20 @@ context "Lexer" do
 
   test "parse rev date" do
     metadata, = parse_header_metadata "Ryan Waldron\n2013-12-18"
-    assert_equal 5, metadata.size
+    assert_equal 7, metadata.size
     assert_equal '2013-12-18', metadata['revdate']
   end
 
   # while compliant w/ AsciiDoc, this is just sloppy parsing
   test "treats arbitrary text on rev line as revdate" do
     metadata, = parse_header_metadata "Ryan Waldron\nfoobar\n"
-    assert_equal 5, metadata.size
+    assert_equal 7, metadata.size
     assert_equal 'foobar', metadata['revdate']
   end
 
   test "parse rev date remark" do
     metadata, = parse_header_metadata "Ryan Waldron\n2013-12-18:  The first release you can stand on"
-    assert_equal 6, metadata.size
+    assert_equal 8, metadata.size
     assert_equal '2013-12-18', metadata['revdate']
     assert_equal 'The first release you can stand on', metadata['revremark']
   end
@@ -331,7 +371,8 @@ context "Lexer" do
 
   test "skip line comments before author" do
     metadata, = parse_header_metadata "// Asciidoctor\n// release artist\nRyan Waldron"
-    assert_equal 4, metadata.size
+    assert_equal 6, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Ryan Waldron', metadata['author']
     assert_equal 'Ryan', metadata['firstname']
     assert_equal 'Waldron', metadata['lastname']
@@ -340,7 +381,8 @@ context "Lexer" do
 
   test "skip block comment before author" do
     metadata, = parse_header_metadata "////\nAsciidoctor\nrelease artist\n////\nRyan Waldron"
-    assert_equal 4, metadata.size
+    assert_equal 6, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Ryan Waldron', metadata['author']
     assert_equal 'Ryan', metadata['firstname']
     assert_equal 'Waldron', metadata['lastname']
@@ -349,7 +391,8 @@ context "Lexer" do
 
   test "skip block comment before rev" do
     metadata, = parse_header_metadata "Ryan Waldron\n////\nAsciidoctor\nrelease info\n////\nv0.0.7, 2013-12-18"
-    assert_equal 6, metadata.size
+    assert_equal 8, metadata.size
+    assert_equal 1, metadata['authorcount']
     assert_equal 'Ryan Waldron', metadata['author']
     assert_equal '0.0.7', metadata['revnumber']
     assert_equal '2013-12-18', metadata['revdate']

data/test/links_test.rb

@@ -30,6 +30,10 @@ context 'Links' do
     assert_xpath '//a[@href="http://asciidoc.org"][text()="http://asciidoc.org"]', render_string('(http://asciidoc.org) is the project page for AsciiDoc.'), 1
   end
 
+  test 'qualified url containing round brackets' do
+    assert_xpath '//a[@href="http://jruby.org/apidocs/org/jruby/Ruby.html#addModule(org.jruby.RubyModule)"][text()="addModule() adds a Ruby module"]', render_string('http://jruby.org/apidocs/org/jruby/Ruby.html#addModule(org.jruby.RubyModule)[addModule() adds a Ruby module]'), 1
+  end
+
   test 'qualified url adjacent to text in square brackets' do
     assert_xpath '//a[@href="http://asciidoc.org"][text()="AsciiDoc"]', render_string(']http://asciidoc.org[AsciiDoc] project page.'), 1
   end

data/test/lists_test.rb

@@ -16,6 +16,28 @@ List
       assert_xpath '//ul/li', output, 3
     end
 
+    test 'indented dash elements using spaces' do
+      input = <<-EOS
+ - Foo
+ - Boo
+ - Blech
+      EOS
+      output = render_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
+    test 'indented dash elements using tabs' do
+      input = <<-EOS
+\t-\tFoo
+\t-\tBoo
+\t-\tBlech
+      EOS
+      output = render_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
     test "dash elements separated by blank lines should merge lists" do
       input = <<-EOS
 List
@@ -150,6 +172,40 @@ wrapped content
       assert_xpath "//ul/li[1]/p[text() = 'Foo\n:foo: bar']", output, 1
     end
 
+    test 'a list item with a nested marker terminates non-indented paragraph for text of list item' do
+      input = <<-EOS
+- Foo
+Bar
+* Foo
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'ul ul', output, 1
+      assert !output.include?('* Foo')
+    end
+
+    test 'a list item for a different list terminates non-indented paragraph for text of list item' do
+      input = <<-EOS
+== Example 1
+
+- Foo
+Bar
+. Foo
+
+== Example 2
+
+* Item
+text
+term:: def
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'ul ol', output, 1
+      assert !output.include?('* Foo')
+      assert_css 'ul dl', output, 1
+      assert !output.include?('term:: def')
+    end
+
     test 'an indented wrapped line is unindented and folded into text of list item' do
       input = <<-EOS
 List
@@ -186,6 +242,40 @@ second wrapped line
       assert_equal 'second wrapped line', lines[2].chomp
     end
 
+    test 'a list item with a nested marker terminates indented paragraph for text of list item' do
+      input = <<-EOS
+- Foo
+  Bar
+* Foo
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'ul ul', output, 1
+      assert !output.include?('* Foo')
+    end
+
+    test 'a list item for a different list terminates indented paragraph for text of list item' do
+      input = <<-EOS
+== Example 1
+
+- Foo
+  Bar
+. Foo
+
+== Example 2
+
+* Item
+  text
+term:: def
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'ul ol', output, 1
+      assert !output.include?('* Foo')
+      assert_css 'ul dl', output, 1
+      assert !output.include?('term:: def')
+    end
+
     test "a literal paragraph offset by blank lines in list content is appended as a literal block" do
       input = <<-EOS
 List
@@ -331,6 +421,28 @@ List
       assert_xpath '//ul/li', output, 3
     end
 
+    test 'indented asterisk elements using spaces' do
+      input = <<-EOS
+ * Foo
+ * Boo
+ * Blech
+      EOS
+      output = render_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
+    test 'indented asterisk elements using tabs' do
+      input = <<-EOS
+\t*\tFoo
+\t*\tBoo
+\t*\tBlech
+      EOS
+      output = render_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
     test "asterisk elements separated by blank lines should merge lists" do
       input = <<-EOS
 List
@@ -455,6 +567,21 @@ item
       assert_xpath '//ul/li', output, 2
       assert_xpath '//h2[@id = "sec"][text() = "Section"]', output, 1
     end
+
+    test 'should not find section title immediately below last list item' do
+      input = <<-EOS
+* first
+* second
+== Not a section
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'ul', output, 1
+      assert_css 'ul > li', output, 2
+      assert_css 'h2', output, 0
+      assert output.include?('== Not a section')
+      assert_xpath %((//li)[2]/p[text() = "second\n== Not a section"]), output, 1
+    end
   end
 
   context "Lists with inline markup" do
@@ -472,7 +599,7 @@ List
       assert_xpath '//ul/li', output, 3
       assert_xpath '(//ul/li)[1]//strong', output, 1
       assert_xpath '(//ul/li)[2]//em', output, 1
-      assert_xpath '(//ul/li)[3]//tt', output, 1
+      assert_xpath '(//ul/li)[3]//code', output, 1
     end
 
     test "attribute substitutions" do
@@ -1287,6 +1414,28 @@ List
       assert_xpath '//ol/li', output, 3
     end
 
+    test 'indented dot elements using spaces' do
+      input = <<-EOS
+ . Foo
+ . Boo
+ . Blech
+      EOS
+      output = render_string input
+      assert_xpath '//ol', output, 1
+      assert_xpath '//ol/li', output, 3
+    end
+
+    test 'indented dot elements using tabs' do
+      input = <<-EOS
+\t.\tFoo
+\t.\tBoo
+\t.\tBlech
+      EOS
+      output = render_string input
+      assert_xpath '//ol', output, 1
+      assert_xpath '//ol/li', output, 3
+    end
+
     test "dot elements separated by blank lines should merge lists" do
       input = <<-EOS
 List
@@ -1409,6 +1558,21 @@ term1:: def1
       assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
     end
 
+    test "single-line indented adjacent elements with tabs" do
+      input = <<-EOS
+term1::\tdef1
+\tterm2::\tdef2
+      EOS
+      output = render_string input
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+      assert_xpath '(//dl/dt)[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
     test "single-line elements separated by blank line should create a single list" do
       input = <<-EOS
 term1:: def1
@@ -2055,20 +2219,46 @@ second term:: definition
       assert_xpath '((//tr)[2]/td)[2]/p[normalize-space(text())="definition"]', output, 1
     end
 
-    test 'should render qanda list with proper semantics' do
+    test 'should render qanda list in HTML with proper semantics' do
       input = <<-EOS
 [qanda]
-Question one::
-        Answer one.
-Question two::
-        Answer two.
+Question 1::
+        Answer 1.
+Question 2::
+        Answer 2.
       EOS
       output = render_embedded_string input
       assert_css '.qlist.qanda', output, 1
-      assert_css '.qlist ol', output, 1
-      assert_css '.qlist ol li', output, 2
-      assert_css '.qlist ol li:nth-child(1) p em', output, 1
-      assert_css '.qlist ol li:nth-child(1) p', output, 2
+      assert_css '.qanda > ol', output, 1
+      assert_css '.qanda > ol > li', output, 2
+      (1..2).each do |idx|
+        assert_css ".qanda > ol > li:nth-child(#{idx}) > p", output, 2
+        assert_css ".qanda > ol > li:nth-child(#{idx}) > p:first-child > em", output, 1
+        assert_xpath "/*[@class = 'qlist qanda']/ol/li[#{idx}]/p[1]/em[normalize-space(text()) = 'Question #{idx}']", output, 1
+        assert_css ".qanda > ol > li:nth-child(#{idx}) > p:last-child > *", output, 0
+        assert_xpath "/*[@class = 'qlist qanda']/ol/li[#{idx}]/p[2][normalize-space(text()) = 'Answer #{idx}.']", output, 1
+      end
+    end
+
+    test 'should render qanda list in DocBook with proper semantics' do
+      input = <<-EOS
+[qanda]
+Question 1::
+        Answer 1.
+Question 2::
+        Answer 2.
+      EOS
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_css 'qandaset', output, 1
+      assert_css 'qandaset > qandaentry', output, 2
+      (1..2).each do |idx|
+        assert_css "qandaset > qandaentry:nth-child(#{idx}) > question", output, 1
+        assert_css "qandaset > qandaentry:nth-child(#{idx}) > question > simpara", output, 1
+        assert_xpath "/qandaset/qandaentry[#{idx}]/question/simpara[normalize-space(text()) = 'Question #{idx}']", output, 1
+        assert_css "qandaset > qandaentry:nth-child(#{idx}) > answer", output, 1
+        assert_css "qandaset > qandaentry:nth-child(#{idx}) > answer > simpara", output, 1
+        assert_xpath "/qandaset/qandaentry[#{idx}]/answer/simpara[normalize-space(text()) = 'Answer #{idx}.']", output, 1
+      end
     end
 
     test 'should render bibliography list with proper semantics' do
@@ -2640,6 +2830,55 @@ para
       assert_xpath '//*[@class="dlist"]//dd/*[@class="paragraph"]', output, 1
       assert_xpath '//*[@class="dlist"]//dd/*[@class="paragraph"]/p[text()="para"]', output, 1
     end
+
+    test 'attached paragraph does not break on adjacent nested labeled list term' do
+      input = <<-EOS
+term1:: def
++
+more definition
+not a term::: def
+      EOS
+
+      output = render_embedded_string input
+      assert_css '.dlist > dl > dt', output, 1
+      assert_css '.dlist > dl > dd', output, 1
+      assert_css '.dlist > dl > dd > .paragraph', output, 1
+      assert output.include?('not a term::: def')
+    end
+
+    # FIXME pending
+=begin
+    test 'attached paragraph does not break on adjacent sibling labeled list term' do
+      input = <<-EOS
+term1:: def
++
+more definition
+not a term:: def
+      EOS
+
+      output = render_embedded_string input
+      assert_css '.dlist > dl > dt', output, 1
+      assert_css '.dlist > dl > dd', output, 1
+      assert_css '.dlist > dl > dd > .paragraph', output, 1
+      assert output.include?('not a term:: def')
+    end
+=end
+
+    test 'attached styled paragraph does not break on adjacent nested labeled list term' do
+      input = <<-EOS
+term1:: def
++
+[quote]
+more definition
+not a term::: def
+      EOS
+
+      output = render_embedded_string input
+      assert_css '.dlist > dl > dt', output, 1
+      assert_css '.dlist > dl > dd', output, 1
+      assert_css '.dlist > dl > dd > .quoteblock', output, 1
+      assert output.include?('not a term::: def')
+    end
   
     test 'appends line as paragraph if attached by continuation following blank line and line comment when term has no inline definition' do
       input = <<-EOS
@@ -3292,11 +3531,11 @@ puts doc.render # <3>
     output = render_embedded_string input, :attributes => {'icons' => ''}
     assert_css '.listingblock code > img', output, 3
     (1..3).each do |i|
-      assert_xpath %((/div[@class="listingblock"]//code/img)[#{i}][@src="images/icons/callouts/#{i}.png"][@alt="#{i}"]), output, 1
+      assert_xpath %((/div[@class="listingblock"]//code/img)[#{i}][@src="./images/icons/callouts/#{i}.png"][@alt="#{i}"]), output, 1
     end
     assert_css '.colist table td img', output, 3
     (1..3).each do |i|
-      assert_xpath %((/div[@class="colist arabic"]//td/img)[#{i}][@src="images/icons/callouts/#{i}.png"][@alt="#{i}"]), output, 1
+      assert_xpath %((/div[@class="colist arabic"]//td/img)[#{i}][@src="./images/icons/callouts/#{i}.png"][@alt="#{i}"]), output, 1
     end
   end
 end