asciidoctor 0.1.4 → 1.5.0

data/test/options_test.rb

@@ -1,4 +1,8 @@
-require 'test_helper'
+# encoding: UTF-8
+unless defined? ASCIIDOCTOR_PROJECT_DIR
+  $: << File.dirname(__FILE__); $:.uniq!
+  require 'test_helper'
+end
 require 'asciidoctor/cli/options'
 
 context 'Options' do
@@ -45,7 +49,7 @@ context 'Options' do
   test 'basic argument assignment' do
     options = Asciidoctor::Cli::Options.parse!(%w(-v -s -d book test/fixtures/sample.asciidoc))
 
-    assert_equal true, options[:verbose]
+    assert_equal 2, options[:verbose]
     assert_equal false, options[:header_footer]
     assert_equal 'book', options[:attributes]['doctype']
     assert_equal 1, options[:input_files].size
@@ -108,4 +112,84 @@ context 'Options' do
     assert_equal ['custom-backend', 'custom-backend-hacks'], options[:template_dirs]
   end
 
+  test 'multiple -r flags requires specified libraries' do
+    options = Asciidoctor::Cli::Options.new
+    redirect_streams do |stdout, stderr|
+      exitval = options.parse! %w(-r foobar -r foobaz test/fixtures/sample.asciidoc)
+      assert_match(%(asciidoctor: FAILED: 'foobar' could not be loaded), stderr.string)
+      assert_equal 1, exitval
+      assert_equal ['foobar', 'foobaz'], options[:requires]
+    end
+  end
+
+  test '-r flag with multiple values requires specified libraries' do
+    options = Asciidoctor::Cli::Options.new
+    redirect_streams do |stdout, stderr|
+      exitval = options.parse! %w(-r foobar,foobaz test/fixtures/sample.asciidoc)
+      assert_match(%(asciidoctor: FAILED: 'foobar' could not be loaded), stderr.string)
+      assert_equal 1, exitval
+      assert_equal ['foobar', 'foobaz'], options[:requires]
+    end
+  end
+
+  test '-I option appends paths to $LOAD_PATH' do
+    options = Asciidoctor::Cli::Options.new
+    old_load_path = $LOAD_PATH.dup
+    begin
+      exitval = options.parse! %w(-I foobar -I foobaz test/fixtures/sample.asciidoc)
+      refute_equal 1, exitval
+      assert_equal old_load_path.size + 2, $LOAD_PATH.size
+      assert_equal File.expand_path('foobar'), $LOAD_PATH[0]
+      assert_equal File.expand_path('foobaz'), $LOAD_PATH[1]
+      assert_equal ['foobar', 'foobaz'], options[:load_paths]
+    ensure
+      ($LOAD_PATH.size - old_load_path.size).times { $LOAD_PATH.shift }
+    end
+  end
+
+  test '-I option appends multiple paths to $LOAD_PATH' do
+    options = Asciidoctor::Cli::Options.new
+    old_load_path = $LOAD_PATH.dup
+    begin
+      exitval = options.parse! %W(-I foobar#{File::PATH_SEPARATOR}foobaz test/fixtures/sample.asciidoc)
+      refute_equal 1, exitval
+      assert_equal old_load_path.size + 2, $LOAD_PATH.size
+      assert_equal File.expand_path('foobar'), $LOAD_PATH[0]
+      assert_equal File.expand_path('foobaz'), $LOAD_PATH[1]
+      assert_equal ['foobar', 'foobaz'], options[:load_paths]
+    ensure
+      ($LOAD_PATH.size - old_load_path.size).times { $LOAD_PATH.shift }
+    end
+  end
+
+  test 'should set verbose to 2 when -v flag is specified' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-v test/fixtures/sample.asciidoc))
+    assert_equal 2, options[:verbose]
+  end
+
+  test 'should set verbose to 0 when -q flag is specified' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-q test/fixtures/sample.asciidoc))
+    assert_equal 0, options[:verbose]
+  end
+
+  test 'should set verbose to 2 when -v flag is specified after -q flag' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-q -v test/fixtures/sample.asciidoc))
+    assert_equal 2, options[:verbose]
+  end
+
+  test 'should set verbose to 0 when -q flag is specified after -v flag' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-v -q test/fixtures/sample.asciidoc))
+    assert_equal 0, options[:verbose]
+  end
+
+  test 'should enable timings when -t flag is specified' do
+    options = Asciidoctor::Cli::Options.parse!(%w(-t test/fixtures/sample.asciidoc))
+    assert_equal true, options[:timings]
+  end
+
+  test 'timings option is disable by default' do
+    options = Asciidoctor::Cli::Options.parse!(%w(test/fixtures/sample.asciidoc))
+    assert_equal false, options[:timings]
+  end
+
 end

