asciidoctor 1.5.6 → 1.5.6.1

data/lib/asciidoctor/version.rb

@@ -1,3 +1,3 @@
 module Asciidoctor
-  VERSION = '1.5.6'
+  VERSION = '1.5.6.1'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 1.5.6
-.\"      Date: 2017-07-12
+.\" Generator: Asciidoctor 1.5.6.1
+.\"      Date: 2017-07-23
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 1.5.6
+.\"    Source: Asciidoctor 1.5.6.1
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2017-07-12" "Asciidoctor 1.5.6" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2017-07-23" "Asciidoctor 1.5.6.1" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -242,4 +242,4 @@ Free use of this software is granted under the terms of the MIT License.
 \fBDan Allen, Sarah White, Ryan Waldron\fP
 .RS 4
 Author(s).
-.RE
+.RE

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 1.5.6
+:man source: Asciidoctor 1.5.6.1
 :page-layout: base
 
 == NAME

data/test/attributes_test.rb

@@ -362,12 +362,12 @@ content
         assert_equal val, doc.attributes[key]
       end
 
-      assert !doc.attributes.key?('backend-html5')
-      assert !doc.attributes.key?('backend-html5-doctype-article')
-      assert !doc.attributes.key?('basebackend-html')
-      assert !doc.attributes.key?('basebackend-html-doctype-article')
-      assert !doc.attributes.key?('doctype-article')
-      assert !doc.attributes.key?('filetype-html')
+      refute doc.attributes.key?('backend-html5')
+      refute doc.attributes.key?('backend-html5-doctype-article')
+      refute doc.attributes.key?('basebackend-html')
+      refute doc.attributes.key?('basebackend-html-doctype-article')
+      refute doc.attributes.key?('doctype-article')
+      refute doc.attributes.key?('filetype-html')
     end
 
     test 'backend attributes defined in document options overrides backend attribute in document' do
@@ -420,7 +420,7 @@ content
 
     test 'set_attribute should set attribute if key is not locked' do
       doc = empty_document
-      assert !(doc.attr? 'foo')
+      refute doc.attr? 'foo'
       res = doc.set_attribute 'foo', 'baz'
       assert res
       assert_equal 'baz', (doc.attr 'foo')
@@ -430,7 +430,7 @@ content
       doc = empty_document :attributes => { 'foo' => 'bar' }
       assert_equal 'bar', (doc.attr 'foo')
       res = doc.set_attribute 'foo', 'baz'
-      assert !res
+      refute res
       assert_equal 'bar', (doc.attr 'foo')
     end
 
@@ -439,7 +439,7 @@ content
       assert_equal '', (doc.attr 'backend-html5')
       res = doc.set_attribute 'backend', 'docbook5'
       assert res
-      assert !(doc.attr? 'backend-html5')
+      refute doc.attr? 'backend-html5'
       assert_equal '', (doc.attr 'backend-docbook5')
     end
 
@@ -467,10 +467,10 @@ toc toc-placement!                        |   |content     |macro        |nil
         raw_attrs, toc, toc_position, toc_placement, toc_class = expect
         attrs = Hash[*raw_attrs.split.map {|e| e.include?('=') ? e.split('=', 2) : [e, ''] }.flatten]
         doc = document_from_string '', :attributes => attrs
-        toc ? (assert doc.attr?('toc', toc)) : (assert !doc.attr?('toc'))
-        toc_position ? (assert doc.attr?('toc-position', toc_position)) : (assert !doc.attr?('toc-position'))
-        toc_placement ? (assert doc.attr?('toc-placement', toc_placement)) : (assert !doc.attr?('toc-placement'))
-        toc_class ? (assert doc.attr?('toc-class', toc_class)) : (assert !doc.attr?('toc-class'))
+        toc ? (assert doc.attr?('toc', toc)) : (refute doc.attr?('toc'))
+        toc_position ? (assert doc.attr?('toc-position', toc_position)) : (refute doc.attr?('toc-position'))
+        toc_placement ? (assert doc.attr?('toc-placement', toc_placement)) : (refute doc.attr?('toc-placement'))
+        toc_class ? (assert doc.attr?('toc-class', toc_class)) : (refute doc.attr?('toc-class'))
       end
     end
   end
@@ -1116,7 +1116,7 @@ paragraph
 
       doc = document_from_string input
       para = doc.blocks.first
