RubyGems - jekyll-asciidoc - Versions diffs - 2.0.1 → 2.1.0 - Mend

jekyll-asciidoc 2.0.1 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

data/spec/fixtures/include_relative_to_root/source/about/index.adoc ADDED

@@ -0,0 +1,13 @@
+= About Us
+We provide content design services for open source tech companies.
+* docfile={docfile}
+* docdir={docdir}
+* outfile={outfile}
+* outdir={outdir}
+* outpath={outpath}
+== Our Team
+include::source/about/_people.adoc[]

data/spec/fixtures/tocify_filter/_config.yml ADDED

	@@ -0,0 +1,2 @@
1	+ gems:
2	+ - jekyll-asciidoc

data/spec/fixtures/tocify_filter/_layouts/default.html ADDED

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>{{ page.title }}</title>
+</head>
+<body>
+<div class="page-content">
+{{ content }}
+</div>
+<aside class="page-toc">
+{{ page.document | tocify_asciidoc: 2 }}
+</aside>
+</body>
+</html>

data/spec/fixtures/tocify_filter/index.adoc ADDED

@@ -0,0 +1,25 @@
+= Page Title
+== Major Section A
+content
+=== Minor Section A.1
+content
+== Major Section B
+content
+=== Minor Section B.1
+content
+==== Micro Section B.1.1
+content
+== Major Section C
+content

data/spec/fixtures/with_posts/_config.yml CHANGED

@@ -1,2 +1,6 @@
 gems:
   - jekyll-asciidoc
+asciidoctor:
+  # base_dir is set to :docdir here to verify excerpt conversion doesn't break
+  # we probably want to create a dedicated fixture for this scenario
+  base_dir: :docdir

data/spec/fixtures/with_posts/_layouts/post.html CHANGED

@@ -5,9 +5,17 @@
 <title>{{ page.title }}</title>
 </head>
 <body>
+<article class="post">
+<header class="post-header">
+<h1 class="post-title">{{ page.title }}</h1>
+<p class="post-details">
+<time class="date-published" datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time>
+</p>
+</header>
 <div class="post-content">
 {{ content }}
 </div>
+</article>
 <footer>
 <p>Footer for post layout.</p>
 </footer>

data/spec/fixtures/with_posts/_posts/2016-02-02-post-with-singular-vars.adoc ADDED

@@ -0,0 +1,7 @@
+= Post With Categories
+:page-category: node
+:page-categories: [code, javascript]
+:page-tag: tip
+:page-tags: [syntax, beginner]
+Lorem ipsum.

data/spec/fixtures/with_posts/_posts/2016-06-15-post-with-date.adoc ADDED

@@ -0,0 +1,4 @@
+= Post With Date
+:revdate: 2016-06-15 10:30:00
+Lorem ipsum.

data/spec/fixtures/with_posts/_posts/2016-07-15-post-with-date-and-tz.adoc ADDED

@@ -0,0 +1,4 @@
+= Post With Date and Time Zone
+:revdate: 2016-07-15 04:15:30 -0600
+Lorem ipsum.

data/spec/fixtures/with_posts/_posts/2016-07-20-post-with-date-in-revision-line.adoc ADDED

@@ -0,0 +1,6 @@
+= Post With Date in Revision Line
+Author Name
+// NOTE cannot use colon in date because it's used as the delimiter for the revision remark
+2016-07-20 05h45m25s -0600
+Lorem ipsum.

data/spec/fixtures/xhtml_syntax/images/sunset.jpg CHANGED

Binary file

data/spec/jekyll-asciidoc_spec.rb CHANGED

@@ -22,6 +22,10 @@ describe 'Jekyll::AsciiDoc' do
       'default_config'
     end
+    before :each do
+      site.object_id
+    end
     it 'should register AsciiDoc converter' do
       expect(site.converters.any? {|c| ::Jekyll::AsciiDoc::Converter === c }).to be true
     end
@@ -40,6 +44,15 @@ describe 'Jekyll::AsciiDoc' do
       expect(converter.output_ext '.adoc').to eql('.html')
     end
+    it 'should mark configuration as configured to prevent duplicate initialization' do
+      expect(asciidoc_config = site.config['asciidoc']).to be_a(::Jekyll::AsciiDoc::Configured)
+      expect(asciidoctor_config = site.config['asciidoctor']).to be_a(::Jekyll::AsciiDoc::Configured)
+      site.reset
+      site.setup
+      expect(site.config['asciidoc'].object_id).to eql(asciidoc_config.object_id)
+      expect(site.config['asciidoctor'].object_id).to eql(asciidoctor_config.object_id)
+    end
     it 'should use Asciidoctor to process AsciiDoc files by default' do
       expect(site.config['asciidoc']).to be_a(::Hash)
       expect(site.config['asciidoc']['processor']).to eql('asciidoctor')
