jekyll-asciidoc 3.0.0.beta.1 → 3.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df9c038b47a511b9b26c4c9e8f585f5d6e89b747f47cfa09f2e257edb26e73bf
-  data.tar.gz: 86591c6545adce1715f2f3afd5032671748e33013ccc567599bd0362101ae9aa
+  metadata.gz: 6b2a064cf1ceff4378a24a1d48ce6249bcd33a686b1a1392c2255adf95c00cbc
+  data.tar.gz: e72bda16edd69136e9a73b1c0ccfc3767a4bf07d887f1fcee9947cd875abd3dd
 SHA512:
-  metadata.gz: 5afb33673bed24e8448ab7cb4def0a6cb3606c9bdc0d69ac6dac15c374f6aa17de50a765416447699486765c5ffefaf9b5323c0e1af282e64f08956c001fbeef
-  data.tar.gz: 7d5dbf5562d3c260555947dc264287693f5bedcf36e51e0fa63a93875013bce949f9545ddf7d318ce6485e86bae01dd2587f917ac87b00868c4da1edc7a60cb2
+  metadata.gz: 35f25b4477a7e9d721551738e91914ae30a5de1860a9b64908583fe9f0700a16bc40d0fb2764b446fd56196c60b818304eb76248fc9f96aaaeccbb35caa5ba3a
+  data.tar.gz: f59b45c2c182f9f4029e5ed711a675f31ce7c9b491ef075c28772b50e6a972585167ee1d4159ca158dac00ce3f4c09e0d1b34af73594682ff6aa539fcb354c74

data/.yardopts

@@ -0,0 +1,11 @@
+--charset UTF-8
+--readme README.adoc
+--no-private
+--hide-api private
+--title "Jekyll AsciiDoc API Docs"
+--output-dir apidoc
+--exclude /(?:core|jekyll)_ext/
+lib/**/*.rb
+-
+CHANGELOG.adoc
+LICENSE.adoc

data/CHANGELOG.adoc

@@ -1,9 +1,17 @@
 = {project-name} Changelog
 :project-name: Jekyll AsciiDoc Plugin
-:uri-repo: https://github.com/asciidoctor/jekyll-asciidoc
+:url-repo: https://github.com/asciidoctor/jekyll-asciidoc
 
 This document provides a high-level view of the changes to the {project-name} by release.
