asciidoctor 0.1.2 → 0.1.3

data/test/links_test.rb

@@ -74,6 +74,26 @@ context 'Links' do
     assert_xpath '//a[@href="http://github.com/asciidoctor"]', render_string('Asciidoctor GitHub organization: <**http://github.com/asciidoctor**>'), 1
   end
 
+  test 'link with quoted text should not be separated into attributes when linkattrs is set' do
+    assert_xpath '//a[@href="http://search.example.com"][text()="Google, Yahoo, Bing"]', render_embedded_string('http://search.example.com["Google, Yahoo, Bing"]', :attributes => {'linkattrs' => ''}), 1
+  end
+
+  test 'role and window attributes on link are processed when linkattrs is set' do
+    assert_xpath '//a[@href="http://google.com"][@class="external"][@target="_blank"]', render_embedded_string('http://google.com[Google, role="external", window="_blank"]', :attributes => {'linkattrs' => ''}), 1
+  end
+
+  test 'link text that ends in ^ should set link window to _blank' do
+    assert_xpath '//a[@href="http://google.com"][@target="_blank"]', render_embedded_string('http://google.com[Google^]'), 1
+  end
+
+  test 'inline irc link' do
+    assert_xpath '//a[@href="irc://irc.freenode.net"][text()="irc://irc.freenode.net"]', render_embedded_string('irc://irc.freenode.net'), 1
+  end
+
+  test 'inline irc link with text' do
+    assert_xpath '//a[@href="irc://irc.freenode.net"][text()="Freenode IRC"]', render_embedded_string('irc://irc.freenode.net[Freenode IRC]'), 1
+  end
+
   test 'inline ref' do
     doc = document_from_string 'Here you can read about tigers.[[tigers]]'
     output = doc.render
@@ -119,6 +139,14 @@ context 'Links' do
     assert_xpath %{//a[@href="#tigers"][text() = "about\ntigers"]}, render_string("Want to learn <<tigers,about\ntigers>>?"), 1
   end
 
+  test 'xref with escaped text' do
+    # when \x0 was used as boundary character for passthrough, it was getting stripped
+    # now using \e as boundary character, which resolves issue
+    input = 'See the <<tigers , `[tigers]`>> section for data about tigers'
+    output = render_embedded_string input
+    assert_xpath %(//a[@href="#tigers"]/code[text()="[tigers]"]), output, 1
+  end
+
   test 'xref using macro syntax' do
     doc = document_from_string 'xref:tigers[]'
     doc.references[:ids]['tigers'] = '[tigers]'

data/test/lists_test.rb

@@ -322,6 +322,23 @@ para
       assert_xpath '(//ul/li)[1]/*[@class="literalblock"]/following-sibling::*[@class="paragraph"]/p[text()="para"]', output, 1
     end
 
+    test 'an admonition paragraph attached by a line continuation to a list item with wrapped text should produce admonition' do
+      input = <<-EOS
+- first-line text
+  wrapped text
++
+NOTE: This is a note.
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'ul', output, 1
+      assert_css 'ul > li', output, 1
+      assert_css 'ul > li > p', output, 1
+      assert_xpath %(//ul/li/p[text()="first-line text\nwrapped text"]), output, 1
+      assert_css 'ul > li > p + .admonitionblock.note', output, 1
+      assert_xpath '//ul/li/*[@class="admonitionblock note"]//td[@class="content"][normalize-space(text())="This is a note."]', output, 1
+    end
+
     test 'appends line as paragraph if attached by continuation following line comment' do
       input = <<-EOS
 - list item 1
@@ -1020,7 +1037,7 @@ Lists
       assert_xpath '//ul/li[1]/p', output, 1
       assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@id="beck"][@class = "listingblock"]', output, 1
       assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@id="beck"]/div[@class="title"][starts-with(text(),"Read")]', output, 1
-      assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@id="beck"]//code[@class="ruby"][starts-with(text(),"5.times")]', output, 1
+      assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@id="beck"]//code[@class="ruby language-ruby"][starts-with(text(),"5.times")]', output, 1
     end
 
     test 'trailing block attribute line attached by continuation should not create block' do
@@ -1681,6 +1698,22 @@ def2
       assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
     end
 
