middleman-asciidoc 1.0.0.rc.6 → 1.0.0.rc.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fbada42f7900398ed4146ab4c34415730ff11250e7fe0aeac5fb0a9ab79052f
-  data.tar.gz: 8f8d642ddad76e9543043b12537b8d993e187a488b8441345e6251d868d95b65
+  metadata.gz: 7ae4f8ddef716de5e418a26661263c42e49aaf6904d8a8afc909ea0edf780242
+  data.tar.gz: e46fca12ff3c1406ef222daf7e0d0b62d99955d523b35a63bf855fb87eaf137d
 SHA512:
-  metadata.gz: 08bef99c6140b5dfbfe52cdf0ea75a4fb493cc086b5cd56ba31cd3bf0cdc6bf0b673ad160adf36cb2105e023e6b8363089dab51c895603bf77bfd62aac2a191d
-  data.tar.gz: e205ad469ba66138631ea7cf0040a64df009c7f78129ec658c125e73dcfbd2f49f23edd9a12d73d988463da26c9837a3479395ef123b3f27d727139abb79bb68
+  metadata.gz: 0dce20bf3fda0ac2d72f39fccd325c948a2536bc80fe1d64dfc3412c82ffcb22b4ec31902c31a4629612081ba29804ed67ad343b0e2274e6a0ee83f9256283f6
+  data.tar.gz: e8cc0aa2f4345a7a025d20c6b36d08d9fdb4c5854733392ffb8371ad42e9e2e7f289ae8feb12a65449e33dcef3811c37f771096f40d8926e4212ca1ffdea0246

data/Gemfile

@@ -19,8 +19,8 @@ gem 'cucumber', '~> 2.0', require: false
 gem 'aruba', '~> 0.7.4', require: false
 gem 'capybara', '~> 2.5.0', require: false
 
-# Code quality tools
-gem 'cane', platforms: :mri, require: false
+# Code coverage tools
+gem 'simplecov', require: false
 
 # Additional libraries for testing
 # Middleman itself (use for testing against development version)

data/README.adoc

@@ -1,9 +1,10 @@
 = AsciiDoc Extension for Middleman (powered by Asciidoctor)
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0.rc.6, 2017-12-07
+v1.0.0.rc.7, 2017-12-20
 // Settings:
 :idprefix:
 :idseparator: -
+:hide-uri-scheme:
 ifndef::env-github[:icons: font]
 ifdef::env-github,env-browser[]
 :toc: preamble
@@ -20,12 +21,18 @@ ifdef::env-github[]
 endif::[]
 // URIs:
 :uri-repo: https://github.com/middleman/middleman-asciidoc
+:uri-issues: https://github.com/middleman/middleman-asciidoc/issues
 :uri-middleman: https://middlemanapp.com
+:uri-middleman-forum: https://forum.middlemanapp.com
 :uri-asciidoc: http://asciidoc.org
 :uri-asciidoctor: http://asciidoctor.org
+:uri-asciidoctor-discuss: http://discuss.asciidoctor.org
 :uri-gem: https://rubygems.org/gems/middleman-asciidoc
+:uri-tilt: https://github.com/rtomayko/tilt
+:uri-yaml: https://en.wikipedia.org/wiki/YAML
+:uri-help-pr: https://help.github.com/articles/using-pull-requests
 :badge-gem: https://img.shields.io/gem/v/middleman-asciidoc.svg?label=gem
-:uri-build: http://travis-ci.org/middleman/middleman-asciidoc
+:uri-build: https://travis-ci.org/middleman/middleman-asciidoc
 :badge-build: https://img.shields.io/travis/middleman/middleman-asciidoc/master.svg
 :uri-deps: https://gemnasium.com/middleman/middleman-asciidoc
 :badge-deps: https://img.shields.io/gemnasium/middleman/middleman-asciidoc.svg
@@ -48,7 +55,7 @@ Prior to Middleman 4, AsciiDoc support was bundled with Middleman.
 
 == Installation
 
-If you're just getting started, first install the Middleman gem.
+If you're just getting started, first install the *middleman* gem.
 
  $ gem install middleman
 
@@ -110,7 +117,8 @@ With the exception of `layout`, these option keys map directly to options in the
 
 attributes (type: Hash or Array, default: [])::
 Custom AsciiDoc attributes to pass to the processor.
-The following implicit attributes are automatically appended to this collection.
+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 `-`).
 
 * env=site
 * env-site
