asciidoctor-reducer 1.0.0.alpha.1 → 1.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b897d6327d17f704a62f21f7649a2ae1a4f2643bf7f8f41445c126aafbf77e2
-  data.tar.gz: d3c11b63175f9f235f459a2c8822d0ee2d08e2762f2cab5273f30c238797db49
+  metadata.gz: 8e5bfad3f3b343a1fd2741938d31812feac3218e8b6998d43b3614b6800874b0
+  data.tar.gz: 443bcb83342bb51cf3537b9b5cba497b7a1f5340eb7e7fb0956e85746344f917
 SHA512:
-  metadata.gz: 421524a636890420cebe721455f2ba348cb514b8b576d125c1baa2d9e474297a2763b3c325d7c8948e7bd12d28276f8e27b5171cfecc0d92be62b1f1e8094f11
-  data.tar.gz: 7c148e99347aaf86474d376b80e8beb7a35cb96fe211ace49c5ba6a8e8a8bfb40716225c995107407ff3c13c9f3e850f8fc3b83ce9e4e172102b719a2ef48dca
+  metadata.gz: b52ca3132349b059d672bab08dd1b1c5a2586d88e8f4f31eb8d2ae7f0f9891917f0ee0cd46bd63826e7127cb8a64fda650bc5a13815760d299c06c6e5181e02b
+  data.tar.gz: 6bdb49618d5adb7b1ce702d266ee8d6a229545b6ca8676931083df9362b21aaedabf539c7d1c4ea5c2fabecbb25426a9bcc140d80ffce93cd9b6da52bdc0e4cd

data/CHANGELOG.adoc

@@ -4,6 +4,53 @@
 This document provides a high-level view of the changes to the Asciidoctor Reducer by release.
 For a detailed view of what has changed, refer to the {url-repo}/commits/main[commit history] on GitHub.
 
