asciidoctor 0.1.3 → 0.1.4

data/test/tables_test.rb

@@ -147,7 +147,6 @@ A | here| a | there
       input = <<-EOS
 |====
 |first |second |third |fourth
-
 |1 |2 |3
 |4
 |====
@@ -224,6 +223,90 @@ A | here| a | there
       assert_css 'table > tbody > tr', output, 3
     end
 
+    test 'table with implicit header row' do
+      input = <<-EOS
+|===
+|Column 1 |Column 2
+
+|Data A1
+|Data B1
+
+|Data A2
+|Data B2
+|===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 2
+      assert_css 'table > thead', output, 1
+      assert_css 'table > thead > tr', output, 1
+      assert_css 'table > thead > tr > th', output, 2
+      assert_css 'table > tbody', output, 1
+      assert_css 'table > tbody > tr', output, 2
+    end
+
+    test 'no implicit header row if second line not blank' do
+      input = <<-EOS
+|===
+|Column 1 |Column 2
+|Data A1
+|Data B1
+
+|Data A2
+|Data B2
+|===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 2
+      assert_css 'table > thead', output, 0
+      assert_css 'table > tbody', output, 1
+      assert_css 'table > tbody > tr', output, 3
+    end
+
+    test 'no implicit header row if first line blank' do
+      input = <<-EOS
+|===
+
+|Column 1 |Column 2
+
+|Data A1
+|Data B1
+
+|Data A2
+|Data B2
+
+|===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 2
+      assert_css 'table > thead', output, 0
+      assert_css 'table > tbody', output, 1
+      assert_css 'table > tbody > tr', output, 3
+    end
+
+    test 'no implicit header row if options is specified' do
+      input = <<-EOS
+[options=""]
+|===
+|Column 1 |Column 2
+
+|Data A1
+|Data B1
+
+|Data A2
+|Data B2
+|===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 2
+      assert_css 'table > thead', output, 0
+      assert_css 'table > tbody', output, 1
+      assert_css 'table > tbody > tr', output, 3
+    end
+
     test 'styles not applied to header cells' do
       input = <<-EOS
 [cols="1h,1s,1e",options="header,footer"]
@@ -292,6 +375,20 @@ I am getting in shape!
       assert_xpath '/table/tbody/tr[3]/td[4]/p[2][text()="I am getting in shape!"]', output, 1
     end
 
+    test 'percentages as column widths' do
+      input = <<-EOS
+[width="100%", cols="<.^10%,<90%"]
+|===
+|column A |column B
+|===
+      EOS
+
+      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
+    end
+
     test 'spans, alignments and styles' do
       input = <<-EOS
 [cols="e,m,^,>s",width="25%"]
@@ -452,19 +549,27 @@ output file name is used.
       assert_css 'table > tbody > tr:nth-child(2) > td:nth-child(3) div.dlist', output, 1
     end
 
+    test 'preprocessor directive on first line of AsciiDoc cell should be processed' do
+      input = <<-EOS
+|===
+a|include::fixtures/include-file.asciidoc[]
+|===
+      EOS
+
+      output = render_embedded_string input, :safe => :safe, :base_dir => File.dirname(__FILE__)
+      assert_match(/included content/, output)
+    end
+
     test 'nested table' do
       input = <<-EOS
 [cols="1,2a"]
 |===
 |Normal cell
-
 |Cell with nested table
-
 [cols="2,1"]
 !===
 !Nested table cell 1 !Nested table cell 2
 !===
-
 |===
       EOS
       output = render_embedded_string input

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+if RUBY_VERSION < '1.9'
+  require 'rubygems'
+end
 require 'fileutils'
 require 'pathname'
 require 'test/unit'
@@ -5,10 +8,11 @@ require 'test/unit'
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb"
 
 require 'nokogiri'
-require 'pending'
 
 ENV['SUPPRESS_DEBUG'] ||= 'true'
 
+RE_XMLNS_ATTRIBUTE = / xmlns="[^"]+"/
+
 class Test::Unit::TestCase
   def windows?
     RbConfig::CONFIG['host_os'] =~ /win|ming/
@@ -18,6 +22,15 @@ class Test::Unit::TestCase
     "#{windows? ? File.expand_path(__FILE__).split('/').first : nil}/"
   end
 
+  def empty_document options = {}
+    Asciidoctor::Document.new [], options
+  end
+
+  def empty_safe_document options = {}
+    options[:safe] = :safe
+    Asciidoctor::Document.new [], options
+  end
+
   def sample_doc_path(name)
     name = name.to_s
     unless name.include?('.')
