middleman-asciidoc 1.0.0.rc.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa72cd0510e5297fab150560bad9f8442cc6d7c096b10251f660ab841d686107
-  data.tar.gz: 9fae6c014ec4b90ee98f8ec24f40eee7167f822d129001578f80cc138bc1d043
+  metadata.gz: 7909cdd279e171a461923db5746fdf236ee381dbb8f8363270e8430955fa089c
+  data.tar.gz: 4e6ce5b8dc92d08ce60c19357cb57fb488b6cbde5fbbe1bcf3cba3ecd69bdd02
 SHA512:
-  metadata.gz: 4726cd97933cce73a7dda15de14f1a22a42c2f822f91b8b2d337669e48610c8428cffd6531c1464ab172f29510eeb677734b7fa4bc64aa1c35743e8de1099cc3
-  data.tar.gz: 65e8dfa84591fac199e070ef733b34e4d1600c31b31801b6febcf95f21e0627883dbd5b62bdb9bb0fc7bc5c602574a82b075611fce9527873ce27b2064bba797
+  metadata.gz: 8ee1f3439e6c295076bebe35f0f62229860ffc68455bdbe6ae73ad2dd1ee88ff3c21c55fb551b88a725e456c6e8fa5438f275da1c4995138c8ebde43e946ed95
+  data.tar.gz: d2cc8173fa9f43976dbc82a7286b5b353744c23924b59cd44cfb3f0a423e3f078791773f66b84733d39fcf0caa9ed8825142af048c65d6b754eb731a46c78999

data/CHANGELOG.adoc

@@ -1,14 +1,24 @@
-= Middleman AsciiDoc Changelog
+= {project-name} Changelog
+:project-name: Middleman AsciiDoc
+:uri-repo: https://github.com/middleman/middleman-asciidoc
 
-== 1.0.0 (pending) - @mojavelinux
+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.
 
-* Split AsciiDoc support out of Middleman core into its own extension.
+== 1.0.0 (2018-01-28) - @mojavelinux
 
-//^
-Distribution Packages::
+* Split AsciiDoc support out of Middleman core into its own extension / gem (Middleman >= 4).
+* Generate standalone document when page-layout is unset or false.
+* Set env attribute to site instead of middleman.
+* Parse value of page attributes as YAML.
+* Add better integration between AsciiDoc header attributes and page data.
+* Support use of custom AsciiDoc templates.
+* Make AsciiDoc Document object available to template.
+* Add test suite.
+* Improve README.
+* Test integration with the Middleman blog extension.
+* Test integration with Asciidoctor Diagram.
 
-  * http://rubygems.org/gems/middleman-asciidoc[RubyGem (middleman-asciidoc)]
-
-https://github.com/middleman/middleman-asciidoc/issues?q=milestone%3Av1.0.0[issues resolved] |
-https://github.com/middleman/middleman-asciidoc/releases/tag/v1.0.0[git tag] |
-https://github.com/middleman/middleman-asciidoc/compare/1e7871a3237320239f31da10d982174f84497daa...v1.0.0[full diff]
+{uri-repo}/issues?q=milestone%3Av1.0.0[issues resolved] |
+{uri-repo}/releases/tag/v1.0.0[git tag] |
+{uri-repo}/compare/1e7871a3237320239f31da10d982174f84497daa...v1.0.0[full diff]

data/Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 # Runtime dependencies are defined in middleman-asciidoc.gemspec
 gemspec
 
-# NOTE when running tests on JRuby, use version of middleman-core that does not depend on fast_blank
-#git 'https://github.com/middleman/middleman.git', ref: '1d13e415e27aa1b30d85fecebf8cc0f91d4023c6' do
-# ...and which fixes the misplaced chmod command
-git 'https://github.com/mojavelinux/middleman.git', branch: 'jruby-compat-fix' do
+# NOTE to run tests on JRuby, use a version of middleman-core that:
+# a) doesn't depend on fast_blank and
+# b) fixes the misplaced chmod command
+git 'https://github.com/middleman/middleman.git', ref: '0936519ab9fc28cf1c07dc8ed555d97d96c8c176' do
   gem 'middleman-core'
 end if RUBY_ENGINE == 'jruby'
 
