asciidoctor 1.5.2 → 1.5.3

data/test/extensions_test.rb

@@ -125,7 +125,7 @@ end
 
 class MetaAppDocinfoProcessor < Asciidoctor::Extensions::DocinfoProcessor
   use_dsl
-  at_location :header
+  at_location :head
 
   def process document
     '<meta name="application-name" content="Asciidoctor App">'
@@ -310,7 +310,7 @@ context 'Extensions' do
       registry.docinfo_processor SampleDocinfoProcessor
       registry.activate Asciidoctor::Document.new
       assert registry.docinfo_processors?
-      assert registry.docinfo_processors?(:header)
+      assert registry.docinfo_processors?(:head)
       extensions = registry.docinfo_processors
       assert_equal 1, extensions.size
       assert extensions.first.is_a? Asciidoctor::Extensions::ProcessorExtension
@@ -589,6 +589,25 @@ snippet::12345[]
       end
     end
 
+    test 'should resolve regexp for inline macro lazily' do
+      begin
+        Asciidoctor::Extensions.register do
+          inline_macro do
+            named :label
+            using_format :short
+            process do |parent, target|
+              %(<label>#{target}</label>)
+            end
+          end
+        end
+
+        output = render_embedded_string 'label:[Checkbox]'
+        assert output.include?('<label>Checkbox</label>')
+      ensure
+        Asciidoctor::Extensions.unregister_all
+      end
+    end
+
     test 'should not carry over attributes if block processor returns nil' do
       begin
         Asciidoctor::Extensions.register do
@@ -687,7 +706,7 @@ sample content
 
         doc = document_from_string input, :safe => :server
         assert_equal '<meta name="robots" content="index,follow">
-<meta name="application-name" content="Asciidoctor App">', doc.docinfo(:header)
+<meta name="application-name" content="Asciidoctor App">', doc.docinfo
         assert_equal '<script><!-- analytics code --></script>', doc.docinfo(:footer)
       ensure
         Asciidoctor::Extensions.unregister_all

data/test/fixtures/circle.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- An SVG of a black circle -->
+<svg viewBox="0 0 120 120" version="1.1"
+xmlns="http://www.w3.org/2000/svg" style="width:500px;height:500px"
+width="500px" height="500px">
+  <circle cx="60" cy="60" r="50"/>
+</svg>

data/test/fixtures/subs-docinfo.html

@@ -0,0 +1,2 @@
+<meta name="copyright" content="(C) OpenDevise">
+<script src="bootstrap.{bootstrap-version}.min.js"></script>

data/test/fixtures/subs.adoc

@@ -0,0 +1,7 @@
+= Document Title
+Doc Writer <doc.writer@asciidoc.org>
+v1.0, 2013-01-01
+:bootstrap-version: 3.2.0
+
+Body content.
+

data/test/invoker_test.rb

@@ -46,6 +46,15 @@ context 'Invoker' do
     assert invoker.read_output.empty?
   end
 
+  test 'should allow docdate and doctime to be overridden' do
+    sample_filepath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample.asciidoc'))
+    invoker = invoke_cli_to_buffer %w(-o /dev/null -a docdate=2015-01-01 -a doctime=10:00:00-07:00), sample_filepath
+    doc = invoker.document
+    assert doc.attr?('docdate', '2015-01-01')
+    assert doc.attr?('doctime', '10:00:00-07:00')
+    assert doc.attr?('docdatetime', '2015-01-01 10:00:00-07:00')
+  end
+
   test 'should accept document from stdin and write to stdout' do
     invoker = invoke_cli_to_buffer(%w(-s), '-') { 'content' }
     doc = invoker.document
@@ -277,6 +286,22 @@ context 'Invoker' do
     end
   end
 
+  test 'should not copy custom stylesheet to target directory if stylesdir is a URI' do
+    destdir = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'output'))
+    sample_outpath = File.join destdir, 'sample-output.html'
+    stylesdir = File.join destdir, 'http:'
+    begin
+      invoker = invoke_cli %W(-o #{sample_outpath} -a linkcss -a stylesdir=http://example.org/styles -a stylesheet=custom.css)
+      invoker.document
+      assert File.exist?(sample_outpath)
+      assert !File.exist?(stylesdir)
+    ensure
+      FileUtils.rm_f(sample_outpath)
+      FileUtils.rmdir(stylesdir) if File.directory? stylesdir
+      FileUtils.rmdir(destdir)
+    end
+  end
+
   test 'should render all passed files' do
     basic_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'basic.html'))
     sample_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample.html'))