@@ -36,8 +49,7 @@ class Test::Unit::TestCase
   end
 
   def example_document(name, opts = {})
-    opts[:header_footer] = true unless opts.has_key?(:header_footer)
-    Asciidoctor::Document.new(File.readlines(sample_doc_path(name)), opts)
+    document_from_string File.read(sample_doc_path(name)), opts
   end
 
   def assert_difference(expression, difference = 1, message = nil, &block)
@@ -69,7 +81,8 @@ class Test::Unit::TestCase
     doc = xmldoc_from_string content
     case type
       when :xpath
-        results = doc.xpath("#{path.sub('/', './')}")
+        namespaces = doc.respond_to?(:root) ? doc.root.namespaces : {}
+        results = doc.xpath("#{path.sub('/', './')}", namespaces)
       when :css
         results = doc.css(path)
     end
@@ -115,10 +128,14 @@ class Test::Unit::TestCase
   end
 
   def xmldoc_from_string(content)
-    match = content.match(/\s*<!DOCTYPE (.*)/)
-    if !match
-      doc = Nokogiri::HTML::DocumentFragment.parse(content)
-    elsif match[1].start_with? 'html'
+    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
+    elsif doctype_match[1].start_with? 'html'
       doc = Nokogiri::HTML::Document.parse(content)
     else
       doc = Nokogiri::XML::Document.parse(content)
@@ -126,18 +143,26 @@ class Test::Unit::TestCase
   end
 
   def document_from_string(src, opts = {})
-    opts[:header_footer] = true unless opts.has_key?(:header_footer)
+    assign_default_test_options opts
     Asciidoctor::Document.new(src.lines.entries, opts)
   end
 
   def block_from_string(src, opts = {})
     opts[:header_footer] = false
-    doc = Asciidoctor::Document.new(src.lines.entries, opts)
+    doc = document_from_string src, opts
     doc.blocks.first
   end
 
   def render_string(src, opts = {})
-    document_from_string(src, opts).render
+    keep_namespaces = opts.delete(:keep_namespaces)
+    if keep_namespaces
+      document_from_string(src, opts).render
+    else
+      # this is required because nokogiri is ignorant
+      result = document_from_string(src, opts).render
+      result = result.sub(RE_XMLNS_ATTRIBUTE, '')
+      result
+    end
   end
 
   def render_embedded_string(src, opts = {})
@@ -150,11 +175,52 @@ class Test::Unit::TestCase
     [Asciidoctor::Lexer.parse_header_metadata(reader), reader]
   end
 
-  # Expand the character for an entity such as &#8212; so
-  # it can be used to match in an XPath expression
+  def assign_default_test_options(opts)
+    opts[:header_footer] = true unless opts.has_key?(:header_footer)
+    if opts[:header_footer]
+      # don't embed stylesheet unless test requests the default behavior
+      if opts.has_key? :linkcss_default
+        opts.delete(:linkcss_default)
+      else
+        opts[:attributes] ||= {}
+        opts[:attributes]['linkcss'] = ''
+      end
+    end
+    #opts[:template_dir] = File.join(File.dirname(__FILE__), '..', '..', 'asciidoctor-backends', 'slim')
+    nil
+  end
+
+  # Expand the character for an entity such as &#8212; into a glyph
+  # so it can be used to match in an XPath expression
+  #
+  # Examples
+  #
+  #   expand_entity 60
+  #   # => "<"
+  #
+  # Returns the String entity expanded to its equivalent UTF-8 glyph
   def expand_entity(number)
     [number].pack('U*')
   end
+  alias :entity :expand_entity
+
+  def invoke_cli_with_filenames(argv = [], filenames = [], &block)
+    
+    filepaths = Array.new
+
+    filenames.each { |filename|
+      if filenames.nil?|| ::Pathname.new(filename).absolute?
+        filepaths.push(filename)
+      else
+        filepaths.push(File.join(File.dirname(__FILE__), 'fixtures', filename))
+      end
+    }
+
+    invoker = Asciidoctor::Cli::Invoker.new(argv + filepaths)
+
+    invoker.invoke!(&block)
+    invoker
+  end
 
   def invoke_cli_to_buffer(argv = [], filename = 'sample.asciidoc', &block)
     invoke_cli(argv, filename, [StringIO.new, StringIO.new], &block)

data/test/text_test.rb

@@ -16,8 +16,8 @@ context "Text" do
 
   test "proper encoding to handle utf8 characters in document using docbook backend" do
     output = example_document(:encoding, :attributes => {'backend' => 'docbook'}).render