@@ -93,6 +106,10 @@ describe 'Jekyll::AsciiDoc' do
       'legacy_config'
     end
+    before :each do
+      site.object_id
+    end
     it 'should allow processor to be set using asciidoc key' do
       expect(site.config['asciidoc']).to be_a(::Hash)
       expect(site.config['asciidoc']['processor']).to eql('asciidoctor')
@@ -114,6 +131,10 @@ describe 'Jekyll::AsciiDoc' do
       'hybrid_config'
     end
+    before :each do
+      site.object_id
+    end
     it 'should use new key for ext over legacy key' do
       expect(site.config['asciidoc']).to be_a(::Hash)
       expect(site.config['asciidoc']['ext']).to eql('asciidoc,adoc')
@@ -130,6 +151,10 @@ describe 'Jekyll::AsciiDoc' do
       'default_config'
     end
+    before :each do
+      site.object_id
+    end
     it 'should parse string as YAML value' do
       expect(integrator.send :parse_yaml_value, '').to eql('')
       expect(integrator.send :parse_yaml_value, 'true').to be true
@@ -150,11 +175,15 @@ describe 'Jekyll::AsciiDoc' do
       'imagesdir_relative_to_root'
     end
+    before :each do
+      site.object_id
+    end
     it 'should set imagesoutdir if imagesdir is relative to root' do
       expect(asciidoctor_config = site.config['asciidoctor']).to be_a(::Hash)
       expect(attrs = asciidoctor_config[:attributes]).to be_a(::Hash)
-      expect(attrs['imagesdir']).to eql('/images')
-      expect(attrs['imagesoutdir']).to eql(::File.join(site.dest, attrs['imagesdir']))
+      expect(attrs['imagesdir']).to eql('/images@')
+      expect(attrs['imagesoutdir']).to eql(::File.join site.dest, (attrs['imagesdir'].chomp '@'))
     end
   end
@@ -163,6 +192,10 @@ describe 'Jekyll::AsciiDoc' do
       'default_config'
     end
+    before :each do
+      site.object_id
+    end
     it 'should not set imagesoutdir if imagesdir is not set' do
       expect(asciidoctor_config = site.config['asciidoctor']).to be_a(::Hash)
       expect(attrs = asciidoctor_config[:attributes]).to be_a(::Hash)
@@ -176,43 +209,91 @@ describe 'Jekyll::AsciiDoc' do
       'default_config'
     end
+    before :each do
+      site.object_id
+    end
+    it 'should assign nil value to attribute for attribute with nil value' do
+      result = converter.send :assemble_attributes, { 'icons' => nil }
+      expect(result.key? 'icons').to be true
+      expect(result['icons']).to be_nil
+    end
     it 'should transform negated attribute with trailing ! to attribute with nil value' do
-      result = converter.send :hashify_attributes, {'icons!' => ''}
+      result = converter.send :assemble_attributes, { 'icons!' => '' }
       expect(result.key? 'icons').to be true
       expect(result['icons']).to be_nil
     end
     it 'should transform negated attribute with leading ! to attribute with nil value' do
-      result = converter.send :hashify_attributes, {'!icons' => ''}
+      result = converter.send :assemble_attributes, { '!icons' => '' }
       expect(result.key? 'icons').to be true
       expect(result['icons']).to be_nil
     end
-    it 'should remove existing attribute when attribute is unset' do
-      result = converter.send :hashify_attributes, {'icons' => 'font', '!icons' => ''}
+    it 'should set existing attribute to nil when attribute is unset' do
+      result = converter.send :assemble_attributes, { 'icons' => 'font', '!icons' => '' }
       expect(result.key? 'icons').to be true
       expect(result['icons']).to be_nil
     end
-    it 'should assign existing attribute to new value when set again' do
-      result = converter.send :hashify_attributes, ['!icons', 'icons=font']
+    it 'should assign value to existing attribute when set again' do
+      result = converter.send :assemble_attributes, ['!icons', 'icons=font', '!source-highlighter', 'source-highlighter=coderay']
       expect(result['icons']).to eql('font')
+      expect(result['source-highlighter']).to eql('coderay')
     end
     it 'should resolve attribute references in attribute value' do
-      result = converter.send :hashify_attributes,{'foo' => 'foo', 'bar' => 'bar', 'foobar' => '{foo}{bar}'}
+      result = converter.send :assemble_attributes, { 'foo' => 'foo', 'bar' => 'bar', 'baz' => nil, 'foobar' => '{foo}{bar}{baz}' }
+      expect(result['foobar']).to eql('foobar')
+    end
+    it 'should drop trailing @ from value when resolving attribute reference' do
+      result = converter.send :assemble_attributes, { 'foo' => 'foo@', 'bar' => 'bar@', 'baz' => '@', 'foobar' => '{foo}{bar}{baz}' }
       expect(result['foobar']).to eql('foobar')
     end
     it 'should not resolve escaped attribute reference' do