-      assert !para.attributes.has_key?('id')
+      refute para.attributes.has_key?('id')
     end
 
     test 'role? returns true if role is assigned' do
@@ -1140,7 +1140,7 @@ A paragraph
       p = doc.blocks.first
       assert p.role?('lead')
       p2 = doc.blocks.last
-      assert !p2.role?('final')
+      refute p2.role?('final')
     end
 
     test 'has_role? can check for precense of role name' do
@@ -1151,7 +1151,7 @@ A paragraph
 
       doc = document_from_string input
       p = doc.blocks.first
-      assert !p.role?('lead')
+      refute p.role?('lead')
       assert p.has_role?('lead')
     end
 
@@ -1265,7 +1265,7 @@ A normal paragraph
       assert res
       assert_equal 'role2', para.attributes['role']
       assert para.has_role? 'role2'
-      assert !para.has_role?('role1')
+      refute para.has_role?('role1')
     end
 
     test 'roles are removed when last role is removed using remove_role' do
@@ -1293,7 +1293,7 @@ A normal paragraph
       refute res
       assert_equal 'role1', para.attributes['role']
       assert para.has_role? 'role1'
-      assert !para.has_role?('role2')
+      refute para.has_role?('role2')
     end
 
     test 'roles are not changed when using remove_role if the node has no roles' do
@@ -1305,7 +1305,7 @@ A normal paragraph
       res = para.remove_role 'role1'
       refute res
       assert_equal nil, para.attributes['role']
-      assert !para.has_role?('role1')
+      refute para.has_role?('role1')
     end
 
     test 'option can be specified in first position of block style using shorthand syntax' do
@@ -1344,7 +1344,7 @@ content
       section = doc.blocks[0]
       refute_nil section
       assert_equal :section, section.context
-      assert !section.special
+      refute section.special
       output = doc.convert
       assert_css 'section', output, 1
       assert_css 'section#idname', output, 1

data/test/blocks_test.rb

@@ -85,6 +85,23 @@ second paragraph
       assert_xpath '//p', output, 2
     end
 
+    test 'comment block between paragraphs offset by blank lines inside delimited block' do
+      input = <<-EOS
+====
+first paragraph
+
+////
+block comment
+////
+
+second paragraph
+====
+      EOS
+      output = render_embedded_string input
+      refute_match(/block comment/, output)
+      assert_xpath '//p', output, 2
+    end
+
     test 'adjacent comment block between paragraphs' do
       input = <<-EOS
 first paragraph
@@ -133,7 +150,7 @@ block comment
       EOS
 
       output = render_embedded_string input
-      assert !output.strip.empty?, "Line should be emitted => #{input.rstrip}"
+      refute_empty output.strip, "Line should be emitted => #{input.rstrip}"
     end
 
     test 'preprocessor directives should not be processed within comment block within block metadata' do
@@ -181,9 +198,9 @@ line should not be rendered
       assert_xpath '//p', output, 0
     end
 
-    # WARNING if first line of content is a directive, it will get interpretted before we know it's a comment block
-    # it happens because we always look a line ahead...not sure what we can do about it
-    test 'preprocessor directives should not be processed within comment paragraph' do
+    # WARNING this assertion fails if the directive is the first line of the paragraph instead of the second
+    # it happens because we always look a line ahead; not sure what we can do about it
+    test 'preprocessor directives should not be processed on subsequent lines of a comment paragraph' do
       input = <<-EOS
 [comment]
 first line of content
@@ -237,6 +254,24 @@ not this text
       assert_xpath '/*[@class="exampleblock"]', result, 1
       assert_xpath '/*[@class="exampleblock"]//*[normalize-space(text())="not this text"]', result, 1
     end