+    test 'consecutive terms share same varlistentry in docbook' do
+      input = <<-EOS
+term::
+alt term::
+definition
+
+last::
+      EOS
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_xpath '//varlistentry', output, 2
+      assert_xpath '(//varlistentry)[1]/term', output, 2
+      assert_xpath '(//varlistentry)[2]/term', output, 1
+      assert_xpath '(//varlistentry)[2]/listitem', output, 1
+      assert_xpath '(//varlistentry)[2]/listitem[normalize-space(text())=""]', output, 1
+    end
+
     test "multi-line elements with blank line before paragraph content" do
       input = <<-EOS
 term1::
@@ -2192,6 +2225,23 @@ term 2:: def 2
       assert_css '.dlist dt:not([class])', output, 2
     end
 
+    test 'consecutive glossary terms should share same glossentry element in docbook' do
+      input = <<-EOS
+[glossary]
+term::
+alt term::
+definition
+
+last::
+      EOS
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_xpath '/glossentry', output, 2
+      assert_xpath '(/glossentry)[1]/glossterm', output, 2
+      assert_xpath '(/glossentry)[2]/glossterm', output, 1
+      assert_xpath '(/glossentry)[2]/glossdef', output, 1
+      assert_xpath '(/glossentry)[2]/glossdef[normalize-space(text())=""]', output, 1
+    end
+
     test 'should render horizontal list with proper markup' do
       input = <<-EOS
 [horizontal]
@@ -2204,7 +2254,7 @@ second term:: definition
       output = render_embedded_string input
       assert_css '.hdlist', output, 1
       assert_css '.hdlist table', output, 1
-      assert_css '.hdlist table colgroup col', output, 2
+      assert_css '.hdlist table colgroup', output, 0
       assert_css '.hdlist table tr', output, 2
       assert_xpath '/*[@class="hdlist"]/table/tr[1]/td', output, 2
       assert_xpath '/*[@class="hdlist"]/table/tr[1]/td[@class="hdlist1"]', output, 1
@@ -2219,6 +2269,74 @@ second term:: definition
       assert_xpath '((//tr)[2]/td)[2]/p[normalize-space(text())="definition"]', output, 1
     end
 
+    test 'should set col widths of item and label if specified' do
+      input = <<-EOS
+[horizontal]
+[labelwidth="25", itemwidth="75"]
+term:: def
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup', output, 1
+      assert_css 'table > colgroup > col', output, 2
+      assert_xpath '(//table/colgroup/col)[1][@style="width:25%;"]', output, 1
+      assert_xpath '(//table/colgroup/col)[2][@style="width:75%;"]', output, 1
+    end
+
+    test 'consecutive terms in horizontal list should share same cell' do
+      input = <<-EOS
+[horizontal]
+term::
+alt term::
+definition
+
+last::
+      EOS
+      output = render_embedded_string input 
+      assert_xpath '//tr', output, 2
+      assert_xpath '(//tr)[1]/td[@class="hdlist1"]', output, 1
+      assert_xpath '(//tr)[1]/td[@class="hdlist1"]/br', output, 2
+      assert_xpath '(//tr)[2]/td[@class="hdlist2"]', output, 1
+    end
+
+    test 'consecutive terms in horizontal list should share same entry in docbook' do
+      input = <<-EOS
+[horizontal]
+term::
+alt term::
+definition
+
+last::
+      EOS
+      output = render_embedded_string input, :backend => 'docbook' 
+      assert_xpath '//row', output, 2
+      assert_xpath '(//row)[1]/entry', output, 2
+      assert_xpath '((//row)[1]/entry)[1]/simpara', output, 2
+      assert_xpath '(//row)[2]/entry', output, 2
+      assert_xpath '((//row)[2]/entry)[2][normalize-space(text())=""]', output, 1
+    end
+
+    test 'should render horizontal list in docbook with proper markup' do
+      input = <<-EOS
+.Terms
+[horizontal]
+first term:: definition
++
+more detail
+
+second term:: definition
+      EOS
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_xpath '/table', output, 1
+      assert_xpath '/table[@tabstyle="horizontal"]', output, 1
+      assert_xpath '/table[@tabstyle="horizontal"]/title[text()="Terms"]', output, 1
+      assert_xpath '/table//row', output, 2
+      assert_xpath '(/table//row)[1]/entry', output, 2
+      assert_xpath '(/table//row)[2]/entry', output, 2
+      assert_xpath '((/table//row)[1]/entry)[2]/simpara', output, 2
+    end
+
     test 'should render qanda list in HTML with proper semantics' do
       input = <<-EOS
 [qanda]
@@ -2261,6 +2379,24 @@ Question 2::
       end
     end
 