-    assert_xpath '//simpara', output, 4
-    assert_xpath '//ulink', output, 1
+    assert_xpath '//xmlns:simpara', output, 4
+    assert_xpath '//xmlns:ulink', output, 1
   end
 
   test "proper encoding to handle utf8 characters in embedded document using docbook backend" do
@@ -27,22 +27,22 @@ context "Text" do
   end
 
   # NOTE this test ensures we have the encoding line on block templates too
-  test "proper encoding to handle utf8 characters in arbitrary block" do
+  test 'proper encoding to handle utf8 characters in arbitrary block' do
     input = []
     input << "[verse]\n"
     input.concat(File.readlines(sample_doc_path(:encoding)))
-    doc = Asciidoctor::Document.new
-    reader = Asciidoctor::Reader.new(input, doc, true)
+    doc = empty_document
+    reader = Asciidoctor::PreprocessorReader.new doc, input
     block = Asciidoctor::Lexer.next_block(reader, doc)
     assert_xpath '//pre', block.render.gsub(/^\s*\n/, ''), 1
   end
 
-  test "proper encoding to handle utf8 characters from included file" do
+  test 'proper encoding to handle utf8 characters from included file' do
     input = <<-EOS
 include::fixtures/encoding.asciidoc[tags=romé]
     EOS
-    doc = Asciidoctor::Document.new [], :safe => Asciidoctor::SafeMode::SAFE, :base_dir => File.expand_path(File.dirname(__FILE__))
-    reader = Asciidoctor::Reader.new(input, doc, true)
+    doc = empty_safe_document :base_dir => File.expand_path(File.dirname(__FILE__))
+    reader = Asciidoctor::PreprocessorReader.new doc, input
     block = Asciidoctor::Lexer.next_block(reader, doc)
     output = block.render
     assert_css '.paragraph', output, 1
@@ -63,9 +63,109 @@ include::fixtures/encoding.asciidoc[tags=romé]
     assert_match(/&#8216;The New Yorker.&#8217;/, rendered)
   end
 
-  test "separator" do
-    # for some reason, the html enclosure breaks the xpath //*[@id='content']//hr
-    assert_xpath "//*[@id='content']//hr", render_string("This is separated.\n\n'''\n\n...from this!"), 1
+  test 'horizontal rule' do
+    input = <<-EOS
+This line is separated by a horizontal rule...
+
+'''
+
+...from this line.
+    EOS
+    output = render_embedded_string input
+    assert_xpath "//hr", output, 1
+    assert_xpath "/*[@class='paragraph']", output, 2
+    assert_xpath "(/*[@class='paragraph'])[1]/following-sibling::hr", output, 1
+    assert_xpath "/hr/following-sibling::*[@class='paragraph']", output, 1
+  end
+
+  test 'markdown horizontal rules' do
+    variants = [
+      '---',
+      '- - -',
+      '***',
+      '* * *',
+      '___',
+      '_ _ _'
+    ]
+
+    offsets = [
+      '',
+      ' ',
+      '  ',
+      '   '
+    ]
+
+    variants.each do |variant|
+      offsets.each do |offset|
+        input = <<-EOS
+This line is separated by a horizontal rule...
+
+#{offset}#{variant}
+
+...from this line.
+        EOS
+        output = render_embedded_string input
+        assert_xpath "//hr", output, 1
+        assert_xpath "/*[@class='paragraph']", output, 2
+        assert_xpath "(/*[@class='paragraph'])[1]/following-sibling::hr", output, 1
+        assert_xpath "/hr/following-sibling::*[@class='paragraph']", output, 1
+      end
+    end
+  end
+
+  test 'markdown horizontal rules negative case' do
+
+    bad_variants = [
+      '- - - -',
+      '* * * *',
+      '_ _ _ _'
+    ]
+
+    good_offsets = [
+      '',
+      ' ',
+      '  ',
+      '   '
+    ]
+
+    bad_variants.each do |variant|
+      good_offsets.each do |offset|
+        input = <<-EOS
+This line is separated something that is not a horizontal rule...
+
+#{offset}#{variant}
+
+...from this line.
+        EOS
+        output = render_embedded_string input
+        assert_xpath '//hr', output, 0
+      end
+    end
+
+    good_variants = [
+      '- - -',
+      '* * *',
+      '_ _ _'
+    ]
+
+    bad_offsets = [
+      "\t",
+      '    '
+    ]
+
+    good_variants.each do |variant|
+      bad_offsets.each do |offset|
+        input = <<-EOS
+This line is separated something that is not a horizontal rule...
+
+#{offset}#{variant}
+
+...from this line.
+        EOS
+        output = render_embedded_string input
+        assert_xpath '//hr', output, 0
+      end
+    end
   end
 
   test "emphasized text" do