-      result = converter.send :hashify_attributes, {'foo' => 'foo', 'bar' => 'bar', 'foobar' => '{foo}\{bar}'}
+      result = converter.send :assemble_attributes, { 'foo' => 'foo', 'bar' => 'bar', 'foobar' => '{foo}\{bar}' }
       expect(result['foobar']).to eql('foo{bar}')
     end
     it 'should leave unresolved attribute reference in place' do
-      result = converter.send :hashify_attributes, {'foo' => 'foo', 'foobar' => '{foo}{bar}'}
+      result = converter.send :assemble_attributes, { 'foo' => 'foo', 'foobar' => '{foo}{bar}' }
       expect(result['foobar']).to eql('foo{bar}')
     end
+    it 'should remove matching attribute if attribute starts with minus' do
+      result = converter.send :assemble_attributes, { '-idseparator' => '' }, { 'idseparator' => '-' }
+      expect(result).to be_empty
+    end
+    it 'should not fail if attribute to be removed does not exist' do
+      result = converter.send :assemble_attributes, { '-idseparator' => '' }
+      expect(result).to be_empty
+    end
+    it 'should assign empty string to attribute if value is true' do
+      result = converter.send :assemble_attributes, { 'icons' => true }
+      expect(result['icons']).to eql('')
+    end
+    it 'should assign nil value to attribute if value is false' do
+      result = converter.send :assemble_attributes, { 'icons' => false }
+      expect(result.key? 'icons').to be true
+      expect(result['icons']).to be_nil
+    end
+    it 'should assign numeric value as string if value is numeric' do
+      result = converter.send :assemble_attributes, { 'count' => 1 }
+      expect(result['count']).to eql('1')
+    end
+    it 'should pass through Date value to attribute if value is Date' do
+      date = ::Date.parse('2016-01-01')
+      result = converter.send :assemble_attributes, { 'localdate' => date }
+      expect(result['localdate']).to eql(date)
+    end
   end
   describe 'attributes as hash' do
@@ -220,6 +301,10 @@ describe 'Jekyll::AsciiDoc' do
       'attributes_as_hash'
     end
+    before :each do
+      site.object_id
+    end
     it 'should merge attributes defined as a Hash into the attributes Hash' do
       expect(asciidoctor_config = site.config['asciidoctor']).to be_a(::Hash)
       expect(attrs = asciidoctor_config[:attributes]).to be_a(::Hash)
@@ -236,6 +321,10 @@ describe 'Jekyll::AsciiDoc' do
       'attributes_as_array'
     end
+    before :each do
+      site.object_id
+    end
     it 'should merge attributes defined as an Array into the attributes Hash' do
       expect(asciidoctor_config = site.config['asciidoctor']).to be_a(::Hash)
       expect(attrs = asciidoctor_config[:attributes]).to be_a(::Hash)
@@ -252,9 +341,7 @@ describe 'Jekyll::AsciiDoc' do
       'alternate_page_attribute_prefix'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should strip trailing hyphen from page attribute prefix value' do
       expect(site.config['asciidoc']).to be_a(::Hash)
@@ -268,8 +355,8 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'permalink/index.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<div class="page-content">')
-      expect(contents).not_to match('<meta name="generator" content="Asciidoctor 1.5.4">')
+      expect(contents).to include('<div class="page-content">')
+      expect(contents).not_to include(%(<meta name="generator" content="Asciidoctor #{::Asciidoctor::VERSION}">))
     end
   end
@@ -278,9 +365,7 @@ describe 'Jekyll::AsciiDoc' do
       'blank_page_attribute_prefix'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should coerce null value for page attribute prefix to empty string' do
       expect(site.config['asciidoc']).to be_a(::Hash)
@@ -294,8 +379,8 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'permalink/index.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<div class="page-content">')
-      expect(contents).not_to match('<meta name="generator" content="Asciidoctor 1.5.4">')
+      expect(contents).to include('<div class="page-content">')
+      expect(contents).not_to include(%(<meta name="generator" content="Asciidoctor #{::Asciidoctor::VERSION}">))
     end
   end
@@ -304,9 +389,7 @@ describe 'Jekyll::AsciiDoc' do
       'basic_site'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should consider a plain AsciiDoc file to have a YAML header' do
       file = source_file 'without-front-matter-header.adoc'
@@ -317,14 +400,14 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'without-front-matter-header.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Lorem ipsum.</p>')
+      expect(contents).to include('<p>Lorem ipsum.</p>')
     end
     it 'should promote AsciiDoc document title to page title' do
       file = output_file 'without-front-matter-header.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Page Title</title>')