data/test/paragraphs_test.rb

@@ -1,4 +1,8 @@
-require 'test_helper'
+# encoding: UTF-8
+unless defined? ASCIIDOCTOR_PROJECT_DIR
+  $: << File.dirname(__FILE__); $:.uniq!
+  require 'test_helper'
+end
 
 context 'Paragraphs' do
   context 'Normal' do
@@ -186,11 +190,35 @@ Note that multi-entry terms generate separate index entries.
     test 'normal paragraph should honor explicit subs list' do
       input = <<-EOS
 [subs="specialcharacters"]
-*Hey Jude*
+*<Hey Jude>*
       EOS
 
       output = render_embedded_string input
-      assert output.include?('*Hey Jude*')
+      assert output.include?('*&lt;Hey Jude&gt;*')
+    end
+
+    test 'normal paragraph should honor specialchars shorthand' do
+      input = <<-EOS
+[subs="specialchars"]
+*<Hey Jude>*
+      EOS
+
+      output = render_embedded_string input
+      assert output.include?('*&lt;Hey Jude&gt;*')
+    end
+
+    test 'should add a hardbreak at end of each line when hardbreaks option is set' do
+      input = <<-EOS
+[%hardbreaks]
+read
+my
+lips
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'br', output, 2
+      assert_xpath '//p', output, 1
+      assert output.include?("<p>read<br>\nmy<br>\nlips</p>")
     end
   end
 
@@ -265,7 +293,7 @@ use the source, luke!
 die 'zomg perl sucks';
       EOS
       output = render_embedded_string input