+    test 'consecutive questions should share same question element in docbook' do
+      input = <<-EOS
+[qanda]
+question::
+follow-up question::
+response
+
+last question::
+      EOS
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_xpath '//qandaentry', output, 2
+      assert_xpath '(//qandaentry)[1]/question', output, 1
+      assert_xpath '(//qandaentry)[1]/question/simpara', output, 2
+      assert_xpath '(//qandaentry)[2]/question', output, 1
+      assert_xpath '(//qandaentry)[2]/answer', output, 1
+      assert_xpath '(//qandaentry)[2]/answer[normalize-space(text())=""]', output, 1
+    end
+
     test 'should render bibliography list with proper semantics' do
       input = <<-EOS
 [bibliography]
@@ -3297,7 +3433,7 @@ end
 context 'Callout lists' do
   test 'listing block with sequential callouts followed by adjacent callout list' do
     input = <<-EOS
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # <1>
 doc = Asciidoctor::Document.new('Hello, World!') # <2>
@@ -3321,7 +3457,7 @@ puts doc.render # <3>
 
   test 'listing block with sequential callouts followed by non-adjacent callout list' do
     input = <<-EOS
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # <1>
 doc = Asciidoctor::Document.new('Hello, World!') # <2>
@@ -3349,7 +3485,7 @@ Paragraph.
 
   test 'listing block with a callout that refers to two different lines' do
     input = <<-EOS
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # <1>
 doc = Asciidoctor::Document.new('Hello, World!') # <2>
@@ -3371,7 +3507,7 @@ puts doc.render # <2>
 
   test 'listing block with non-sequential callouts followed by adjacent callout list' do
     input = <<-EOS
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # <2>
 doc = Asciidoctor::Document.new('Hello, World!') # <3>
@@ -3396,13 +3532,13 @@ puts doc.render # <1>
   test 'two listing blocks can share the same callout list' do
     input = <<-EOS
 .Import library
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # <1>
 ----
 
 .Use library
-[source]
+[source, ruby]
 ----
 doc = Asciidoctor::Document.new('Hello, World!') # <2>
 puts doc.render # <3>
@@ -3427,14 +3563,14 @@ puts doc.render # <3>
   test 'two listing blocks each followed by an adjacent callout list' do
     input = <<-EOS
 .Import library
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # <1>
 ----
 <1> Describe the first line
 
 .Use library
-[source]
+[source, ruby]
 ----
 doc = Asciidoctor::Document.new('Hello, World!') # <1>
 puts doc.render # <2>
@@ -3459,7 +3595,7 @@ puts doc.render # <2>
 
   test 'callout list with block content' do
     input = <<-EOS
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # <1>
 doc = Asciidoctor::Document.new('Hello, World!') # <2>
@@ -3486,7 +3622,7 @@ You can write this to file rather than printing to stdout.
 
   test 'escaped callout should not be interpreted as a callout' do
     input = <<-EOS
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # \\<1>
 ----
@@ -3518,7 +3654,7 @@ Violets are blue <2>
 
   test 'callout list with icons enabled' do
     input = <<-EOS
-[source]
+[source, ruby]
 ----
 require 'asciidoctor' # <1>
 doc = Asciidoctor::Document.new('Hello, World!') # <2>