+      expect(contents).to include('<title>Page Title</title>')
     end
     it 'should convert an AsciiDoc with no doctitle or AsciiDoc header' do
@@ -334,8 +417,8 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'no-doctitle.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Site Title</title>')
-      expect(contents).to match(%(<p>Just content.\nLorem ipsum.</p>))
+      expect(contents).to include('<title>Site Title</title>')
+      expect(contents).to include(%(<p>Just content.\nLorem ipsum.</p>))
     end
     it 'should convert an AsciiDoc with bare AsciiDoc header' do
@@ -346,8 +429,8 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'bare/index.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Site Title</title>')
-      expect(contents).to match(%(<p>Just content.\nLorem ipsum.</p>))
+      expect(contents).to include('<title>Site Title</title>')
+      expect(contents).to include(%(<p>Just content.\nLorem ipsum.</p>))
     end
     it 'should consider an AsciiDoc file with a front matter header to have a YAML header' do
@@ -359,22 +442,36 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'with-front-matter-header.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Page Title</title>')
-      expect(contents).to match('<p>Lorem ipsum.</p>')
+      expect(contents).to include('<title>Page Title</title>')
+      expect(contents).to include('<p>Lorem ipsum.</p>')
+    end
+    it 'should apply explicit id and role attributes on section titles' do
+      file = output_file 'section-with-id-and-role.html'
+      expect(::File).to exist(file)
+      contents = ::File.read file
+      expect(contents).to include(%(<div class="sect1 section-role">\n<h2 id="section-id">Section Title</h2>))
+    end
+    it 'should assign AsciiDoc document id, if set, to docid page attribute' do
+      page = find_page 'docid.adoc'
+      expect(page).not_to be_nil
+      expect(page.data.key? 'docid').to be true
+      expect(page.data['docid']).to eq('page-id')
     end
     it 'should not use Liquid preprocessor by default' do
       file = output_file 'no-liquid.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>{{ page.title }}</p>')
+      expect(contents).to include('<p>{{ page.title }}</p>')
     end
     it 'should enable Liquid preprocessor if liquid page variable is set' do
       file = output_file 'liquid-enabled.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Liquid Enabled</p>')
+      expect(contents).to include('<p>Liquid Enabled</p>')
     end
     it 'should not publish a page if the published page variable is set in the AsciiDoc header' do
@@ -386,55 +483,53 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'standalone-a.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<meta name="generator" content="Asciidoctor 1.5.4">')
-      expect(contents).to match('<title>Standalone Page A</title>')
-      expect(contents).to match('<h1>Standalone Page A</h1>')
+      expect(contents).to include(%(<meta name="generator" content="Asciidoctor #{::Asciidoctor::VERSION}">))
+      expect(contents).to include('<title>Standalone Page A</title>')
+      expect(contents).to include('<h1>Standalone Page A</h1>')
     end
     it 'should output a standalone HTML page if the page-layout attribute is false' do
       file = output_file 'standalone-b.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<meta name="generator" content="Asciidoctor 1.5.4">')
-      expect(contents).to match('<title>Standalone Page B</title>')
-      expect(contents).to match('<h1>Standalone Page B</h1>')
+      expect(contents).to include(%(<meta name="generator" content="Asciidoctor #{::Asciidoctor::VERSION}">))
+      expect(contents).to include('<title>Standalone Page B</title>')
+      expect(contents).to include('<h1>Standalone Page B</h1>')
     end
     it 'should apply layout named page to page content if page-layout attribute not specified' do
       file = output_file 'without-front-matter-header.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for page layout.</p>')
+      expect(contents).to include('<p>Footer for page layout.</p>')
     end
     it 'should apply layout named page to page content if page-layout attribute is empty' do
       file = output_file 'empty-layout.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for page layout.</p>')
+      expect(contents).to include('<p>Footer for page layout.</p>')
     end
     it 'should apply layout named page to page content if page-layout attribute has value _auto' do
       file = output_file 'auto-layout.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for page layout.</p>')
+      expect(contents).to include('<p>Footer for page layout.</p>')
     end
     it 'should apply specified layout to page content if page-layout has non-empty string value' do
       file = output_file 'custom-layout.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for custom layout.</p>')
+      expect(contents).to include('<p>Footer for custom layout.</p>')
     end
     it 'should not apply a layout to page content if page-layout attribute is nil' do
       file = output_file 'nil-layout.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('div class="paragraph">
-<p>Lorem ipsum.</p>
-</div>')
+      expect(contents).to include(%(div class="paragraph">\n<p>Lorem ipsum.</p>\n</div>))
     end
     it 'should convert an empty page attribute value to empty string' do