-      assert_xpath %(/*[@class="listingblock"]//pre[@class="highlight"]/code[@class="perl language-perl"][text()="die 'zomg perl sucks';"]), output, 1
+      assert_xpath %(/*[@class="listingblock"]//pre[@class="highlight"]/code[@class="language-perl"][@data-lang="perl"][text()="die 'zomg perl sucks';"]), output, 1
     end
 
     test 'literal paragraph terminates at block attribute list' do
@@ -336,6 +364,16 @@ A famouse quote.
       assert_xpath '//*[@class = "verseblock"]/pre[normalize-space(text()) = "Famous verse."]', output, 1
     end
 
+    test 'should perform normal subs on a verse paragraph' do
+      input = <<-EOS
+[verse]
+_GET /groups/link:#group-id[\{group-id\}]_
+      EOS
+
+      output = render_embedded_string input
+      assert output.include?('<pre class="content"><em>GET /groups/<a href="#group-id">{group-id}</a></em></pre>')
+    end
+
     test 'quote paragraph should honor explicit subs list' do
       input = <<-EOS
 [subs="specialcharacters"]
@@ -397,6 +435,8 @@ An abstract for the book.
 [partintro]
 An intro to this part.
 
+== Chapter 1
+
 [sidebar]
 Just a side note.
 
@@ -433,6 +473,8 @@ An abstract for the book.
 .Part intro title
 An intro to this part.
 
+== Chapter 1
+
 [sidebar]
 .Sidebar title
 Just a side note.
@@ -469,7 +511,7 @@ Wise words from a wise person.
       test 'should only format and output text in first paragraph when doctype is inline' do
         input = "http://asciidoc.org[AsciiDoc] is a _lightweight_ markup language...\n\nignored"
         output = render_string input, :doctype => 'inline'
-        assert_equal '<a href="http://asciidoc.org">AsciiDoc</a> is a <em>lightweight</em> markup language&#8230;', output
+        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

data/test/{lexer_test.rb → parser_test.rb}

@@ -1,16 +1,20 @@
-require 'test_helper'
+# encoding: UTF-8
+unless defined? ASCIIDOCTOR_PROJECT_DIR
+  $: << File.dirname(__FILE__); $:.uniq!
+  require 'test_helper'
+end
 
-context "Lexer" do
+context "Parser" do
 
   test "is_section_title?" do
-    assert Asciidoctor::Lexer.is_section_title?('AsciiDoc Home Page', '==================')
-    assert Asciidoctor::Lexer.is_section_title?('=== AsciiDoc Home Page')
+    assert Asciidoctor::Parser.is_section_title?('AsciiDoc Home Page', '==================')
+    assert Asciidoctor::Parser.is_section_title?('=== AsciiDoc Home Page')
   end
 
   test 'sanitize attribute name' do
-    assert_equal 'foobar', Asciidoctor::Lexer.sanitize_attribute_name("Foo Bar")
-    assert_equal 'foo', Asciidoctor::Lexer.sanitize_attribute_name("foo")
-    assert_equal 'foo3-bar', Asciidoctor::Lexer.sanitize_attribute_name("Foo 3^ # - Bar[")
+    assert_equal 'foobar', Asciidoctor::Parser.sanitize_attribute_name("Foo Bar")
+    assert_equal 'foo', Asciidoctor::Parser.sanitize_attribute_name("foo")
+    assert_equal 'foo3-bar', Asciidoctor::Parser.sanitize_attribute_name("Foo 3^ # - Bar[")
   end
 
   test "collect unnamed attribute" do
@@ -198,7 +202,7 @@ context "Lexer" do
 
   test 'parse style attribute with id and role' do
     attributes = {1 => 'style#id.role'}
-    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    style, original_style = Asciidoctor::Parser.parse_style_attribute(attributes)
     assert_equal 'style', style
     assert_nil original_style
     assert_equal 'style', attributes['style']
@@ -209,7 +213,7 @@ context "Lexer" do
 
   test 'parse style attribute with style, role, id and option' do
     attributes = {1 => 'style.role#id%fragment'}
-    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    style, original_style = Asciidoctor::Parser.parse_style_attribute(attributes)
     assert_equal 'style', style
     assert_nil original_style
     assert_equal 'style', attributes['style']
@@ -222,7 +226,7 @@ context "Lexer" do
 
   test 'parse style attribute with style, id and multiple roles' do
     attributes = {1 => 'style#id.role1.role2'}
-    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    style, original_style = Asciidoctor::Parser.parse_style_attribute(attributes)
     assert_equal 'style', style
     assert_nil original_style
     assert_equal 'style', attributes['style']
@@ -233,7 +237,7 @@ context "Lexer" do
 
   test 'parse style attribute with style, multiple roles and id' do
     attributes = {1 => 'style.role1.role2#id'}
-    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    style, original_style = Asciidoctor::Parser.parse_style_attribute(attributes)
     assert_equal 'style', style
     assert_nil original_style
     assert_equal 'style', attributes['style']
@@ -244,7 +248,7 @@ context "Lexer" do
 
   test 'parse style attribute with positional and original style' do
     attributes = {1 => 'new_style', 'style' => 'original_style'}
-    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    style, original_style = Asciidoctor::Parser.parse_style_attribute(attributes)
     assert_equal 'new_style', style
     assert_equal 'original_style', original_style
     assert_equal 'new_style', attributes['style']
@@ -253,7 +257,7 @@ context "Lexer" do
 
   test 'parse style attribute with id and role only' do
     attributes = {1 => '#id.role'}
-    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    style, original_style = Asciidoctor::Parser.parse_style_attribute(attributes)
     assert_nil style
     assert_nil original_style
     assert_equal 'id', attributes['id']
@@ -263,7 +267,7 @@ context "Lexer" do
 
   test 'parse empty style attribute' do
     attributes = {1 => nil}
-    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    style, original_style = Asciidoctor::Parser.parse_style_attribute(attributes)
     assert_nil style
     assert_nil original_style
     assert_nil attributes['id']
@@ -273,7 +277,7 @@ context "Lexer" do
 
   test 'parse style attribute with option should preserve existing options' do
     attributes = {1 => '%header', 'options' => 'footer', 'footer-option' => ''}
-    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    style, original_style = Asciidoctor::Parser.parse_style_attribute(attributes)
     assert_nil style
     assert_nil original_style
     assert_equal 'header,footer', attributes['options']
@@ -282,7 +286,7 @@ context "Lexer" do
   end
 
   test "parse author first" do
-    metadata, = parse_header_metadata 'Stuart'
+    metadata, _ = parse_header_metadata 'Stuart'
     assert_equal 5, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal metadata['author'], metadata['authors']
@@ -291,7 +295,7 @@ context "Lexer" do
   end
 
   test "parse author first last" do
-    metadata, = parse_header_metadata 'Yukihiro Matsumoto'
+    metadata, _ = parse_header_metadata 'Yukihiro Matsumoto'
     assert_equal 6, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Yukihiro Matsumoto', metadata['author']
@@ -302,7 +306,7 @@ context "Lexer" do
   end
 
   test "parse author first middle last" do
-    metadata, = parse_header_metadata 'David Heinemeier Hansson'
+    metadata, _ = parse_header_metadata 'David Heinemeier Hansson'
     assert_equal 7, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'David Heinemeier Hansson', metadata['author']
@@ -314,7 +318,7 @@ context "Lexer" do
   end
 
   test "parse author first middle last email" do
-    metadata, = parse_header_metadata 'David Heinemeier Hansson <rails@ruby-lang.org>'
+    metadata, _ = parse_header_metadata 'David Heinemeier Hansson <rails@ruby-lang.org>'
     assert_equal 8, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'David Heinemeier Hansson', metadata['author']
@@ -327,7 +331,7 @@ context "Lexer" do
   end
 
   test "parse author first email" do
-    metadata, = parse_header_metadata 'Stuart <founder@asciidoc.org>'
+    metadata, _ = parse_header_metadata 'Stuart <founder@asciidoc.org>'
     assert_equal 6, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Stuart', metadata['author']
@@ -338,7 +342,7 @@ context "Lexer" do
   end
 
   test "parse author first last email" do
-    metadata, = parse_header_metadata 'Stuart Rackham <founder@asciidoc.org>'
+    metadata, _ = parse_header_metadata 'Stuart Rackham <founder@asciidoc.org>'
     assert_equal 7, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Stuart Rackham', metadata['author']
@@ -350,7 +354,7 @@ context "Lexer" do
   end
 
   test "parse author with hyphen" do
-    metadata, = parse_header_metadata 'Tim Berners-Lee <founder@www.org>'
+    metadata, _ = parse_header_metadata 'Tim Berners-Lee <founder@www.org>'
     assert_equal 7, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Tim Berners-Lee', metadata['author']
@@ -362,7 +366,7 @@ context "Lexer" do
   end
 
   test "parse author with single quote" do
-    metadata, = parse_header_metadata 'Stephen O\'Grady <founder@redmonk.com>'
+    metadata, _ = parse_header_metadata 'Stephen O\'Grady <founder@redmonk.com>'
     assert_equal 7, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Stephen O\'Grady', metadata['author']
@@ -374,7 +378,7 @@ context "Lexer" do
   end
 
   test "parse author with dotted initial" do
-    metadata, = parse_header_metadata 'Heiko W. Rupp <hwr@example.de>'
+    metadata, _ = parse_header_metadata 'Heiko W. Rupp <hwr@example.de>'
     assert_equal 8, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Heiko W. Rupp', metadata['author']
@@ -387,7 +391,7 @@ context "Lexer" do
   end
 
   test "parse author with underscore" do
-    metadata, = parse_header_metadata 'Tim_E Fella'
+    metadata, _ = parse_header_metadata 'Tim_E Fella'
     assert_equal 6, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Tim E Fella', metadata['author']
@@ -397,8 +401,31 @@ context "Lexer" do
     assert_equal 'TF', metadata['authorinitials']
   end
 
+  test 'parse author name with letters outside basic latin' do
+    metadata, _ = parse_header_metadata 'Stéphane Brontë'
+    assert_equal 6, metadata.size
+    assert_equal 1, metadata['authorcount']
+    assert_equal 'Stéphane Brontë', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
+    assert_equal 'Stéphane', metadata['firstname']
+    assert_equal 'Brontë', metadata['lastname']
+    assert_equal 'SB', metadata['authorinitials']
+  end if ::RUBY_MIN_VERSION_1_9
+
+  test 'parse ideographic author names' do
+    metadata, _ = parse_header_metadata '李 四 <si.li@example.com>'
+    assert_equal 7, metadata.size
+    assert_equal 1, metadata['authorcount']
+    assert_equal '李 四', metadata['author']
+    assert_equal metadata['author'], metadata['authors']
+    assert_equal '李', metadata['firstname']
+    assert_equal '四', metadata['lastname']
+    assert_equal 'si.li@example.com', metadata['email']
+    assert_equal '李四', metadata['authorinitials']
+  end if ::RUBY_MIN_VERSION_1_9
+
   test "parse author condenses whitespace" do
-    metadata, = parse_header_metadata '   Stuart       Rackham     <founder@asciidoc.org>'
+    metadata, _ = parse_header_metadata '   Stuart       Rackham     <founder@asciidoc.org>'
     assert_equal 7, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Stuart Rackham', metadata['author']
@@ -410,7 +437,7 @@ context "Lexer" do
   end
 
   test "parse invalid author line becomes author" do
-    metadata, = parse_header_metadata '   Stuart       Rackham, founder of AsciiDoc   <founder@asciidoc.org>'
+    metadata, _ = parse_header_metadata '   Stuart       Rackham, founder of AsciiDoc   <founder@asciidoc.org>'
     assert_equal 5, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Stuart Rackham, founder of AsciiDoc <founder@asciidoc.org>', metadata['author']
@@ -420,7 +447,7 @@ context "Lexer" do
   end
 
   test 'parse multiple authors' do
-    metadata, = parse_header_metadata 'Doc Writer <doc.writer@asciidoc.org>; John Smith <john.smith@asciidoc.org>'
+    metadata, _ = parse_header_metadata 'Doc Writer <doc.writer@asciidoc.org>; John Smith <john.smith@asciidoc.org>'
     assert_equal 2, metadata['authorcount']
     assert_equal 'Doc Writer, John Smith', metadata['authors']
     assert_equal 'Doc Writer', metadata['author']
@@ -429,7 +456,11 @@ context "Lexer" do
   end
 
   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"
+    input = <<-EOS
+Ryan Waldron
+v0.0.7, 2013-12-18: The first release you can stand on
+    EOS
+    metadata, _ = parse_header_metadata input
     assert_equal 9, metadata.size
     assert_equal '0.0.7', metadata['revnumber']
     assert_equal '2013-12-18', metadata['revdate']
@@ -437,39 +468,64 @@ context "Lexer" do
   end
 
   test "parse rev date" do
-    metadata, = parse_header_metadata "Ryan Waldron\n2013-12-18"
+    input = <<-EOS
+Ryan Waldron
+2013-12-18
+    EOS
+    metadata, _ = parse_header_metadata input
     assert_equal 7, metadata.size
     assert_equal '2013-12-18', metadata['revdate']
   end
 
   # 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"
+    input = <<-EOS
+Ryan Waldron
+foobar
+    EOS
+    metadata, _ = parse_header_metadata input
     assert_equal 7, 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"
+    input = <<-EOS
+Ryan Waldron
+2013-12-18:  The first release you can stand on
+    EOS
+    metadata, _ = parse_header_metadata input
     assert_equal 8, metadata.size
     assert_equal '2013-12-18', metadata['revdate']
     assert_equal 'The first release you can stand on', metadata['revremark']
   end
 
   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']
+    input = <<-EOS
+Joe Cool
+:page-layout: post
+    EOS
+    metadata, _ = parse_header_metadata input
+    refute_equal 'page-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']
+    input = <<-EOS
+Joe Cool
+ :Must start revremark-only line with space
+    EOS
+    metadata, _ = parse_header_metadata input
+    assert_equal 'Must start revremark-only 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"
+    input = <<-EOS
+// Asciidoctor
+// release artist
+Ryan Waldron
+    EOS
+    metadata, _ = parse_header_metadata input
     assert_equal 6, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Ryan Waldron', metadata['author']
@@ -479,7 +535,14 @@ context "Lexer" do
   end
 
   test "skip block comment before author" do
-    metadata, = parse_header_metadata "////\nAsciidoctor\nrelease artist\n////\nRyan Waldron"
+    input = <<-EOS
+////
+Asciidoctor
+release artist
+////
+Ryan Waldron
+    EOS
+    metadata, _ = parse_header_metadata input
     assert_equal 6, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Ryan Waldron', metadata['author']
@@ -489,7 +552,15 @@ context "Lexer" do
   end
 
   test "skip block comment before rev" do
-    metadata, = parse_header_metadata "Ryan Waldron\n////\nAsciidoctor\nrelease info\n////\nv0.0.7, 2013-12-18"
+    input = <<-EOS
+Ryan Waldron
+////
+Asciidoctor
+release info
+////
+v0.0.7, 2013-12-18
+    EOS
+    metadata, _ = parse_header_metadata input
     assert_equal 8, metadata.size
     assert_equal 1, metadata['authorcount']
     assert_equal 'Ryan Waldron', metadata['author']
@@ -500,13 +571,13 @@ context "Lexer" do
   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)
+    metadata = Asciidoctor::Parser.parse_header_metadata(reader, blankdoc)
     assert_equal 'SR', metadata['authorinitials']
     assert_equal 'SJR', blankdoc.attributes['authorinitials']
   end
 
   test 'reset block indent to 0' do
-    input = <<-EOS
+    input = <<-EOS.chomp
     def names
 
       @name.split ' '
@@ -514,7 +585,7 @@ context "Lexer" do
     end
     EOS
 
-    expected = <<-EOS
+    expected = <<-EOS.chomp
 def names
 
   @name.split ' '
@@ -522,13 +593,13 @@ def names
 end
     EOS
 
-    lines = input.lines.entries
-    Asciidoctor::Lexer.reset_block_indent! lines
-    assert_equal expected, lines.join
+    lines = input.split("\n")
+    Asciidoctor::Parser.reset_block_indent! lines
+    assert_equal expected, (lines * "\n")
   end
 
   test 'reset block indent mixed with tabs and spaces to 0' do
-    input = <<-EOS
+    input = <<-EOS.chomp
     def names
 
 \t  @name.split ' '
@@ -536,7 +607,7 @@ end
     end
     EOS
 
-    expected = <<-EOS
+    expected = <<-EOS.chomp
 def names
 
   @name.split ' '
@@ -544,13 +615,13 @@ def names
 end
     EOS
 
-    lines = input.lines.entries
-    Asciidoctor::Lexer.reset_block_indent! lines
-    assert_equal expected, lines.join
+    lines = input.split("\n")
+    Asciidoctor::Parser.reset_block_indent! lines
+    assert_equal expected, (lines * "\n")
   end
 
   test 'reset block indent to non-zero' do
-    input = <<-EOS
+    input = <<-EOS.chomp
     def names
 
       @name.split ' '
@@ -558,7 +629,7 @@ end
     end
     EOS
 
-    expected = <<-EOS
+    expected = <<-EOS.chomp
   def names
   
     @name.split ' '
@@ -566,9 +637,9 @@ end
   end
     EOS
 
-    lines = input.lines.entries
-    Asciidoctor::Lexer.reset_block_indent! lines, 2
-    assert_equal expected, lines.join
+    lines = input.split("\n")
+    Asciidoctor::Parser.reset_block_indent! lines, 2
+    assert_equal expected, (lines * "\n")
   end
 
   test 'preserve block indent' do
@@ -583,7 +654,7 @@ end
     expected = input
 
     lines = input.lines.entries
-    Asciidoctor::Lexer.reset_block_indent! lines, nil
+    Asciidoctor::Parser.reset_block_indent! lines, nil
     assert_equal expected, lines.join
   end
 
@@ -592,7 +663,7 @@ end
     expected = input
 
     lines = input.dup
-    Asciidoctor::Lexer.reset_block_indent! lines
+    Asciidoctor::Parser.reset_block_indent! lines
     assert_equal expected, lines
   end