+
+    # NOTE this test verifies the nil return value of Parser#next_block
+    test 'should not drop content that follows skipped content inside a delimited block' do
+      input = <<-EOS
+====
+paragraph
+
+[comment#idname]
+skip
+
+paragraph
+====
+      EOS
+      result = render_embedded_string input
+      assert_xpath '/*[@class="exampleblock"]', result, 1
+      assert_xpath '/*[@class="exampleblock"]//*[@class="paragraph"]', result, 2
+      assert_xpath '//*[@class="paragraph"][@id="idname"]', result, 0
+    end
   end
 
   context 'Quote and Verse Blocks' do
@@ -605,7 +640,7 @@ You just write.
       assert_nil doc.blocks[0].number
       output = doc.render
       assert_xpath '(//*[@class="exampleblock"])[1]/*[@class="title"][text()="Look! Writing Docs with AsciiDoc"]', output, 1
-      assert !doc.attributes.has_key?('example-number')
+      refute doc.attributes.has_key?('example-number')
     end
 
     test 'automatic caption can be turned off and on and modified' do
@@ -1127,7 +1162,7 @@ This is a passthrough block.
       EOS
 
       block = block_from_string input
-      assert !block.nil?
+      refute_nil block
       assert_equal 1, block.lines.size
       assert_equal 'This is a passthrough block.', block.source
     end
@@ -1402,7 +1437,7 @@ section paragraph
       assert_xpath '//*[@id="content"]/h1[text()="Section Title"]', output, 1
       assert_xpath '//*[@class="paragraph"]', output, 1
       assert_xpath '//*[@class="paragraph"]/*[@class="title"][text()="Block title"]', output, 1
-      assert !errors.empty?
+      refute_empty errors
       assert_match(/only book doctypes can contain level 0 sections/, errors)
     end
 
@@ -1433,7 +1468,7 @@ Block content
 
       output = render_embedded_string input
       assert output.include?('Block content')
-      assert !output.include?('[]')
+      refute output.include?('[]')
     end
 
     test 'empty block anchor should not appear in output' do
@@ -1446,7 +1481,7 @@ Block content
 
       output = render_embedded_string input
       assert output.include?('Block content')
-      assert !output.include?('[[]]')
+      refute output.include?('[[]]')
     end
   end
 
@@ -1726,7 +1761,7 @@ image::images/tiger.png[Tiger]
       output = doc.render
       assert_xpath '//*[@class="imageblock"]//img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
       assert_xpath '//*[@class="imageblock"]/*[@class="title"][text() = "Voila! The AsciiDoc Tiger"]', output, 1
-      assert !doc.attributes.has_key?('figure-number')
+      refute doc.attributes.has_key?('figure-number')
     end
 
     test 'can align image in DocBook backend' do
@@ -1809,7 +1844,7 @@ image::{bogus}[]
       EOS
 
       output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
-      assert output.strip.empty?
+      assert_empty output.strip
       assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
@@ -1821,7 +1856,7 @@ image::{bogus}[]
       EOS
 
       output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
-      assert output.strip.empty?
+      assert_empty output.strip
       assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
@@ -1837,7 +1872,7 @@ image::{bogus}[]
       output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
       assert_css 'img', output, 0
       assert_css 'h2', output, 1
-      assert !output.include?('== Section Title')
+      refute output.include?('== Section Title')
       assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
@@ -2651,7 +2686,7 @@ public class Printer {
       assert_match(/\.<em>out<\/em>\./, output, 1)
       assert_match(/\*asterisks\*/, output, 1)
       assert_match(/<strong>bold<\/strong>/, output, 1)
-      assert !output.include?(Asciidoctor::Substitutors::PASS_START)
+      refute output.include?(Asciidoctor::Substitutors::PASS_START)
     end
 
     test 'should link to CodeRay stylesheet if source-highlighter is coderay and linkcss is set' do
@@ -2743,7 +2778,7 @@ puts HTML::Pipeline.new(filters, {}).call(input)[:output]
 :source-highlighter: coderay
       EOS
       doc = document_from_string input, :safe => Asciidoctor::SafeMode::SERVER
-      assert doc.attributes['source-highlighter'].nil?
+      assert_nil doc.attributes['source-highlighter']
     end
   end
 
@@ -3151,7 +3186,7 @@ content
       block = doc.blocks.first
       assert_nil block.id
       assert_nil(block.attr 'reftext')
-      assert !doc.catalog[:ids].has_key?('illegal$id')
+      refute doc.catalog[:ids].has_key?('illegal$id')
     end
 
     test 'should not recognize block anchor that starts with digit' do

data/test/converter_test.rb

@@ -167,25 +167,25 @@ Sidebar content
         caches = Asciidoctor::Converter::TemplateConverter.caches
         if defined? ::ThreadSafe::Cache
           assert caches[:templates].is_a?(::ThreadSafe::Cache)
-          assert !caches[:templates].empty?
+          refute_empty caches[:templates]
           paragraph_template_before = caches[:templates].values.find {|t| File.basename(t.file) == 'block_paragraph.html.haml' }
-          assert !paragraph_template_before.nil?
+          refute_nil paragraph_template_before
 
           # should use cache
           doc = Asciidoctor::Document.new [], :template_dir => template_dir
           template_converter = doc.converter.find_converter('paragraph')
           paragraph_template_after = template_converter.templates['paragraph']
-          assert !paragraph_template_after.nil?
+          refute_nil paragraph_template_after
           assert paragraph_template_before.eql?(paragraph_template_after)
 
           # should not use cache
           doc = Asciidoctor::Document.new [], :template_dir => template_dir, :template_cache => false
           template_converter = doc.converter.find_converter('paragraph')
           paragraph_template_after = template_converter.templates['paragraph']
-          assert !paragraph_template_after.nil?
-          assert !paragraph_template_before.eql?(paragraph_template_after)
+          refute_nil paragraph_template_after
+          refute paragraph_template_before.eql?(paragraph_template_after)
         else
-          assert caches.empty?
+          assert_empty caches
         end
       ensure
         # clean up
@@ -199,10 +199,10 @@ Sidebar content
       caches = { :scans => {}, :templates => {} }
       doc = Asciidoctor::Document.new [], :template_dir => template_dir, :template_cache => caches
       doc.converter
-      assert !caches[:scans].empty?
-      assert !caches[:templates].empty?
+      refute_empty caches[:scans]
+      refute_empty caches[:templates]
       paragraph_template = caches[:templates].values.find {|t| File.basename(t.file) == 'block_paragraph.html.haml' }
-      assert !paragraph_template.nil?
+      refute_nil paragraph_template
       assert paragraph_template.is_a? ::Tilt::HamlTemplate
     end
 
@@ -231,7 +231,7 @@ Sidebar content
         assert selected.is_a? Asciidoctor::Converter::TemplateConverter
         template = selected.templates[node_name]
         assert template.is_a? Tilt::ERBTemplate
-        assert !(template.is_a? Tilt::ErubisTemplate)
+        refute template.is_a? Tilt::ErubisTemplate
         assert template.instance_variable_get('@engine').is_a? ::ERB
         assert_equal %(block_#{node_name}.html.erb), File.basename(selected.templates[node_name].file)
       end

data/test/document_test.rb

@@ -18,7 +18,7 @@ context 'Document' do
       assert_equal 'header', doc.header.sectname
       assert_equal 14, doc.blocks.size
       assert_equal :preamble, doc.blocks[0].context
-      assert doc.blocks[1].context == :section
+      assert_equal :section, doc.blocks[1].context
 
       # verify compat-mode is set when atx-style doctitle is used
       result = doc.blocks[0].convert
@@ -61,9 +61,9 @@ context 'Document' do
       assert_equal Asciidoctor::SafeMode::SECURE, doc.attr('safe-mode-level')
       assert_equal 'secure', doc.attr('safe-mode-name')
       assert doc.attr?('safe-mode-secure')
-      assert !doc.attr?('safe-mode-unsafe')
-      assert !doc.attr?('safe-mode-safe')
-      assert !doc.attr?('safe-mode-server')
+      refute doc.attr?('safe-mode-unsafe')
+      refute doc.attr?('safe-mode-safe')
+      refute doc.attr?('safe-mode-server')
     end
 
     test 'safe mode level can be set in the constructor' do
@@ -105,8 +105,8 @@ context 'Document' do
 :sectnums!:
       EOS
       doc = document_from_string input, :backend => 'docbook'
-      assert !doc.attr?('toc')
-      assert !doc.attr?('sectnums')
+      refute doc.attr?('toc')
+      refute doc.attr?('sectnums')
     end
 
     test 'noheader attribute should suppress info element when converting to DocBook' do
@@ -127,7 +127,7 @@ content
 :numbered!:
       EOS
       doc = document_from_string input, :backend => 'docbook'
-      assert !doc.attr?('sectnums')
+      refute doc.attr?('sectnums')
     end
   end
 
@@ -169,7 +169,7 @@ preamble
       EOS
       doc = Asciidoctor.load(input, :safe => Asciidoctor::SafeMode::SAFE)
       assert_equal 'Document Title', doc.doctitle
-      assert !doc.attr?('docfile')
+      refute doc.attr?('docfile')
       assert_equal doc.base_dir, doc.attr('docdir')
     end
 
@@ -182,7 +182,7 @@ preamble
       EOS
       doc = Asciidoctor.load(input, :safe => Asciidoctor::SafeMode::SAFE)
       assert_equal 'Document Title', doc.doctitle
-      assert !doc.attr?('docfile')
+      refute doc.attr?('docfile')
       assert_equal doc.base_dir, doc.attr('docdir')
     end
 
@@ -195,14 +195,14 @@ preamble
       EOS
       doc = Asciidoctor.load(input.lines.entries, :safe => Asciidoctor::SafeMode::SAFE)
       assert_equal 'Document Title', doc.doctitle
-      assert !doc.attr?('docfile')
+      refute doc.attr?('docfile')
       assert_equal doc.base_dir, doc.attr('docdir')
     end
 
     test 'should accept attributes as array' do
 	  # NOTE there's a tab character before idseparator
       doc = Asciidoctor.load('text', :attributes => %w(toc sectnums   source-highlighter=coderay idprefix	idseparator=-))
-      assert doc.attributes.is_a?(Hash)
+      assert_kind_of Hash, doc.attributes
       assert doc.attr?('toc')
       assert_equal '', doc.attr('toc')
       assert doc.attr?('sectnums')
@@ -217,7 +217,7 @@ preamble
 
     test 'should accept attributes as empty array' do
       doc = Asciidoctor.load('text', :attributes => [])
-      assert doc.attributes.is_a?(Hash)
+      assert_kind_of Hash, doc.attributes
     end
 
     test 'should accept attributes as string' do
@@ -225,7 +225,7 @@ preamble
 source-highlighter=coderay
 idprefix
 idseparator=-')
-      assert doc.attributes.is_a?(Hash)
+      assert_kind_of Hash, doc.attributes
       assert doc.attr?('toc')
       assert_equal '', doc.attr('toc')
       assert doc.attr?('sectnums')
@@ -240,7 +240,7 @@ idseparator=-')
 
     test 'should accept values containing spaces in attributes string' do
       doc = Asciidoctor.load('text', :attributes => %(idprefix idseparator=-   note-caption=Note\\ to\\\tself toc))
-      assert doc.attributes.is_a?(Hash)
+      assert_kind_of Hash, doc.attributes
       assert doc.attr?('idprefix')
       assert_equal '', doc.attr('idprefix')
       assert doc.attr?('idseparator')
@@ -251,12 +251,12 @@ idseparator=-')
 
     test 'should accept attributes as empty string' do
       doc = Asciidoctor.load('text', :attributes => '')
-      assert doc.attributes.is_a?(Hash)
+      assert_kind_of Hash, doc.attributes
     end
 
     test 'should accept attributes as nil' do
       doc = Asciidoctor.load('text', :attributes => nil)
-      assert doc.attributes.is_a?(Hash)
+      assert_kind_of Hash, doc.attributes
     end
 
     test 'should accept attributes if hash like' do
@@ -275,7 +275,7 @@ idseparator=-')
       end
 
       doc = Asciidoctor.load('text', :attributes => Hashish.new)
-      assert doc.attributes.is_a?(Hash)
+      assert_kind_of Hash, doc.attributes
       assert doc.attributes.has_key?('toc')
     end
 
@@ -546,9 +546,9 @@ term without description::
       result = doc.find_by
       refute_nil result
       assert_equal 3, result.size
-      assert Asciidoctor::Document === result[0]
-      assert Asciidoctor::List === result[1]
-      assert Asciidoctor::ListItem === result[2]
+      assert_kind_of Asciidoctor::Document, result[0]
+      assert_kind_of Asciidoctor::List, result[1]
+      assert_kind_of Asciidoctor::ListItem, result[2]
     end
   end
 
@@ -557,7 +557,7 @@ term without description::
       sample_input_path = fixture_path('sample.asciidoc')
 
       output = Asciidoctor.convert_file sample_input_path, :header_footer => true, :to_file => false
-      assert !output.empty?
+      refute_empty output
       assert_xpath '/html', output, 1
       assert_xpath '/html/head', output, 1
       assert_xpath '/html/body', output, 1
@@ -569,12 +569,12 @@ term without description::
       sample_input_path = fixture_path('sample.asciidoc')
 
       output = Asciidoctor.convert_file sample_input_path, :header_footer => true, :to_file => false
-      assert !output.empty?
+      refute_empty output
       lines = output.split("\n")
-      assert lines.size == output.split(/\r\n|\r|\n/).size
+      assert_equal lines.size, output.split(/\r\n|\r|\n/).size
       raw_lengths = lines.map(&:length)
       trimmed_lengths = lines.map {|line| line.rstrip.length }
-      assert raw_lengths == trimmed_lengths
+      assert_equal raw_lengths, trimmed_lengths
     end
 
     test 'should accept attributes as array' do
@@ -608,8 +608,8 @@ text
       assert_css 'html:root > head > link[rel="stylesheet"][href="./asciidoctor.css"]', output, 0
       stylenode = xmlnodes_at_css 'html:root > head > style', output, 1
       styles = stylenode.content
-      assert !styles.nil?
-      assert !styles.strip.empty?
+      refute_nil styles
+      refute_empty styles.strip
     end
 
     test 'should link to default stylesheet by default even if linkcss is unset in document' do
@@ -644,8 +644,8 @@ text
       assert_css 'html:root > head > style', output, 1
       stylenode = xmlnodes_at_css 'html:root > head > style', output, 1
       styles = stylenode.content
-      assert !styles.nil?
-      assert !styles.strip.empty?
+      refute_nil styles
+      refute_empty styles.strip
     end
 
     test 'should not link to stylesheet if stylesheet is unset' do
@@ -692,8 +692,8 @@ text
           :attributes => {'stylesheet' => 'custom.css', 'stylesdir' => './stylesheets', 'linkcss!' => ''}
       stylenode = xmlnodes_at_css 'html:root > head > style', output, 1
       styles = stylenode.content
-      assert !styles.nil?
-      assert !styles.strip.empty?
+      refute_nil styles
+      refute_empty styles.strip
     end
 
     test 'should convert source file and write result to adjacent file by default' do
@@ -703,7 +703,7 @@ text
         Asciidoctor.convert_file sample_input_path
         assert File.exist?(sample_output_path)
         output = IO.read(sample_output_path)
-        assert !output.empty?
+        refute_empty output
         assert_xpath '/html', output, 1
         assert_xpath '/html/head', output, 1
         assert_xpath '/html/body', output, 1
@@ -721,7 +721,7 @@ text
         Asciidoctor.convert_file sample_input_path, :to_file => sample_output_path
         assert File.exist?(sample_output_path)
         output = IO.read(sample_output_path)
-        assert !output.empty?
+        refute_empty output
         assert_xpath '/html', output, 1
         assert_xpath '/html/head', output, 1
         assert_xpath '/html/body', output, 1
@@ -740,7 +740,7 @@ text
         Asciidoctor.convert_file sample_input_path, :to_file => 'result.html', :base_dir => fixture_dir
         assert File.exist?(sample_output_path)
         output = IO.read(sample_output_path)
-        assert !output.empty?
+        refute_empty output
         assert_xpath '/html', output, 1
         assert_xpath '/html/head', output, 1
         assert_xpath '/html/body', output, 1
@@ -865,7 +865,7 @@ text
       cases.each do |attr_val, markup|
         output = Asciidoctor.convert_file sample_input_path, :to_file => false,
             :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => %(linkcss copycss! #{attr_val})
-        assert !output.empty?
+        refute_empty output
         assert_css 'script[src="modernizr.js"]', output, markup[:head_script]
         assert_css 'meta[http-equiv="imagetoolbar"]', output, markup[:meta]
         assert_css 'body > a#top', output, markup[:top_link]
@@ -877,7 +877,7 @@ text
       sample_input_path = fixture_path('basic.asciidoc')
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => '', 'nofooter' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'body > a#top', output, 1
     end
 
@@ -886,25 +886,25 @@ text
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
                                         :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo' => '', 'docinfodir' => 'custom-docinfodir'}
-      assert !output.empty?
+      refute_empty output
       assert_css 'script[src="bootstrap.js"]', output, 1
       assert_css 'meta[name="robots"]', output, 0
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
                                         :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => '', 'docinfodir' => 'custom-docinfodir'}
-      assert !output.empty?
+      refute_empty output
       assert_css 'script[src="bootstrap.js"]', output, 0
       assert_css 'meta[name="robots"]', output, 1
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
                                         :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => '', 'docinfodir' => './custom-docinfodir'}
-      assert !output.empty?
+      refute_empty output
       assert_css 'script[src="bootstrap.js"]', output, 1
       assert_css 'meta[name="robots"]', output, 1
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
                                         :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => '', 'docinfodir' => 'custom-docinfodir/subfolder'}
-      assert !output.empty?
+      refute_empty output
       assert_css 'script[src="bootstrap.js"]', output, 0
       assert_css 'meta[name="robots"]', output, 0
     end
@@ -914,13 +914,13 @@ text
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :backend => 'docbook', :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'productname', output, 0
       assert_css 'copyright', output, 1
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :backend => 'docbook', :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'productname', output, 1
       assert_xpath '//xmlns:productname[text()="Asciidoctor™"]', output, 1
       assert_css 'edition', output, 1
@@ -929,7 +929,7 @@ text
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :backend => 'docbook', :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'productname', output, 1
       assert_xpath '//xmlns:productname[text()="Asciidoctor™"]', output, 1
       assert_css 'edition', output, 1
@@ -942,19 +942,19 @@ text
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'body script', output, 1
       assert_css 'a#top', output, 0
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'body script', output, 0
       assert_css 'a#top', output, 1
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'body script', output, 1
       assert_css 'a#top', output, 1
     end
@@ -964,20 +964,20 @@ text
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :backend => 'docbook', :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'article > revhistory', output, 1
       assert_xpath '/xmlns:article/xmlns:revhistory/xmlns:revision/xmlns:revnumber[text()="1.0"]', output, 1 # verifies substitutions are performed
       assert_css 'glossary#_glossary', output, 0
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :backend => 'docbook', :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'article > revhistory', output, 0
       assert_css 'glossary#_glossary', output, 1
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :backend => 'docbook', :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'article > revhistory', output, 1
       assert_xpath '/xmlns:article/xmlns:revhistory/xmlns:revision/xmlns:revnumber[text()="1.0"]', output, 1 # verifies substitutions are performed
       assert_css 'glossary#_glossary', output, 1
@@ -1000,7 +1000,7 @@ text
         end
         output = Asciidoctor.convert_file sample_input_path, :to_file => false,
             :header_footer => true, :backend => 'docbook', :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => ''}