@@ -119,9 +127,16 @@ The following implicit attributes are automatically appended to this collection.
 * builder=middleman
 * builder-middleman
 * middleman-version=(value of `Middleman::VERSION` constant)
-* imagesdir=(value of http_prefix + images_dir in app config)@
- ** skipped if `!imagesdir` is defined as a custom attribute
- ** can be overridden in page (hence the trailing @)
+* site-root=(app.root.to_s)
+* site-source=(app.source_dir.to_s)
+* site-destination=(app.root.to_s + / + app.config[:build_dir])
+* site-environment=(app.environment.to_s)
+* relfilesuffix=(path to index file, as configured, if directory indexes are enabled)
+* relfilesuffix=../ if directory indexes are enabled
+* imagesdir=(http_prefix + app.config[:images_dir])@
+ ** skipped if `-imagesdir` (soft unset) or `!imagesdir` (hard unset) is defined as a custom attribute
+ ** can be overridden by page, hence the trailing @
+* imagesoutdir=(imagesdir relative to site destination)
 
 backend (type: Symbol, default: :html5)::
 The moniker for a converter, which determines the output format to generate.
@@ -146,7 +161,7 @@ Each AsciiDoc file in the source directory (except for files that begin with `+_
 AsciiDoc files can have the file extension `.adoc` or `.html.adoc`.
 These extensions are stripped and replaced with the value of the `outfilesuffix` attribute, which defaults to `.html`.
 
-NOTE: For details about how the file extension is substituted, see the discussion in https://github.com/middleman/middleman-asciidoc/issues/7[issue #7].
+NOTE: For details about how the file extension is substituted, see the discussion in {uri-issues}/7[issue #7].
 
 To add a page composed in AsciiDoc, simply add an AsciiDoc file that has one of the aforementioned AsciiDoc file extensions to the project source directory.
 
@@ -170,7 +185,7 @@ puts "Hello, World!"
 
 AsciiDoc attributes defined in the document header whose names begin with `page-` are promoted to page data (aka front matter).
 The part of the name after the `page-` prefix is used as the entry's key (e.g., page-layout becomes layout).
-The value is parsed as https://en.wikipedia.org/wiki/YAML[YAML] data (that which can be expressed in a single line).
+The value is parsed as {uri-yaml}[YAML] data (that which can be expressed in a single line).
 
 In addition to these explicit page attributes, the following AsciiDoc attributes are also promoted to page data:
 
@@ -245,6 +260,30 @@ Here are the different ways to specify a layout:
 .Layout for blog posts
 WARNING: If you're using the Middleman Blog extension to write blog posts, the `layout` property on the blog configuration overrides the default layout, but you can still override that setting using the `page-layout` attribute in each post.
 
+==== Accessing the AsciiDoc Configuration From a Layout
+
+You can access the global configuration for the AsciiDoc extension from a layout template using the variable path `app.config.asciidoc` (Hash).
+
+For example, let's say you want to reference the location stored in the `imagesoutdir` attribute.
+You can do so in an ERB template using:
+
+----
+<%= app.config.asciidoc[:attributes]['imagesoutdir'] %>
+----
+
+Other processor options, such as `:safe`, are available from the `app.config.asciidoc` variable path.
+
+If you want to access the options passed to the AsciiDoc processor for the current page, use the variable path `current_page.options[:renderer_options]` (Hash) instead.
+
+For example, let's say you want to access the resolved base directory for the current page.
+You can do so in an ERB template using:
+
+----
+<%= current_page.options[:renderer_options][:base_dir] %>
+----
+
+Other processor options, such as `:attributes`, are available from the `current_page.options[:renderer_options]` variable path.
+
 === Ignoring a Page
 
 In addition to the normal ignore filter in Middleman, you can also control whether a page is ignored from AsciiDoc.
@@ -411,18 +450,91 @@ If you're using Bundler, use the following commands instead:
  $ bundle exec middleman build
  $ bundle exec middleman serve
 
+== Customizing the HTML
+
+You can use templates to customize the HTML Asciidoctor generates for the pages in your site.
+Each template file corresponds to a node in the AsciiDoc document tree (aka AST).
+Template files can be composed in any templating language supported by {uri-tilt}[Tilt].
+
+Follow the steps below to configure Asciidoctor to use custom templates when converting AsciiDoc documents to HTML.
+
+=== Step {counter:step}: Add Required Gems
+
+You'll first need to add the *thread_safe* gem to your [.path]_Gemfile_.
+If you plan to use a template language other than ERB (.erb) or InterpolatedString (.str), you'll also need to add the dependency for the template language.
+We've decided to use Slim for this example, so we need to also add the *slim* gem.
+
+[source,ruby]
+----
+gem 'slim', '~> 3.0.9'
+gem 'thread_safe', '~> 0.3.6'
+----
+
+=== Step {counter:step}: Install New Gems
+
+Now run the `bundle` command to install the new gems.
+
+ $ bundle
+
+=== Step {counter:step}: Create a Templates Folder
+
+Next, create a new folder in your site named [.path]_source/_asciidoc_templates_ to store your templates for AsciiDoc.
+
+ $ mkdir source/_asciidoc_templates
+
+We prefix the folder name with an underscore so it doesn't get included in the sitemap (i.e., Middleman won't look for pages in this folder).
+
+=== Step {counter:step}: Configure Asciidoctor to Load Templates
+
+In your site's [.path]_config.rb_ file, configure Asciidoctor to load the templates by setting the `:template_dirs` option when activating the extension:
+
+[source,ruby]
+----
+activate :asciidoc, template_dirs: source/_asciidoc_templates
+----
+
+=== Step {counter:step}: Compose a Template
+
+The final step is to compose a template.
+We'll be customizing the unordered list node.
+Add a file named [.path]_ulist.html.slim_ to the [.path]_source/_asciidoc_templates_ directory.
+Populate the file with the following contents:
+
+.source/_asciidoc_templates/ulist.html.slim
+[source,slim]
+----
+- if title?
+  figure.list.unordered id=id
+    figcaption=title
+    ul class=[style, role]
+      - items.each do |_item|
+        li
+          span.primary=_item.text
+          - if _item.blocks?
+            =_item.content
+- else
+  ul id=id class=[style, role]
+    - items.each do |_item|
+      li
+        span.primary=_item.text
+        - if _item.blocks?
+          =_item.content
+----
+
+The next time you build your site, Asciidoctor will use your custom template to generate HTML for all unordered lists converted from AsciiDoc.
+
 == Community
 
-The official community forum for Middleman can be found at http://forum.middlemanapp.com.
-For questions related to this extension or general questions about AsciiDoc, please post to the Asciidoctor discussion list at http://discuss.asciidoctor.org.
+The official community forum for Middleman can be found at {uri-middleman-forum}.
+For questions related to this extension or general questions about AsciiDoc, please post to the Asciidoctor discussion list at {uri-asciidoctor-discuss}.
 
 == Bug Reports
 
 Github Issues are used for managing bug reports and feature requests.
-If you run into issues, please search the issues and submit new problems in the project's https://github.com/middleman/middleman-asciidoc/issues[issue tracker].
+If you run into issues, please search the issues and submit new problems in the project's {uri-issues}[issue tracker].
 
 The best way to get quick responses to your issues and swift fixes to your bugs is to submit detailed bug reports, include test cases and respond to developer questions in a timely manner.
-Even better, if you know Ruby, you can submit https://help.github.com/articles/using-pull-requests[pull requests] containing Cucumber Features which describe how your feature should work or exploit the bug you are submitting.
+Even better, if you know Ruby, you can submit {uri-help-pr}[pull requests] containing Cucumber Features which describe how your feature should work or exploit the bug you are submitting.
 
 == How to Run Tests
 
@@ -430,9 +542,10 @@ The tests are based on Cucumber.
 Here's how to clone the project and run the tests.
 
 . Clone the repository:
-
- $ git clone https://github.com/middleman/middleman-asciidoc.git &&
-   cd middleman-asciidoc
++
+[subs=attributes+]
+ $ git clone {uri-repo} &&
+   cd "`basename $_`"
 
 . Install Bundler (if not already installed):
 

data/Rakefile

@@ -17,19 +17,6 @@ require 'rake/clean'
 task :test => ['cucumber']
 task :default => ['test', 'build']
 
-begin
-  require 'cane/rake_task'
-
-  desc 'Run cane to check quality metrics'
-  Cane::RakeTask.new(:quality) do |cane|
-    cane.no_style = true
-    cane.no_doc = true
-    cane.abc_glob = 'lib/middleman-asciidoc/**/*.rb'
-  end
-rescue LoadError
-  # warn 'cane not available, quality task not provided.'
-end
-
 desc 'Build HTML documentation'
 task :doc do
   sh 'bundle exec yard'

data/features/asciidoc-pages.feature

@@ -226,6 +226,33 @@ Feature: AsciiDoc Support
       </div>
       """
 
+  Scenario: Rendering html with layout and layout engine specified
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "source/layout-engine.adoc" with:
+      """
+      :page-layout: engine
+      :page-layout-engine: str
+      = Page Title
+
+      Hello, AsciiDoc!
+      """
+    And the Server is running
+    When I go to "/layout-engine.html"
+    Then I should see:
+      """
+      <!DOCTYPE html>
+      <html>
+      <head>
+      <title>str :: Page Title</title>
+      </head>
+      <body>
+      <div class="paragraph">
+      <p>Hello, AsciiDoc!</p>
+      </div>
+      </body>
+      </html>
+      """
+
   Scenario: Rendering html using title and tags from document
     Given the Server is running at "asciidoc-pages-app"
     When I go to "/hello-with-title-and-tags.html"
@@ -407,9 +434,10 @@ Feature: AsciiDoc Support
       <p>Page Title</p>
       <p>Doc Writer</p>
       <p>doc.writer@example.com</p>
-      <p>Doc Writer | Junior Writer</p>
+      <p>Doc Writer | Junior Writer | Random Dude</p>
       <p>https://social.example.com/jrw</p>
       <p>jrw</p>
+      <p>http://example.com</p>
       <p>This is a sample page.</p>
       <p>meta, AsciiDoc, Middleman</p>
       """
@@ -436,6 +464,21 @@ Feature: AsciiDoc Support
       <html data-date="2017-01-01T16:00:00Z">
       """
 
+  Scenario: Using a fixed time as local time for pages
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      set :time_zone, 'America/Los_Angeles'
+      set :time, (Time.parse '2017-01-01 09:00:00 MST')
+      activate :asciidoc
+      """
+    And the Server is running
+    When I go to "/localtime.html"
+    Then I should see:
+      """
+      2017-01-01 08:00:00 PST
+      """
+
   Scenario: Including a file relative to source root
     Given the Server is running at "asciidoc-pages-app"
     When I go to "/master.html"
@@ -571,11 +614,11 @@ Feature: AsciiDoc Support
       </div>
       """
 
-  Scenario: Restoring imagesdir to default value
+  Scenario: Setting imagesdir to blank
     Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
-      activate :asciidoc, attributes: %w(imagesdir!)
+      activate :asciidoc, attributes: %w(imagesdir=)
       """
     And the Server is running
     When I go to "/custom-imagesdir.html"
@@ -587,6 +630,20 @@ Feature: AsciiDoc Support
       </div>
       """
 
+  Scenario: Restoring imagesdir to default value
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      activate :asciidoc, attributes: %w(-imagesdir)
+      """
+    And a file named "source/imagesdir.adoc" with:
+      """
+      imagesdir={imagesdir}
+      """
+    And the Server is running
+    When I go to "/imagesdir.html"
+    Then I should see "imagesdir="
+
   Scenario: Overriding imagesdir attribute in page with imagesdir configuration
     Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
@@ -603,6 +660,20 @@ Feature: AsciiDoc Support
       </div>
       """
 
+  Scenario: Forcefully unsetting AsciiDoc attributes in document
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      activate :asciidoc, attributes: %w(!icons sectanchors!)
+      """
+    And the Server is running
+    When I go to "/page-with-attributes.html"
+    Then I should see:
+      """
+      !icons
+      !sectanchors
+      """
+
   Scenario: Configuring custom AsciiDoc attributes as Array
     Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
@@ -623,6 +694,73 @@ Feature: AsciiDoc Support
     When I go to "/custom-attribute.html"
     Then I should see "bar{baz}"
 
+  Scenario: Using non-string attribute values in AsciiDoc attributes Hash
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      activate :asciidoc, attributes: {
+        'sectnumlevels' => 2,
+        'sectids' => nil,
+        'experimental' => true,
+        'builddate' => (DateTime.parse '2017-01-01T09:00:00-05:00')
+      }
+      """
+    And a file named "source/non-string-attrs.adoc" with:
+      """
+      {sectnumlevels}
+      ifndef::sectids[!sectids]
+      ifdef::experimental[experimental]
+      {builddate}
+      """
+    And the Server is running
+    When I go to "/non-string-attrs.html"
+    Then I should see:
+      """
+      2
+      !sectids
+      experimental
+      2017-01-01T09:00:00-05:00
+      """
+
+  Scenario: Passing invalid type to attributes setting
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      activate :asciidoc, attributes: 'icons=font'
+      """
+    Then running the Server should raise an exception
+
+  Scenario: Setting custom attributes for a specific page
+    Given a fixture app "asciidoc-pages-app"
+    And app "asciidoc-pages-app" is using config "page-attributes"
+    And the Server is running
+    When I go to "/with-sections.html"
+    Then I should see:
+      """
+      <h2 id="_section_a"><a class="anchor" href="#_section_a"></a>Section A</h2>
+      """
+
+  Scenario: Using custom templates to convert AsciiDoc document nodes to HTML
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      activate :asciidoc do |asciidoc|
+        asciidoc.template_dirs = 'source/_templates'
+        asciidoc.template_engine = :erb
+      end
+      """
+    And a file named "source/rosy-paragraph.adoc" with:
+      """
+      [.rosy]
+      Rosey paragraph.
+      """
+    And the Server is running
+    When I go to "/rosy-paragraph.html"
+    Then I should see:
+      """
+      <p class="rosy">Rosey paragraph.</p>
+      """
+
   Scenario: Warn when options are set using `set :asciidoc`
     Given a fixture app "asciidoc-pages-app"
     And app "asciidoc-pages-app" is using config "set-asciidoc"

data/features/support/env.rb

@@ -1,4 +1,6 @@
 PROJECT_ROOT_PATH = File.expand_path '../../..', __FILE__
+# simplecov loads settings from .simplecov
+require 'simplecov' if ENV['COVERAGE'] == 'true'
 ENV['TEST'] = 'true'
 require 'middleman-core'
 require 'middleman-core/step_definitions'

data/features/support/server_steps.rb

@@ -0,0 +1,3 @@
+Then(/^running the Server should raise an exception$/) do
+  expect{ step 'the Server is running' }.to raise_exception RuntimeError
+end

data/fixtures/asciidoc-pages-app/config-page-attributes.rb

@@ -0,0 +1,6 @@
+activate :asciidoc
+page 'with-sections', renderer_options: {
+  attributes: {
+    'sectanchors' => ''
+  }
+}

data/fixtures/asciidoc-pages-app/source/_templates/paragraph.html.erb

@@ -0,0 +1 @@
+<p<% if role? %> class="<%= role %>"<% end %>><%= content %></p>

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

@@ -8,5 +8,6 @@ layout: false
 <p><%= (page_data.authors || []) * ' | ' %></p>
 <p><%= page_data.authors[1].url %></p>
 <p><%= page_data.authors[1].username %></p>
+<p><%= page_data.authors[2].url %></p>
 <p><%= page_data.description %></p>
 <p><%= page_data.keywords %></p>

data/fixtures/asciidoc-pages-app/source/layouts/engine.erb

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>erb :: <%= current_resource.data.title || 'Fallback' %></title>
+</head>
+<body>
+<%= yield %>
+</body>
+</html>

data/fixtures/asciidoc-pages-app/source/layouts/engine.str

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>str :: #{current_resource.data.title || 'Fallback'}</title>
+</head>
+<body>
+#{yield}
+</body>
+</html>

data/fixtures/asciidoc-pages-app/source/localtime.adoc

@@ -0,0 +1,3 @@
+= Local Time
+
+{localdatetime}

data/fixtures/asciidoc-pages-app/source/page-with-attributes.adoc

@@ -0,0 +1,11 @@
+= Page Title
+:icons: font
+:sectanchors:
+
+[subs=attributes]
+++++
+ifdef::icons[icons={icons}]
+ifndef::icons[!icons]
+ifdef::sectanchors[sectanchors]
+ifndef::sectanchors[!sectanchors]
+++++

data/fixtures/asciidoc-pages-app/source/standard-page-data.adoc

@@ -1,5 +1,5 @@
 = Page Title
-Doc Writer <doc.writer@example.com>; Junior Writer <https://social.example.com/jrw[@jrw]>
+Doc Writer <doc.writer@example.com>; Junior Writer <https://social.example.com/jrw[@jrw]>; Random Dude <http://example.com>
 :page-id: std-page-data
 :showtitle:
 :description: This is a sample page.

data/fixtures/asciidoc-pages-app/source/with-sections.adoc

@@ -0,0 +1,11 @@
+= Page Title
+
+Preamble content.
+
+== Section A
+
+Section content.
+
+== Section B
+
+Section content.

data/lib/middleman-asciidoc/extension.rb

@@ -22,7 +22,10 @@ module Middleman
       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)'
-      option :layout, nil, 'Name of layout to use for AsciiDoc-based pages (not blog articles) (String or Symbol)'
+      option :template_dirs, nil, 'Directories containing custom converter templates for the AsciiDoc processor. (String or Array)'
+      option :template_engine, nil, 'Template engine to use for custom converter templates. (String or Symbol)'
+      option :template_engine_options, nil, 'Override options to pass to template engines of custom converter templates (indexed by engine). (Hash)'
+      option :layout, nil, 'Name of layout to use for AsciiDoc-based pages (not blog articles). (String or Symbol)'
 
       def initialize app, options_hash = {}, &block
         super unless app.mode? :config
@@ -33,7 +36,9 @@ module Middleman
         app.config[:asciidoc_extensions] = prune_tilt_mapping!
         set_time_zone app.config[:time_zone]
         if (app.config.defines_setting? :asciidoc)
+          # :nocov:
           warn 'Using `set :asciidoc` to set options for AsciiDoc is no longer supported. Please use `activate :asciidoc`.'
+          # :nocov:
         end
         (app.config[:asciidoc] = {}).tap do |cfg|
           attributes = {
@@ -42,21 +47,13 @@ module Middleman
             'site-destination' => (dest = (app.root_path.join app.config[:build_dir]).to_s),
             'site-environment' => app.environment.to_s
           }.merge IMPLICIT_ATTRIBUTES
-          if !!app.extensions[:directory_indexes]
-            if app.config[:strip_index_file]
-              attributes['relfilesuffix'] = app.config[:trailing_slash] ? '/' : ''
-            else
-              attributes['relfilesuffix'] = %(/#{app.config[:index_file]})
-            end
+          if app.extensions[:directory_indexes]
+            attributes['relfilesuffix'] = app.config[:strip_index_file] ? (app.config[:trailing_slash] ? '/' : '') : %(/#{app.config[:index_file]})
             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?
-          if attributes.key? 'imagesdir'
-            imagesdir = attributes['imagesdir']
-          else
-            imagesdir = attributes['imagesdir'] = %(#{[((app.config[:http_prefix] || '').chomp '/'), app.config[:images_dir]] * '/'}@)
-          end
-          if imagesdir && !(attributes.key? 'imagesoutdir') && (imagesdir.start_with? '/')
+          if !(attributes.key? 'imagesoutdir') && (imagesdir = attributes['imagesdir']) && (imagesdir.start_with? '/')
             attributes['imagesoutdir'] = ::File.join dest, (imagesdir.chomp '@')
           end
           cfg[:attributes] = attributes
@@ -72,6 +69,11 @@ module Middleman
           cfg[:backend] = (cfg[:backend] || :html5).to_sym
           cfg[:safe] = options[:safe] if (options.setting :safe).value_set?
           cfg[:safe] = (cfg[:safe] || :safe).to_sym
+          if (template_dirs_opt = options.setting :template_dirs).value_set?
+            cfg[:template_dirs] = (Array template_dirs_opt.value).map {|dir| (app.root_path.join dir).to_s }
+            cfg[:template_engine] = options[:template_engine].to_s if (options.setting :template_engine).value_set?
+            cfg[:template_engine_options] = options[:template_engine_options] if (options.setting :template_engine_options).value_set?
+          end
           if (default_layout = options[:layout] || app.config[:layout])
             # set priority to run after blog extension, which also sets a layout
             app.sitemap.register_resource_list_manipulator :asciidoc_default_layout, (DefaultLayoutConfigurator.new app, default_layout.to_sym), 60
@@ -80,12 +82,16 @@ module Middleman
       end
 
       def manipulate_resource_list resources
+        if (app_time = app.config[:time])
+          app_date_time_strs = (app_time.in_time_zone.strftime '%F %T %Z').split ' ', 2
+        end
         header_asciidoc_opts = app.config[:asciidoc].merge parse_header_only: true
         header_attrs = header_asciidoc_opts[:attributes].merge 'skip-front-matter' => ''
         use_docdir_as_base_dir = header_asciidoc_opts[:base_dir] == :docdir
 
         resources.select {|res| !res.ignored? && (asciidoc_file? res) }.each do |resource|
           page_attrs = { 'page-id' => %(#{resource.page_id}@) }
+          page_attrs['localdate'], page_attrs['localtime'] = app_date_time_strs if app_date_time_strs
           if (path = resource.source_file)
             page_attrs['docfile'] = path
             page_attrs['docdir'] = (dir = ::File.dirname path)
@@ -113,7 +119,7 @@ module Middleman
           if doc.attr? 'page-layout'
             if (layout = doc.attr 'page-layout').empty?
               opts[:layout] = :_auto_layout
-              opts[:layout_engine] = doc.attr 'page-layout-engine' if doc.attr? 'page-layout-engine'
+              opts[:layout_engine] = (doc.attr 'page-layout-engine').to_sym if doc.attr? 'page-layout-engine'
             else
               case (layout = layout.to_sym)
               when :~, :null
@@ -123,7 +129,7 @@ module Middleman
                 page_asciidoc_opts[:header_footer] = true
               else
                 opts[:layout] = layout
-                opts[:layout_engine] = doc.attr 'page-layout-engine' if doc.attr? 'page-layout-engine'
+                opts[:layout_engine] = (doc.attr 'page-layout-engine').to_sym if doc.attr? 'page-layout-engine'
               end
             end
           else
@@ -182,17 +188,33 @@ module Middleman
       def merge_attributes attrs, initial = {}
         if (is_array = ::Array === attrs) || ::Hash === attrs
           attrs.each_with_object(initial) {|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
+            # "-" prefix means to remove key from accumulator
+            elsif key.start_with? '-'
+              new_attrs.delete (key.slice 1, key.length)
+            elsif is_array
+              new_attrs[key] = resolve_attribute_refs val, new_attrs
             else
-              new_attrs[key] = val ? (resolve_attribute_refs val, new_attrs) : nil
+              new_attrs[key] = case val
+              when ::String
+                resolve_attribute_refs val, new_attrs
+              when ::Numeric
+                val.to_s
+              when true
+                ''
+              when nil, false
+                nil
+              else
+                val
+              end
             end
           }
         else
-          initial
+          raise 'Value of attributes setting on AsciiDoc extension must be a Hash or an Array.'
         end
       end
 
@@ -200,7 +222,7 @@ module Middleman
         if text.empty?
           text
         elsif text.include? '{'
-          text.gsub(AttributeReferenceRx) { ($&.start_with? '\\') ? $&[1..-1] : ((attrs.fetch $1, $&).to_s.chomp '@') }
+          text.gsub(AttributeReferenceRx) { ($&.start_with? '\\') ? ($&.slice 1, $&.length) : ((attrs.fetch $1, $&).to_s.chomp '@') }
         else
           text
         end
@@ -255,7 +277,9 @@ module Middleman
             %(.#{ext})
           end
         else
+          # :nocov:
           ::Tilt.mappings.select {|_, classes| classes.include? ::Tilt::AsciidoctorTemplate }.keys.map {|ext| %(.#{ext}) }
+          # :nocov:
         end
       end
 

data/lib/middleman-asciidoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-asciidoc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.6
+  version: 1.0.0.rc.7
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -56,6 +56,7 @@ files:
 - features/asciidoc-blog.feature
 - features/asciidoc-pages.feature
 - features/support/env.rb
+- features/support/server_steps.rb
 - fixtures/asciidoc-blog-app/config-asciidoc-layout.rb
 - fixtures/asciidoc-blog-app/config-auto-layout.rb
 - fixtures/asciidoc-blog-app/config-date-in-filename.rb
@@ -74,10 +75,12 @@ files:
 - fixtures/asciidoc-blog-app/source/layouts/article.erb
 - fixtures/asciidoc-blog-app/source/layouts/asciidoc_page.erb
 - fixtures/asciidoc-pages-app/config-global-layout.rb
+- fixtures/asciidoc-pages-app/config-page-attributes.rb
 - fixtures/asciidoc-pages-app/config-page-layout.rb
 - fixtures/asciidoc-pages-app/config-set-asciidoc.rb
 - fixtures/asciidoc-pages-app/config.rb
 - fixtures/asciidoc-pages-app/source/_include.adoc
+- fixtures/asciidoc-pages-app/source/_templates/paragraph.html.erb
 - fixtures/asciidoc-pages-app/source/backend.adoc
 - fixtures/asciidoc-pages-app/source/code.adoc
 - fixtures/asciidoc-pages-app/source/custom-attribute.adoc
@@ -93,19 +96,24 @@ files:
 - fixtures/asciidoc-pages-app/source/images/tiger.gif
 - fixtures/asciidoc-pages-app/source/inspect-standard-page-data.html.erb
 - fixtures/asciidoc-pages-app/source/layouts/default.erb
+- fixtures/asciidoc-pages-app/source/layouts/engine.erb
+- fixtures/asciidoc-pages-app/source/layouts/engine.str
 - fixtures/asciidoc-pages-app/source/layouts/inspect-page-data.erb
 - fixtures/asciidoc-pages-app/source/layouts/showdate.erb
 - fixtures/asciidoc-pages-app/source/link-to-page.adoc
+- fixtures/asciidoc-pages-app/source/localtime.adoc
 - fixtures/asciidoc-pages-app/source/manual/_chapters/ch01.adoc
 - fixtures/asciidoc-pages-app/source/manual/index.adoc
 - fixtures/asciidoc-pages-app/source/master.adoc
 - fixtures/asciidoc-pages-app/source/page-data.adoc
+- fixtures/asciidoc-pages-app/source/page-with-attributes.adoc
 - fixtures/asciidoc-pages-app/source/page-with-date-at-zone.adoc
 - fixtures/asciidoc-pages-app/source/page-with-date.adoc
 - fixtures/asciidoc-pages-app/source/safe-mode.adoc
 - fixtures/asciidoc-pages-app/source/site-information.adoc
 - fixtures/asciidoc-pages-app/source/standard-page-data.adoc
 - 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/extension.rb
 - lib/middleman-asciidoc/middleman_extension.rb
@@ -139,6 +147,7 @@ test_files:
 - features/asciidoc-blog.feature
 - features/asciidoc-pages.feature
 - features/support/env.rb
+- features/support/server_steps.rb
 - fixtures/asciidoc-blog-app/config-asciidoc-layout.rb
 - fixtures/asciidoc-blog-app/config-auto-layout.rb
 - fixtures/asciidoc-blog-app/config-date-in-filename.rb
@@ -157,10 +166,12 @@ test_files:
 - fixtures/asciidoc-blog-app/source/layouts/article.erb
 - fixtures/asciidoc-blog-app/source/layouts/asciidoc_page.erb
 - fixtures/asciidoc-pages-app/config-global-layout.rb
+- fixtures/asciidoc-pages-app/config-page-attributes.rb
 - fixtures/asciidoc-pages-app/config-page-layout.rb
 - fixtures/asciidoc-pages-app/config-set-asciidoc.rb
 - fixtures/asciidoc-pages-app/config.rb
 - fixtures/asciidoc-pages-app/source/_include.adoc
+- fixtures/asciidoc-pages-app/source/_templates/paragraph.html.erb
 - fixtures/asciidoc-pages-app/source/backend.adoc
 - fixtures/asciidoc-pages-app/source/code.adoc
 - fixtures/asciidoc-pages-app/source/custom-attribute.adoc
@@ -176,16 +187,21 @@ test_files:
 - fixtures/asciidoc-pages-app/source/images/tiger.gif
 - fixtures/asciidoc-pages-app/source/inspect-standard-page-data.html.erb
 - fixtures/asciidoc-pages-app/source/layouts/default.erb
+- fixtures/asciidoc-pages-app/source/layouts/engine.erb
+- fixtures/asciidoc-pages-app/source/layouts/engine.str
 - fixtures/asciidoc-pages-app/source/layouts/inspect-page-data.erb
 - fixtures/asciidoc-pages-app/source/layouts/showdate.erb
 - fixtures/asciidoc-pages-app/source/link-to-page.adoc
+- fixtures/asciidoc-pages-app/source/localtime.adoc
 - fixtures/asciidoc-pages-app/source/manual/_chapters/ch01.adoc
 - fixtures/asciidoc-pages-app/source/manual/index.adoc
 - fixtures/asciidoc-pages-app/source/master.adoc
 - fixtures/asciidoc-pages-app/source/page-data.adoc
+- fixtures/asciidoc-pages-app/source/page-with-attributes.adoc
 - fixtures/asciidoc-pages-app/source/page-with-date-at-zone.adoc
 - fixtures/asciidoc-pages-app/source/page-with-date.adoc
 - fixtures/asciidoc-pages-app/source/safe-mode.adoc
 - fixtures/asciidoc-pages-app/source/site-information.adoc
 - fixtures/asciidoc-pages-app/source/standard-page-data.adoc
 - fixtures/asciidoc-pages-app/source/topic/echo-page-id.adoc
+- fixtures/asciidoc-pages-app/source/with-sections.adoc