data/test/links_test.rb

@@ -202,6 +202,23 @@ context 'Links' do
     assert_xpath '//a[@href="tigers.html"][text() = "[tigers]"]', doc.render, 1
   end
 
+  test 'xref using angled bracket syntax with path sans extension using docbook backend' do
+    doc = document_from_string '<<tigers#>>', :header_footer => false, :backend => 'docbook'
+    assert_match '<link xlink:href="tigers.xml">tigers.xml</link>', doc.render, 1
+    doc = document_from_string '<<tigers#>>', :header_footer => false, :backend => 'docbook45'
+    assert_match '<ulink url="tigers.xml">tigers.xml</ulink>', doc.render, 1
+  end
+
+  test 'xref using angled bracket syntax with ancestor path sans extension' do
+    doc = document_from_string '<<../tigers#,tigers>>', :header_footer => false
+    assert_xpath '//a[@href="../tigers.html"][text() = "tigers"]', doc.render, 1
+  end
+
+  test 'xref using angled bracket syntax with absolute path sans extension' do
+    doc = document_from_string '<</path/to/tigers#,tigers>>', :header_footer => false
+    assert_xpath '//a[@href="/path/to/tigers.html"][text() = "tigers"]', doc.render, 1
+  end
+
   test 'xref using angled bracket syntax with path and extension' do
     doc = document_from_string '<<tigers.adoc#>>', :header_footer => false
     assert_xpath '//a[@href="tigers.html"][text() = "[tigers]"]', doc.render, 1

data/test/lists_test.rb

@@ -453,6 +453,17 @@ List
       assert_xpath '//ul/li', output, 3
     end
 
+    test 'indented unicode bullet 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 if ::RUBY_MIN_VERSION_1_9
+
     test 'indented asterisk elements using tabs' do
       input = <<-EOS
 \t*\tFoo
@@ -804,6 +815,27 @@ List
       assert_xpath '(((((//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
     end
 
