jekyll-asciidoc 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1904bf71894c9ce06a2bc0076e930b6eff13ffd62bef1c1d15400f270322c38
-  data.tar.gz: 161bc87b7c6acfedfdf9e2b4f0e90e093e930a1ad55c8663ddf0c2a99678c783
+  metadata.gz: ec2fbf892d456f3a8bd99b9ddc7a402c9fb2d0c97a9c75db95f21a06940dfb4a
+  data.tar.gz: b46881e3f2cb90201cae60abe45e7c7a4e45139ce0c47e2461fb7d9674960d54
 SHA512:
-  metadata.gz: df177d71835a02e93d5e1a88927130a3bdbf8f2aaf164a445865928c6d71bb5b07f076cb7dc9c1b2706728c7e31b457a657b900fc360236fdca6bda5410af5ea
-  data.tar.gz: 29a2136a37caa0e552053788fd5f8fc6624edb32572882ff9bd7f012cdc790485af0cea601d71917f982463bde93ff7d1ff9bec39697d431fb573981925d522c
+  metadata.gz: 4bd45b214ab78e04d115c127a6c4b5ef02735a711eefde1ca116ebfc96b8b0bfd238e107722e665073fbd5e5876416eee8ea214812e77a752ec6ef8c190b2dbe
+  data.tar.gz: '0820e864821743154409895c604e090faf5759a5908fc92e70f7dcb0c86f680e01ed3eacaa19703d32a0a8317a1ca9e72d779c0dc497263071f15169853d8863'

data/CHANGELOG.adoc

@@ -5,6 +5,19 @@
 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 {url-repo}/commits/master[commit history] on GitHub.
 