@@ -448,10 +543,10 @@ describe 'Jekyll::AsciiDoc' do
       out_file = output_file 'subdir/page-in-subdir.html'
       expect(::File).to exist(out_file)
       contents = ::File.read out_file
-      expect(contents).to match(%(docdir=#{::Dir.pwd}))
+      expect(contents).to include(%(docdir=#{::Dir.pwd}))
       if ::Jekyll::MIN_VERSION_3
-        expect(contents).to match(%(docfile=#{src_file}))
-        expect(contents).to match(%(docname=#{::File.basename src_file, '.adoc'}))
+        expect(contents).to include(%(docfile=#{src_file}))
+        expect(contents).to include(%(docname=#{::File.basename src_file, '.adoc'}))
       end
     end
@@ -474,11 +569,9 @@ describe 'Jekyll::AsciiDoc' do
       'explicit_site_time'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
-    it 'should set localdatetime on AsciiDoc pages to match site time and timezone' do
+    it 'should set localdatetime on AsciiDoc pages to match site time and time zone' do
       expect(asciidoctor_config = site.config['asciidoctor']).to be_a(::Hash)
       expect(attrs = asciidoctor_config[:attributes]).to be_a(::Hash)
       expect(attrs['localdate']).to eql(site.time.strftime '%Y-%m-%d')
@@ -486,7 +579,7 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'home.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match(%(localdatetime=#{site.time.strftime '%Y-%m-%d %H:%M:%S %Z'}))
+      expect(contents).to include(%(localdatetime=#{site.time.strftime '%Y-%m-%d %H:%M:%S %Z'}))
     end
   end
@@ -495,9 +588,7 @@ describe 'Jekyll::AsciiDoc' do
       'safe_mode'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should register converter and generator when running in safe mode' do
       expect(site.converters.any? {|c| ::Jekyll::AsciiDoc::Converter === c }).to be true
@@ -508,8 +599,8 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'home.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Home Page</title>')
-      expect(contents).to match('<p>Footer for home layout.</p>')
+      expect(contents).to include('<title>Home Page</title>')
+      expect(contents).to include('<p>Footer for home layout.</p>')
     end
   end
@@ -518,29 +609,27 @@ describe 'Jekyll::AsciiDoc' do
       'fallback_to_default_layout'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should use default layout for page if page layout is not available' do
       file = output_file 'home.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for default layout.</p>')
+      expect(contents).to include('<p>Footer for default layout.</p>')
     end
     it 'should use default layout for post if post layout is not available' do
       file = output_file '2016/01/01/post.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for default layout.</p>')
+      expect(contents).to include('<p>Footer for default layout.</p>')
     end
     it 'should use default layout for document if layout for document collection is not available' do
       file = output_file 'blueprints/blueprint.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for default layout.</p>')
+      expect(contents).to include('<p>Footer for default layout.</p>')
     end
   end
@@ -549,9 +638,7 @@ describe 'Jekyll::AsciiDoc' do
       'require_front_matter_header'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should consider an AsciiDoc file with a front matter header to have a YAML header' do
       file = source_file 'with-front-matter-header.adoc'
@@ -567,8 +654,8 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'with-front-matter-header.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Page Title</title>')
-      expect(contents).to match('<p>Lorem ipsum.</p>')
+      expect(contents).to include('<title>Page Title</title>')
+      expect(contents).to include('<p>Lorem ipsum.</p>')
     end
     it 'should not convert an AsciiDoc file without a front matter header' do
@@ -594,8 +681,8 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file '2016/01/01/welcome.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Welcome, Visitor!</title>')
-      expect(contents).not_to match('<h1>Welcome, Visitor!</h1>')
+      expect(contents).to include('<title>Welcome, Visitor!</title>')
+      expect(contents).not_to include('<h1>Welcome, Visitor!</h1>')
     end
     it 'should use automatic title if no document title is given' do
@@ -609,7 +696,7 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file '2016/05/31/automatic-title.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Automatic Title</title>')
+      expect(contents).to include('<title>Automatic Title</title>')
     end
     it 'should set author of post to value defined in AsciiDoc header' do
@@ -622,45 +709,44 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file '2016/01/01/welcome.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for post layout.</p>')
+      expect(contents).to include('<p>Footer for post layout.</p>')
     end
     it 'should apply layout named post to post content if page-layout attribute is empty' do
       file = output_file '2016/01/02/empty-layout.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for post layout.</p>')
+      expect(contents).to include('<p>Footer for post layout.</p>')
     end
     it 'should apply layout named post to post content if page-layout attribute has value _auto' do
       file = output_file '2016/01/03/auto-layout.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for post layout.</p>')
+      expect(contents).to include('<p>Footer for post layout.</p>')
     end
     it 'should apply custom layout to post content if page-layout attribute has non-empty string value' do
       file = output_file '2016/01/04/custom-layout.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for custom layout.</p>')
+      expect(contents).to include('<p>Footer for custom layout.</p>')
     end
     it 'should not apply a layout to post content if page-layout attribute is nil' do
       file = output_file '2016/01/05/nil-layout.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('div class="paragraph">
-<p>Lorem ipsum.</p>
-</div>')
+      expect(contents).to include(%(div class="paragraph">\n<p>Lorem ipsum.</p>\n</div>))
     end
     it 'should show the title above the content if the showtitle attribute is set' do
       file = output_file '2016/04/01/show-me-the-title.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<title>Show Me the Title</title>')
-      expect(contents).to match('<h1>Show Me the Title</h1>')
+      expect(contents).to include('<title>Show Me the Title</title>')
+      expect(contents).to include('<h1 class="post-title">Show Me the Title</h1>')
+      expect(contents).to include('<h1>Show Me the Title</h1>')
     end
     it 'should interpret value of page attribute as YAML data' do
@@ -673,6 +759,60 @@ describe 'Jekyll::AsciiDoc' do
       end
     end
+    it 'should merge singular variables with collection variables' do
+      post = find_post '2016-02-02-post-with-singular-vars.adoc'
+      expect(post).not_to be_nil
+      expect(post.data['categories']).to eql(['code', 'javascript', 'node'])
+      expect(post.data['tags']).to eql(['syntax', 'beginner', 'tip'])
+      if ::Jekyll::MIN_VERSION_3
+        file = output_file 'code/javascript/node/2016/02/02/post-with-singular-vars.html'
+        expect(::File).to exist(file)
+      end
+    end
+    it 'should convert revdate to local Time object and use it as date of post' do
+      # NOTE Time.parse without time zone assumes time zone of site
+      date = ::Time.parse('2016-06-15 10:30:00')
+      date = date.localtime if ::Jekyll::MIN_VERSION_3
+      slug = 'post-with-date'
+      post = find_post %(#{date.strftime '%Y-%m-%d'}-#{slug}.adoc)
+      expect(post).not_to be_nil
+      expect(post.data['date']).to be_a(::Time)
+      expect(post.data['date'].to_s).to eql(date.to_s)
+      file = output_file %(#{date.strftime '%Y/%m/%d'}/#{slug}.html)
+      expect(::File).to exist(file)
+      contents = ::File.read file
+      expect(contents).to include(%(<time class="date-published" datetime="#{date.xmlschema}">#{date.strftime '%B %d, %Y'}</time>))
+    end
+    it 'should convert revdate with time zone to local Time object and use it as date of post' do
+      date = ::Time.parse('2016-07-15 04:15:30 -0600')
+      date = date.localtime if ::Jekyll::MIN_VERSION_3
+      slug = 'post-with-date-and-tz'
+      post = find_post %(#{date.strftime '%Y-%m-%d'}-#{slug}.adoc)
+      expect(post).not_to be_nil
+      expect(post.data['date']).to be_a(::Time)
+      expect(post.data['date'].to_s).to eql(date.to_s)
+      file = output_file %(#{date.strftime '%Y/%m/%d'}/#{slug}.html)
+      expect(::File).to exist(file)
+      contents = ::File.read file
+      expect(contents).to include(%(<time class="date-published" datetime="#{date.xmlschema}">#{date.strftime '%B %d, %Y'}</time>))
+    end
+    it 'should convert revdate in revision line to local Time object and use it as date of post' do
+      date = ::Time.parse('2016-07-20 05:45:25 -0600')
+      date = date.localtime if ::Jekyll::MIN_VERSION_3
+      slug = 'post-with-date-in-revision-line'
+      post = find_post %(#{date.strftime '%Y-%m-%d'}-#{slug}.adoc)
+      expect(post).not_to be_nil
+      expect(post.data['date']).to be_a(::Time)
+      expect(post.data['date'].to_s).to eql(date.to_s)
+      file = output_file %(#{date.strftime '%Y/%m/%d'}/#{slug}.html)
+      expect(::File).to exist(file)
+      contents = ::File.read file
+      expect(contents).to include(%(<time class="date-published" datetime="#{date.xmlschema}">#{date.strftime '%B %d, %Y'}</time>))
+    end
     it 'should process AsciiDoc header of draft post' do
       draft = find_draft 'a-draft-post.adoc'
       expect(draft).not_to be_nil
@@ -682,11 +822,11 @@ describe 'Jekyll::AsciiDoc' do
       expect(::File).to exist(file)
     end
-    it 'should apply asciidocify filter' do
+    it 'should apply asciidocify filter to excerpt' do
       file = output_file 'index.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p class="excerpt">This is the <em>excerpt</em> of this post.</p>')
+      expect(contents).to include('<p class="excerpt">This is the <em>excerpt</em> of this post.</p>')
     end
   end
@@ -710,52 +850,95 @@ describe 'Jekyll::AsciiDoc' do
       contents = ::File.read file
       expect(contents).to be_empty
     end
-  end
+  end unless windows?
-  describe 'site with include relative to doc' do
+  describe 'site with include relative to docdir' do
     let :name do
-      'include_relative_to_doc'
+      'include_relative_to_docdir'
     end
-    before :each do
-      site.process
+    before(:each) { site.process }
+    it 'should not expand base_dir when base_dir config key has value :docdir' do
+      expect(site.config['asciidoctor'][:base_dir]).to eql(:docdir)
     end
-    it 'should resolve includes relative to docdir when base_dir config key has value :docdir' do
+    it 'should resolve include relative to docdir when base_dir config key has value :docdir' do
       src_file = source_file 'about/index.adoc'
       out_file = output_file 'about/index.html'
       expect(::File).to exist(out_file)
       contents = ::File.read out_file
-      expect(contents).to match('Doc Writer')
-      expect(contents).to match(%(docfile=#{src_file}))
-      expect(contents).to match(%(docdir=#{::File.dirname src_file}))
-      expect(contents).to match(%(outfile=#{out_file}))
-      expect(contents).to match(%(outdir=#{::File.dirname out_file}))
-      expect(contents).to match(%(outpath=/about/))
+      expect(contents).to include('Doc Writer')
+      expect(contents).to include(%(docfile=#{src_file}))
+      expect(contents).to include(%(docdir=#{::File.dirname src_file}))
+      expect(contents).to include(%(outfile=#{out_file}))
+      expect(contents).to include(%(outdir=#{::File.dirname out_file}))
+      expect(contents).to include(%(outpath=/about/))
     end
   end if ::Jekyll::MIN_VERSION_3
+  describe 'site with include relative to root' do
+    let :name do
+      'include_relative_to_root'
+    end
+    let :config do
+      ::Jekyll.configuration((fixture_site_params name).merge('source' => (::File.join (source_dir name), 'source')))
+    end
+    before(:each) {
+      @old_pwd = ::Dir.pwd
+      ::Dir.chdir(source_dir name)
+      site.process
+    }
+    after(:each) {
+      ::Dir.chdir(@old_pwd)
+    }
+    it 'should not set base_dir if base_dir config key has no value' do
+      expect(site.config['asciidoctor'].key? :base_dir).to be false
+    end
+    it 'should resolve include relative to root when base_dir is not set' do
+      src_file = source_file 'about/index.adoc'
+      out_file = output_file 'about/index.html'
+      expect(::File).to exist(out_file)
+      contents = ::File.read out_file
+      expect(contents).to include('Doc Writer')
+      expect(contents).to include(%(docdir=#{::Dir.pwd}))
+      if ::Jekyll::MIN_VERSION_3
+        expect(contents).to include(%(docfile=#{src_file}))
+        expect(contents).to include(%(outfile=#{out_file}))
+        expect(contents).to include(%(outdir=#{::File.dirname out_file}))
+        expect(contents).to include(%(outpath=/about/))
+      end
+    end
+  end
   describe 'site with include relative to source' do
     let :name do
       'include_relative_to_source'
     end
-    before :each do
-      site.process
+    before(:each) { site.process }
+    it 'should expand base_dir to match site source when base_dir config key has value :source' do
+      expect(site.config['asciidoctor'][:base_dir]).to eql(site.source)
     end
-    it 'should resolve includes relative to source when base_dir config key has value :source' do
+    it 'should resolve include relative to source when base_dir config key has value :source' do
       src_file = source_file 'about/index.adoc'
       out_file = output_file 'about/index.html'
       expect(::File).to exist(out_file)
       contents = ::File.read out_file
-      expect(contents).to match('Doc Writer')
-      expect(contents).to match(%(docdir=#{site.source}))
+      expect(contents).to include('Doc Writer')
+      expect(contents).to include(%(docdir=#{site.source}))
       if ::Jekyll::MIN_VERSION_3
-        expect(contents).to match(%(docfile=#{src_file}))
-        expect(contents).to match(%(outfile=#{out_file}))
-        expect(contents).to match(%(outdir=#{::File.dirname out_file}))
-        expect(contents).to match(%(outpath=/about/))
+        expect(contents).to include(%(docfile=#{src_file}))
+        expect(contents).to include(%(outfile=#{out_file}))
+        expect(contents).to include(%(outdir=#{::File.dirname out_file}))
+        expect(contents).to include(%(outpath=/about/))
       end
     end
@@ -770,15 +953,12 @@ describe 'Jekyll::AsciiDoc' do
       'with_custom_collection'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should decorate document in custom collection' do
       doc = find_doc 'blueprint-a.adoc', 'blueprints'
       expect(doc).not_to be_nil
       expect(doc.data['title']).to eql('First Blueprint')
-      expect(doc.title).to eql('First Blueprint') if ::Jekyll::MIN_VERSION_3
       expect(doc.data['foo']).to eql('bar')
     end
@@ -786,14 +966,14 @@ describe 'Jekyll::AsciiDoc' do
       file = output_file 'blueprints/blueprint-a.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for blueprint layout.</p>')
+      expect(contents).to include('<p>Footer for blueprint layout.</p>')
     end
     it 'should allow the layout to be customized' do
       file = output_file 'blueprints/blueprint-b.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<p>Footer for default layout.</p>')
+      expect(contents).to include('<p>Footer for default layout.</p>')
     end
     it 'should set docdir for document in custom collection when base_dir config key has the value :docdir' do
@@ -801,11 +981,11 @@ describe 'Jekyll::AsciiDoc' do
       out_file = output_file 'blueprints/blueprint-b.html'
       expect(::File).to exist(out_file)
       contents = ::File.read out_file
-      expect(contents).to match(%(docfile=#{src_file}))
-      expect(contents).to match(%(docdir=#{::File.dirname src_file}))
-      expect(contents).to match(%(outfile=#{out_file}))
-      expect(contents).to match(%(outdir=#{::File.dirname out_file}))
-      expect(contents).to match(%(outpath=/blueprints/blueprint-b.html))
+      expect(contents).to include(%(docfile=#{src_file}))
+      expect(contents).to include(%(docdir=#{::File.dirname src_file}))
+      expect(contents).to include(%(outfile=#{out_file}))
+      expect(contents).to include(%(outdir=#{::File.dirname out_file}))
+      expect(contents).to include(%(outpath=/blueprints/blueprint-b.html))
     end if ::Jekyll::MIN_VERSION_3
   end
@@ -814,9 +994,7 @@ describe 'Jekyll::AsciiDoc' do
       'pygments_code_highlighting'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should write the pygments stylesheet to the stylesdir' do
       src_file = source_file 'css/asciidoc-pygments.css'
@@ -827,7 +1005,7 @@ describe 'Jekyll::AsciiDoc' do
         src_content = ::File.read src_file
         out_content = ::File.read out_file
         expect(src_content).to eql(out_content)
-        expect(src_content).to match('.pygments .tok-c')
+        expect(src_content).to include('.pygments .tok-c')
       ensure
         if ::File.exist? src_file
           ::File.delete src_file
@@ -844,14 +1022,13 @@ describe 'Jekyll::AsciiDoc' do
         out_content = ::File.read src_file
         attrs = site.config['asciidoctor'][:attributes]
         attrs['pygments-style'] = 'monokai'
-        integrator = site.generators.find {|g| ::Jekyll::AsciiDoc::Integrator === g }
         integrator.generate_pygments_stylesheet site, attrs
         expect(::File.read src_file).not_to eql(src_content)
         ::Jekyll::StaticFile.reset_cache
         site.process
         new_out_content = ::File.read out_file
         expect(new_out_content).not_to eql(out_content)
-        expect(new_out_content).to match('background-color: #49483e')
+        expect(new_out_content).to include('background-color: #49483e')
       ensure
         if ::File.exist? src_file
           ::File.delete src_file
@@ -866,15 +1043,31 @@ describe 'Jekyll::AsciiDoc' do
       'xhtml_syntax'
     end
-    before :each do
-      site.process
-    end
+    before(:each) { site.process }
     it 'should output xhtml if asciidoctor backend option is xhtml' do
       file = output_file 'home.html'
       expect(::File).to exist(file)
       contents = ::File.read file
-      expect(contents).to match('<img src="/images/sunset.jpg" alt="Sunset" width="408" height="230"/>')
+      expect(contents).to include('<img src="/images/sunset.jpg" alt="Sunset" width="408" height="230"/>')
     end
   end
+  describe 'tocify filter' do
+    let :name do
+      'tocify_filter'
+    end
+    before(:each) { site.process }
+    it 'should generate document outline when tocify_asciidoc filter is applied to page.document' do
+      file = output_file 'index.html'
+      expect(::File).to exist(file)
+      contents = ::File.read file
+      aside = contents.match(/<aside class="page-toc">.*<\/aside>/m)[0]
+      expect(aside).to include('<ul class="sectlevel1">')
+      expect(aside).to include('<a href="#major-section-a">Major Section A</a>')
+      expect(aside).not_to include('Micro Section')
+    end
+  end if ::Jekyll::MIN_VERSION_3
 end