+    test 'nested elements (5) with unicode bullet' do
+      input = <<-EOS
+List
+====
+
+• Foo
+•• Boo
+••• Snoo
+•••• Froo
+••••• Groo
+• Blech
+      EOS
+      output = render_string input
+      assert_xpath '//ul', output, 5
+      assert_xpath '(//ul)[1]/li', output, 2
+      assert_xpath '((//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '(((//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '((((//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '(((((//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+    end if ::RUBY_MIN_VERSION_1_9
+
     test "nested ordered elements (2)" do
       input = <<-EOS
 List
@@ -1848,6 +1880,39 @@ term2::
       assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
     end
 
+    test "multi-line elements with indented paragraph content that includes comment lines" do
+      input = <<-EOS
+term1::
+ def1
+// comment
+term2::
+  def2
+// comment
+  def2 continued
+      EOS
+      output = render_embedded_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\ndef2 continued"]), output, 1
+    end
+
+    test "should not strip comment line in literal paragraph block attached to list item" do
+      input = <<-EOS
+term1::
++
+ line 1
+// not a comment
+ line 3
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//*[@class="literalblock"]', output, 1
+      assert_xpath %(//*[@class="literalblock"]//pre[text()=" line 1\n// not a comment\n line 3"]), output, 1
+    end
+
     test 'multi-line element with paragraph starting with multiple dashes should not be seen as list' do
       input = <<-EOS
 term1::
@@ -2225,6 +2290,18 @@ section text
       assert_xpath '/*[@class="sect1"]/h2[text()="Section"]', output, 1
       assert_xpath '/*[@class="ulist"]/following-sibling::*[@class="sect1"]', output, 1
     end
+
+    test 'more than 4 consecutive colons should become part of description list term' do
+      input = <<-EOS
+A term::::: a description
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dt', output, 1
+      assert_xpath '//dt[text()="A term:"]', output, 1
+      assert_xpath '//dd/p[text()="a description"]', output, 1
+    end
   end
 
   context "Nested lists" do
@@ -4179,4 +4256,100 @@ context 'Lists model' do
     assert_equal 3, items.size
     assert_equal list.items, list.content
   end
+
+  test 'list item should be the parent of block attached to a list item' do
+    input = <<-EOS
+* list item 1
++
+----
+listing block in list item 1
+----
+    EOS
+
+    doc = document_from_string input
+    list = doc.blocks.first
+    list_item_1 = list.items.first
+    listing_block = list_item_1.blocks.first
+    assert_equal :listing, listing_block.context
+    assert_equal list_item_1, listing_block.parent
+  end
+
+  test 'outline? should return true for unordered list' do
+    input = <<-EOS
+* one
+* two
+* three
+    EOS
+
+    doc = document_from_string input
+    list = doc.blocks.first
+    assert list.outline?
+  end
+
+  test 'outline? should return true for ordered list' do
+    input = <<-EOS
+. one
+. two
+. three
+    EOS
+
+    doc = document_from_string input
+    list = doc.blocks.first
+    assert list.outline?
+  end
+
+  test 'outline? should return false for description list' do
+    input = <<-EOS
+label:: desc
+    EOS
+
+    doc = document_from_string input
+    list = doc.blocks.first
+    assert !list.outline?
+  end
+
+  test 'simple? should return true for list item with no nested blocks' do
+    input = <<-EOS
+* one
+* two
+* three
+    EOS
+
+    doc = document_from_string input
+    list = doc.blocks.first
+    assert list.items.first.simple?
+    assert !list.items.first.compound?
+  end
+
+  test 'simple? should return true for list item with nested outline list' do
+    input = <<-EOS
+* one
+  ** more about one
+  ** and more
+* two
+* three
+    EOS
+
+    doc = document_from_string input
+    list = doc.blocks.first
+    assert list.items.first.simple?
+    assert !list.items.first.compound?
+  end
+
+  test 'simple? should return false for list item with block content' do
+    input = <<-EOS
+* one
++
+----
+listing block in list item 1
+----
+* two
+* three
+    EOS
+
+    doc = document_from_string input
+    list = doc.blocks.first
+    assert !list.items.first.simple?
+    assert list.items.first.compound?
+  end
 end

data/test/options_test.rb

@@ -57,9 +57,9 @@ context 'Options' do
   end
 
   test 'standard attribute assignment' do
-    options = Asciidoctor::Cli::Options.parse!(%w(-a imagesdir=images,icons test/fixtures/sample.asciidoc))
+    options = Asciidoctor::Cli::Options.parse!(%w(-a docinfosubs=attributes,replacements -a icons test/fixtures/sample.asciidoc))
 
-    assert_equal 'images', options[:attributes]['imagesdir']
+    assert_equal 'attributes,replacements', options[:attributes]['docinfosubs']
     assert_equal '', options[:attributes]['icons']
   end
 

data/test/paragraphs_test.rb

@@ -514,10 +514,10 @@ Wise words from a wise person.
         assert_equal '<a href="http://asciidoc.org">AsciiDoc</a> is a <em>lightweight</em> markup language&#8230;&#8203;', output
       end
 
-      test 'should output empty string if first block is not a paragraph' do
+      test 'should output nil if first block is not a paragraph' do
         input = '* bullet'
         output = render_string input, :doctype => 'inline'
-        assert output.empty?
+        assert output.nil?
       end
     end
   end

data/test/parser_test.rb

@@ -477,6 +477,29 @@ Ryan Waldron
     assert_equal '2013-12-18', metadata['revdate']
   end
 
+  test 'parse rev number with trailing comma' do
+    input = <<-EOS
+Stuart Rackham
+v8.6.8,
+    EOS
+    metadata, _ = parse_header_metadata input
+    assert_equal 7, metadata.size
+    assert_equal '8.6.8', metadata['revnumber']
+    assert !metadata.has_key?('revdate')
+  end
+
+  # Asciidoctor recognizes a standalone revision without a trailing comma
+  test 'parse rev number' do
+    input = <<-EOS
+Stuart Rackham
+v8.6.8
+    EOS
+    metadata, _ = parse_header_metadata input
+    assert_equal 7, metadata.size
+    assert_equal '8.6.8', metadata['revnumber']
+    assert !metadata.has_key?('revdate')
+  end
+
   # while compliant w/ AsciiDoc, this is just sloppy parsing
   test "treats arbitrary text on rev line as revdate" do
     input = <<-EOS
@@ -516,7 +539,7 @@ Joe Cool
     EOS
     metadata, _ = parse_header_metadata input
     assert_equal 'Must start revremark-only line with space', metadata['revremark']
-    assert_equal '', metadata['revdate']
+    assert !metadata.has_key?('revdate')
   end
 
   test "skip line comments before author" do
@@ -576,7 +599,7 @@ v0.0.7, 2013-12-18
     assert_equal 'SJR', blankdoc.attributes['authorinitials']
   end
 
-  test 'reset block indent to 0' do
+  test 'adjust indentation to 0' do
     input = <<-EOS.chomp
     def names
 
@@ -594,11 +617,11 @@ end
     EOS
 
     lines = input.split("\n")
-    Asciidoctor::Parser.reset_block_indent! lines
+    Asciidoctor::Parser.adjust_indentation! lines
     assert_equal expected, (lines * "\n")
   end
 
-  test 'reset block indent mixed with tabs and spaces to 0' do
+  test 'adjust indentation mixed with tabs and spaces to 0' do
     input = <<-EOS.chomp
     def names
 
@@ -616,11 +639,31 @@ end
     EOS
 
     lines = input.split("\n")
-    Asciidoctor::Parser.reset_block_indent! lines
+    Asciidoctor::Parser.adjust_indentation! lines, 0, 4
     assert_equal expected, (lines * "\n")
   end
 
-  test 'reset block indent to non-zero' do
+  test 'expands tabs to spaces' do
+    input = <<-EOS.chomp
+Filesystem				Size	Used	Avail	Use%	Mounted on
+Filesystem              Size    Used    Avail   Use%    Mounted on
+devtmpfs				3.9G	   0	 3.9G	  0%	/dev
+/dev/mapper/fedora-root	 48G	 18G	  29G	 39%	/
+    EOS
+
+    expected = <<-EOS.chomp
+Filesystem              Size    Used    Avail   Use%    Mounted on
+Filesystem              Size    Used    Avail   Use%    Mounted on
+devtmpfs                3.9G       0     3.9G     0%    /dev
+/dev/mapper/fedora-root  48G     18G      29G    39%    /
+    EOS
+
+    lines = input.split("\n")
+    Asciidoctor::Parser.adjust_indentation! lines, 0, 4
+    assert_equal expected, (lines * "\n")
+  end
+
+  test 'adjust indentation to non-zero' do
     input = <<-EOS.chomp
     def names
 
@@ -631,18 +674,18 @@ end
 
     expected = <<-EOS.chomp
   def names
-  
+
     @name.split ' '
-  
+
   end
     EOS
 
     lines = input.split("\n")
-    Asciidoctor::Parser.reset_block_indent! lines, 2
+    Asciidoctor::Parser.adjust_indentation! lines, 2
     assert_equal expected, (lines * "\n")
   end
 
-  test 'preserve block indent' do
+  test 'preserve block indent if indent is -1' do
     input = <<-EOS
     def names
     
@@ -654,16 +697,16 @@ end
     expected = input
 
     lines = input.lines.entries
-    Asciidoctor::Parser.reset_block_indent! lines, nil
+    Asciidoctor::Parser.adjust_indentation! lines, -1
     assert_equal expected, lines.join
   end
 
-  test 'reset block indent hands empty lines gracefully' do
+  test 'adjust indentation handles empty lines gracefully' do
     input = []
     expected = input
 
     lines = input.dup
-    Asciidoctor::Parser.reset_block_indent! lines
+    Asciidoctor::Parser.adjust_indentation! lines
     assert_equal expected, lines
   end