-        assert !output.empty?
+        refute_empty output
         assert_css 'productname', output, 1
         assert_css 'edition', output, 1
         assert_xpath '//xmlns:edition[text()="1.0"]', output, 1 # verifies substitutions are performed
@@ -1019,13 +1019,13 @@ text
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER
-      assert !output.empty?
+      refute_empty output
       assert_css 'script[src="modernizr.js"]', output, 0
       assert_css 'meta[http-equiv="imagetoolbar"]', output, 0
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :backend => 'docbook', :safe => Asciidoctor::SafeMode::SERVER
-      assert !output.empty?
+      refute_empty output
       assert_css 'productname', output, 0
       assert_css 'copyright', output, 0
     end
@@ -1035,13 +1035,13 @@ text
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :attributes => {'docinfo2' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'script[src="modernizr.js"]', output, 0
       assert_css 'meta[http-equiv="imagetoolbar"]', output, 0
 
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
           :header_footer => true, :backend => 'docbook', :attributes => {'docinfo2' => ''}
-      assert !output.empty?
+      refute_empty output
       assert_css 'productname', output, 0
       assert_css 'copyright', output, 0
     end
@@ -1056,7 +1056,7 @@ text
             :attributes => { 'docinfo' => '', 'bootstrap-version' => nil, 'linkcss' => '', 'attribute-missing' => 'drop-line' }
         [output, err.string]
       end
-      refute output.empty?
+      refute_empty output
       assert_css 'script', output, 0
       assert_xpath %(//meta[@name="copyright"][@content="(C) OpenDevise"]), output, 1
       assert_includes warnings, 'dropping line containing reference to missing attribute'
@@ -1069,7 +1069,7 @@ text
           :header_footer => true,
           :safe => :server,
           :attributes => { 'docinfo' => '', 'docinfosubs' => 'attributes,replacements', 'linkcss' => '' }
-      refute output.empty?
+      refute_empty output
       assert_css 'script[src="bootstrap.3.2.0.min.js"]', output, 1
       assert_xpath %(//meta[@name="copyright"][@content="#{decode_char 169} OpenDevise"]), output, 1
     end
@@ -1093,9 +1093,9 @@ text
       assert_equal 'html', doc.attributes['basebackend']
       assert doc.attributes.has_key? 'basebackend-html'
       converter = doc.converter
-      assert converter.is_a? Asciidoctor::Converter::Html5Converter
+      assert_kind_of Asciidoctor::Converter::Html5Converter, converter
       BUILT_IN_ELEMENTS.each do |element|
-        assert converter.respond_to? element
+        assert_respond_to converter, element
       end
     end
 
@@ -1107,9 +1107,9 @@ text
       assert_equal 'docbook', doc.attributes['basebackend']
       assert doc.attributes.has_key? 'basebackend-docbook'
       converter = doc.converter
-      assert converter.is_a? Asciidoctor::Converter::DocBook45Converter
+      assert_kind_of Asciidoctor::Converter::DocBook45Converter, converter
       BUILT_IN_ELEMENTS.each do |element|
-        assert converter.respond_to? element
+        assert_respond_to converter, element
       end
     end
 
@@ -1121,9 +1121,9 @@ text
       assert_equal 'docbook', doc.attributes['basebackend']
       assert doc.attributes.has_key? 'basebackend-docbook'
       converter = doc.converter
-      assert converter.is_a? Asciidoctor::Converter::DocBook5Converter
+      assert_kind_of Asciidoctor::Converter::DocBook5Converter, converter
       BUILT_IN_ELEMENTS.each do |element|
-        assert converter.respond_to? element
+        assert_respond_to converter, element
       end
     end
 
@@ -1146,7 +1146,7 @@ text
       doc = document_from_string('Snorf')
       assert_nil doc.doctitle
       assert_nil doc.name
-      assert !doc.has_header?
+      refute doc.has_header?
       assert_nil doc.header
     end
 
@@ -1395,17 +1395,17 @@ content
 
     test 'should not choke on empty source' do
       doc = Asciidoctor::Document.new ''
-      assert doc.blocks.empty?
+      assert_empty doc.blocks
       assert_nil doc.doctitle
-      assert !doc.has_header?
+      refute doc.has_header?
       assert_nil doc.header
     end
 
     test 'should not choke on nil source' do
       doc = Asciidoctor::Document.new nil
-      assert doc.blocks.empty?
+      assert_empty doc.blocks
       assert_nil doc.doctitle
-      assert !doc.has_header?
+      refute doc.has_header?
       assert_nil doc.header
     end
 
@@ -1434,6 +1434,21 @@ more info...
       assert_xpath '//*[@id="header"]/*[@class="details"]/span[@id="revremark"][text() = "See changelog."]', output, 1
     end
 
+    test 'should parse revision line if date is empty' do
+      input = <<-EOS
+= Document Title
+Author Name
+v1.0.0,:remark
+
+content
+      EOS
+
+      doc = document_from_string input
+      assert_equal '1.0.0', doc.attributes['revnumber']
+      assert_nil doc.attributes['revdate']
+      assert_equal 'remark', doc.attributes['revremark']
+    end
+
     test 'should include revision history if revdate and revnumber is set' do
       input = <<-EOS
 = Document Title
@@ -1612,7 +1627,7 @@ content
 
     test 'with header footer' do
       doc = document_from_string "= Title\n\nparagraph"
-      assert !doc.attr?('embedded')
+      refute doc.attr?('embedded')
       result = doc.render
       assert_xpath '/html', result, 1
       assert_xpath '//*[@id="header"]', result, 1
@@ -2329,7 +2344,7 @@ asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats
       naughty_path = "#{disk_root}etc/passwd"
       doc = empty_document
       secure_path = doc.normalize_asset_path(naughty_path)
-      assert naughty_path != secure_path
+      refute_equal naughty_path, secure_path
       assert_match(/^#{doc.base_dir}/, secure_path)
     end
 
@@ -2337,7 +2352,7 @@ asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats
       naughty_path = 'safe/ok/../../../../../etc/passwd'
       doc = empty_document
       secure_path = redirect_streams { doc.normalize_asset_path(naughty_path) }
-      assert naughty_path != secure_path
+      refute_equal naughty_path, secure_path
       assert_match(/^#{doc.base_dir}/, secure_path)
     end