asciidoctor 0.1.0 → 0.1.1

data/test/invoker_test.rb

@@ -87,10 +87,10 @@ context 'Invoker' do
     end
   end
 
-  test 'should fail with too many arguments if extra arguments are included' do
+  test 'should warn if extra arguments are detected' do
     redirect_streams do |stdout, stderr|
       invoker = invoke_cli %w(-o /dev/null extra arguments sample.asciidoc), nil
-      assert_match(/too many arguments/, stderr.string)
+      assert_match(/extra arguments detected/, stderr.string)
       assert_equal 1, invoker.code
     end
   end
@@ -239,10 +239,18 @@ context 'Invoker' do
     assert_equal Asciidoctor::SafeMode::SAFE, doc.safe
   end
 
-  test 'should set safe mode to specified level if specified' do
-    invoker = invoke_cli_to_buffer %w(-S safe -o /dev/null)
-    doc = invoker.document
-    assert_equal Asciidoctor::SafeMode::SAFE, doc.safe
+  test 'should set safe mode to specified level' do
+    levels = {
+      'unsafe' => Asciidoctor::SafeMode::UNSAFE,
+      'safe'   => Asciidoctor::SafeMode::SAFE,
+      'server' => Asciidoctor::SafeMode::SERVER,
+      'secure' => Asciidoctor::SafeMode::SECURE,
+    }
+    levels.each do |name, const|
+      invoker = invoke_cli_to_buffer %W(-S #{name} -o /dev/null)
+      doc = invoker.document
+      assert_equal const, doc.safe
+    end
   end
 
   test 'should set eRuby impl if specified' do

data/test/lexer_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 context "Lexer" do
 
-  test "test_is_section_title" do
+  test "is_section_title?" do
     assert Asciidoctor::Lexer.is_section_title?('AsciiDoc Home Page', '==================')
     assert Asciidoctor::Lexer.is_section_title?('=== AsciiDoc Home Page')
   end
@@ -174,7 +174,7 @@ context "Lexer" do
     assert_equal expected, attributes
   end
 
-  test "test_parse_author_first" do
+  test "parse author first" do
     metadata, = parse_header_metadata 'Stuart'
     assert_equal 3, metadata.size
     assert_equal 'Stuart', metadata['author']
@@ -182,7 +182,7 @@ context "Lexer" do
     assert_equal 'S', metadata['authorinitials']
   end
 
-  test "test_parse_author_first_last" do
+  test "parse author first last" do
     metadata, = parse_header_metadata 'Yukihiro Matsumoto'
     assert_equal 4, metadata.size
     assert_equal 'Yukihiro Matsumoto', metadata['author']
@@ -191,7 +191,7 @@ context "Lexer" do
     assert_equal 'YM', metadata['authorinitials']
   end
 
-  test "test_parse_author_first_middle_last" do
+  test "parse author first middle last" do
     metadata, = parse_header_metadata 'David Heinemeier Hansson'
     assert_equal 5, metadata.size
     assert_equal 'David Heinemeier Hansson', metadata['author']
@@ -201,7 +201,7 @@ context "Lexer" do
     assert_equal 'DHH', metadata['authorinitials']
   end
 
-  test "test_parse_author_first_middle_last_email" do
+  test "parse author first middle last email" do
     metadata, = parse_header_metadata 'David Heinemeier Hansson <rails@ruby-lang.org>'
     assert_equal 6, metadata.size
     assert_equal 'David Heinemeier Hansson', metadata['author']
@@ -212,7 +212,7 @@ context "Lexer" do
     assert_equal 'DHH', metadata['authorinitials']
   end
 
-  test "test_parse_author_first_email" do
+  test "parse author first email" do
     metadata, = parse_header_metadata 'Stuart <founder@asciidoc.org>'
     assert_equal 4, metadata.size
     assert_equal 'Stuart', metadata['author']
@@ -221,7 +221,7 @@ context "Lexer" do
     assert_equal 'S', metadata['authorinitials']
   end
 
-  test "test_parse_author_first_last_email" do
+  test "parse author first last email" do
     metadata, = parse_header_metadata 'Stuart Rackham <founder@asciidoc.org>'
     assert_equal 5, metadata.size
     assert_equal 'Stuart Rackham', metadata['author']
@@ -231,7 +231,7 @@ context "Lexer" do
     assert_equal 'SR', metadata['authorinitials']
   end
 
-  test "test_parse_author_with_hyphen" do
+  test "parse author with hyphen" do
     metadata, = parse_header_metadata 'Tim Berners-Lee <founder@www.org>'
     assert_equal 5, metadata.size
     assert_equal 'Tim Berners-Lee', metadata['author']
@@ -241,7 +241,7 @@ context "Lexer" do
     assert_equal 'TB', metadata['authorinitials']
   end
 
-  test "test_parse_author_with_single_quote" do
+  test "parse author with single quote" do
     metadata, = parse_header_metadata 'Stephen O\'Grady <founder@redmonk.com>'
     assert_equal 5, metadata.size
     assert_equal 'Stephen O\'Grady', metadata['author']
@@ -262,7 +262,7 @@ context "Lexer" do
     assert_equal 'HWR', metadata['authorinitials']
   end
 
-  test "test_parse_author_with_underscore" do
+  test "parse author with underscore" do
     metadata, = parse_header_metadata 'Tim_E Fella'
     assert_equal 4, metadata.size
     assert_equal 'Tim E Fella', metadata['author']
@@ -271,7 +271,7 @@ context "Lexer" do
     assert_equal 'TF', metadata['authorinitials']
   end
 
-  test "test_parse_author_condenses_whitespace" do
+  test "parse author condenses whitespace" do
     metadata, = parse_header_metadata '   Stuart       Rackham     <founder@asciidoc.org>'
     assert_equal 5, metadata.size
     assert_equal 'Stuart Rackham', metadata['author']
@@ -281,7 +281,7 @@ context "Lexer" do
     assert_equal 'SR', metadata['authorinitials']
   end
 
-  test "test_parse_invalid_author_line_becomes_author" do
+  test "parse invalid author line becomes author" do
     metadata, = parse_header_metadata '   Stuart       Rackham, founder of AsciiDoc   <founder@asciidoc.org>'
     assert_equal 3, metadata.size
     assert_equal 'Stuart Rackham, founder of AsciiDoc <founder@asciidoc.org>', metadata['author']
@@ -289,7 +289,7 @@ context "Lexer" do
     assert_equal 'S', metadata['authorinitials']
   end
 
-  test "test_parse_rev_number_date_remark" do
+  test "parse rev number date remark" do
     metadata, = parse_header_metadata "Ryan Waldron\nv0.0.7, 2013-12-18: The first release you can stand on"
     assert_equal 7, metadata.size
     assert_equal '0.0.7', metadata['revnumber']
@@ -297,20 +297,39 @@ context "Lexer" do
     assert_equal 'The first release you can stand on', metadata['revremark']
   end
 
-  test "test_parse_rev_date" do
+  test "parse rev date" do
     metadata, = parse_header_metadata "Ryan Waldron\n2013-12-18"
     assert_equal 5, metadata.size
     assert_equal '2013-12-18', metadata['revdate']
   end
 
-  test "test_parse_rev_date_remark" do
+  # while compliant w/ AsciiDoc, this is just sloppy parsing
+  test "treats arbitrary text on rev line as revdate" do
+    metadata, = parse_header_metadata "Ryan Waldron\nfoobar\n"
+    assert_equal 5, metadata.size
+    assert_equal 'foobar', metadata['revdate']
+  end
+
+  test "parse rev date remark" do
     metadata, = parse_header_metadata "Ryan Waldron\n2013-12-18:  The first release you can stand on"
     assert_equal 6, metadata.size
     assert_equal '2013-12-18', metadata['revdate']
     assert_equal 'The first release you can stand on', metadata['revremark']
   end
 
-  test "test_skip_line_comments_before_author" do
+  test "should not mistake attribute entry as rev remark" do
+    metadata, = parse_header_metadata "Joe Cool\n:layout: post\n"
+    assert_not_equal 'layout: post', metadata['revremark']
+    assert !metadata.has_key?('revdate')
+  end
+
+  test "parse rev remark only" do
+    metadata, = parse_header_metadata "Joe Cool\n :Must start line with space\n"
+    assert_equal 'Must start line with space', metadata['revremark']
+    assert_equal '', metadata['revdate']
+  end
+
+  test "skip line comments before author" do
     metadata, = parse_header_metadata "// Asciidoctor\n// release artist\nRyan Waldron"
     assert_equal 4, metadata.size
     assert_equal 'Ryan Waldron', metadata['author']
@@ -319,7 +338,7 @@ context "Lexer" do
     assert_equal 'RW', metadata['authorinitials']
   end
 
-  test "test_skip_block_comment_before_author" do
+  test "skip block comment before author" do
     metadata, = parse_header_metadata "////\nAsciidoctor\nrelease artist\n////\nRyan Waldron"
     assert_equal 4, metadata.size
     assert_equal 'Ryan Waldron', metadata['author']
@@ -328,7 +347,7 @@ context "Lexer" do
     assert_equal 'RW', metadata['authorinitials']
   end
 
-  test "test_skip_block_comment_before_rev" do
+  test "skip block comment before rev" do
     metadata, = parse_header_metadata "Ryan Waldron\n////\nAsciidoctor\nrelease info\n////\nv0.0.7, 2013-12-18"
     assert_equal 6, metadata.size
     assert_equal 'Ryan Waldron', metadata['author']
@@ -336,4 +355,12 @@ context "Lexer" do
     assert_equal '2013-12-18', metadata['revdate']
   end
 
+  test "attribute entry overrides generated author initials" do
+    blankdoc = Asciidoctor::Document.new
+    reader = Asciidoctor::Reader.new "Stuart Rackham <founder@asciidoc.org>\n:Author Initials: SJR".lines.entries
+    metadata = Asciidoctor::Lexer.parse_header_metadata(reader, blankdoc)
+    assert_equal 'SR', metadata['authorinitials']
+    assert_equal 'SJR', blankdoc.attributes['authorinitials']
+  end
+
 end

data/test/lists_test.rb

@@ -88,6 +88,22 @@ List
       assert_xpath '(//ul)[2]/preceding-sibling::*[@class = "title"][text() = "Also"]', output, 1
     end
 
+    test "dash elements separated by an attribute entry offset by a blank line should not merge lists" do
+      input = <<-EOS
+== List
+
+- Foo
+- Boo
+
+:foo: bar
+- Blech
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//ul', output, 2
+      assert_xpath '(//ul)[1]/li', output, 2
+      assert_xpath '(//ul)[2]/li', output, 1
+    end
+
     test 'a non-indented wrapped line is folded into text of list item' do
       input = <<-EOS
 List
@@ -104,6 +120,36 @@ wrapped content
       assert_xpath "//ul/li[1]/p[text() = 'Foo\nwrapped content']", output, 1
     end
 
+    test 'a non-indented wrapped line that resembles a block title is folded into text of list item' do
+      input = <<-EOS
+== List
+
+- Foo
+.wrapped content
+- Boo
+- Blech
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li[1]/*', output, 1
+      assert_xpath "//ul/li[1]/p[text() = 'Foo\n.wrapped content']", output, 1
+    end
+
+    test 'a non-indented wrapped line that resembles an attribute entry is folded into text of list item' do
+      input = <<-EOS
+== List
+
+- Foo
+:foo: bar
+- Boo
+- Blech
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li[1]/*', output, 1
+      assert_xpath "//ul/li[1]/p[text() = 'Foo\n:foo: bar']", output, 1
+    end
+
     test 'an indented wrapped line is unindented and folded into text of list item' do
       input = <<-EOS
 List
@@ -357,6 +403,22 @@ List
       assert_xpath '(//ul)[2]/preceding-sibling::*[@class = "title"][text() = "Also"]', output, 1
     end
 
+    test "asterisk elements separated by an attribute entry offset by a blank line should not merge lists" do
+      input = <<-EOS
+== List
+
+* Foo
+* Boo
+
+:foo: bar
+* Blech
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//ul', output, 2
+      assert_xpath '(//ul)[1]/li', output, 2
+      assert_xpath '(//ul)[2]/li', output, 1
+    end
+
     test "list should terminate before next lower section heading" do
       input = <<-EOS
 List
@@ -815,6 +877,7 @@ Lists
 
 * Item one, paragraph one
 +
+:foo: bar
 [[beck]]
 .Read the following aloud to yourself
 [source, ruby]
@@ -1295,6 +1358,22 @@ List
       assert_xpath '(//ol)[2]/li', output, 1
       assert_xpath '(//ol)[2]/preceding-sibling::*[@class = "title"][text() = "Also"]', output, 1
     end
+
+    test "dot elements separated by an attribute entry offset by a blank line should not merge lists" do
+      input = <<-EOS
+== List
+
+. Foo
+. Boo
+
+:foo: bar
+. Blech
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//ol', output, 2
+      assert_xpath '(//ol)[1]/li', output, 2
+      assert_xpath '(//ol)[2]/li', output, 1
+    end
   end
 end
 

data/test/paragraphs_test.rb

@@ -102,11 +102,19 @@ You're good to go!
       assert_match(/^gem install asciidoctor/, output, "Indentation should be trimmed from literal block")
     end
 
+    test "literal paragraph" do
+      assert_xpath "//*[@class='literalblock']//pre[text()='blah blah blah']", render_string("[literal]\nblah blah blah")
+    end
+
     test "listing paragraph" do
-      assert_xpath "//pre[@class='highlight']/code", render_string("[source]\n----\nblah blah blah\n----")
+      assert_xpath "//*[@class='listingblock']//pre[text()='blah blah blah']", render_string("[listing]\nblah blah blah")
     end
 
     test "source code paragraph" do
+      assert_xpath "//pre[@class='highlight']/code", render_string("[source]\nblah blah blah")
+    end
+
+    test "source code paragraph with language" do
       assert_xpath "//pre[@class='highlight']/code[@class='perl']", render_string("[source, perl]\ndie 'zomg perl sucks';")
     end
   end

data/test/reader_test.rb

@@ -7,13 +7,13 @@ class ReaderTest < Test::Unit::TestCase
     @reader = Asciidoctor::Reader.new @src_data
   end
 
-  context "has_lines?" do
+  context "has_more_lines?" do
     test "returns false for empty document" do
-      assert !Asciidoctor::Reader.new.has_lines?
+      assert !Asciidoctor::Reader.new.has_more_lines?
     end
 
     test "returns true with lines remaining" do
-      assert @reader.has_lines?, "Yo, didn't work"
+      assert @reader.has_more_lines?, "Yo, didn't work"
     end
   end
 
@@ -57,7 +57,7 @@ This is another paragraph.
       result = reader.grab_lines_until
       assert_equal 3, result.size
       assert_equal lines, result
-      assert !reader.has_lines?
+      assert !reader.has_more_lines?
       assert reader.empty?
     end
 
@@ -181,10 +181,14 @@ include::include-file.asciidoc[]
 last line
       EOS
       doc = Asciidoctor::Document.new [], :safe => Asciidoctor::SafeMode::SAFE
-      Asciidoctor::Reader.new(input.lines.entries, doc) {|inc|
-        ":file: #{inc}\n\nmiddle line".lines.entries
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true) {|inc|
+        ":includefile: #{inc}\n\nmiddle line".lines.entries
       }
-      assert_equal 'include-file.asciidoc', doc.attributes['file']
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_match(/^:includefile: include-file.asciidoc$/, lines.join)
     end
 
     test 'escaped include macro is left unprocessed' do
@@ -231,7 +235,7 @@ include::include-file.asciidoc[]
   context 'build secure asset path' do
     test 'allows us to specify a path relative to the current dir' do
       doc = Asciidoctor::Document.new
-      Asciidoctor::Reader.new(["foo"], doc)
+      Asciidoctor::Reader.new([], doc, true)
       legit_path = Dir.pwd + "/foo"
       assert_equal legit_path, doc.normalize_asset_path(legit_path)
     end
@@ -239,7 +243,7 @@ include::include-file.asciidoc[]
     test "keeps naughty absolute paths from getting outside" do
       naughty_path = "#{disk_root}etc/passwd"
       doc = Asciidoctor::Document.new
-      Asciidoctor::Reader.new(["foo"], doc)
+      Asciidoctor::Reader.new([], doc, true)
       secure_path = doc.normalize_asset_path(naughty_path)
       assert naughty_path != secure_path
       assert_match(/^#{doc.base_dir}/, secure_path)
@@ -248,26 +252,247 @@ include::include-file.asciidoc[]
     test "keeps naughty relative paths from getting outside" do
       naughty_path = "safe/ok/../../../../../etc/passwd"
       doc = Asciidoctor::Document.new
-      Asciidoctor::Reader.new(["foo"], doc)
+      Asciidoctor::Reader.new([], doc, true)
       secure_path = doc.normalize_asset_path(naughty_path)
       assert naughty_path != secure_path
       assert_match(/^#{doc.base_dir}/, secure_path)
     end
   end
 
-  # TODO these tests could be expanded
-  context 'Conditional blocks' do
-    test 'ifdef with defined attribute includes block' do
+  context 'Conditional Inclusions' do
+    test 'preprocess_next_line returns true if cursor advanced' do
+      input = <<-EOS
+ifdef::asciidoctor[]
+Asciidoctor!
+endif::asciidoctor[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      assert reader.preprocess_next_line == true
+    end
+
+    test 'preprocess_next_line returns false if cursor not advanced' do
+      input = <<-EOS
+content
+ifdef::asciidoctor[]
+Asciidoctor!
+endif::asciidoctor[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      assert reader.preprocess_next_line == false
+    end
+
+    test 'preprocess_next_line returns nil if cursor advanced past end of source' do
       input = <<-EOS
-:holygrail:
+ifdef::foobar[]
+swallowed content
+endif::foobar[]
+      EOS
 
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      assert reader.preprocess_next_line.nil?
+    end
+
+    test 'ifdef with defined attribute includes block' do
+      input = <<-EOS
 ifdef::holygrail[]
 There is a holy grail!
 endif::holygrail[]
       EOS
        
-      reader = Asciidoctor::Reader.new(input.lines.entries, Asciidoctor::Document.new)
-      assert_match(/There is a holy grail!/, reader.lines.join)
+      doc = Asciidoctor::Document.new [], :attributes => {'holygrail' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'There is a holy grail!', lines.join.strip
+    end
+
+    test 'ifdef with defined attribute includes text in brackets' do
+      input = <<-EOS
+On our quest we go...
+ifdef::holygrail[There is a holy grail!]
+There was much rejoicing.
+      EOS
+       
+      doc = Asciidoctor::Document.new [], :attributes => {'holygrail' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal "On our quest we go...\nThere is a holy grail!\nThere was much rejoicing.", lines.join.strip
+    end
+
+    test 'include with non-matching nested exclude' do
+      input = <<-EOS
+ifdef::grail[]
+holy
+ifdef::swallow[]
+swallow
+endif::swallow[]
+grail
+endif::grail[]
+      EOS
+       
+      doc = Asciidoctor::Document.new [], :attributes => {'grail' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal "holy\ngrail", lines.join.strip
+    end
+
+    test 'nested excludes with same condition' do
+      input = <<-EOS
+ifndef::grail[]
+ifndef::grail[]
+not here
+endif::grail[]
+endif::grail[]
+      EOS
+       
+      doc = Asciidoctor::Document.new [], :attributes => {'grail' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal '', lines.join.strip
+    end
+
+    test 'include with nested exclude of inverted condition' do
+      input = <<-EOS
+ifdef::grail[]
+holy
+ifndef::grail[]
+not here
+endif::grail[]
+grail
+endif::grail[]
+      EOS
+       
+      doc = Asciidoctor::Document.new [], :attributes => {'grail' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal "holy\ngrail", lines.join.strip
+    end
+
+    test 'exclude with matching nested exclude' do
+      input = <<-EOS
+poof
+ifdef::swallow[]
+no
+ifdef::swallow[]
+swallow
+endif::swallow[]
+here
+endif::swallow[]
+gone
+      EOS
+       
+      doc = Asciidoctor::Document.new [], :attributes => {'grail' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal "poof\ngone", lines.join.strip
+    end
+
+    test 'exclude with nested include using shorthand end' do
+      input = <<-EOS
+poof
+ifndef::grail[]
+no grail
+ifndef::swallow[]
+or swallow
+endif::[]
+in here
+endif::[]
+gone
+      EOS
+       
+      doc = Asciidoctor::Document.new [], :attributes => {'grail' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal "poof\ngone", lines.join.strip
+    end
+
+    test 'ifdef with one alternative attribute set includes content' do
+      input = <<-EOS
+ifdef::holygrail,swallow[]
+Our quest is complete!
+endif::holygrail,swallow[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'swallow' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Our quest is complete!', lines.join.strip
+    end
+
+    test 'ifdef with no alternative attributes set does not include content' do
+      input = <<-EOS
+ifdef::holygrail,swallow[]
+Our quest is complete!
+endif::holygrail,swallow[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal '', lines.join.strip
+    end
+
+    test 'ifdef with all required attributes set includes content' do
+      input = <<-EOS
+ifdef::holygrail+swallow[]
+Our quest is complete!
+endif::holygrail+swallow[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'holygrail' => '', 'swallow' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Our quest is complete!', lines.join.strip
+    end
+
+    test 'ifdef with missing required attributes does not include content' do
+      input = <<-EOS
+ifdef::holygrail+swallow[]
+Our quest is complete!
+endif::holygrail+swallow[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'holygrail' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal '', lines.join.strip
     end
 
     test 'ifndef with undefined attribute includes block' do
@@ -277,8 +502,220 @@ Our quest continues to find the holy grail!
 endif::holygrail[]
       EOS
 
-      reader = Asciidoctor::Reader.new(input.lines.entries, Asciidoctor::Document.new)
-      assert_match(/Our quest continues to find the holy grail!/, reader.lines.join)
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Our quest continues to find the holy grail!', lines.join.strip
+    end
+
+    test 'ifndef with one alternative attribute set includes content' do
+      input = <<-EOS
+ifndef::holygrail,swallow[]
+Our quest is complete!
+endif::holygrail,swallow[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'swallow' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Our quest is complete!', lines.join.strip
+    end
+
+    test 'ifndef with no alternative attributes set includes content' do
+      input = <<-EOS
+ifndef::holygrail,swallow[]
+Our quest is complete!
+endif::holygrail,swallow[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Our quest is complete!', lines.join.strip
+    end
+
+    test 'ifndef with any required attributes set does not include content' do
+      input = <<-EOS
+ifndef::holygrail+swallow[]
+Our quest is complete!
+endif::holygrail+swallow[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'swallow' => ''}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal '', lines.join.strip
+    end
+
+    test 'ifndef with no required attributes set includes content' do
+      input = <<-EOS
+ifndef::holygrail+swallow[]
+Our quest is complete!
+endif::holygrail+swallow[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Our quest is complete!', lines.join.strip
+    end
+
+    test 'escaped ifdef is unescaped and ignored' do
+      input = <<-EOS
+\\ifdef::holygrail[]
+content
+\\endif::holygrail[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal "ifdef::holygrail[]\ncontent\nendif::holygrail[]", lines.join.strip
+    end
+
+    test 'ifeval comparing double-quoted attribute to matching string is included' do
+      input = <<-EOS
+ifeval::["{gem}" == "asciidoctor"]
+Asciidoctor it is!
+endif::[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'gem' => 'asciidoctor'}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Asciidoctor it is!', lines.join.strip
+    end
+
+    test 'ifeval comparing single-quoted attribute to matching string is included' do
+      input = <<-EOS
+ifeval::['{gem}' == 'asciidoctor']
+Asciidoctor it is!
+endif::[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'gem' => 'asciidoctor'}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Asciidoctor it is!', lines.join.strip
+    end
+
+    test 'ifeval comparing quoted attribute to non-matching string is ignored' do
+      input = <<-EOS
+ifeval::['{gem}' == 'asciidoctor']
+Asciidoctor it is!
+endif::[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'gem' => 'tilt'}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal '', lines.join.strip
+    end
+
+    test 'ifeval comparing attribute to lower version number is included' do
+      input = <<-EOS
+ifeval::['{asciidoctor-version}' >= '0.1.0']
+That version will do!
+endif::[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'That version will do!', lines.join.strip
+    end
+
+    test 'ifeval comparing attribute to self is included' do
+      input = <<-EOS
+ifeval::['{asciidoctor-version}' == '{asciidoctor-version}']
+Of course it's the same!
+endif::[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'Of course it\'s the same!', lines.join.strip
+    end
+
+    test 'ifeval arguments can be mirrored' do
+      input = <<-EOS
+ifeval::["0.1.0" <= "{asciidoctor-version}"]
+That version will do!
+endif::[]
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'That version will do!', lines.join.strip
+    end
+
+    test 'ifeval matching numeric comparison is included' do
+      input = <<-EOS
+ifeval::[{rings} == 1]
+One ring to rule them all!
+endif::[]
+      EOS
+
+      doc = Asciidoctor::Document.new [], :attributes => {'rings' => 1}
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal 'One ring to rule them all!', lines.join.strip
+    end
+
+    test 'ifdef with no target is ignored' do
+      input = <<-EOS
+ifdef::[]
+content
+      EOS
+
+      doc = Asciidoctor::Document.new
+      reader = Asciidoctor::Reader.new(input.lines.entries, doc, true)
+      lines = []
+      while reader.has_more_lines?
+        lines << reader.get_line
+      end
+      assert_equal "ifdef::[]\ncontent", lines.join.strip
     end
   end
 
@@ -291,7 +728,7 @@ CRLF\r
 endlines\r
       EOS
 
-      reader = Asciidoctor::Reader.new(input.lines.entries, Asciidoctor::Document.new)
+      reader = Asciidoctor::Reader.new(input.lines.entries, Asciidoctor::Document.new, true)
       reader.lines.each do |line|
         assert !line.end_with?("\r\n")
       end