-For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
+For a detailed view of what has changed, refer to the {url-repo}/commits/master[commit history] on GitHub.
+
+== 3.0.0.beta.2 (2019-06-03) - @mojavelinux
+
+* allow site-wide AsciiDoc attributes to also be defined on `asciidoc` key in site configuration (#126)
+* set date page variable from revdate for any document in a collection (posts or otherwise) (#202)
+* allow non-ASCII word character to be used in name of attribute reference in config file
+* use File.write instead of IO.write (as IO.write has extra magic we don't need)
+* auto-generate excerpts for posts and documents written in AsciiDoc (#200)
 
 == 3.0.0.beta.1 (2018-12-29) - @mojavelinux
 
@@ -98,15 +106,15 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * Document how to use plugin with GitLab Pages (#47)
 * Document `asciidocify` Liquid filter
 
-{uri-repo}/issues?q=milestone%3Av2.0.0[issues resolved] |
-{uri-repo}/releases/tag/v2.0.0[git tag]
+{url-repo}/issues?q=milestone%3Av2.0.0[issues resolved] |
+{url-repo}/releases/tag/v2.0.0[git tag]
 
 == 1.1.2 (2016-05-10) - @mkobit
 
 * Apply fix for documents that did not contain at least one attribute beginning with `page-` (#60)
 
-{uri-repo}/issues?q=milestone%3Av1.1.2[issues resolved] |
-{uri-repo}/releases/tag/v1.1.2[git tag]
+{url-repo}/issues?q=milestone%3Av1.1.2[issues resolved] |
+{url-repo}/releases/tag/v1.1.2[git tag]
 
 == 1.1.1 (2016-05-07) - @mkobit
 
@@ -119,8 +127,8 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * Only configure the Asciidoctor options once (previously it was being called twice in serve mode)
 * Set `env` attribute to `site` instead of `jekyll` (#55)
 
-{uri-repo}/issues?q=milestone%3Av1.1.1[issues resolved] |
-{uri-repo}/releases/tag/v1.1.1[git tag]
+{url-repo}/issues?q=milestone%3Av1.1.1[issues resolved] |
+{url-repo}/releases/tag/v1.1.1[git tag]
 
 == 1.0.1 (2016-03-19) - @mkobit
 
@@ -131,12 +139,12 @@ It is still compatible with Jekyll 2.
 * Documentation and onboarding improvements (#25, #24)
 * Improvements to release process (#28)
 
-{uri-repo}/issues?q=milestone%3Av1.0.1[issues resolved] |
-{uri-repo}/releases/tag/v1.0.1[git tag]
+{url-repo}/issues?q=milestone%3Av1.0.1[issues resolved] |
+{url-repo}/releases/tag/v1.0.1[git tag]
 
 == 1.0.0 (2015-01-04) - @paulrayner
 
 Initial release.
 
-{uri-repo}/issues?q=milestone%3Av1.0.0[issues resolved] |
-{uri-repo}/releases/tag/v1.0.0[git tag]
+{url-repo}/issues?q=milestone%3Av1.0.0[issues resolved] |
+{url-repo}/releases/tag/v1.0.0[git tag]

data/Gemfile

@@ -1,8 +1,12 @@
 source 'https://rubygems.org'
+
 gemspec
 
+gem 'asciidoctor', ENV['ASCIIDOCTOR_VERSION'], require: false if ENV.key? 'ASCIIDOCTOR_VERSION'
 gem 'jekyll', %(~> #{ENV['JEKYLL_VERSION']}), require: false if ENV.key? 'JEKYLL_VERSION'
-gem 'pygments.rb', '~> 1.2.1', require: false
-gem 'rubocop', '~> 0.61.1', require: false
 # NOTE Windows does not include zoneinfo files, so load tzinfo-data gem
 gem 'tzinfo-data', platform: [:x64_mingw, :mingw], require: false
+
+group :docs do
+  gem 'yard', require: false
+end

data/README.adoc

@@ -1,6 +1,6 @@
 = Jekyll AsciiDoc Plugin (powered by Asciidoctor)
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Paul Rayner <https://github.com/paulrayner[@paulrayner]>
-v3.0.0.beta.1, 2018-12-29
+v3.0.0.beta.2, 2019-06-03
 // Settings:
 :idprefix:
 :idseparator: -
@@ -24,53 +24,53 @@ endif::[]
 :conum-guard: {sp}
 ifndef::icons[:conum-guard: {sp}#{sp}]
 // URIs:
-:uri-repo: https://github.com/asciidoctor/jekyll-asciidoc
-:uri-issues: {uri-repo}/issues
-:uri-search-issues: {uri-repo}/search?type=Issues
-:uri-chat: https://gitter.im/asciidoctor/asciidoctor
-:uri-ci-travis: https://travis-ci.org/asciidoctor/jekyll-asciidoc
-:uri-ci-appveyor: https://ci.appveyor.com/project/asciidoctor/jekyll-asciidoc
-:uri-gem: http://rubygems.org/gems/jekyll-asciidoc
-:uri-gem-asciidoctor: http://rubygems.org/gems/asciidoctor
-:uri-asciidoc: http://asciidoc.org
-:uri-asciidoctor: http://asciidoctor.org
-:uri-asciidoctor-backends: https://github.com/asciidoctor/asciidoctor-backends
-:uri-asciidoctor-docs: {uri-asciidoctor}/docs
-:uri-asciidoctor-diagram: {uri-asciidoctor-docs}/asciidoctor-diagram
-:uri-asciidoctor-discuss: http://discuss.asciidoctor.org
-:uri-asciidoctor-manual: {uri-asciidoctor-docs}/user-manual
-:uri-asciidoc-practices: {uri-asciidoctor-docs}/asciidoc-recommended-practices
-:uri-jaq: https://github.com/asciidoctor/jekyll-asciidoc-quickstart
-:uri-jekyll: https://jekyllrb.com
-:uri-jekyll-docs: {uri-jekyll}/docs
-:uri-jekyll-discuss: https://talk.jekyllrb.com
-:uri-front-matter: {uri-jekyll-docs}/frontmatter
-:uri-liquid-templates: {uri-jekyll-docs}/templates
-:uri-variables: {uri-jekyll-docs}/variables
-:uri-graphviz: http://www.graphviz.org
-:uri-tilt: https://github.com/rtomayko/tilt
-:uri-yaml: https://en.wikipedia.org/wiki/YAML
-:uri-guide-publish-gem: http://guides.rubygems.org/publishing/#publishing-to-rubygemsorg
+:url-repo: https://github.com/asciidoctor/jekyll-asciidoc
+:url-issues: {url-repo}/issues
+:url-search-issues: {url-repo}/search?type=Issues
+:url-chat: https://gitter.im/asciidoctor/asciidoctor
+:url-ci-travis: https://travis-ci.org/asciidoctor/jekyll-asciidoc
+:url-ci-appveyor: https://ci.appveyor.com/project/asciidoctor/jekyll-asciidoc
+:url-gem: http://rubygems.org/gems/jekyll-asciidoc
+:url-gem-asciidoctor: http://rubygems.org/gems/asciidoctor
+:url-asciidoc: http://asciidoc.org
+:url-asciidoctor: http://asciidoctor.org
+:url-asciidoctor-backends: https://github.com/asciidoctor/asciidoctor-backends
+:url-asciidoctor-docs: {url-asciidoctor}/docs
+:url-asciidoctor-diagram: {url-asciidoctor-docs}/asciidoctor-diagram
+:url-asciidoctor-discuss: http://discuss.asciidoctor.org
+:url-asciidoctor-manual: {url-asciidoctor-docs}/user-manual
+:url-asciidoc-practices: {url-asciidoctor-docs}/asciidoc-recommended-practices
+:url-jaq: https://github.com/asciidoctor/jekyll-asciidoc-quickstart
+:url-jekyll: https://jekyllrb.com
+:url-jekyll-docs: {url-jekyll}/docs
+:url-jekyll-discuss: https://talk.jekyllrb.com
+:url-front-matter: {url-jekyll-docs}/frontmatter
+:url-liquid-templates: {url-jekyll-docs}/templates
+:url-variables: {url-jekyll-docs}/variables
+:url-graphviz: http://www.graphviz.org
+:url-tilt: https://github.com/rtomayko/tilt
+:url-yaml: https://en.wikipedia.org/wiki/YAML
+:url-guide-publish-gem: http://guides.rubygems.org/publishing/#publishing-to-rubygemsorg
 
 ifdef::status[]
-image:https://img.shields.io/gem/v/jekyll-asciidoc.svg[Latest Release, link={uri-gem}]
+image:https://img.shields.io/gem/v/jekyll-asciidoc.svg[Latest Release, link={url-gem}]
 image:https://img.shields.io/badge/license-MIT-blue.svg[MIT License, link=#copyright-and-license]
-image:https://img.shields.io/travis/asciidoctor/jekyll-asciidoc/master.svg[Build Status (Travis CI), link={uri-ci-travis}]
-image:https://ci.appveyor.com/api/projects/status/3cf1f8p2cyoaoc25/branch/master?svg=true&passingText=green%20bar&failingText=%23fail&pendingText=checking[Build Status (AppVeyor), link={uri-ci-appveyor}]
+image:https://img.shields.io/travis/asciidoctor/jekyll-asciidoc/master.svg[Build Status (Travis CI), link={url-ci-travis}]
+image:https://ci.appveyor.com/api/projects/status/3cf1f8p2cyoaoc25/branch/master?svg=true&passingText=green%20bar&failingText=%23fail&pendingText=checking[Build Status (AppVeyor), link={url-ci-appveyor}]
 endif::[]
 
-A plugin for {uri-jekyll}[Jekyll] (>= 3.0.0) that converts {uri-asciidoc}[AsciiDoc] source files in your site to HTML pages using {uri-asciidoctor}[Asciidoctor].
+A plugin for {url-jekyll}[Jekyll] (>= 3.0.0) that converts {url-asciidoc}[AsciiDoc] source files in your site to HTML pages using {url-asciidoctor}[Asciidoctor].
 
 ifeval::['{branch}' == 'master']
 NOTE: You're viewing the documentation for the upcoming release.
 If you're looking for the documentation for an older release, please refer to one of the following branches: +
-{uri-repo}/tree/v2.1.x#readme[2.1.x]
+{url-repo}/tree/v2.1.x#readme[2.1.x]
 &hybull;
-{uri-repo}/tree/v2.0.x#readme[2.0.x]
+{url-repo}/tree/v2.0.x#readme[2.0.x]
 &hybull;
-{uri-repo}/tree/v1.1.x#readme[1.1.x]
+{url-repo}/tree/v1.1.x#readme[1.1.x]
 &hybull;
-{uri-repo}/tree/v1.0.x#readme[1.0.x]
+{url-repo}/tree/v1.0.x#readme[1.0.x]
 endif::[]
 
 toc::[]
@@ -95,9 +95,9 @@ These extensions are registered automatically when the [.app]*jekyll-asciidoc* g
 
 == Prerequisites
 
-To use this plugin, you must be using Jekyll >= 3.0.0 and Ruby >= 2.2.0 (with development headers installed).
+To use this plugin, you must be using Jekyll >= 3.0.0 and Ruby >= 2.3.0 (with development headers installed).
 You should also be familiar with creating sites with Jekyll.
-If you're not, you should first read the {uri-jekyll-docs}[Jekyll documentation] to familiarize yourself with how it works.
+If you're not, you should first read the {url-jekyll-docs}[Jekyll documentation] to familiarize yourself with how it works.
 Experience with AsciiDoc and Asciidoctor is also helpful, but not a requirement.
 
 Like Jekyll, this plugin was designed for developers, so some assembly is required.
@@ -105,8 +105,8 @@ That means you'll be expected to edit configuration, modify HTML templates, and
 
 == Installation
 
-This plugin is packaged as a gem named [.app]*{uri-gem}[jekyll-asciidoc]* and published to RubyGems.org.
-The plugin depends on the [.app]*{uri-gem-asciidoctor}[asciidoctor]* gem, which gets installed automatically.
+This plugin is packaged as a gem named [.app]*{url-gem}[jekyll-asciidoc]* and published to RubyGems.org.
+The plugin depends on the [.app]*{url-gem-asciidoctor}[asciidoctor]* gem, which gets installed automatically.
 
 Your method of installation will depend on whether you use Bundler to manage the dependencies for your Jekyll project.
 
@@ -173,8 +173,8 @@ This plugin converts eligible AsciiDoc files located inside the source directory
 There are a few conditions that must be met in order for an AsciiDoc file to be eligible:
 
 . The file must have an AsciiDoc file extension (see <<configuration>>).
-. The name of the file must not begin with a dot (`.`) or an underscore (`_`).footnoteref:[excluded_files,Hidden files and folders are automatically excluded by Jekyll.]
-. The file must not be located in a folder whose name begins with a dot (`.`) or an underscore (`_`) (unless the folder is a designated collection, such as _posts).footnoteref:[excluded_files]
+. The name of the file must not begin with a dot (`.`) or an underscore (`_`).footnote:excluded_files[Hidden files and folders are automatically excluded by Jekyll.]
+. The file must not be located in a folder whose name begins with a dot (`.`) or an underscore (`_`) (unless the folder is a designated collection, such as _posts).footnote:excluded_files[]
 . While you can use a Jekyll front matter header, it is not required.
 
 Here's a sample AsciiDoc file that meets these criteria:
@@ -187,10 +187,10 @@ layout: info
 permalink: /sample/
 ---
 = Sample Page
-:uri-asciidoctor: http://asciidoctor.org
+:url-asciidoctor: http://asciidoctor.org
 
 This is a sample page composed in AsciiDoc.
-Jekyll converts it to HTML using {uri-asciidoctor}[Asciidoctor].
+Jekyll converts it to HTML using {url-asciidoctor}[Asciidoctor].
 
 [source,ruby]
 puts "Hello, World!"
@@ -204,10 +204,10 @@ Alternatively, you can define the page variables directly in the AsciiDoc header
 = Sample Page
 :page-layout: info
 :page-permalink: /sample/
-:uri-asciidoctor: http://asciidoctor.org
+:url-asciidoctor: http://asciidoctor.org
 
 This is a sample page composed in AsciiDoc.
-Jekyll converts it to HTML using {uri-asciidoctor}[Asciidoctor].
+Jekyll converts it to HTML using {url-asciidoctor}[Asciidoctor].
 
 [source,ruby]
 puts "Hello, World!"
@@ -215,9 +215,9 @@ puts "Hello, World!"
 
 === Page Attributes
 
-Any AsciiDoc attribute defined in the AsciiDoc document header whose name begins with ``page-``footnote:[The prefix used to label page attributes can be customized.] gets promoted to a {uri-variables}[page variables].
+Any AsciiDoc attribute defined in the AsciiDoc document header whose name begins with ``page-``footnote:[The prefix used to label page attributes can be customized.] gets promoted to a {url-variables}[page variables].
 The part of the name after the `page-` prefix is _lowercased_ and used as the variable name (e.g., page-layout becomes layout).
-The value is processed as {uri-yaml}[YAML] data (single-line form).
+The value is processed as {url-yaml}[YAML] data (single-line form).
 
 Since the attribute value is processed as YAML data, you can build nested data structure using the inline YAML syntax.
 For example, here's how you can assign a value to the `page.header.image` page variable:
@@ -279,7 +279,7 @@ In addition to page attributes defined explicitly (e.g., layout, permalink, etc)
 * doctitle (aka the document title) (becomes `title`)
 * id (becomes `docid`)
 * author
-* revdate (becomes `date`; value is converted to a DateTime object; posts only)
+* revdate (becomes `date`; value is converted to a DateTime object; not applied to pages)
 
 Although not an implicit page variable, another very common page variable to set is `page-description`, which becomes `description` in the model.
 
@@ -394,7 +394,7 @@ When you're ready to publish the post, move the file from the [.path]_{empty}_dr
 
 === Enabling Liquid Preprocessing
 
-Unlike other content files, the {uri-liquid-templates}[Liquid template preprocessor] is not applied to AsciiDoc files by default (since version 2.0.0 of this plugin).
+Unlike other content files, the {url-liquid-templates}[Liquid template preprocessor] is not applied to AsciiDoc files by default (since version 2.0.0 of this plugin).
 If you want the Liquid template preprocessor to be applied to an AsciiDoc file (prior to the content being passed to the AsciiDoc processor), you must enable it by setting the `liquid` page variable (shown here defined using a page attribute).
 
 [source,asciidoc]
@@ -402,7 +402,7 @@ If you want the Liquid template preprocessor to be applied to an AsciiDoc file (
 :page-liquid:
 ----
 
-IMPORTANT: AsciiDoc files may include a {uri-front-matter}[front matter header] for defining page variables.
+IMPORTANT: AsciiDoc files may include a {url-front-matter}[front matter header] for defining page variables.
 If present, the front matter header must be the very first character of the file.
 The front matter header won't be seen--and could distort conversion--if the front matter is preceded by whitespace or a Byte Order Mark (BOM).
 
@@ -412,6 +412,8 @@ In these cases, you define all the page variables (e.g., layout) using AsciiDoc
 You can also use a combination of both.
 When intermixed, the page attributes defined in the AsciiDoc header take precedence.
 
+Liquid processing does not extend to files included using the AsciiDoc include directive (see {url-issues}/166[#166]).
+
 If you're using the Liquid include tag to include HTML into the AsciiDoc document, you need to enclose it in a passthrough block.
 
 ----
@@ -421,7 +423,50 @@ If you're using the Liquid include tag to include HTML into the AsciiDoc documen
 ----
 
 This is necessary since AsciiDoc will escape HTML by default.
-To pass it through as is requires enclosing in a passthrough block.
+To pass it through raw requires enclosing it in a passthrough block.
+
+=== Extracting Excerpts
+
+This plugin will extract an excerpt for any post or document in a collection if the `excerpt` page variable isn't set using the same logic as for Markdown files.
+By default, it will use the content between the header and the first blank line.
+If the `excerpt` page variable is set, that value will be used instead.
+The excerpt will automatically be converted from AsciiDoc to embedded HTML whereever the `excerpt` property is referenced in a Liquid template.
+
+----
+{% post.excerpt %}
+----
+
+IMPORTANT: Since version 3.0.0 of this plugin, you no longer have to run the excerpt through the `asciidocify` filter since the conversion is already done for you.
+In fact, if you do, the HTML in the converted excerpt will be escaped, which is not what you want.
+
+If you want to use a different excerpt separator for AsciiDoc files, set the `excerpt_separator` under the `asciidoc` key in the site configuration.
+For example, you can configure the plugin to use the line comment `//more` as the excerpt separator as follows:
+
+[source,yaml]
+----
+asciidoc:
+  excerpt_separator: "\n//more\n"
+----
+
+If you're only working with AsciiDoc files in your site, you can go ahead and set this for all files by using the top-level property:
+
+[source,yaml]
+----
+excerpt_separator: "\n//more\n"
+----
+
+If the excerpt separator isn't found, the content of the whole document is used instead.
+
+By default, the excerpt is converted to HTML using the article doctype.
+If you want to use a different doctype, such as inline, you can set it in the site configuration as follows:
+
+[source,yaml]
+----
+asciidoc:
+  excerpt_doctype: inline
+----
+
+You can also set the excerpt doctype per page using the page attribute named `page-excerpt_doctype`.
 
 == Building and Previewing Your Site
 
@@ -627,7 +672,7 @@ asciidoctor:
     -idprefix:
 ----
 
-In addition to `attributes`, you may define any other option key (e.g., `safe`) recognized by the {uri-asciidoctor-manual}#ruby-api-options[Asciidoctor API].
+In addition to `attributes`, you may define any other option key (e.g., `safe`) recognized by the {url-asciidoctor-manual}#ruby-api-options[Asciidoctor API].
 One of those options is `base_dir`, which is covered in the next section.
 
 ==== Specifying the Base Directory
@@ -699,13 +744,13 @@ Keep in mind that the value of the attribute will be unmodified from the value d
 Many Jekyll users are used to writing in GitHub-flavored Markdown (GFM), which preserves hard line breaks in paragraph content.
 Asciidoctor supports this feature for AsciiDoc files.
 (In fact, previous versions of this plugin enabled this behavior by default).
-If you want to enable this behavior for AsciiDoc files, add the `hardbreaks-option` attribute to the Asciidoctor attributes configuration in your site's {path-config} file:
+If you want to enable this behavior for AsciiDoc files, add the `hardbreaks` attribute to the Asciidoctor attributes configuration in your site's {path-config} file:
 
 [source,yaml]
 ----
 asciidoctor:
   attributes:
-  - hardbreaks-option
+  - hardbreaks
 ----
 
 If you still want to allow individual files to be able to override the attribute, append the charcter `@` to the value in the site configuration:
@@ -714,12 +759,12 @@ If you still want to allow individual files to be able to override the attribute
 ----
 asciidoctor:
   attributes:
-  - hardbreaks-option=@
+  - hardbreaks=@
 ----
 
 If you already have AsciiDoc attributes defined in the {path-config}, the new attribute should be added as a sibling entry in the YAML collection.
 
-WARNING: Keep in mind, if you enable hard line breaks, you won't be able to use the {uri-asciidoc-practices}#one-sentence-per-line[one sentence-per-line writing technique].
+WARNING: Keep in mind, if you enable hard line breaks, you won't be able to use the {url-asciidoc-practices}#one-sentence-per-line[one sentence-per-line writing technique].
 
 == Running in Safe Mode
 
@@ -750,22 +795,22 @@ This plugin defines two additional Liquid filters, `asciidocify` and `tocify_asc
 === Converting a String from AsciiDoc
 
 You can use the `asciidocify` filter to convert an arbitrary AsciiDoc string anywhere in your template.
+This filter allows you to compose site-wide data in AsciiDoc, such your site's description or synopsis, then convert it to HTML for use in the page template(s).
 
-Let's assume the excerpt of the post is written in AsciiDoc.
+Let's assume you've defined a page variable named `synopsis` that you want treat as AsciiDoc.
 You can convert it in your template as follows:
 
 ----
-{{ post.excerpt | asciidocify }}
+{{ page.synopsis | asciidocify }}
 ----
 
-By default, the AsciiDoc content is parsed as a full AsciiDoc document.
+By default, the AsciiDoc content is parsed as an embedded AsciiDoc document.
 If the content represents a single paragraph, and you only want to perform inline substitutions on that content, add the `inline` doctype as the filter's first argument:
 
 ----
-{{ post.excerpt | asciidocify: 'inline' }}
+{{ page.synopsis | asciidocify: 'inline' }}
 ----
 
-TIP: This filter allows you to compose site-wide data in AsciiDoc, such your site's description or synopsis, then convert it to HTML for use in the page template(s).
 
 === Generating a Table of Contents
 
@@ -805,7 +850,7 @@ content
 == Customizing the Generated HTML
 
 You can use templates to customize the HTML output that Asciidoctor generates for your site.
-Template files can be composed in any templating language that is supported by {uri-tilt}[Tilt].
+Template files can be composed in any templating language that is supported by {url-tilt}[Tilt].
 Each template file corresponds to a node in the AsciiDoc document tree (aka AST).
 
 Below are the steps you need to take to configure Asciidoctor to use custom templates with your site.
@@ -873,7 +918,7 @@ Name the file [.path]_ulist.html.slim_.
 
 The next time you build your site, Asciidoctor will use your custom template to generate the HTML for unordered lists.
 
-TIP: You can find additional examples of custom templates in the {uri-asciidoctor-backends}[asciidoctor-backends] repository.
+TIP: You can find additional examples of custom templates in the {url-asciidoctor-backends}[asciidoctor-backends] repository.
 
 == Enabling Asciidoctor Extensions
 
@@ -933,11 +978,11 @@ For a concrete example of using an Asciidoctor extension, refer to the next sect
 
 == Enabling Asciidoctor Diagram
 
-{uri-asciidoctor-diagram}[Asciidoctor Diagram] is a set of extensions for Asciidoctor that allow you to embed diagrams generated by PlantUML, Graphviz, ditaa, Shaape, and other plain-text diagram tools inside your AsciiDoc documents.
+{url-asciidoctor-diagram}[Asciidoctor Diagram] is a set of extensions for Asciidoctor that allow you to embed diagrams generated by PlantUML, Graphviz, ditaa, Shaape, and other plain-text diagram tools inside your AsciiDoc documents.
 In order to use Asciidoctor Diagram in a Jekyll project successfully, *you must use a version of this plugin >= 2.0.0*.
 Other combinations are known to have issues.
 
-IMPORTANT: For Graphviz and PlantUML diagram generation, {uri-graphviz}[Graphviz] must be installed (i.e., the `dot` utility must be available on your `$PATH`.
+IMPORTANT: For Graphviz and PlantUML diagram generation, {url-graphviz}[Graphviz] must be installed (i.e., the `dot` utility must be available on your `$PATH`.
 
 TIP: To follow a start-to-finish tutorial that covers how to integrate Asciidoctor Diagram, see https://gist.github.com/mojavelinux/968623c493190dd61c059c2d85f9bdc3[this gist].
 
@@ -1137,7 +1182,7 @@ Certain Asciidoctor features, such as icons, require additional CSS rules and ot
 These CSS rules and other assets do not get automatically included in the pages generated by Jekyll.
 This section documents how to configure these additional resources.
 
-TIP: If you want to take a shortcut that skips all this configuration, clone the {uri-jaq}[Jekyll AsciiDoc Quickstart (JAQ)] repository and use it as a starting point for your site.
+TIP: If you want to take a shortcut that skips all this configuration, clone the {url-jaq}[Jekyll AsciiDoc Quickstart (JAQ)] repository and use it as a starting point for your site.
 JAQ provides a page layout out of the box configured to fully style body content generated from AsciiDoc.
 
 === Setup
@@ -1311,7 +1356,7 @@ Refer to the http://eshepelyuk.github.io/2014/10/28/automate-github-pages-travis
 You can also refer to the https://github.com/johncarl81/transfuse-site[Transfuse website build^] for an example in practice.
 
 In fact, if you're using Travis CI, it's even easier than that.
-Travis CI provides a https://docs.travis-ci.com/user/deployment/pages/[deployer for GitLab Pages]!
+Travis CI provides a https://docs.travis-ci.com/user/deployment/pages/[deployer for GitHub Pages]!
 Using this deployer, Travis CI can push your generated site to GitHub Pages after a successful build on your behalf, as long as you've completed these steps:
 
 . Create a personal access token on GitHub that has write access to your GitHub repository (public_repo or repo scope)
@@ -1337,7 +1382,7 @@ TIP: When using this setup, don't forget to add the [.path]_.nojekyll_ file to t
 
 ==== Jekyll AsciiDoc Quickstart
 
-If you want to take a shortcut that skips all the steps in the previously mentioned tutorial, clone the {uri-jaq}[Jekyll AsciiDoc Quickstart (JAQ)] repository and use it as a starting point for your site.
+If you want to take a shortcut that skips all the steps in the previously mentioned tutorial, clone the {url-jaq}[Jekyll AsciiDoc Quickstart (JAQ)] repository and use it as a starting point for your site.
 JAQ includes a Rake build that is preconfigured to deploy to GitHub Pages from Travis CI and also provides a theme (page layout and CSS) that properly styles body content generated from AsciiDoc.
 
 ==== Feeling Responsive
@@ -1408,17 +1453,17 @@ But we can't achieve that goal without your input.
 Your questions and feedback help steer the project, so speak up!
 Activity drives progress.
 
-When seeking answers, always start with the official documentation for Jekyll, which can be found on the {uri-jekyll}[Jekyll website].
-If you have general questions about Jekyll, we recommend you visit the {uri-jekyll-discuss}[Jekyll Talk] forum to get assistance.
-For questions related to this extension specifically, or general questions about AsciiDoc, please post to the {uri-asciidoctor-discuss}[Asciidoctor discussion list].
-You can also join us in the {uri-chat}[asciidoctor/asciidoctor channel] on Gitter.
-For general information about AsciiDoc, look no further than the {uri-asciidoctor-manual}[Asciidoctor User Manual].
+When seeking answers, always start with the official documentation for Jekyll, which can be found on the {url-jekyll}[Jekyll website].
+If you have general questions about Jekyll, we recommend you visit the {url-jekyll-discuss}[Jekyll Talk] forum to get assistance.
+For questions related to this extension specifically, or general questions about AsciiDoc, please post to the {url-asciidoctor-discuss}[Asciidoctor discussion list].
+You can also join us in the {url-chat}[asciidoctor/asciidoctor channel] on Gitter.
+For general information about AsciiDoc, look no further than the {url-asciidoctor-manual}[Asciidoctor User Manual].
 
 === Filing Bug Reports and Feature Requests
 
-This project uses the {uri-issues}[GitHub issue tracker] to manage bug reports and feature requests.
-If you encounter a problem, please {uri-search-issues}[browse or search] the issues to find out if your problem has already been reported.
-If it has not, you may {uri-issues}/new[submit a new issue].
+This project uses the {url-issues}[GitHub issue tracker] to manage bug reports and feature requests.
+If you encounter a problem, please {url-search-issues}[browse or search] the issues to find out if your problem has already been reported.
+If it has not, you may {url-issues}/new[submit a new issue].
 
 The best way to get a timely response and quick fix for your issue is to write a detailed report and respond to replies in a timely manner.
 
@@ -1437,11 +1482,11 @@ Follow the instructions below to learn how to clone the source, run the tests an
 === Retrieve the Source Code
 
 You can retrieve the source code from GitHub using git.
-Simply copy the URL of the {uri-repo}[GitHub repository] and pass it to the `git clone` command:
+Simply copy the URL of the {url-repo}[GitHub repository] and pass it to the `git clone` command:
 
 [subs=attributes+]
 ....
-git clone {uri-repo}
+git clone {url-repo}
 ....
 
 Next, switch to the project directory.
@@ -1570,13 +1615,13 @@ Next, package, tag and release the gem to RubyGems.org, run the following rake t
 
  $ bundle exec rake release
 
-IMPORTANT: Ensure you have the proper credentials setup as described in the guide {uri-guide-publish-gem}[Publishing to RubyGems.org].
+IMPORTANT: Ensure you have the proper credentials setup as described in the guide {url-guide-publish-gem}[Publishing to RubyGems.org].
 
 Once you finish the release, you should update the version to the next micro version in the sequence using the `.dev` suffix (e.g., 3.0.1.dev).
 
 == About the Project
 
-The Jekyll AsciiDoc plugin, a plugin for the static site generator {uri-jekyll}[Jekyll], is a member project of the Asciidoctor organization.
+The Jekyll AsciiDoc plugin, a plugin for the static site generator {url-jekyll}[Jekyll], is a member project of the Asciidoctor organization.
 This plugin is developed and supported by volunteers in the Asciidoctor community.
 
 === Authors

data/jekyll-asciidoc.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   rescue ::SystemCallError
     Dir['**/*']
   end
-  s.files = files.grep %r/^(?:lib\/.+|Gemfile|(?:CHANGELOG|LICENSE|README)\.adoc|jekyll-asciidoc\.gemspec)$/
+  s.files = files.grep %r/^(?:lib\/.+|Gemfile|(?:CHANGELOG|LICENSE|README)\.adoc|\.yardopts|jekyll-asciidoc\.gemspec)$/
   #s.test_files = files.grep %r/^spec\/./
 
   s.require_paths = ['lib']
@@ -36,7 +36,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'jekyll', '>= 3.0.0'
 
   s.add_development_dependency 'deep-cover-core', '~> 0.7.0'
+  s.add_development_dependency 'pygments.rb', '~> 1.2.1'
   s.add_development_dependency 'rake', '~> 12.3.2'
   s.add_development_dependency 'rspec', '~> 3.8.0'
+  s.add_development_dependency 'rubocop', '~> 0.61.1'
   s.add_development_dependency 'simplecov', '~> 0.16.1'
 end

data/lib/jekyll-asciidoc.rb

@@ -1,6 +1,15 @@
-require_relative 'jekyll-asciidoc/compat'
+module Jekyll
+  module AsciiDoc
+    jekyll_gem_version = ::Gem::Version.new ::Jekyll::VERSION
+    Jekyll3_0 = (::Gem::Requirement.new '~> 3.0.0').satisfied_by? jekyll_gem_version
+    Jekyll3_1 = !Jekyll3_0 && ((::Gem::Requirement.new '~> 3.1.0').satisfied_by? jekyll_gem_version)
+  end
+end
+require_relative 'jekyll-asciidoc/core_ext'
+require_relative 'jekyll-asciidoc/jekyll_ext'
 require_relative 'jekyll-asciidoc/utils'
 require_relative 'jekyll-asciidoc/mixins'
+require_relative 'jekyll-asciidoc/excerpt'
 require_relative 'jekyll-asciidoc/converter'
 require_relative 'jekyll-asciidoc/integrator'
 require_relative 'jekyll-asciidoc/filters'

data/lib/jekyll-asciidoc/converter.rb

@@ -20,8 +20,9 @@ module Jekyll
       MessageTopic = Utils::MessageTopic
       NewLine = Utils::NewLine
 
-      AttributeReferenceRx = /\\?\{(\w+(?:[\-]\w+)*)\}/
+      AttributeReferenceRx = /\\?\{(\p{Word}[-\p{Word}]*)\}/
       HeaderBoundaryRx = /(?<=\p{Graph}#{NewLine * 2})/
+      HeaderLineRx = /^=[ \t]+.|^:!?\w[-\w]*!?:(?:[ \t]+.)?/
 
       # Enable plugin when running in safe mode; jekyll-asciidoc gem must also be declared in whitelist
       safe true
@@ -97,7 +98,8 @@ module Jekyll
               'site-url' => config['url'],
             }
             attrs = asciidoctor_config[:attributes] = compile_attributes asciidoctor_config[:attributes],
-                ((site_attributes.merge ImplicitAttributes).merge DefaultAttributes)
+                (compile_attributes asciidoc_config['attributes'],
+                    ((site_attributes.merge ImplicitAttributes).merge DefaultAttributes))
             if (imagesdir = attrs['imagesdir']) && !(attrs.key? 'imagesoutdir') && (imagesdir.start_with? '/')
               attrs['imagesoutdir'] = ::File.join dest, (imagesdir.chomp '@')
             end
@@ -139,15 +141,15 @@ module Jekyll
       end
 
       def self.before_render document, payload
-        (get_instance document.site).before_render document, payload if Document === document
+        (get_instance document.site).before_render document, payload if Document === document || Excerpt === document
       end
 
       def self.after_render document
-        (get_instance document.site).after_render document if Document === document
+        (get_instance document.site).after_render document if Document === document || Excerpt === document
       end
 
       def before_render document, payload
-        # NOTE Jekyll 3.1 incorrectly mapped the page payload to document.data instead of payload['page']
+        # NOTE Jekyll 3.1 incorrectly maps the page payload to document.data instead of payload['page']
         @page_context[:data] = ::Jekyll::AsciiDoc::Jekyll3_1 ? document.data : payload['page']
         record_paths document
       end
@@ -175,11 +177,10 @@ module Jekyll
 
       def load_header document
         record_paths document, source_only: true
-        # NOTE merely an optimization; if this doesn't match, the header still gets extracted by the processor
-        header = (content = document.content) ? (HeaderBoundaryRx =~ content ? $` : content) : ''
         case @asciidoc_config['processor']
         when 'asciidoctor'
           opts = @asciidoctor_config.merge parse_header_only: true
+          header = extract_header document
           if (paths = @page_context[:paths])
             if opts[:base_dir] == :docdir
               opts[:base_dir] = paths['docdir'] # NOTE this assignment happens inside the processor anyway
@@ -208,7 +209,7 @@ module Jekyll
 
         case @asciidoc_config['processor']
         when 'asciidoctor'
-          opts = @asciidoctor_config.merge header_footer: (@page_context[:data] || {})['standalone']
+          opts = @asciidoctor_config.merge header_footer: (data = @page_context[:data] || {})['standalone']
           if (paths = @page_context[:paths])
             if opts[:base_dir] == :docdir
               opts[:base_dir] = paths['docdir'] # NOTE this assignment happens inside the processor anyway
@@ -216,11 +217,11 @@ module Jekyll
               paths.delete 'docdir'
             end
             opts[:attributes] = opts[:attributes].merge paths
-          # for auto-extracted excerpt, paths are't available since hooks don't get triggered
-          elsif opts[:base_dir] == :docdir
-            opts.delete :base_dir
           end
-          ((@page_context[:data] || {})['document'] = ::Asciidoctor.load content, opts).extend(Liquidable).convert
+          if (doctype = data['doctype'])
+            opts[:doctype] = doctype
+          end
+          (data['document'] = ::Asciidoctor.load content, opts).extend(Liquidable).convert
         else
           @logger.warn MessageTopic,
               %(Unknown AsciiDoc processor: #{@asciidoc_config['processor']}. Passing through unparsed content.)
@@ -230,6 +231,33 @@ module Jekyll
 
       private
 
+      # Take up to the AsciiDoc document header (if present), then continue to the excerpt separator, if non-blank.
+      def extract_header document
+        if (content = document.content)
+          header = (header_boundary = HeaderBoundaryRx =~ content) ? $` : content
+          # NOTE at this point, excerpt is already set to an instance of Jekyll::Excerpt unless set in front matter
+          if ::Jekyll::Page === document || !(::Jekyll::Excerpt === document.data['excerpt'])
+            header = '' unless HeaderLineRx.match? header
+          else
+            document.data['excerpt'] = nil
+            if (excerpt_separator = document.data['excerpt_separator'] || @asciidoc_config['excerpt_separator'] ||
+                @config['excerpt_separator']).to_s.empty?
+              header = '' unless HeaderLineRx.match? header
+            else
+              header_boundary = 0 unless header_boundary && (HeaderLineRx.match? header)
+              if (excerpt_boundary = content.index excerpt_separator, header_boundary)
+                header = content.slice 0, excerpt_boundary
+              else
+                header = content
+              end
+            end
+          end
+          header
+        else
+          ''
+        end
+      end
+
       def symbolize_keys hash
         hash.each_with_object({}) {|(key, val), accum| accum[key.to_sym] = val }
       end
@@ -237,14 +265,14 @@ module Jekyll
       def compile_attributes attrs, initial = {}
         if (is_array = ::Array === attrs) || ::Hash === attrs
           attrs.each_with_object(initial) do |entry, new_attrs|
-            key, val = is_array ? ((entry.split '=', 2) + ['', ''])[0..1] : entry
+            key, val = is_array ? (((entry.split '=', 2) + ['', '']).slice 0, 2) : entry
             if key.start_with? '!'
-              new_attrs[key[1..-1]] = nil
+              new_attrs[key.slice 1, key.length] = nil
             elsif key.end_with? '!'
               new_attrs[key.chop] = nil
             # we're reserving -name to mean "unset implicit value but allow doc to override"
             elsif key.start_with? '-'
-              new_attrs.delete key[1..-1]
+              new_attrs.delete key.slice 1, key.length
             else
               case val
               when ::String
@@ -271,14 +299,16 @@ module Jekyll
         if text.empty?
           text
         elsif text.include? '{'
-          text.gsub(AttributeReferenceRx) { ($&.start_with? '\\') ? $&[1..-1] : ((attrs.fetch $1, $&).to_s.chomp '@') }
+          text.gsub AttributeReferenceRx do
+            ($&.start_with? '\\') ? ($&.slice 1, $&.length) : ((attrs.fetch $1, $&).to_s.chomp '@')
+          end
         else
           text
         end
       end
 
       def resolve_default_layout document, attributes
-        layout_attr_name = %(#{document.site.config['asciidoc']['page_attribute_prefix']}layout)
+        layout_attr_name = %(#{@asciidoc_config['page_attribute_prefix']}layout)
         if attributes.key? layout_attr_name
           if ::String === (layout = attributes[layout_attr_name])
             if layout == '~@'

data/lib/jekyll-asciidoc/core_ext.rb

@@ -0,0 +1 @@
+require_relative 'core_ext/regexp/is_match'

data/lib/jekyll-asciidoc/core_ext/regexp/is_match.rb

@@ -0,0 +1,4 @@
+# NOTE remove once minimum required Ruby version is at least 2.4
+class Regexp
+  alias match? ===
+end unless Regexp.method_defined? :match?

data/lib/jekyll-asciidoc/excerpt.rb

@@ -0,0 +1,49 @@
+module Jekyll
+  module AsciiDoc
+    class Excerpt < ::Jekyll::Excerpt
+      if Jekyll3_0
+        def_delegators :@doc, :destination, :url
+      else
+        def_delegators :@doc, :destination
+      end
+
+      def initialize primary_doc, excerpt_content
+        excerpt_doc = primary_doc.dup
+        excerpt_doc.content = excerpt_content
+        excerpt_doc.extend NoLiquid unless primary_doc.data['liquid']
+        super excerpt_doc
+      end
+
+      def extract_excerpt content
+        # NOTE excerpt_doctype has already been resolved from either the page attribute or front matter variable
+        if (doctype = (excerpt_data = data)['excerpt_doctype'] ||
+            (inherited = doc.site.config['asciidoc']['excerpt_doctype']))
+          excerpt_data['doctype'] = doctype
+          excerpt_data['excerpt_doctype'] = doc.data['excerpt_doctype'] = doctype if inherited
+        end
+        content
+      end
+
+      def output
+        unless defined? @output
+          renderer = ::Jekyll::Renderer.new doc.site, self, site.site_payload
+          @output = renderer.run
+          trigger_hooks :post_render
+        end
+        @output
+      end
+
+      def render_with_liquid?
+        !(NoLiquid === doc)
+      end
+
+      # NOTE Jekyll 3.0 incorrectly maps to_liquid to primary doc
+      alias to_liquid data if Jekyll3_0
+
+      def trigger_hooks hook_name, *args
+        #::Jekyll::Hooks.trigger collection.label.to_sym, hook_name, self, *args if collection
+        ::Jekyll::Hooks.trigger :documents, hook_name, self, *args
+      end
+    end
+  end
+end

data/lib/jekyll-asciidoc/filters.rb

@@ -1,31 +1,31 @@
 module Jekyll
   module AsciiDoc
     module Filters
-      # A Liquid filter for converting an AsciiDoc string to HTML.
+      # A Liquid filter for converting an AsciiDoc string to HTML using {Converter#convert}.
       #
-      # input   - The AsciiDoc String to convert.
-      # doctype - The target AsciiDoc doctype (optional, default: nil).
-      #
-      # Examples
+      # @param input [String] the AsciiDoc String to convert.
+      # @param doctype [String] the target AsciiDoc doctype.
       #
+      # @example Convert the AsciiDoc page excerpt to inline HTML
       #   {{ page.excerpt | asciidocify: 'inline' }}
       #
-      # Returns the converted result as an HTML-formatted String.
+      # @return [String] the converted result as an HTML-formatted String.
       def asciidocify input, doctype = nil
         (@context.registers[:cached_asciidoc_converter] ||= (Converter.get_instance @context.registers[:site]))
           .convert(doctype ? %(:doctype: #{doctype}#{Utils::NewLine}#{input}) : (input || ''))
       end
 
-      # A Liquid filter for generating a table of contents in HTML from a parsed AsciiDoc document.
-      #
-      # document      - The parsed AsciiDoc document from which to generate a table of contents in HTML.
-      # levels        - The max section depth to include (optional, default: value of toclevels document attribute).
+      # A Liquid filter for generating an HTML table of contents from a parsed AsciiDoc document.
       #
-      # Examples
+      # @param document [Asciidoctor::Document] the parsed AsciiDoc document for which to generate an HTML table of
+      # contents.
+      # @param levels [Integer] the maximum section depth to use; if not specified, uses the value of toclevels document
+      # attribute.
       #
+      # @example Generate a table of contents from the document for the current page
       #   {{ page.document | tocify_asciidoc: 3 }}
       #
-      # Returns the table of contents as an HTML-formatted String.
+      # @return [String] the table of contents as an HTML-formatted String.
       def tocify_asciidoc document, levels = nil
         ::Asciidoctor::Document === document ?
           (document.converter.convert document, 'outline', toclevels: (levels.nil_or_empty? ? nil : levels.to_i)) : nil

data/lib/jekyll-asciidoc/integrator.rb

@@ -5,6 +5,7 @@ module Jekyll
     # source highlighter and configured to use class-based styling.
     class Integrator < ::Jekyll::Generator
       NewLine = Utils::NewLine
+      PygmentsRootSelector = /^(.+?)\.pygments +{/
 
       # Enable plugin when running in safe mode; jekyll-asciidoc gem must also be declared in whitelist
       safe true
@@ -15,6 +16,10 @@ module Jekyll
 
       # This method is triggered each time the site is generated, including after any file has changed when running in
       # watch mode (regardless of incremental setting).
+      #
+      # @param site [Jekyll::Site] the site being processed.
+      #
+      # @return [nil] Nothing
       def generate site
         @converter = converter = Converter.get_instance site
 
@@ -28,21 +33,25 @@ module Jekyll
           end
         end
 
-        attrs = site.config['asciidoctor'][:attributes]
-        attrs['localdate'], attrs['localtime'] = (site.time.strftime '%Y-%m-%d %H:%M:%S %Z').split ' ', 2
-        if ((attrs['source-highlighter'] || '').chomp '@') == 'pygments' &&
-            ((attrs['pygments-css'] || '').chomp '@') != 'style' && (attrs.fetch 'pygments-stylesheet', '')
-          generate_pygments_stylesheet site, attrs
+        if site.config['asciidoc']['processor'] == 'asciidoctor'
+          attrs = site.config['asciidoctor'][:attributes]
+          attrs['localdate'], attrs['localtime'] = (site.time.strftime '%Y-%m-%d %H:%M:%S %Z').split ' ', 2
+          if ((attrs['source-highlighter'] || '').chomp '@') == 'pygments' &&
+              ((attrs['pygments-css'] || '').chomp '@') != 'style' && (attrs.fetch 'pygments-stylesheet', '')
+            generate_pygments_stylesheet site, attrs
+          end
         end
+
+        nil
       end
 
       # Integrate the page-related attributes from the AsciiDoc document header into the data Array of the specified
       # {::Jekyll::Page}, {::Jekyll::Post} or {::Jekyll::Document}.
       #
-      # document        - the Page, Post or Document instance to integrate.
-      # collection_name - the String name of the collection to which this document belongs (optional, default: nil).
+      # @param document [::Jekyll::Page, ::Jekyll::Post, ::Jekyll::Document] the page, post, or document to integrate.
+      # @param collection_name [String] the name of the collection to which this document belongs.
       #
-      # Returns a [Boolean] indicating whether the document should be published.
+      # @return [Boolean] whether the document should be published.
       def integrate document, collection_name = nil
         return true unless (doc = @converter.load_header document)
 
@@ -52,7 +61,7 @@ module Jekyll
         data['docid'] = doc.id if doc.id
         data['title'] = doc.doctitle if doc.header?
         data['author'] = doc.author if doc.author
-        if collection_name == 'posts' && (doc.attr? 'revdate')
+        if collection_name && (doc.attr? 'revdate')
           data['date'] = ::Jekyll::Utils.parse_date doc.revdate,
               %(Document '#{document.relative_path}' does not have a valid revdate in the AsciiDoc header.)
         end
@@ -75,6 +84,12 @@ module Jekyll
           end
         end
 
+        # NOTE excerpt must be set before layout is assigned since excerpt cannot have a layout (or be standalone)
+        unless ::Jekyll::Page === document
+          data['excerpt'] = Excerpt.new document, ((excerpt = data['excerpt']) || doc.source)
+          data['excerpt_origin'] = excerpt ? ((adoc_data.key? 'excerpt') ? 'asciidoc-header' : 'front-matter') : 'body'
+        end
+
         case data['layout']
         when nil
           data['standalone'] = true unless data.key? 'layout'
@@ -101,12 +116,12 @@ module Jekyll
         css_style = (attrs['pygments-style'] || 'vs').chomp '@'
         css = ::Asciidoctor::Stylesheets.instance.pygments_stylesheet_data css_style
         # NOTE apply stronger CSS rule for general text color
-        css = css.sub '.listingblock .pygments  {', '.listingblock .pygments, .listingblock .pygments code {'
+        css = css.sub PygmentsRootSelector, '\1.pygments, \1.pygments code {'
         if site.static_files.any? {|f| f.path == css_file }
-          ::IO.write css_file, css unless css == (::IO.read css_file)
+          ::File.write css_file, css unless css == (::File.read css_file)
         else
-          ::Asciidoctor::Helpers.mkdir_p ::File.dirname css_file
-          ::IO.write css_file, css
+          ::FileUtils.mkdir_p ::File.dirname css_file
+          ::File.write css_file, css
           site.static_files << (::Jekyll::StaticFile.new site, css_base, css_dir, css_name)
         end
       end
@@ -119,9 +134,10 @@ module Jekyll
       # If the value fails to parse, wrap the value in single quotes (after escaping any single quotes in the value) and
       # parse it as a character sequence. If the value is empty, return an empty String.
       #
-      # val - The String value to parse.
+      # @param val [String] the value to parse.
       #
-      # Returns an [Object] parsed from the string-based YAML value or empty [String] if the specified value is empty.
+      # @return [Object, String] the value parsed from the string-based YAML value or an empty String if the specified
+      # value is empty.
       def parse_yaml_value val
         if val.empty?
           ''

data/lib/jekyll-asciidoc/jekyll_ext.rb

@@ -0,0 +1,3 @@
+require_relative 'jekyll_ext/drops/drop'
+require_relative 'jekyll_ext/renderer/layouts'
+require_relative 'jekyll_ext/site/find_generator_instance'

data/lib/jekyll-asciidoc/jekyll_ext/drops/drop.rb

@@ -0,0 +1,14 @@
+module Jekyll
+  module Drops
+    class Drop
+      class << self
+        # NOTE fixes "warning: instance variable @is_mutable not initialized"
+        prepend (Module.new do
+          def mutable?
+            @is_mutable ||= nil # rubocop:disable Naming/MemoizedInstanceVariableName
+          end
+        end)
+      end
+    end
+  end
+end if defined? Jekyll::Drops::Drop

data/lib/jekyll-asciidoc/jekyll_ext/renderer/layouts.rb

@@ -0,0 +1,11 @@
+module Jekyll
+  class Renderer
+    # NOTE fixes "warning: instance variable @layouts not initialized"
+    prepend (Module.new do
+      def layouts
+        @layouts = nil unless defined? @layouts
+        super
+      end
+    end)
+  end
+end if Jekyll::Renderer.method_defined? :layouts

data/lib/jekyll-asciidoc/jekyll_ext/site/find_generator_instance.rb

@@ -0,0 +1,8 @@
+module Jekyll
+  class Site
+    # Introduce complement to {::Jekyll::Site#find_converter_instance} for generators.
+    def find_generator_instance type
+      generators.find {|candidate| type === candidate } || (raise %(No Generators found for #{type}))
+    end
+  end
+end unless Jekyll::Site.method_defined? :find_generator_instance

data/lib/jekyll-asciidoc/utils.rb

@@ -6,8 +6,16 @@ module Jekyll
 
       module_function
 
-      def has_front_matter? dlg_method, asciidoc_ext_re, path
-        (asciidoc_ext_re.match? ::File.extname path) || (dlg_method.call path)
+      # Checks whether the file at the specified path has front matter. For AsciiDoc files, this method always returns
+      # true. Otherwise, it delegates to {::Jekyll::Utils.has_yaml_header?}.
+      #
+      # @param dlg_method [Method] the delegate method to call if this path is not an AsciiDoc file.
+      # @param asciidoc_ext_rx [Regexp] the regular expression to use to check if this path is an AsciiDoc file.
+      # @param path [String] the path to check.
+      #
+      # @return [Boolean] whether the file at this path has front matter.
+      def has_front_matter? dlg_method, asciidoc_ext_rx, path
+        (asciidoc_ext_rx.match? ::File.extname path) || (dlg_method.call path)
       end
 
       # NOTE use define_method to match signature of original method (and avoid extra call)

data/lib/jekyll-asciidoc/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AsciiDoc
-    VERSION = '3.0.0.beta.1'
+    VERSION = '3.0.0.beta.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-asciidoc
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.1
+  version: 3.0.0.beta.2
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: pygments.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.61.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.61.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -103,16 +131,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - CHANGELOG.adoc
 - Gemfile
 - LICENSE.adoc
 - README.adoc
 - jekyll-asciidoc.gemspec
 - lib/jekyll-asciidoc.rb
-- lib/jekyll-asciidoc/compat.rb
 - lib/jekyll-asciidoc/converter.rb
+- lib/jekyll-asciidoc/core_ext.rb
+- lib/jekyll-asciidoc/core_ext/regexp/is_match.rb
+- lib/jekyll-asciidoc/excerpt.rb
 - lib/jekyll-asciidoc/filters.rb
 - lib/jekyll-asciidoc/integrator.rb
+- lib/jekyll-asciidoc/jekyll_ext.rb
+- lib/jekyll-asciidoc/jekyll_ext/drops/drop.rb
+- lib/jekyll-asciidoc/jekyll_ext/renderer/layouts.rb
+- lib/jekyll-asciidoc/jekyll_ext/site/find_generator_instance.rb
 - lib/jekyll-asciidoc/mixins.rb
 - lib/jekyll-asciidoc/utils.rb
 - lib/jekyll-asciidoc/version.rb
@@ -139,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin that converts the AsciiDoc source files in your site to HTML

data/lib/jekyll-asciidoc/compat.rb

@@ -1,16 +0,0 @@
-module Jekyll
-  module AsciiDoc
-    Jekyll3_1 = (::Gem::Requirement.new '~> 3.1.0').satisfied_by? ::Gem::Version.new ::Jekyll::VERSION
-  end
-
-  class Site
-    # Introduce complement to {::Jekyll::Site#find_converter_instance} for generators.
-    def find_generator_instance type
-      generators.find {|candidate| type === candidate } || (raise %(No Generators found for #{type}))
-    end unless method_defined? :find_generator_instance
-  end
-end
-
-class Regexp
-  alias match? ===
-end unless Regexp.method_defined? :match?