+== 3.0.1 (2023-11-06) - @mojavelinux
+
+* clear `:base_dir` option if value is `:docdir` and paths with docdir information is not available (such as to `asciidocify` filter) (#270)
+* prepend baseurl to value of imagesdir if imagesdir value is root-relative (#177)
+
+=== Details
+
+{url-repo}/releases/tag/v3.0.1[git tag] | {url-repo}/compare/v3.0.0\...v3.0.1[full diff]
+
+== 3.0.0 (2019-08-31) - @mojavelinux
+
+_No changes since previous release._
+
 == 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)

data/Gemfile

@@ -2,11 +2,22 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'asciidoctor', ENV['ASCIIDOCTOR_VERSION'], require: false if ENV.key? 'ASCIIDOCTOR_VERSION'
+gem 'asciidoctor', %(~> #{ENV['ASCIIDOCTOR_VERSION']}), require: false if ENV.key? 'ASCIIDOCTOR_VERSION'
+gem 'em-websocket', '0.5.2', platform: [:jruby], require: false
 gem 'jekyll', %(~> #{ENV['JEKYLL_VERSION']}), require: false if ENV.key? 'JEKYLL_VERSION'
+gem 'pygments.rb', %(~> #{ENV['PYGMENTS_VERSION']}), require: false if ENV.key? 'PYGMENTS_VERSION'
 # NOTE Windows does not include zoneinfo files, so load tzinfo-data gem
 gem 'tzinfo-data', platform: [:x64_mingw, :mingw], require: false
 
+group :coverage do
+  gem 'deep-cover-core', '~> 1.1.0', require: false
+  gem 'simplecov', '~> 0.18.0', require: false
+end
+
 group :docs do
   gem 'yard', require: false
 end
+
+group :lint do
+  gem 'rubocop', '~> 0.74.0', require: false
+end

data/{LICENSE.adoc → LICENSE}

@@ -1,6 +1,4 @@
-.The MIT License
-....
-Copyright (C) 2013-2018 Dan Allen, Paul Rayner, and the Asciidoctor Project
+Copyright (C) 2013-present Dan Allen, Paul Rayner, and the Asciidoctor Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-....

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, 2019-08-31
+v3.0.1, 2023-11-06
 // Settings:
 :idprefix:
 :idseparator: -
@@ -11,6 +11,7 @@ ifdef::env-github,env-browser[]
 endif::[]
 ifdef::env-github[]
 :status:
+:branch: v3.0.x
 :outfilesuffix: .adoc
 :!toc-title:
 :caution-caption: :fire:
@@ -27,17 +28,14 @@ ifndef::icons[:conum-guard: {sp}#{sp}]
 :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-chat: https://chat.asciidoctor.org
+:url-gem: https://rubygems.org/gems/jekyll-asciidoc
+:url-gem-asciidoctor: https://rubygems.org/gems/asciidoctor
+:url-asciidoc: https://asciidoc.org
+:url-asciidoctor: https://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
@@ -47,32 +45,20 @@ ifndef::icons[:conum-guard: {sp}#{sp}]
 :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-graphviz: https://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
+:url-guide-publish-gem: https://guides.rubygems.org/publishing/#publishing-to-rubygemsorg
 
 ifdef::status[]
 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={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}]
+image:{url-repo}/actions/workflows/ci.yml/badge.svg?branch={branch}[Build Status (GitHub Actions),link={url-repo}/actions/workflows/ci.yml?query=branch%3A{branch}]
+image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[Project Chat (Zulip),link={url-chat}]
 endif::[]
 
 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: +
-{url-repo}/tree/v2.1.x#readme[2.1.x]
-&hybull;
-{url-repo}/tree/v2.0.x#readme[2.0.x]
-&hybull;
-{url-repo}/tree/v1.1.x#readme[1.1.x]
-&hybull;
-{url-repo}/tree/v1.0.x#readme[1.0.x]
-endif::[]
-
 toc::[]
 
 == Overview
@@ -95,7 +81,7 @@ 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.3.0 (with development headers installed).
+To use this plugin, you must be using Jekyll >= 3.0.0 and Ruby >= 2.4.0 (with development headers installed).
 You should also be familiar with creating sites with Jekyll.
 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.
@@ -135,7 +121,8 @@ Jekyll will automatically activate any plugins listed in the `:jekyll_plugins` g
 
 If you want to keep the installed gems inside the project, use this command instead:
 
- $ bundle --path=.bundle/gems
+ $ bundle config set --local path .bundle/gems
+   bundle
 
 TIP: Subsequent calls to `bundle` will retain the `path` setting.
 
@@ -167,6 +154,23 @@ gems:
 - jekyll-asciidoc
 ----
 
+=== Plugin Ordering
+
+Since the [.app]*jekyll-asciidoc* plugin promotes <<page-attributes,page attributes>> to the front matter, it must run first.
+To make sure it does, rearrange the sequence of plugins in your Gemfile or {path-config} file so the [.app]*jekyll-asciidoc* plugin is listed before other plugins.
+By doing so, other plugins will be able to access any front matter that this plugin assigns.
+
+Let's consider the case of using the [.app]*jekyll-archives* plugin alongside the [.app]*jekyll-asciidoc* plugin.
+
+[source,ruby]
+----
+group :jekyll_plugins do
+  gem 'jekyll-asciidoc'
+  gem 'jekyll-archives' <1>
+end
+----
+<1> The [.app]*jekyll-archives* plugin should be listed after the [.app]*jekyll-asciidoc* plugin since it needs to access front matter that is promoted from the header of the AsciiDoc document.
+
 == Creating Pages
 
 This plugin converts eligible AsciiDoc files located inside the source directory (by default, the project root) to HTML pages in the generated site.
@@ -187,7 +191,7 @@ layout: info
 permalink: /sample/
 ---
 = Sample Page
-:url-asciidoctor: http://asciidoctor.org
+:url-asciidoctor: https://asciidoctor.org
 
 This is a sample page composed in AsciiDoc.
 Jekyll converts it to HTML using {url-asciidoctor}[Asciidoctor].
@@ -204,7 +208,7 @@ Alternatively, you can define the page variables directly in the AsciiDoc header
 = Sample Page
 :page-layout: info
 :page-permalink: /sample/
-:url-asciidoctor: http://asciidoctor.org
+:url-asciidoctor: https://asciidoctor.org
 
 This is a sample page composed in AsciiDoc.
 Jekyll converts it to HTML using {url-asciidoctor}[Asciidoctor].
@@ -237,11 +241,14 @@ To define a page attribute that contains multiple words, use either a hyphen or
 IMPORTANT: Page attributes must be defined in the document header.
 That means either putting them directly below the document title (the line beginning with a single equals sign in the sample above) or above all other AsciiDoc content if the document title is not defined in AsciiDoc.
 The AsciiDoc document header stops after the first blank line.
-For more details about the document header, see the http://asciidoctor.org/docs/user-manual/#doc-header[Document Header] chapter in the Asciidoctor User Manual.
+For more details about the document header, see the https://asciidoctor.org/docs/user-manual/#doc-header[Document Header] chapter in the Asciidoctor User Manual.
 
 IMPORTANT: You may use include directives in the the document header.
 However, you must ensure that the file included _does not_ contain blank lines.
 
+CAUTION: If an attribute defined in the header of an AsciiDoc document is not visible to another plugin or Liquid template, you may have a plugin ordering problem.
+See <<Plugin Ordering>> to learn how to fix it.
+
 === Specifying a Layout
 
 The most commonly defined page variable is layout, which determines which template is used to wrap the generated content.
@@ -425,6 +432,16 @@ 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 raw requires enclosing it in a passthrough block.
 
+=== Preventing Liquid Processing on AsciiDoc Includes
+
+The Liquid preprocessor does not process content included using the AsciiDoc include directive.
+However, if those files are otherwise publishable, they are processed independently by Jekyll with the Liquid preprocessor and will appear in your site.
+If this is not the behavior you want, you can exclude them from being processed independently using one of the following techniques:
+
+* Place them in an automatically excluded location, such as a directory starting with `_` (e.g. [.path]___includes__).
+* Name them in such a way that they are automatically excluded, such as starting the name with `_` ([.path]___excluded-include.yml__).
+* Adding them to the https://jekyllrb.com/docs/configuration/options/[excludes] key in the Jekyll configuration.
+
 === 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.
@@ -693,7 +710,7 @@ asciidoctor:
 
 If, instead, you want the base directory to track the directory of the document being processed, and you're using Jekyll 3 or better, you can set the value of the `base_dir` option to `:docdir`.
 This behavior matches how Asciidoctor works when running it outside of Jekyll.
-Since the base directory is also the jail, we also recommend setting the `safe` option to `unsafe` so that you can still resolve paths outside of this directory.
+Since the base directory is also the jail, we also recommend setting the `safe` option to enable unsafe mode so you can still resolve paths outside of this directory.
 
 [source,yaml]
 ----
@@ -847,6 +864,21 @@ content
 content
 ----
 
+By default, the `tocify_asciidoc` filter will insert a table of contents on any page that has even one section below the page title.
+It's possible to conditionally disable this by using a Liquid `if` statement in your template with a custom attribute, similar to:
+
+----
+{% if page.show-toc != false %}
+ <div class="toc">
+   {{ page.document | tocify_asciidoc }}
+ </div>
+{% endif %}
+----
+
+Then in the front matter of pages where you do not want a table of contents to appear, use the attribute `:page-show-toc: false`.
+Note that since this example uses a custom attribute, its name can be anything you'd like, it only needs to start with with `page-`.
+If you change the attribute name from this example, be sure to update the it in the `if` statement as appropriate.
+
 == Customizing the Generated HTML
 
 You can use templates to customize the HTML output that Asciidoctor generates for your site.
@@ -1103,7 +1135,7 @@ An alternative to the monkeypath approach is to identify folders that contain ge
 
 [source,yaml]
 ----
-keep_files: 
+keep_files:
 - images
 asciidoctor:
   base_dir: :docdir
@@ -1196,7 +1228,7 @@ You need to augment the layout to include resources typically present in a stand
 +
 [source,html]
 ----
-<link rel="stylesheet" href="{{ "/css/asciidoc.css" | prepend: site.baseurl }}">
+<link rel="stylesheet" href="{{ '/css/asciidoc.css' | prepend: site.baseurl }}">
 ----
 
 === Stylesheet for Code Highlighting
@@ -1208,11 +1240,9 @@ To do so, add the `pygments.rb` gem to your [.path]_Gemfile_:
 
 [source,ruby]
 ----
-gem 'pygments.rb', '~> 1.1.2'
+gem 'pygments.rb', '~> 2.3.0'
 ----
 
-IMPORTANT: To use Pygments with Ruby >= 2.4 or JRuby, you must install pygments.rb >= 1.1.0.
-
 As part of this integration, Asciidoctor generates a custom stylesheet tailored specially to work with the HTML that Asciidocotor produces.
 Since this stylesheet is backed by the Pygments API, it provides access to all the themes in Pygments
 
@@ -1223,6 +1253,15 @@ This plugin will automatically generate a stylesheet for Pygments into the sourc
 * `pygments-stylesheet` is not unset (if set, it can have any value)
 
 By default, the stylesheet is written to `stylesdir` + `pygments-stylesheet`.
+If you want the stylesheet to be written to the [.path]_css_ directory, add the following configuration to your site's `_config.yml` file:
+
+[source,yaml]
+----
+asciidoctor:
+  attributes:
+    stylesdir: css
+----
+
 If the `pygments-stylesheet` attribute is not specified, the value defaults to `asciidoc-pygments.css`.
 You can customize this value to your liking.
 
@@ -1232,16 +1271,16 @@ If this attribute is not set, it defaults to `vs`.
 The stylesheet file will be created if it does not yet exist or the theme has been changed.
 Jekyll will handle copying the file to the output directory.
 
-You'll need to add a line to your template to link to this stylesheet, such as:
+You'll need to add a line to your template to link to this stylesheet (assuming `stylesdir=css`), such as:
 
 [source,html]
 ----
-<link rel="stylesheet" href="{{ "/css/asciidoc-pygments.css" | prepend: site.baseurl }}">
+<link rel="stylesheet" href="{{ '/css/asciidoc-pygments.css' | prepend: site.baseurl }}">
 ----
 
 To disable this feature, either set the `pygments-css` to `style` (to enable inline styles) or unset the `pygments-stylesheet` attribute in your site's {path-config}.
 
-NOTE: It may still be necessary to make some tweaks to your site's stylesheet to accomodate this integration.
+NOTE: It may still be necessary to make some tweaks to your site's stylesheet to accommodate this integration.
 
 === Font-based Admonition and Inline Icons
 
@@ -1258,7 +1297,7 @@ Next, you need to add the following CSS rules from the default Asciidoctor style
 
 [source,css]
 ----
-span.icon>.fa {
+span.icon > .fa {
   cursor: default;
 }
 .admonitionblock td.icon {
@@ -1312,6 +1351,8 @@ asciidoctor:
   ...
 ----
 
+==== Circled Callout Numbers
+
 Circled callout numbers are also linked to the `icons=font` setting, even though they don't rely on the Font Awesome font.
 To enable them, you need to add the following additional CSS to the [.path]_css/asciidoc.css_ file:
 
@@ -1393,7 +1434,7 @@ Refer to the help page https://help.github.com/articles/adding-jekyll-plugins-to
 
 _But don't despair!_
 You can still automate publishing of the generated site to GitHub Pages using a continuous integration job.
-Refer to the http://eshepelyuk.github.io/2014/10/28/automate-github-pages-travisci.html[Automate GitHub Pages publishing with Jekyll and Travis CI^] tutorial to find step-by-step instructions.
+Refer to the https://eshepelyuk.github.io/2014/10/28/automate-github-pages-travisci.html[Automate GitHub Pages publishing with Jekyll and Travis CI^] tutorial to find step-by-step instructions.
 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.
@@ -1437,7 +1478,7 @@ Refer to the https://phlow.github.io/feeling-responsive/getting-started/[Getting
 Deployment to GitLab Pages is much simpler.
 That's because GitLab allows you to control the execution of Jekyll yourself.
 There's no need to mess around with CI jobs and authentication tokens.
-You can find all about how to use Jekyll with GitLab Pages in the tutorial https://about.gitlab.com/2016/04/07/gitlab-pages-setup/#option-b-gitlab-ci-for-jekyll-websites[Hosting on GitLab.com with GitLab Pages]. 
+You can find all about how to use Jekyll with GitLab Pages in the tutorial https://about.gitlab.com/2016/04/07/gitlab-pages-setup/#option-b-gitlab-ci-for-jekyll-websites[Hosting on GitLab.com with GitLab Pages].
 More in-depth information regarding setting up your repository for GitLab Pages can be found in the  https://docs.gitlab.com/ee/pages/README.html[GitLab Enterprise Edition / Pages] documentation.
 
 Assuming the following are true:
@@ -1496,8 +1537,7 @@ Activity drives progress.
 
 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 questions related to this extension specifically, or general questions about AsciiDoc or Asciidoctor, please post to the #users stream in the {url-chat}[project chat].
 For general information about AsciiDoc, look no further than the {url-asciidoctor-manual}[Asciidoctor User Manual].
 
 === Filing Bug Reports and Feature Requests
@@ -1673,7 +1713,7 @@ This plugin was created by Dan Allen and Paul Rayner and has received contributi
 
 Copyright (C) 2013-2018 Dan Allen, Paul Rayner, and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
-See <<LICENSE#,LICENSE>> for details.
+See link:LICENSE[LICENSE] for details.
 
 ////
 [glossary]

data/jekyll-asciidoc.gemspec

@@ -27,18 +27,16 @@ Gem::Specification.new do |s|
   rescue ::SystemCallError
     Dir['**/*']
   end
-  s.files = files.grep %r/^(?:lib\/.+|Gemfile|(?:CHANGELOG|LICENSE|README)\.adoc|\.yardopts|jekyll-asciidoc\.gemspec)$/
+  s.files = files.grep %r/^(?:lib\/.+|Gemfile|LICENSE|(?:CHANGELOG|README)\.adoc|\.yardopts|jekyll-asciidoc\.gemspec)$/
   #s.test_files = files.grep %r/^spec\/./
 
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'asciidoctor', '>= 1.5.0'
+  s.add_runtime_dependency 'asciidoctor', ['>= 1.5.0', '< 3.0.0']
   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.74.0'
-  s.add_development_dependency 'simplecov', '~> 0.17.0'
+  s.add_development_dependency 'kramdown-parser-gfm', '~> 1.1.0' # required when testing Jekyll 3
+  s.add_development_dependency 'pygments.rb', '~> 2.3.0'
+  s.add_development_dependency 'rake', '~> 13.1.0'
+  s.add_development_dependency 'rspec', '~> 3.12.0'
 end

data/lib/jekyll-asciidoc/converter.rb

@@ -94,14 +94,15 @@ module Jekyll
               'site-root' => ::Dir.pwd,
               'site-source' => source,
               'site-destination' => dest,
-              'site-baseurl' => config['baseurl'],
+              'site-baseurl' => (baseurl = config['baseurl']),
               'site-url' => config['url'],
             }
             attrs = asciidoctor_config[:attributes] = compile_attributes asciidoctor_config[:attributes],
                 (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 '@')
+            if (imagesdir = attrs['imagesdir']) && (imagesdir.start_with? '/')
+              attrs['imagesoutdir'] = ::File.join dest, (imagesdir.chomp '@') unless attrs.key? 'imagesoutdir'
+              attrs['imagesdir'] = baseurl + imagesdir unless baseurl.to_s.empty?
             end
             asciidoctor_config.extend Configured
           end
@@ -217,6 +218,8 @@ module Jekyll
               paths.delete 'docdir'
             end
             opts[:attributes] = opts[:attributes].merge paths
+          elsif opts[:base_dir] == :docdir
+            opts.delete :base_dir
           end
           if (doctype = data['doctype'])
             opts[:doctype] = doctype

data/lib/jekyll-asciidoc/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AsciiDoc
-    VERSION = '3.0.0'
+    VERSION = '3.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-asciidoc
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -40,89 +46,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: deep-cover-core
+  name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 13.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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.74.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.74.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 3.12.0
 description: A Jekyll plugin that converts the AsciiDoc source files in your site
   to HTML pages using Asciidoctor.
 email:
@@ -134,7 +112,7 @@ files:
 - ".yardopts"
 - CHANGELOG.adoc
 - Gemfile
-- LICENSE.adoc
+- LICENSE
 - README.adoc
 - jekyll-asciidoc.gemspec
 - lib/jekyll-asciidoc.rb
@@ -174,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin that converts the AsciiDoc source files in your site to HTML