@@ -3538,4 +3674,27 @@ puts doc.render # <3>
       assert_xpath %((/div[@class="colist arabic"]//td/img)[#{i}][@src="./images/icons/callouts/#{i}.png"][@alt="#{i}"]), output, 1
     end
   end
+
+  test 'callout list with font-based icons enabled' do
+    input = <<-EOS
+[source]
+----
+require 'asciidoctor' # <1>
+doc = Asciidoctor::Document.new('Hello, World!') # <2>
+puts doc.render # <3>
+----
+<1> Describe the first line
+<2> Describe the second line
+<3> Describe the third line
+    EOS
+    output = render_embedded_string input, :attributes => {'icons' => 'font'}
+    assert_css '.listingblock code > i', output, 3
+    (1..3).each do |i|
+      assert_xpath %((/div[@class="listingblock"]//code/i)[#{i}][@class="conum"][text() = "#{i}"]), output, 1
+    end
+    assert_css '.colist table td i', output, 3
+    (1..3).each do |i|
+      assert_xpath %((/div[@class="colist arabic"]//td/i)[#{i}][@class="conum"][text() = "#{i}"]), output, 1
+    end
+  end
 end

data/test/options_test.rb

@@ -20,9 +20,9 @@ context 'Options' do
 
   test 'should return error code 1 when option has invalid argument' do
     redirect_streams do |stdout, stderr|
-      exitval = Asciidoctor::Cli::Options.parse!(%w(-b foo input.ad))
+      exitval = Asciidoctor::Cli::Options.parse!(%w(-d chapter input.ad)) # had to change for #320
       assert_equal 1, exitval
-      assert_equal 'asciidoctor: invalid argument: -b foo', stderr.string.chomp
+      assert_equal 'asciidoctor: invalid argument: -d chapter', stderr.string.chomp
     end
   end
 
@@ -65,4 +65,31 @@ context 'Options' do
     assert_equal '', options[:attributes]['icons']
   end
 
+  test 'should only split attribute key/value pairs on first equal sign' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-a name=value=value test/fixtures/sample.asciidoc))
+
+    assert_equal 'value=value', options[:attributes]['name']
+  end
+
+  test 'should allow any backend to be specified' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-b my_custom_backend test/fixtures/sample.asciidoc))
+
+    assert_equal 'my_custom_backend', options[:attributes]['backend']
+  end
+
+  test 'article doctype assignment' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-d article test/fixtures/sample.asciidoc))
+    assert_equal 'article', options[:attributes]['doctype']
+  end
+
+  test 'book doctype assignment' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-d book test/fixtures/sample.asciidoc))
+    assert_equal 'book', options[:attributes]['doctype']
+  end
+
+  test 'inline doctype assignment' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-d inline test/fixtures/sample.asciidoc))
+    assert_equal 'inline', options[:attributes]['doctype']
+  end
+
 end

data/test/paragraphs_test.rb

@@ -252,7 +252,7 @@ use the source, luke!
 die 'zomg perl sucks';
       EOS
       output = render_embedded_string input