+== 1.0.0.alpha.5 (2022-02-06) - @mojavelinux
+
+=== Changed
+
+* Removing trailing empty lines after reducing when sourcemap is not enabled
+* Remove unnecessary override of lineno in preprocess_include_directive override
+* Simplify how include replacement target is tracked
+* Classify extensions in group named `:reducer`
+
+=== Fixed
+
+* Suppress log messages when reloading document (#14)
+
+== 1.0.0.alpha.4 (2022-02-03) - @mojavelinux
+
+=== Fixed
+
+* Fix replacement of nested empty and unresolved includes
+
+== 1.0.0.alpha.3 (2022-02-02) - @mojavelinux
+
+=== Changed
+
+* Rename PreprocessorReader ext module to PreprocessorReaderTracker
+* Encapsulate logic to enhance PreprocessorReader inside PreprocessorReaderTracker module
+* Only reload document if source lines have changed; otherwise, update source lines on reader directly
+* Change default safe mode for CLI to :unsafe
+
+== 1.0.0.alpha.2 (2022-01-27) - @mojavelinux
+
+=== Added
+
+* Add `-a` / `--attribute` option to CLI for setting an AsciiDoc document attribute at runtime (#6)
+
+=== Changed
+
+* Reduce preprocessor conditionals by default; add option (`--preserve-conditionals` / `:preserve_conditionals`) to preserve them (#8)
+* Don't enable sourcemap automatically (#4)
+* Don't override logger by default; instead, rely on `:logger` API option to change logger
+* Add `--log-level` option to CLI to set severity level on logger (#9)
+* Add `-q` / `--quiet` option to CLI to suppress log messages (#9)
+* Reserve zero index in include replacements for top-level document
+
+=== Fixed
+
+* Preserve return value when overridding `preprocess_include_directive` method
+
 == 1.0.0.alpha.1 (2022-01-12) - @mojavelinux
 
 Initial release.
@@ -11,3 +58,19 @@ Initial release.
 === Details
 
 {url-repo}/releases/tag/v1.0.0.alpha.1[git tag]
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.2[git tag]
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.3[git tag]
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.4[git tag]
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.5[git tag]

data/README.adoc

@@ -1,6 +1,6 @@
-= Asciidoctor Reducer
+= {project-name}
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0.alpha.1, 2022-01-12
+v1.0.0.alpha.5, 2022-02-06
 :idprefix:
 :idseparator: -
 ifndef::env-github[:icons: font]
@@ -11,15 +11,19 @@ ifdef::env-github[]
 :tip-caption: :bulb:
 :warning-caption: :warning:
 endif::[]
+:project-name: Asciidoctor Reducer
+:project-handle: asciidoctor-reducer
 :url-rvm: https://rvm.io
+:url-repo: https://github.com/asciidoctor/{project-handle}
 
-Asciidoctor Reducer is a tool that reduces an AsciiDoc document with includes to a single document by expanding the includes reachable from the specified parent document.
-If the document does not contain any includes, the tool returns the original source.
+{project-name} is a tool that reduces a composite AsciiDoc document containing includes to a single AsciiDoc document by expanding any includes reachable from the parent document.
+The tool also applies preprocessor conditionals (unless the option to preserve them is specified), leaving behind only the enabled lines.
+If the document does not contain any preprocessor directives, the tool returns the original source.
 
 == Prerequisites
 
-To install and run Asciidoctor Reducer, you need Ruby 2.5 or better installed and the Asciidoctor gem.
-The instructions for installing the gems is covered in the next section.
+{project-name} is a Ruby program that you install using Ruby packaging.
+Therefore, to install and run {project-name}, you need Ruby 2.5 or better installed.
 
 To check whether you have Ruby installed, and which version, run the following command:
 
@@ -30,14 +34,30 @@ We generally recommend using RVM because it allows you to install gems without r
 
 == Installation
 
-Asciidoctor Reducer is published to RubyGems.org as the gem named *asciidoctor-reducer*.
+{project-name} is published to RubyGems.org as the gem named *{project-handle}*.
 
 You can install the latest version of the gem using the following command:
 
  $ gem install asciidoctor-reducer --pre
 
 Installing this gem makes the `asciidoctor-reducer` command available on your $PATH.
-You can also require the gem to use it as an Asciidoctor extension.
+You can also require the gem into the Ruby runtime to use it as an Asciidoctor extension.
+
+If you prefer to manage the application as a project-scoped dependency, you can declare the gem in the project's [.path]_Gemfile_:
+
+.Gemfile
+[,ruby]
+----
+source 'https://rubygems.org'
+
+gem 'asciidoctor-reducer'
+----
+
+You then install the gem using the `bundle` command:
+
+ $ bundle --path=.bundle/gems
+
+Installing the gem this way makes the `bundle exec asciidoctor-reducer` command available on your $PATH.
 
 == Usage
 
@@ -60,7 +80,7 @@ To use the command, pass the AsciiDoc file as the sole argument:
  $ asciidoctor-reducer input.adoc
 
 By default, the command will output the reduced AsciiDoc document to the terminal (via stdout).
-To write the output to a file, specify an output file using the `-o` option.
+To write the output to a file, specify an output file using the `-o` option:
 
  $ asciidoctor-reducer -o output.adoc input.adoc
 
@@ -69,7 +89,7 @@ To use the command in this way, pass `-` as the first argument:
 
  $ cat input.adoc | asciidoctor-reducer -
 
-To write the output to a file, also specify the `-o` option:
+To write the output to a file instead of stdout, also specify an output file using the `-o` option:
 
  $ cat input.adoc | asciidoctor-reducer -o output.adoc -
 
@@ -101,6 +121,121 @@ puts doc.source
 
 You can write this source to a file to save the reduced document.
 
+== How it Works
+
+{project-name} uses a collection of Asciidoctor extensions to rebuild the AsciiDoc source as a single document.
+
+It starts by using a preprocessor extension to enhance the PreprocessorReader class to be notified each time an include is entered (pushed) or exited (popped).
+When an include directive is encountered, the enhanced reader stores the resolved lines and location of the include directive, thus keeping track of where those lines should be inserted in the original source.
+This information is stored as a stack, where each successive entry contains lines to be inserted into a parent entry.
+The enhanced reader also stores the location of preprocessor conditionals and whether the lines they enclose should be kept or dropped.
+
+The reducer then uses a tree processor extension to fold the include stack into a single sequence of lines.
+It does so by working from the end of the stack and inserting the lines into the parent until the stack has been flattened.
+As it goes, it also removes lines that have been excluded by the preprocessor conditionals as well as the directive lines themselves (unless the option to preserve conditionals has been specified).
+
+Finally, it loads the document again and returns it.
+The reduced source is available on the reconstructed document (via `Document#source` or `Document#source_lines`).
+
+=== Impact on Extensions
+
+If the sourcemap is enabled, and the reducer finds lines to replace or filter, the reducer will load the document again using `Asciidoctor.load`.
+This step is necessary to synchronize the sourcemap with the reduced source.
+This call will cause extensions that run during the load phase to be invoked again.
+An extension can check for this secondary load by checking for the `:reduced` option in the `Document#options` hash.
+If this option is set (the value of which will be `true`), then Asciidoctor is loading the reduced document.
+
+== Development
+
+Follow the instructions below to learn how to help develop the project or test-drive the development version.
+
+=== Retrieve the source code
+
+Copy the {url-repo}[GitHub repository URL] and pass it to the `git clone` command:
+
+[subs=attributes+]
+ $ git clone {url-repo}
+
+Next, switch to the project directory:
+
+[subs=attributes+]
+ $ cd {project-handle}
+
+=== Install the dependencies
+
+The dependencies needed to use {project-name} are defined in the [.path]_Gemfile_ at the root of the project.
+You'll use Bundler to install these dependencies.
+
+Use the `bundle` command to install the project dependencies under the project directory:
+
+ $ bundle --path=.bundle/gems
+
+You must invoke `bundle` from the project's root directory so it can locate the [.path]_Gemfile_.
+
+=== Run the tests
+
+The test suite is located in the [.path]_spec_ directory.
+The tests are based on RSpec.
+
+==== Run all tests
+
+You can run all of the tests using Rake:
+
+ $ bundle exec spec
+
+For more fine-grained control, you can also run the tests directly using RSpec:
+
+ $ bundle exec rspec
+
+To run all tests in a single spec, point RSpec at the spec file:
+
+ $ bundle exec rspec spec/asciidoctor_reducer_spec.rb
+
+==== Run specific tests
+
+If you only want to run a single test, or a group of tests, you can do so by tagging the test cases, then filtering the test run using that tag.
+
+Start by adding the `only` tag to one or more specifications:
+
+[source,ruby]
+----
+it 'should do something new', only: true do
+  expect(true).to be true
+end
+----
+
+Next, run RSpec with the `only` flag enabled:
+
+ $ bundle exec rspec -t only
+
+RSpec will only run the specifications that contain this flag.
+
+You can also filter tests by keyword.
+Let's assume we want to run all the tests that have `leveloffset` in the description.
+Run RSpec with the example filter:
+
+ $ bundle exec rspec -e leveloffset
+
+RSpec will only run the specifications that have a description containing the text `leveloffset`.
+
+=== Generate code coverage
+
+To generate a code coverage report when running tests using simplecov, set the `COVERAGE` environment variable as follows when running the tests:
+
+ $ COVERAGE=deep bundle exec rake
+
+You'll see a total coverage score, a detailed coverage report, and a link to HTML report in the output.
+The HTML report helps you understand which lines and branches were missed, if any.
+
+=== Run the development version
+
+When running the `asciidoctor-reducer` command from source, you must prefix the command with `bundle exec`:
+
+[subs=attributes+]
+ $ bundle exec asciidoctor-reducer sample.adoc
+
+To avoid having to do this, or make the `asciidoctor-reducer` command available from anywhere, you need to build the development gem and install it.
+
 == Copyright and License
 
 Copyright (C) 2021-present Dan Allen.

data/asciidoctor-reducer.gemspec

@@ -7,10 +7,8 @@ end
 Gem::Specification.new do |s|
   s.name = 'asciidoctor-reducer'
   s.version = Asciidoctor::Reducer::VERSION
-  # Reduces a set of AsciiDoc documents into a single document by expanding all includes reachable from the parent document.
-
-  s.summary = 'Reduces an AsciiDoc document with includes to a single AsciiDoc document.'
-  s.description = 'A tool that reduces an AsciiDoc document with includes to a single AsciiDoc document by expanding the includes reachable from the specified parent document.'
+  s.summary = 'Reduces a composite AsciiDoc document containing includes and conditionals to a single AsciiDoc document.'
+  s.description = 'A tool that reduces a composite AsciiDoc document containing preprocessor directives (includes and conditionals) to a single AsciiDoc document by expanding the includes and applying the conditionals.'
   s.authors = ['Dan Allen']
   s.email = 'dan.j.allen@gmail.com'
   s.homepage = 'https://asciidoctor.org'

data/lib/asciidoctor/reducer/cli.rb

@@ -8,28 +8,48 @@ module Asciidoctor::Reducer
 
   class Cli
     def parse args
-      options = {}
+      options = { attributes: {}, safe: :unsafe }
 
       opt_parser = ::OptionParser.new do |opts|
         opts.program_name = 'asciidoctor-reducer'
         opts.banner = <<~EOS
         Usage: #{opts.program_name} [OPTION]... FILE
 
-        Reduces an AsciiDoc document with includes to a single AsciiDoc document.
+        Reduces a composite AsciiDoc document containing includes and conditionals to a single AsciiDoc document.
 
         EOS
 
-        opts.on '-o FILE', '--output=FILE', 'Set the output filename or stream' do |file|
+        opts.on '-o FILE', '--output=FILE', 'set the output filename or stream' do |file|
           options[:output_file] = file
         end
 
-        opts.on '-h', '--help', 'Display this help text and exit' do
+        opts.on '-a KEY[=VALUE]', '--attribute=KEY[=VALUE]',
+          'set a document attribute in the AsciiDoc document: [key, key!, key=value]' do |attr|
+          key, val = attr.split '=', 2
+          val ||= ''
+          options[:attributes][key] = val
+        end
+
+        opts.on '--preserve-conditionals', 'preserve preprocessor conditional directives in the reduced source' do
+          options[:preserve_conditionals] = true
+        end
+
+        opts.on '--log-level LEVEL', %w(debug info warn error fatal),
+          'set the minimum level of messages to log: [debug, info, warn, error, fatal] (default: warn)' do |level|
+          (options[:logger] = ::Asciidoctor::Logger.new $stderr).level = level unless level == 'warn'
+        end
+
+        opts.on '-q', '--quiet', 'suppress all application log messages' do
+          options[:logger] = ::Asciidoctor::NullLogger.new
+        end
+
+        opts.on '-h', '--help', 'display this help text and exit' do
           $stdout.write opts.help
           return 0
         end
 
-        opts.on '-v', '--version', %(Display version information and exit) do
-          $stdout.write %(#{opts.program_name} #{::Asciidoctor::Reducer::VERSION}\n)
+        opts.on '-v', '--version', 'display the version information and exit' do
+          $stdout.write %(#{opts.program_name} #{VERSION}\n)
           return 0
         end
       end
@@ -56,6 +76,7 @@ module Asciidoctor::Reducer
     end
 
     def self.run args = ARGV
+      old_logger = ::Asciidoctor::LoggerManager.logger
       code, options = new.parse (Array args)
       return code unless code == 0 && options
       if (output_file = options.delete :output_file) == '-'
@@ -64,15 +85,17 @@ module Asciidoctor::Reducer
         (to = ::Pathname.new output_file).dirname.mkpath
       end
       if (input_file = options.delete :input_file) == '-'
-        reduced = (Asciidoctor.load $stdin, safe: :safe).source + ?\n
+        reduced = (::Asciidoctor.load $stdin, options).source + ?\n
       else
-        reduced = (Asciidoctor.load_file input_file, safe: :safe, to_file: false).source + ?\n
+        reduced = (::Asciidoctor.load_file input_file, (options.merge to_file: false)).source + ?\n
       end
-      Pathname === to ? (to.write reduced, encoding: ::Encoding::UTF_8) : (to.write reduced)
+      ::Pathname === to ? (to.write reduced, encoding: ::Encoding::UTF_8) : (to.write reduced)
       0
-    rescue ::IOError
+    rescue
       $stderr.write %(asciidoctor-reducer: #{$!.message}\n)
       1
+    ensure
+      ::Asciidoctor::LoggerManager.logger = old_logger
     end
   end
 end

data/lib/asciidoctor/reducer/preprocessor.rb

@@ -1,19 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'ext/asciidoctor/preprocessor_reader'
+require_relative 'preprocessor_directive_tracker'
 
 module Asciidoctor::Reducer
   class Preprocessor < ::Asciidoctor::Extensions::Preprocessor
     def process doc, reader
-      return if doc.options[:reduced]
-      doc.sourcemap = true
-      # Q: is there a better place we can store the original logger?
-      ::Asciidoctor::LoggerManager.instance_variable_set :@original_logger, ::Asciidoctor::LoggerManager.logger
-      ::Asciidoctor::LoggerManager.logger = ::Asciidoctor::NullLogger.new
-      reader.singleton_class.prepend AsciidoctorExt::PreprocessorReader
-      reader.instance_variable_set :@x_include_replacements, []
-      reader.instance_variable_set :@x_parents, [-1]
-      nil
+      doc.options[:reduced] ? reader : (reader.extend PreprocessorDirectiveTracker)
     end
   end
 end

data/lib/asciidoctor/reducer/preprocessor_directive_tracker.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Asciidoctor::Reducer
+  module PreprocessorDirectiveTracker
+    attr_writer :source_lines
+    attr_reader :x_include_replacements
+
+    def self.extended instance
+      instance.instance_variable_set :@x_include_replacements, ([{ drop: [] }].extend CurrentPosition)
+      instance.instance_variable_set :@x_include_directive_line, nil
+      instance.instance_variable_set :@x_include_pushed, nil
+    end
+
+    def preprocess_conditional_directive keyword, target, delimiter, text
+      return super if (opts = @document.options)[:preserve_conditionals] || opts[:reduced]
+      skip_active = @skipping
+      depth = @conditional_stack.length
+      cond_lineno = @lineno - 1
+      result = super
+      return result if @skipping && skip_active
+      drop = @x_include_replacements.current[:drop]
+      if (depth_change = @conditional_stack.length - depth) < 0
+        if skip_active
+          drop.push(*(drop.pop..cond_lineno))
+        else
+          drop << cond_lineno
+        end
+      elsif depth_change > 0 || cond_lineno == @lineno - 1
+        drop << cond_lineno
+      else
+        drop << [cond_lineno, text]
+      end
+      result
+    end
+
+    def preprocess_include_directive target, attrlist
+      @x_include_directive_line = %(include::#{target}[#{attrlist}])
+      @x_include_pushed = false
+      inc_lineno = @lineno - 1 # we're currently on the include line, which is 1-based
+      result = super
+      if @x_include_pushed
+        @x_include_directive_line = @x_include_pushed = nil
+        return result
+      end
+      inc_lines = ((line = lines[0].to_s).start_with? 'Unresolved directive in ') && (line.end_with? ']') ? [line] : []
+      push_include_replacement inc_lineno, inc_lines
+      @x_include_directive_line = @x_include_pushed = nil
+      result
+    end
+
+    def push_include data, file, path, lineno, attrs
+      @x_include_pushed = true
+      inc_lineno = @lineno - 2 # we're below the include line, which is 1-based
+      prev_inc_depth = @include_stack.length
+      result = super
+      inc_lines = lines if @include_stack.length > prev_inc_depth
+      push_include_replacement inc_lineno, inc_lines
+      result
+    end
+
+    def pop_include
+      @x_include_replacements.pos = @x_include_replacements.current[:into] unless @x_include_pushed
+      super
+    end
+
+    private
+
+    def push_include_replacement inc_lineno, inc_lines
+      @x_include_replacements << {
+        into: @x_include_replacements.pos,
+        lineno: inc_lineno,
+        line: @x_include_directive_line,
+        lines: inc_lines || [],
+        drop: [],
+      }
+      @x_include_replacements.pos = @x_include_replacements.length - 1 if inc_lines
+      nil
+    end
+  end
+
+  module CurrentPosition
+    attr_accessor :pos
+
+    def self.extended instance
+      instance.pos = instance.length - 1
+    end
+
+    def current
+      self[@pos]
+    end
+  end
+end

data/lib/asciidoctor/reducer/tree_processor.rb

@@ -4,21 +4,30 @@ module Asciidoctor::Reducer
   class TreeProcessor < ::Asciidoctor::Extensions::TreeProcessor
     def process doc
       return if doc.options[:reduced]
-      unless (inc_replacements = doc.reader.instance_variable_get :@x_include_replacements).empty?
-        resolved_source_lines = doc.source_lines.dup
+      unless (inc_replacements = doc.reader.x_include_replacements).length == 1 && inc_replacements[0][:drop].empty?
+        inc_replacements[0][:lines] = doc.source_lines.dup
         inc_replacements.reverse_each do |it|
-          # when into is -1, it indicates this is a top-level include
-          target_lines = (into = it[:into]) < 0 ? resolved_source_lines : inc_replacements[into][:lines]
-          # adds extra bit of assurance that we're replacing the correct line
-          if target_lines[(index = it[:index])] == it[:replace]
-            target_lines[index..index] = it[:lines]
+          if (into = it[:into])
+            target_lines = inc_replacements[into][:lines]
+            # adds extra bit of assurance that we're replacing the correct line
+            next unless target_lines[(index = it[:lineno])] == it[:line]
           end
+          lines = it[:lines]
+          unless (drop = it[:drop]).empty?
+            drop.reverse_each {|idx| ::Array === idx ? (lines[idx[0]] = idx[1]) : (lines.delete_at idx) }
+          end
+          target_lines[index] = lines if target_lines
+        end
+        source_lines = inc_replacements[0][:lines].flatten
+        if doc.sourcemap
+          logger = ::Asciidoctor::LoggerManager.logger
+          doc = ::Asciidoctor.load source_lines, (doc.options.merge logger: false, reduced: true)
+          ::Asciidoctor::LoggerManager.logger = logger
+        else
+          source_lines.pop while (last = source_lines[-1]) && last.empty?
+          doc.reader.source_lines = source_lines
         end
-        # WARNING: if include directives remain that can still be resolved, the sourcemap won't match the source lines
-        doc = ::Asciidoctor.load resolved_source_lines, (doc.options.merge sourcemap: true, reduced: true)
       end
-      ::Asciidoctor::LoggerManager.logger = ::Asciidoctor::LoggerManager.instance_variable_get :@original_logger
-      ::Asciidoctor::LoggerManager.remove_instance_variable :@original_logger
       doc
     end
   end

data/lib/asciidoctor/reducer/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Reducer
-    VERSION = '1.0.0.alpha.1'
+    VERSION = '1.0.0.alpha.5'
   end
 end

data/lib/asciidoctor/reducer.rb

@@ -3,7 +3,7 @@
 require 'asciidoctor'
 require_relative 'reducer/extensions'
 
-Asciidoctor::Extensions.register do
+Asciidoctor::Extensions.register :reducer do
   preprocessor Asciidoctor::Reducer::Preprocessor
   tree_processor Asciidoctor::Reducer::TreeProcessor
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-reducer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.1
+  version: 1.0.0.alpha.5
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -52,8 +52,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.10.0
-description: A tool that reduces an AsciiDoc document with includes to a single AsciiDoc
-  document by expanding the includes reachable from the specified parent document.
+description: A tool that reduces a composite AsciiDoc document containing preprocessor
+  directives (includes and conditionals) to a single AsciiDoc document by expanding
+  the includes and applying the conditionals.
 email: dan.j.allen@gmail.com
 executables:
 - asciidoctor-reducer
@@ -68,9 +69,9 @@ files:
 - lib/asciidoctor-reducer.rb
 - lib/asciidoctor/reducer.rb
 - lib/asciidoctor/reducer/cli.rb
-- lib/asciidoctor/reducer/ext/asciidoctor/preprocessor_reader.rb
 - lib/asciidoctor/reducer/extensions.rb
 - lib/asciidoctor/reducer/preprocessor.rb
+- lib/asciidoctor/reducer/preprocessor_directive_tracker.rb
 - lib/asciidoctor/reducer/tree_processor.rb
 - lib/asciidoctor/reducer/version.rb
 homepage: https://asciidoctor.org
@@ -99,5 +100,6 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
-summary: Reduces an AsciiDoc document with includes to a single AsciiDoc document.
+summary: Reduces a composite AsciiDoc document containing includes and conditionals
+  to a single AsciiDoc document.
 test_files: []

data/lib/asciidoctor/reducer/ext/asciidoctor/preprocessor_reader.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-module Asciidoctor::Reducer
-  module AsciidoctorExt
-    module PreprocessorReader
-      def preprocess_include_directive target, attrlist
-        @x_include_directive_line = %(include::#{target}[#{attrlist}])
-        @x_push_include_called = false
-        inc_lineno = @lineno - 1 # we're currently on the include line, which is 1-based
-        result = super
-        return result if @x_push_include_called
-        parent_depth = (parents = @x_parents).length
-        depth_change = @include_stack.length - (parent_depth - 1)
-        parent_depth -= (parents.slice! parent_depth + depth_change, -depth_change).length if depth_change < 0
-        lines = ((line = @lines[-1].to_s).start_with? 'Unresolved directive in ') && (line.end_with? ']') ? [line] : []
-        @x_include_replacements << {
-          lines: lines,
-          into: parents[parent_depth - 1],
-          index: inc_lineno,
-          replace: @x_include_directive_line,
-        }
-      end
-
-      def push_include data, file, path, lineno, attrs
-        @x_push_include_called = true
-        inc_lineno = @lineno - 2 # we're below the include line, which is 1-based
-        prev_inc_depth = @include_stack.length
-        # Q: can we do this without resetting the lineno?
-        lineno = 1 # rubocop:disable Lint/ShadowedArgument
-        super
-        inc_depth = @include_stack.length
-        parent_depth = (parents = @x_parents).length
-        # push_include did not push to the stack
-        if inc_depth == prev_inc_depth
-          depth_change = inc_depth - (parent_depth - 1)
-          parent_depth -= (parents.slice! parent_depth + depth_change, -depth_change).length if depth_change < 0
-          @x_include_replacements << {
-            lines: [],
-            into: parents[parent_depth - 1],
-            index: inc_lineno,
-            replace: @x_include_directive_line,
-          }
-        else
-          depth_change = inc_depth - parent_depth
-          if depth_change > 0
-            parents << @x_include_replacements.length.pred
-            parent_depth += 1
-          elsif depth_change < 0
-            parent_depth -= (parents.slice! parent_depth + depth_change, -depth_change).length
-          end
-          @x_include_replacements << {
-            lines: @lines.reverse,
-            into: parents[parent_depth - 1],
-            index: inc_lineno,
-            replace: @x_include_directive_line,
-          }
-        end
-        self
-      end
-    end
-  end
-end