@@ -35,3 +35,4 @@ if (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.2.0')
 else
   gem 'middleman-cli', '~> 4.2.0', require: false
 end
+gem 'asciidoctor-diagram', require: false

data/LICENSE.adoc

@@ -1,6 +1,6 @@
 .MIT License
 ....
-Copyright (C) 2014-2017 Dan Allen and the Asciidoctor Project
+Copyright (C) 2014-2018 Dan Allen 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

data/README.adoc

@@ -1,6 +1,6 @@
 = AsciiDoc Extension for Middleman (powered by Asciidoctor)
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0.rc.8, 2017-12-28
+v1.0.0, 2018-01-28
 // Settings:
 :idprefix:
 :idseparator: -
@@ -26,6 +26,7 @@ endif::[]
 :uri-middleman-forum: https://forum.middlemanapp.com
 :uri-asciidoc: http://asciidoc.org
 :uri-asciidoctor: http://asciidoctor.org
+:uri-asciidoctor-diagram: {uri-asciidoctor}/docs/asciidoctor-diagram
 :uri-asciidoctor-discuss: http://discuss.asciidoctor.org
 :uri-gem: https://rubygems.org/gems/middleman-asciidoc
 :uri-tilt: https://github.com/rtomayko/tilt
@@ -112,7 +113,7 @@ end
 The following option keys can be used to configure this extension.
 With the exception of `layout`, these option keys map directly to options in the Asciidoctor API.
 
-attributes (type: Hash or String Array, default: [])::
+attributes (type: Hash or String Array, default: {})::
 Custom AsciiDoc attributes to pass to the processor.
 The following built-in attributes are automatically appended to this collection.
 (You can remove a built-in attribute by passing a custom attribute with the corresponding name prefixed with `-`).
@@ -164,6 +165,14 @@ Options must be indexed by the template engine name (e.g., `:slim`).
 
 TIP: The full set of options can be seen on your preview server's config page at the path [.path]_/__middleman/config/_.
 
+The following implicit attributes are passed to the AsciiDoc processor prior to the page being converted, making them available to both the AsciiDoc source and extensions:
+
+* outfile - the absolute path of the output (HTML) file
+* outdir - the absolute path of the directory containing the output file
+
+In addition to the `outdir` attribute, the `:to_dir` option is also passed to the AsciiDoc processor, and subsequently available on the parsed document object.
+This option may be useful for certain integrations, such as Asciidoctor Diagram.
+
 === Configuring Specific Pages
 
 You can pass extra attributes and other options to the AsciiDoc processor for a given page (or set of pages) using the `:renderer_options` option of the `page` directive (where the "`renderer`" is the AsciiDoc processor):
@@ -190,6 +199,56 @@ page 'manual', attributes: { 'sectanchors' => '' }
 
 The `:attributes` option on the page directive takes precedence over the `:attributes` option in `:renderer_options`.
 
+=== Defining Additional Site Attributes
+
+Middleman doesn't have a predefined schema for site-related data, such as the title, url, and author.
+However, since this information is needed for most sites, authors end up defining one themselves.
+This section describes how to make this site-related information available to your AsciiDoc documents as attributes.
+
+To maintain consistently with integrations for other site generators, we'll use `site-` as the prefix for site-related attributes.
+For example, the site title will be named `site-title`.
+
+First, we assume you've created a data file named [.path]_site.yml_ in the data directory.
+For example:
+
+.data/site.yml
+[source,yml]
+----
+title: Site Title
+url: http://example.com
+description: An awesome site.
+author: Joe Cool
+----
+
+The information in this file is available via the variable path `app.data.site`.
+The next step is to convert this information into AsciiDoc attributes.
+
+Inside the activate block for the AsciiDoc extension, convert this data into attributes to pass to AsciiDoc, then assign the result to the `attributes` property of the extension.
+
+[source,ruby]
+----
+activate :asciidoc do |asciidoc|
+  attributes = {}
+  allowed_value_types = [String, Numeric, TrueClass, FalseClass, Date, Time]
+  app.data.site.inject(attributes) do |accum, (k, v)|
+    accum[%(site-#{k})] = v if allowed_value_types.detect {|type| type === v }
+    accum
+  end
+  asciidoc.attributes = attributes
+end
+----
+
+You can now access these attributes from any AsciiDoc document in the site.
+For example, to reference the site title, you'd use:
+
+[source,asciidoc]
+----
+{site-title}
+----
+
+If you want to support nested properties (e.g., `site.blog.title`), you can refactor the code above into a function you can call recursively.
+The convention is to flatten these paths into attribute names using the hyphen character (e.g., `site-blog-title`).
+
 == Creating Pages
 
 Each AsciiDoc file in the source directory (except for files that begin with `+_+` or which are located in a directory that begins with `+_+`) becomes a page in the site.
@@ -234,7 +293,7 @@ In addition to these explicit page attributes, the following AsciiDoc attributes
 * description
 
 TIP: You can continue to specify page data using the front matter header.
-The AsciiDoc `page-` attributes override matching entries in the front matter header.
+Keep in mind that the AsciiDoc `page-` attributes override matching entries in the front matter header.
 
 NOTE: If you specify a time zone in the value of the `revdate` attribute, that time zone is honored.
 Otherwise, the date specified is assumed to have the time zone set for the application.
@@ -573,6 +632,90 @@ Populate the file with the following contents:
 
 The next time you build your site, Asciidoctor will use your custom template to generate HTML for all unordered lists converted from AsciiDoc.
 
+== Using Asciidoctor Diagram
+
+You can use {uri-asciidoctor-diagram}[Asciidoctor Diagram] (gem: *asciidoctor-diagram*) to generate diagrams from plain text defined in specially marked literal blocks.
+Follow the steps below to enable Asciidoctor Diagram in your Middleman site.
+
+=== Step {counter:diagram-step}: Add the Asciidoctor Diagram Gem
+
+You'll first need to add the *asciidoctor-diagram* gem to your [.path]_Gemfile_.
+
+[source,ruby]
+----
+gem 'asciidoctor-diagram'
+----
+
+If you plan to make diagrams that rely on external commands, such as graphviz (dot), you may need to install additional external applications.
+Consult the {uri-asciidoctor-diagram}#specifying-diagram-generator-paths[Asciidoctor Diagram docs] for further instructions.
+
+=== Step {counter:diagram-step}: Install New Gems
+
+Now run the `bundle` command to install the gem.
+
+ $ bundle
+
+=== Step {counter:diagram-step}: Switch Asciidoctor to Unsafe Mode
+
+This step is very important.
+You must change Asciidoctor to unsafe mode.
+Don't worry, it's not that unsafe.
+It just means that Asciidoctor Diagram will be able to write the generated image to a parent directory of the source file.
+
+[source,ruby]
+----
+activate :asciidoc, safe: :unsafe
+----
+
+=== Step {counter:diagram-step}: Skip Build Clean
+
+To prevent Middleman from removing the generated images when you run the `build` command, you need to add the following function to [.path]_config.rb_.
+
+[source,ruby]
+----
+set :skip_build_clean, proc {|f| f.start_with? 'build/images/' }
+----
+
+This step is necessary since the generated images don't get registered with the sitemap.
+As a result, Middleman inconveniently wants to remove them for you.
+
+=== Step {counter:diagram-step}: Start Making Diagrams
+
+At this point, you're all set to start making diagrams!
+Just create an AsciiDoc page in the source folder and populate it with the following contents:
+
+[source,html]
+----
+= Diagrams FTW!
+
+Here's a document symbol generated by ditaa.
+
+[ditaa,document,png]
+....
++----+
+|{d} |
+|    |
++----+
+....
+----
+
+The next time you generate the site, Asciidoctor Diagram replaces the literal block that has the style `ditaa` with a generated diagram.
+The diagram image ends up in the images folder under the build folder (build/images/document.png).
+The corresponding `<img>` element in the HTML refers to this image using a root-relative path (/images/document.png).
+Asciidoctor Diagram caches information about the image under the [.path]_.asciidoctor/diagram_ folder relative to the project root (MM_ROOT).
+This folder is safe to delete.
+
+=== Limitations
+
+There are limitations with using Asciidoctor Diagram with Middleman.
+Since Asciidoctor Diagram generates the images during AsciiDoc conversion, Middleman doesn't know about these resources (since they don't get registered in Middleman's sitemap).
+As a result, there are two things you must be aware of:
+
+* Diagrams won't be shown when using the preview server (server)
+* Middleman will try to purge the generated images when building the site (build)
+
+To prevent Middleman from purging the diagrams, you need to add the "`skip build clean`" function mentioned above.
+
 == Community
 
 The official community forum for Middleman can be found at {uri-middleman-forum}.
@@ -611,6 +754,6 @@ Here's how to clone the project and run the tests.
 
 == Copyright
 
-Copyright (C) 2014-2017 Dan Allen and the Asciidoctor Project.
+Copyright (C) 2014-2018 Dan Allen and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 For the full text of the license, see the <<LICENSE.adoc#,LICENSE>> file.

data/Rakefile

@@ -8,8 +8,8 @@ require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
   exempt_tags = ''
-  exempt_tags << '--tags ~@nojava ' if RUBY_PLATFORM == 'java'
-  t.cucumber_opts = %(--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'})
+  exempt_tags << ' --tags \'not @nojava\'' if RUBY_PLATFORM == 'java'
+  t.cucumber_opts = %(--color --tags 'not @wip'#{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'})
 end
 
 require 'rake/clean'

data/features/asciidoc-blog.feature

@@ -15,7 +15,7 @@ Feature: Blog Integration
           <article>
             <header>
               <span>by Blog Author</span>
-              <time datetime="2017-09-01T15:00:00Z">Sep  1, 2017</time>
+              <time datetime="2017-09-01T15:00:00Z">Sep 1, 2017</time>
             </header>
             <h1>Welcome</h1>
       <div class="paragraph">
@@ -127,5 +127,37 @@ Feature: Blog Integration
     When I go to "/blog-2/2017/a-fresh-start.html"
     Then I should see:
       """
-      <time datetime="2017-09-01T15:45:00Z">Sep  1, 2017</time>
+      <time datetime="2017-09-01T15:45:00Z">Sep 1, 2017</time>
       """
+
+  Scenario: The date can be specified by the filename only
+    Given a fixture app "asciidoc-blog-app"
+    And app "asciidoc-blog-app" is using config "date-in-filename"
+    And a file named "source/blog-2/2018-01-01-dates-are-arbitrary.adoc" with:
+      """
+      = What's in a Date?
+      Reflective Soul
+      
+      Why do we put so much weight on a date?
+      """
+    And the Server is running
+    When I go to "/blog-2/2018/dates-are-arbitrary.html"
+    Then I should see:
+      """
+      <time datetime="2018-01-01T00:00:00Z">Jan 1, 2018</time>
+      """
+
+  Scenario: Disagreement between date in article and date in filename
+    Given a fixture app "asciidoc-blog-app"
+    And app "asciidoc-blog-app" is using config "date-in-filename"
+    And a file named "source/blog-2/2017-04-20-what-day-is-it.adoc" with:
+      """
+      = What Day Is It?
+      Joe Cool
+      :revdate: 2017-10-20 09:45 MDT
+      
+      This blog is bakin'.
+      """
+    When I run `middleman build`
+    Then the output should contain "doesn't match the date in its frontmatter"
+    And the exit status should be 1

data/features/asciidoc-pages.feature

@@ -394,6 +394,21 @@ Feature: AsciiDoc Support
     And I should see content matching %r{<p>site-destination=.+/tmp/aruba/asciidoc-pages-app/build</p>}
     And I should see content matching %r{<p>site-environment=development</p>}
 
+  Scenario: Publishing document information as AsciiDoc attributes
+    Given the Server is running at "asciidoc-pages-app"
+    When I go to "/document-information.html"
+    Then I should see content matching %r{<p>docdir=.+/tmp/aruba/asciidoc-pages-app/source</p>}
+    And I should see content matching %r{<p>docfile=.+/tmp/aruba/asciidoc-pages-app/source/document-information.adoc</p>}
+    And I should see "<p>docfilesuffix=.adoc</p>"
+    And I should see "<p>docname=document-information</p>"
+    And I should see content matching %r{<p>outdir=.+/tmp/aruba/asciidoc-pages-app/build</p>}
+    And I should see content matching %r{<p>outfile=.+/tmp/aruba/asciidoc-pages-app/build/document-information.html</p>}
+
+  Scenario: Sets value of to_dir option on parsed document
+    Given the Server is running at "asciidoc-pages-app"
+    When I go to "/page-data.html"
+    Then I should see content matching %r{<p>to_dir=.+/tmp/aruba/asciidoc-pages-app/build</p>}
+
   Scenario: Assigning page ID to page-id attribute
     Given the Server is running at "asciidoc-pages-app"
     When I go to "/topic/echo-page-id.html"
@@ -694,6 +709,23 @@ Feature: AsciiDoc Support
     When I go to "/custom-attribute.html"
     Then I should see "bar{baz}"
 
+  Scenario: Defaults attributes setting to empty Hash
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      activate :asciidoc do |asciidoc|
+        if Hash === asciidoc.attributes
+          asciidoc.attributes = asciidoc.attributes.merge({ 'foo' => 'bar' })
+        end
+      end
+      """
+    And the Server is running
+    When I go to "/custom-attribute.html"
+    Then I should see:
+      """
+      bar
+      """
+
   Scenario: Using non-string attribute values in AsciiDoc attributes Hash
     Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
@@ -794,3 +826,81 @@ Feature: AsciiDoc Support
       </div>
       </div>
       """
+
+  Scenario: Asciidoctor Diagram integration
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      require 'asciidoctor-diagram'
+      activate :asciidoc, safe: :unsafe
+      """
+    And a file named "source/diagrams/document.adoc" with:
+      """
+      [ditaa,document,png]
+      ....
+      +-----+
+      |{d}  |
+      |     |
+      +-----+
+      ....
+      """
+    And the Server is running
+    When I go to "/diagrams/document.html"
+    Then I should see:
+      """
+      <img src="/images/document.png" alt="document"
+      """
+    # NOTE we can't request the image URL since it's not in the sitemap
+    When I cd to "build"
+    Then the following files should exist:
+    | images/document.png |
+
+  Scenario: Asciidoctor Diagram cache
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      require 'asciidoctor-diagram'
+      activate :asciidoc, safe: :unsafe
+      """
+    And a file named "source/diagrams/storage.adoc" with:
+      """
+      [ditaa,storage,png]
+      ....
+      +-----+
+      |{s}  |
+      |     |
+      +-----+
+      ....
+      """
+    And the Server is running
+    When I go to "/diagrams/storage.html"
+    Then the file ".asciidoctor/diagram/storage.png.cache" should contain "checksum"
+
+  Scenario: Custom Asciidoctor Diagram imagesoutdir
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      require 'asciidoctor-diagram'
+      activate :asciidoc, safe: :unsafe,
+        attributes: { 'imagesoutdir' => (app.root_path.join app.config[:build_dir], 'images/diagrams').to_s }
+      """
+    And a file named "source/diagrams/io.adoc" with:
+      """
+      :imagesdir: {imagesdir}/diagrams
+      [ditaa,io,png]
+      ....
+      +-----+
+      |{io} |
+      |     |
+      +-----+
+      ....
+      """
+    And the Server is running
+    When I go to "/diagrams/io.html"
+    Then I should see:
+      """
+      <img src="/images/diagrams/io.png" alt="io"
+      """
+    When I cd to "build"
+    Then the following files should exist:
+    | images/diagrams/io.png |

data/fixtures/asciidoc-blog-app/source/layouts/article.erb

@@ -8,7 +8,7 @@
     <article>
       <header>
         <span>by <%= current_article.data.authors * ', ' %></span>
-        <time datetime="<%= current_article.date.getutc.iso8601 %>"><%= current_article.date.strftime '%b %e, %Y' %></time>
+        <time datetime="<%= current_article.date.getutc.iso8601 %>"><%= current_article.date.strftime '%b %-e, %Y' %></time>
         <% unless current_article.tags.empty? %>
         <span class="tags">
           <% current_article.tags.sort.each do |tag| %>

data/fixtures/asciidoc-pages-app/source/document-information.adoc

@@ -0,0 +1,8 @@
+= Doc Information
+
+* docdir={docdir}
+* docfile={docfile}
+* docfilesuffix={docfilesuffix}
+* docname={docname}
+* outdir={outdir}
+* outfile={outfile}

data/fixtures/asciidoc-pages-app/source/layouts/inspect-page-data.erb

@@ -7,5 +7,6 @@
 <pre>{<%= current_resource.data.keys.sort.map {|k|
   %("#{k}"=>#{(k == 'document' ? current_resource.data[k].doctitle : (JSON.load current_resource.data[k].to_json)).inspect })
 } * ', ' %>}</pre>
+<p>to_dir=<%= current_resource.data.document.options[:to_dir] %></p>
 </body>
 </html>

data/lib/middleman-asciidoc/diagram_ext.rb

@@ -0,0 +1,14 @@
+module Middleman; module AsciiDoc
+  module DiagramProcessorExt
+    def cache_dir parent
+      if ENV.key? 'MM_ROOT'
+        File.join ENV['MM_ROOT'], '.asciidoctor/diagram'
+      else
+        super
+      end
+    end
+
+    ::Asciidoctor::Diagram::Extensions::DiagramBlockProcessor.send :prepend, self
+    ::Asciidoctor::Diagram::Extensions::DiagramBlockMacroProcessor.send :prepend, self
+  end
+end; end

data/lib/middleman-asciidoc/extension.rb

@@ -19,7 +19,7 @@ module Middleman
 
       AttributeReferenceRx = /\\?\{(\w+(?:[\-]\w+)*)\}/
 
-      option :attributes, [], 'AsciiDoc attributes passed to all AsciiDoc-based pages. Defaults to empty Array. (Hash or Array)'
+      option :attributes, {}, 'AsciiDoc attributes passed to all AsciiDoc-based pages. Defaults to empty Hash. (Hash or Array)'
       option :backend, :html5, 'Moniker used to select output format for AsciiDoc-based pages. Defaults to :html5. (Symbol)'
       option :base_dir, :docdir, 'Base directory to use for the current AsciiDoc document. Defaults to :docdir, which resolves to the document directory. (String)'
       option :safe, :safe, 'Safe mode level for AsciiDoc processor. Defaults to :safe. (Symbol)'
@@ -32,7 +32,6 @@ module Middleman
         super unless app.mode? :config
       end
 
-      # NOTE options passed to activate take precedence (e.g., activate :asciidoc, attributes: ['foo=bar'])
       def after_configuration
         app.config[:asciidoc_extensions] = prune_tilt_mapping!
         set_time_zone app.config[:time_zone]
@@ -53,7 +52,10 @@ module Middleman
             attributes['relfileprefix'] = '../'
           end
           attributes['imagesdir'] = %(#{[((app.config[:http_prefix] || '').chomp '/'), app.config[:images_dir]] * '/'}@)
-          attributes = merge_attributes options[:attributes], attributes if (options.setting :attributes).value_set?
+          unless (user_attributes = options[:attributes] || {}).empty?
+            attributes = merge_attributes user_attributes, attributes
+          end
+          require 'middleman-asciidoc/diagram_ext' if defined? ::Asciidoctor::Diagram::VERSION
           if !(attributes.key? 'imagesoutdir') && (imagesdir = attributes['imagesdir']) && (imagesdir.start_with? '/')
             attributes['imagesoutdir'] = ::File.join dest, (imagesdir.chomp '@')
           end

data/lib/middleman-asciidoc/template.rb

@@ -6,16 +6,28 @@ module Middleman; module AsciiDoc
     DEFAULT_OPTIONS = { header_footer: false }
 
     def prepare
-      @document = ::Asciidoctor.load data, (DEFAULT_OPTIONS.merge options)
-      if ::Middleman::TemplateContext === (ctx = options[:context])
-        ctx.current_page.data.document = @document
+      opts = DEFAULT_OPTIONS.merge options
+      if (ctx = middleman_context)
+        attrs = opts[:attributes]
+        attrs['outfile'] = outfile = ::File.join \
+            (ctx.app.root_path.join ctx.app.config[:build_dir].to_s),
+            ctx.current_page.destination_path
+        attrs['outdir'] = opts[:to_dir] = ::File.dirname outfile
       end
+      @document = ::Asciidoctor.load data, opts
+      ctx.current_page.data.document = @document if ctx
       @output = nil
     end
 
     def evaluate scope, locals
       @output ||= @document.convert
     end
+
+    def middleman_context
+      if ::Middleman::TemplateContext === (ctx = options[:context])
+        ctx
+      end
+    end
   end
 
   if (template_class = ::Tilt[:adoc])

data/lib/middleman-asciidoc/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module AsciiDoc
-    VERSION = '1.0.0.rc.8'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-asciidoc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -86,6 +86,7 @@ files:
 - fixtures/asciidoc-pages-app/source/code.adoc
 - fixtures/asciidoc-pages-app/source/custom-attribute.adoc
 - fixtures/asciidoc-pages-app/source/custom-imagesdir.adoc
+- fixtures/asciidoc-pages-app/source/document-information.adoc
 - fixtures/asciidoc-pages-app/source/gallery.adoc
 - fixtures/asciidoc-pages-app/source/goodbye.asciidoc
 - fixtures/asciidoc-pages-app/source/hello-with-extension.html.adoc
@@ -116,6 +117,7 @@ files:
 - fixtures/asciidoc-pages-app/source/topic/echo-page-id.adoc
 - fixtures/asciidoc-pages-app/source/with-sections.adoc
 - lib/middleman-asciidoc.rb
+- lib/middleman-asciidoc/diagram_ext.rb
 - lib/middleman-asciidoc/extension.rb
 - lib/middleman-asciidoc/middleman_extension.rb
 - lib/middleman-asciidoc/template.rb
@@ -136,9 +138,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.4
@@ -179,6 +181,7 @@ test_files:
 - fixtures/asciidoc-pages-app/source/code.adoc
 - fixtures/asciidoc-pages-app/source/custom-attribute.adoc
 - fixtures/asciidoc-pages-app/source/custom-imagesdir.adoc
+- fixtures/asciidoc-pages-app/source/document-information.adoc
 - fixtures/asciidoc-pages-app/source/gallery.adoc
 - fixtures/asciidoc-pages-app/source/goodbye.asciidoc
 - fixtures/asciidoc-pages-app/source/hello-with-extension.html.adoc