-      assert_xpath %(/*[@class="listingblock"]//pre[@class="highlight"]/code[@class="perl"][text()="die 'zomg perl sucks';"]), output, 1
+      assert_xpath %(/*[@class="listingblock"]//pre[@class="highlight"]/code[@class="perl language-perl"][text()="die 'zomg perl sucks';"]), output, 1
     end
 
     test 'literal paragraph terminates at block attribute list' do
@@ -292,28 +292,12 @@ normal text
   end
 
   context 'Quote' do
-    test "quote block" do
-      output = render_string("____\nFamous quote.\n____")
-      assert_xpath '//*[@class = "quoteblock"]', output, 1
-      assert_xpath '//*[@class = "quoteblock"]//p[text() = "Famous quote."]', output, 1
-    end
-
-    test "quote block with attribution" do
-      output = render_string("[quote, A famous person, A famous book (1999)]\n____\nFamous quote.\n____")
-      assert_xpath '//*[@class = "quoteblock"]', output, 1
-      assert_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]', output, 1
-      assert_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]/cite[text() = "A famous book (1999)"]', output, 1
-      # TODO I can't seem to match the attribution (author) w/ xpath
-    end
-
-    test "quote block with section body" do
-      output = render_string("____\nFamous quote.\n\nNOTE: That was inspiring.\n____")
-      assert_xpath '//*[@class = "quoteblock"]', output, 1
-      assert_xpath '//*[@class = "quoteblock"]//*[@class = "admonitionblock note"]', output, 1
-    end
-
     test "single-line quote paragraph" do
-      output = render_string("[quote]\nFamous quote.")
+      input = <<-EOS
+[quote]
+Famous quote.
+      EOS
+      output = render_string input
       assert_xpath '//*[@class = "quoteblock"]', output, 1
       assert_xpath '//*[@class = "quoteblock"]//p', output, 0
       assert_xpath '//*[@class = "quoteblock"]//*[contains(text(), "Famous quote.")]', output, 1
@@ -339,31 +323,6 @@ A famouse quote.
       assert_xpath '//*[@class = "verseblock"]/pre[normalize-space(text()) = "Famous verse."]', output, 1
     end
 
-    test "single-line verse block" do
-      output = render_string("[verse]\n____\nFamous verse.\n____")
-      assert_xpath '//*[@class = "verseblock"]', output, 1
-      assert_xpath '//*[@class = "verseblock"]/pre', output, 1
-      assert_xpath '//*[@class = "verseblock"]//p', output, 0
-      assert_xpath '//*[@class = "verseblock"]/pre[normalize-space(text()) = "Famous verse."]', output, 1
-    end
-
-    test "multi-line verse block" do
-      output = render_string("[verse]\n____\nFamous verse.\n\nStanza two.\n____")
-      assert_xpath '//*[@class = "verseblock"]', output, 1
-      assert_xpath '//*[@class = "verseblock"]/pre', output, 1
-      assert_xpath '//*[@class = "verseblock"]//p', output, 0
-      assert_xpath '//*[@class = "verseblock"]/pre[contains(text(), "Famous verse.")]', output, 1
-      assert_xpath '//*[@class = "verseblock"]/pre[contains(text(), "Stanza two.")]', output, 1
-    end
-
-    test "verse block does not contain block elements" do
-      output = render_string("[verse]\n____\nFamous verse.\n\n....\nnot a literal\n....\n____")
-      assert_xpath '//*[@class = "verseblock"]', output, 1
-      assert_xpath '//*[@class = "verseblock"]/pre', output, 1
-      assert_xpath '//*[@class = "verseblock"]//p', output, 0
-      assert_xpath '//*[@class = "verseblock"]//*[@class = "literalblock"]', output, 0
-    end
-
     test 'quote paragraph should honor explicit subs list' do
       input = <<-EOS
 [subs="specialcharacters"]
@@ -407,5 +366,104 @@ Content goes here
       result = render_string(input)
       assert_xpath "//*[@class='sidebarblock']//p", result, 1
     end
+
+    context 'Styled Paragraphs' do
+      test 'should wrap text in simpara for styled paragraphs when rendered to DocBook' do
+        input = <<-EOS
+= Book
+:doctype: book
+
+[preface]
+= About this book
+
+[abstract]
+An abstract for the book.
+
+= Part 1
+
+[partintro]
+An intro to this part.
+
+[sidebar]
+Just a side note.
+
+[example]
+As you can see here.
+
+[quote]
+Wise words from a wise person.
+        EOS
+
+        output = render_string input, :backend => 'docbook'
+        assert_css 'abstract > simpara', output, 1
+        assert_css 'partintro > simpara', output, 1
+        assert_css 'sidebar > simpara', output, 1
+        assert_css 'informalexample > simpara', output, 1
+        assert_css 'blockquote > simpara', output, 1
+      end
+
+      test 'should wrap text in simpara for styled paragraphs with title when rendered to DocBook' do
+        input = <<-EOS
+= Book
+:doctype: book
+
+[preface]
+= About this book
+
+[abstract]
+.Abstract title
+An abstract for the book.
+
+= Part 1
+
+[partintro]
+.Part intro title
+An intro to this part.
+
+[sidebar]
+.Sidebar title
+Just a side note.
+
+[example]
+.Example title
+As you can see here.
+
+[quote]
+.Quote title
+Wise words from a wise person.
+        EOS
+
+        output = render_string input, :backend => 'docbook'
+        assert_css 'abstract > title', output, 1
+        assert_xpath '//abstract/title[text() = "Abstract title"]', output, 1
+        assert_css 'abstract > title + simpara', output, 1
+        assert_css 'partintro > title', output, 1
+        assert_xpath '//partintro/title[text() = "Part intro title"]', output, 1
+        assert_css 'partintro > title + simpara', output, 1
+        assert_css 'sidebar > title', output, 1
+        assert_xpath '//sidebar/title[text() = "Sidebar title"]', output, 1
+        assert_css 'sidebar > title + simpara', output, 1
+        assert_css 'example > title', output, 1
+        assert_xpath '//example/title[text() = "Example title"]', output, 1
+        assert_css 'example > title + simpara', output, 1
+        assert_css 'blockquote > title', output, 1
+        assert_xpath '//blockquote/title[text() = "Quote title"]', output, 1
+        assert_css 'blockquote > title + simpara', output, 1
+      end
+    end
+
+    context 'Inline doctype' do
+      test 'should only format and output text in first paragraph when doctype is inline' do
+        input = "http://asciidoc.org[AsciiDoc] is a _lightweight_ markup language...\n\nignored"
+        output = render_string input, :doctype => 'inline'
+        assert_equal '<a href="http://asciidoc.org">AsciiDoc</a> is a <em>lightweight</em> markup language&#8230;', output
+      end
+
+      test 'should output empty string if first block is not a paragraph' do
+        input = '* bullet'
+        output = render_string input, :doctype => 'inline'
+        assert output.empty?
+      end
+    end
   end
 end