asciidoctor 0.1.4 → 1.5.0

data/test/tables_test.rb

@@ -1,4 +1,8 @@
-require 'test_helper'
+# encoding: UTF-8
+unless defined? ASCIIDOCTOR_PROJECT_DIR
+  $: << File.dirname(__FILE__); $:.uniq!
+  require 'test_helper'
+end
 
 context 'Tables' do
 
@@ -14,8 +18,8 @@ context 'Tables' do
       cells = [%w(A B C), %w(a b c), %w(1 2 3)]
       output = render_embedded_string input
       assert_css 'table', output, 1
-      assert_css 'table.tableblock.frame-all.grid-all[style*="width:100%"]', output, 1
-      assert_css 'table > colgroup > col[style*="width:33%"]', output, 3
+      assert_css 'table.tableblock.frame-all.grid-all.spread', output, 1
+      assert_css 'table > colgroup > col[style*="width: 33%"]', output, 3
       assert_css 'table tr', output, 3
       assert_css 'table > tbody > tr', output, 3
       assert_css 'table td', output, 9
@@ -124,7 +128,7 @@ A | here| a | there
       EOS
       output = render_embedded_string input
       assert_xpath '//tbody/tr/td[1]/p[text()="Cool new show"]', output, 1
-      assert_xpath %(//tbody/tr/td[2]/p[text()='Coming soon#{[8230].pack('U*')}']), output, 1
+      assert_xpath %(//tbody/tr/td[2]/p[text()='Coming soon#{expand_entity 8230}#{expand_entity 8203}']), output, 1
     end
 
     test 'table and col width not assigned when autowidth option is specified' do
@@ -223,6 +227,39 @@ A | here| a | there
       assert_css 'table > tbody > tr', output, 3
     end
 
+    test 'table with header and footer docbook' do
+      input = <<-EOS
+.Table with header, body and footer
+[frame="topbot",options="header,footer"]
+|===
+|Item       |Quantity
+|Item 1     |1        
+|Item 2     |2        
+|Item 3     |3        
+|Total      |6        
+|===
+      EOS
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_css 'table', output, 1
+      assert_css 'table[frame="topbot"]', output, 1
+      assert_css 'table > title', output, 1
+      assert_css 'table > tgroup', output, 1
+      assert_css 'table > tgroup[cols="2"]', output, 1
+      assert_css 'table > tgroup[cols="2"] > colspec', output, 2
+      assert_css 'table > tgroup[cols="2"] > colspec[colwidth="50*"]', output, 2
+      assert_css 'table > tgroup > thead', output, 1
+      assert_css 'table > tgroup > thead > row', output, 1
+      assert_css 'table > tgroup > thead > row > entry', output, 2
+      assert_css 'table > tgroup > thead > row > entry > simpara', output, 0
+      assert_css 'table > tgroup > tfoot', output, 1
+      assert_css 'table > tgroup > tfoot > row', output, 1
+      assert_css 'table > tgroup > tfoot > row > entry', output, 2
+      assert_css 'table > tgroup > tfoot > row > entry > simpara', output, 2
+      assert_css 'table > tgroup > tbody', output, 1
+      assert_css 'table > tgroup > tbody > row', output, 3
+      assert_css 'table > tgroup > tbody > row', output, 3
+    end
+
     test 'table with implicit header row' do
       input = <<-EOS
 |===
@@ -321,17 +358,41 @@ A | here| a | there
       assert_css 'table > thead > tr > th', output, 3
       assert_css 'table > thead > tr > th > *', output, 0
 
-      assert_css 'table > tfoot > tr > td', output, 3
-      assert_css 'table > tfoot > tr > td > p.header', output, 1
+      assert_css 'table > tfoot > tr > th', output, 1
+      assert_css 'table > tfoot > tr > td', output, 2
       assert_css 'table > tfoot > tr > td > p > strong', output, 1
       assert_css 'table > tfoot > tr > td > p > em', output, 1
 
-      assert_css 'table > tbody > tr > td', output, 3
-      assert_css 'table > tbody > tr > td > p.header', output, 1
+      assert_css 'table > tbody > tr > th', output, 1
+      assert_css 'table > tbody > tr > td', output, 2
+      assert_css 'table > tbody > tr > td > p.header', output, 0
       assert_css 'table > tbody > tr > td > p > strong', output, 1
       assert_css 'table > tbody > tr > td > p > em > a', output, 1
     end
 
+    test 'vertical table headers use th element instead of header class' do
+      input = <<-EOS
+[cols="1h,1s,1e"]
+|====
+
+|Name |Occupation| Website
+
+|Octocat |Social coding| http://github.com
+
+|Name |Occupation| Website
+
+|====
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > tbody > tr > th', output, 3
+      assert_css 'table > tbody > tr > td', output, 6
+      assert_css 'table > tbody > tr .header', output, 0
+      assert_css 'table > tbody > tr > td > p > strong', output, 3
+      assert_css 'table > tbody > tr > td > p > em', output, 3
+      assert_css 'table > tbody > tr > td > p > em > a', output, 1
+    end
+
     test 'supports horizontal and vertical source data with blank lines and table header' do
       input = <<-EOS
 .Horizontal and vertical source data
@@ -356,13 +417,13 @@ I am getting in shape!
       EOS
       output = render_embedded_string input
       assert_css 'table', output, 1
-      assert_css 'table[style*="width:80%"]', output, 1
+      assert_css 'table[style*="width: 80%"]', output, 1
       assert_xpath '/table/caption[@class="title"][text()="Table 1. Horizontal and vertical source data"]', output, 1
       assert_css 'table > colgroup > col', output, 4
-      assert_css 'table > colgroup > col:nth-child(1)[@style*="width:17%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(2)[@style*="width:11%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(3)[@style*="width:11%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(4)[@style*="width:58%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(1)[@style*="width: 17%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(2)[@style*="width: 11%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(3)[@style*="width: 11%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(4)[@style*="width: 58%"]', output, 1
       assert_css 'table > thead', output, 1
       assert_css 'table > thead > tr', output, 1
       assert_css 'table > thead > tr > th', output, 4
@@ -377,7 +438,7 @@ I am getting in shape!
 
     test 'percentages as column widths' do
       input = <<-EOS
-[width="100%", cols="<.^10%,<90%"]
+[cols="<.^10%,<90%"]
 |===
 |column A |column B
 |===
@@ -385,8 +446,8 @@ I am getting in shape!
 
       output = render_embedded_string input
       assert_xpath '/table/colgroup/col', output, 2
-      assert_xpath '(/table/colgroup/col)[1][@style="width:10%;"]', output, 1
-      assert_xpath '(/table/colgroup/col)[2][@style="width:90%;"]', output, 1
+      assert_xpath '(/table/colgroup/col)[1][@style="width: 10%;"]', output, 1
+      assert_xpath '(/table/colgroup/col)[2][@style="width: 90%;"]', output, 1
     end
 
     test 'spans, alignments and styles' do
@@ -401,7 +462,7 @@ d|9 2+>|10
       EOS
       output = render_embedded_string input
       assert_css 'table', output, 1
-      assert_css 'table > colgroup > col[style*="width:25%"]', output, 4
+      assert_css 'table > colgroup > col[style*="width: 25%"]', output, 4
       assert_css 'table > tbody > tr', output, 4
       assert_css 'table > tbody > tr > td', output, 10
       assert_css 'table > tbody > tr:nth-child(1) > td', output, 4
@@ -426,6 +487,22 @@ d|9 2+>|10
       assert_css 'table > tbody > tr:nth-child(4) > td:nth-child(2).halign-right.valign-top[colspan="2"] p code', output, 1
     end
 
+    test 'sets up columns correctly if first row has cell that spans columns' do
+      input = <<-EOS
+|===
+2+^|AAA |CCC
+|AAA |BBB |CCC
+|AAA |BBB |CCC
+|===
+      EOS
+      output = render_embedded_string input 
+      assert_css 'table > tbody > tr:nth-child(1) > td', output, 2
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(1)[colspan="2"]', output, 1
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(2):not([colspan])', output, 1
+      assert_css 'table > tbody > tr:nth-child(2) > td:not([colspan])', output, 3
+      assert_css 'table > tbody > tr:nth-child(3) > td:not([colspan])', output, 3
+    end
+
     test 'supports repeating cells' do
       input = <<-EOS
 |===
@@ -506,6 +583,54 @@ I wouldn't have it any other way.
       assert_equal 26, literal.text.lines.entries.size
     end
 
+    test 'basic asciidoc cell' do
+      input = <<-EOS
+|===
+a|--
+NOTE: content
+
+content
+--
+|===
+      EOS
+
+      result = render_embedded_string input
+      assert_css 'table.tableblock', result, 1
+      assert_css 'table.tableblock td.tableblock', result, 1
+      assert_css 'table.tableblock td.tableblock .openblock', result, 1
+      assert_css 'table.tableblock td.tableblock .openblock .admonitionblock', result, 1
+      assert_css 'table.tableblock td.tableblock .openblock .paragraph', result, 1
+    end
+
+    test 'doctype can be set in asciidoc table cell' do
+      input = <<-EOS
+|===
+a|
+:doctype: inline
+
+content
+|===
+      EOS
+
+      result = render_embedded_string input
+      assert_css 'table.tableblock', result, 1
+      assert_css 'table.tableblock .paragraph', result, 0
+    end
+
+    test 'compat mode can be activated in asciidoc table cell' do
+      input = <<-EOS
+|===
+a|
+:compat-mode:
+
+'italic'
+|===
+      EOS
+
+      result = render_embedded_string input
+      assert_css 'table.tableblock td em', result, 1
+    end
+
     test 'asciidoc content' do
       input = <<-EOS
 [cols="1e,1,5a",frame="topbot",options="header"]
@@ -541,7 +666,7 @@ output file name is used.
       assert !body_cell_1_3.inner_document.nil?
       assert body_cell_1_3.inner_document.nested?
       assert_equal doc, body_cell_1_3.inner_document.parent_document
-      assert_equal doc.renderer, body_cell_1_3.inner_document.renderer
+      assert_equal doc.converter, body_cell_1_3.inner_document.converter
       output = doc.render
 
       assert_css 'table > tbody > tr', output, 2
@@ -560,6 +685,35 @@ a|include::fixtures/include-file.asciidoc[]
       assert_match(/included content/, output)
     end
 
+    test 'cross reference link in AsciiDoc-style table cell should resolve to reference in main document' do
+      input = <<-EOS
+== Some
+
+|===
+a|See <<_more>>
+|===
+
+== More
+
+content
+      EOS
+
+      result = render_string input
+      assert_xpath '//a[@href="#_more"]', result, 1
+      assert_xpath '//a[@href="#_more"][text()="More"]', result, 1
+    end
+
+    test 'footnotes should not be shared between AsciiDoc-style table cell and main document' do
+      input = <<-EOS
+|===
+a|AsciiDoc footnote:[A lightweight markup language.]
+|===
+      EOS
+
+      result = render_string input
+      assert_css '#_footnote_1', result, 1
+    end
+
     test 'nested table' do
       input = <<-EOS
 [cols="1,2a"]
@@ -611,10 +765,10 @@ plain
       EOS
 
       output = render_embedded_string input
-      assert_xpath '(/table/thead/tr/th)[1][@style="background-color:green;"]', output, 1
-      assert_xpath '(/table/thead/tr/th)[2][@style="background-color:green;"]', output, 0
-      assert_xpath '(/table/tbody/tr/td)[1][@style="background-color:red;"]', output, 1
-      assert_xpath '(/table/tbody/tr/td)[2][@style="background-color:green;"]', output, 0
+      assert_xpath '(/table/thead/tr/th)[1][@style="background-color: green;"]', output, 1
+      assert_xpath '(/table/thead/tr/th)[2][@style="background-color: green;"]', output, 0
+      assert_xpath '(/table/tbody/tr/td)[1][@style="background-color: red;"]', output, 1
+      assert_xpath '(/table/tbody/tr/td)[2][@style="background-color: green;"]', output, 0
     end
   end
 
@@ -634,7 +788,7 @@ nobody:x:99:99:Nobody:/:/sbin/nologin
       EOS
       output = render_embedded_string input
       assert_css 'table', output, 1
-      assert_css 'table > colgroup > col[style*="width:14%"]', output, 7
+      assert_css 'table > colgroup > col[style*="width: 14%"]', output, 7
       assert_css 'table > tbody > tr', output, 6
       assert_xpath '//tr[4]/td[5]/p/text()', output, 0
       assert_xpath '//tr[3]/td[5]/p[text()="MySQL:Server"]', output, 1
@@ -672,7 +826,7 @@ air, moon roof, loaded",4799.00
       EOS
       output = render_embedded_string input 
       assert_css 'table', output, 1
-      assert_css 'table > colgroup > col[style*="width:20%"]', output, 5
+      assert_css 'table > colgroup > col[style*="width: 20%"]', output, 5
       assert_css 'table > thead > tr', output, 1
       assert_css 'table > tbody > tr', output, 4
       assert_xpath '((//tbody/tr)[1]/td)[4]/p[text()="ac, abs, moon"]', output, 1
@@ -710,5 +864,25 @@ a;b;c
       assert_css 'table > tbody > tr:nth-child(1) > td', output, 3
       assert_css 'table > tbody > tr:nth-child(2) > td', output, 3
     end
+
+    test 'custom separator on AsciiDoc table cell' do
+      input = <<-EOS
+[cols=2,separator=!]
+|===
+!Pipe output to vim
+a!
+----
+asciidoctor -o - -s test.adoc | view -
+----
+|===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 2
+      assert_css 'table > tbody > tr', output, 1
+      assert_css 'table > tbody > tr:nth-child(1) > td', output, 2
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(1) p', output, 1
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(2) .listingblock', output, 1
+    end
   end
 end

data/test/test_helper.rb

@@ -1,19 +1,32 @@
+ASCIIDOCTOR_PROJECT_DIR = File.dirname File.dirname(__FILE__)
+Dir.chdir ASCIIDOCTOR_PROJECT_DIR
+
 if RUBY_VERSION < '1.9'
   require 'rubygems'
 end
-require 'fileutils'
-require 'pathname'
-require 'test/unit'
 
-require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb"
+require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
 
+require 'minitest/autorun'
+require 'socket'
 require 'nokogiri'
 
+autoload :FileUtils, 'fileutils'
+autoload :Pathname,  'pathname'
+
 ENV['SUPPRESS_DEBUG'] ||= 'true'
 
 RE_XMLNS_ATTRIBUTE = / xmlns="[^"]+"/
+RE_DOCTYPE = /\s*<!DOCTYPE (.*)/
+
+if defined? Minitest::Test
+  # We're on Minitest 5+. Nothing to do here.
+else
+  # Minitest 4 doesn't have Minitest::Test yet.
+  Minitest::Test = MiniTest::Unit::TestCase
+end
 
-class Test::Unit::TestCase
+class Minitest::Test
   def windows?
     RbConfig::CONFIG['host_os'] =~ /win|ming/
   end
@@ -23,7 +36,11 @@ class Test::Unit::TestCase
   end
 
   def empty_document options = {}
-    Asciidoctor::Document.new [], options
+    if options[:parse]
+      (Asciidoctor::Document.new [], options).parse
+    else
+      Asciidoctor::Document.new [], options
+    end
   end
 
   def empty_safe_document options = {}
@@ -128,13 +145,10 @@ class Test::Unit::TestCase
   end
 
   def xmldoc_from_string(content)
-    doctype_match = content.match(/\s*<!DOCTYPE (.*)/)
-    if !doctype_match
-      if content.match(RE_XMLNS_ATTRIBUTE)
-        doc = Nokogiri::XML::Document.parse(content)
-      else
-        doc = Nokogiri::HTML::DocumentFragment.parse(content)
-      end
+    if content.match(RE_XMLNS_ATTRIBUTE)
+      doc = Nokogiri::XML::Document.parse(content)
+    elsif !(doctype_match = content.match(RE_DOCTYPE))
+      doc = Nokogiri::HTML::DocumentFragment.parse(content)
     elsif doctype_match[1].start_with? 'html'
       doc = Nokogiri::HTML::Document.parse(content)
     else
@@ -144,7 +158,11 @@ class Test::Unit::TestCase
 
   def document_from_string(src, opts = {})
     assign_default_test_options opts
-    Asciidoctor::Document.new(src.lines.entries, opts)
+    if opts[:parse]
+      (Asciidoctor::Document.new src.lines.entries, opts).parse
+    else
+      Asciidoctor::Document.new src.lines.entries, opts
+    end
   end
 
   def block_from_string(src, opts = {})
@@ -171,12 +189,13 @@ class Test::Unit::TestCase
   end
 
   def parse_header_metadata(source)
-    reader = Asciidoctor::Reader.new source.lines.entries
-    [Asciidoctor::Lexer.parse_header_metadata(reader), reader]
+    reader = Asciidoctor::Reader.new source.split ::Asciidoctor::EOL
+    [::Asciidoctor::Parser.parse_header_metadata(reader), reader]
   end
 
   def assign_default_test_options(opts)
-    opts[:header_footer] = true unless opts.has_key?(:header_footer)
+    opts[:header_footer] = true unless opts.key? :header_footer
+    opts[:parse] = true unless opts.key? :parse
     if opts[:header_footer]
       # don't embed stylesheet unless test requests the default behavior
       if opts.has_key? :linkcss_default
@@ -186,7 +205,10 @@ class Test::Unit::TestCase
         opts[:attributes]['linkcss'] = ''
       end
     end
-    #opts[:template_dir] = File.join(File.dirname(__FILE__), '..', '..', 'asciidoctor-backends', 'slim')
+    if (template_dir = ENV['TEMPLATE_DIR'])
+      opts[:template_dir] = template_dir unless opts.has_key? :template_dir
+      #opts[:template_dir] = File.join(File.dirname(__FILE__), '..', '..', 'asciidoctor-backends', 'erb') unless opts.has_key? :template_dir
+    end
     nil
   end
 
@@ -254,30 +276,78 @@ class Test::Unit::TestCase
       $stderr = old_stderr
     end
   end
+
+  def resolve_localhost
+    (RUBY_VERSION < '1.9' || RUBY_ENGINE == 'rbx') ? Socket.gethostname :
+        Socket.ip_address_list.find {|addr| addr.ipv4? }.ip_address
+  end
+
+  def using_test_webserver host = resolve_localhost, port = 9876
+    server = TCPServer.new host, port
+    base_dir = File.expand_path File.dirname __FILE__
+    t = Thread.new do
+      while (session = server.accept)
+        request = session.gets
+        resource = nil
+        if (m = /GET (\S+) HTTP\/1\.1$/.match(request.chomp))
+          resource = (resource = m[1]) == '' ? '.' : resource
+        else
+          session.print %(HTTP/1.1 405 Method Not Allowed\r\nContent-Type: text/plain\r\n\r\n)
+          session.print %(405 - Method not allowed\n)
+          session.close
+          break
+        end
+      
+        if resource == '/name/asciidoctor'
+          session.print %(HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n)
+          session.print %({"name": "asciidoctor"}\n)
+        elsif File.file?(resource_file = (File.join base_dir, resource))
+          mimetype = if (ext = ::File.extname(resource_file)[1..-1])
+            ext == 'adoc' ? 'text/plain' : %(image/#{ext})
+          else
+            'text/plain'
+          end
+          session.print %(HTTP/1.1 200 OK\r\nContent-Type: #{mimetype}\r\n\r\n)
+          File.open resource_file, 'rb' do |fd|
+            until fd.eof? do
+              buffer = fd.read 256
+              session.write buffer
+            end
+          end
+        else
+          session.print %(HTTP/1.1 404 File Not Found\r\nContent-Type: text/plain\r\n\r\n)
+          session.print %(404 - Resource not found.\n)
+        end
+        session.close
+      end
+    end
+    begin
+      yield
+    ensure
+      begin
+        server.shutdown
+      # "Errno::ENOTCONN: Socket is not connected' is reported on some platforms; call #close instead of #shutdown
+      rescue Errno::ENOTCONN
+        server.close
+      end
+      t.exit
+    end
+  end
 end
 
 ###
 # 
-# Context goodness provided by @citrusbyte's contest
+# Context goodness provided by @citrusbyte's contest.
+# See https://github.com/citrusbyte/contest
 #
 ###
 
-# Test::Unit loads a default test if the suite is empty, whose purpose is to
-# fail. Since having empty contexts is a common practice, we decided to
-# overwrite TestSuite#empty? in order to allow them. Having a failure when no
-# tests have been defined seems counter-intuitive.
-class Test::Unit::TestSuite
-  def empty?
-    false
-  end
-end
-
 # Contest adds +teardown+, +test+ and +context+ as class methods, and the
 # instance methods +setup+ and +teardown+ now iterate on the corresponding
 # blocks. Note that all setup and teardown blocks must be defined with the
 # block syntax. Adding setup or teardown instance methods defeats the purpose
 # of this library.
-class Test::Unit::TestCase
+class Minitest::Test
   def self.setup(&block)
     define_method :setup do
       super(&block)
@@ -330,5 +400,5 @@ private
 end
 
 def context(*name, &block)
-  Test::Unit::TestCase.context(name, &block)
+  Minitest::Test.context(name, &block)
 end