asciidoctor-reducer 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '093396b7e8100e4c3c7ee3a3aadfea734195bee629fe5284c2dc7e09d6a270d7'
-  data.tar.gz: d216e0f827b3c0eeb5f80f130ef0d8200567f14babda2f42b65fb141f465d842
+  metadata.gz: '0315811ef24fa88a755aa6973e86aca45929a43416020d2f82afa7ef1e664fd9'
+  data.tar.gz: 745ee8bc00aba042843abb05bb22a8ad93a50dc9de7090bd946c82b3333b19d3
 SHA512:
-  metadata.gz: b2d405cce7f61beae5ed35f4247892ee321bdb4efbba0c49faa325560503be3bb68d828e2018df686e95c0ddf576436c625d3b81dc87847e8ccce6642d3ecc92
-  data.tar.gz: 4454a1023fbba097f8b8227de6d0c594f215a77cc6f57d71f423141c9594f07e6fee8635e8ef61939f6551a0f6062639dc39c52a197de5b162f9300b9cc3844a
+  metadata.gz: a0eca70526db73201588d3b9154207b7ec1bdf30f41c8799ee6a88a36091e4906b4ce00ef183939be46c3ed8cd78778119e206585e01648fa20eff48c16cd6e9
+  data.tar.gz: 3c97e30588293c5e599cf26d6dff4b142936582bf8544f9d6f577a5ae6a000e1b4e1a835fd33dbaa22f044c863f51e827aa42f56ab6d758a1acf3b5485bc938d

data/CHANGELOG.adoc

@@ -4,11 +4,31 @@
 This document provides a curated view of the changes to Asciidoctor Reducer in each release.
 For a detailed view of what has changed, refer to the {url-repo}/commits/main[commit history] on GitHub.
 
+== 1.0.6 (2024-02-12) - @mojavelinux
+
+=== Fixed
+
+* Reduce single line conditionals inside file included by include directive with `leveloffset` attribute (#53)
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.6[git tag] | {url-repo}/compare/v1.0.5\...v1.0.6[full diff]
+
+== 1.0.5 (2022-10-15) - @mojavelinux
+
+=== Changed
+
+* Insert `role=include` into link macro that replaces include directive more carefully
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.5[git tag] | {url-repo}/compare/v1.0.4\...v1.0.5[full diff]
+
 == 1.0.4 (2022-10-15) - @mojavelinux
 
 === Changed
 
-* don't add role to link that replaces include directive if role is already present
+* Don't add role to link that replaces include directive if role is already present
 
 === Details
 

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.4, 2022-10-15
+v1.0.6, 2024-02-12
 :idprefix:
 :idseparator: -
 ifndef::env-github[:icons: font]
@@ -83,6 +83,10 @@ Thus, to use the command, pass the AsciiDoc file as the sole argument:
 
  $ asciidoctor-reducer input.adoc
 
+If you only want AsciiDoctor Reducer to process include directives, leaving preprocessor conditional directives untouched, add the `--preserve-conditionals` option:
+
+ $ asciidoctor-reducer --preserve-conditionals 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:
 
@@ -217,7 +221,7 @@ To use the include mapper when using the API, first require the extension:
 
 [,ruby]
 ----
-require 'asciidocotor/reducer/include_mapper/extension'
+require 'asciidoctor/reducer/include_mapper/extension'
 ----
 
 You then need to register the extension when reducing the document:
@@ -243,7 +247,7 @@ You can also register the extension globally:
 
 [,ruby]
 ----
-require 'asciidocotor/reducer/include_mapper'
+require 'asciidoctor/reducer/include_mapper'
 ----
 
 In this case, you don't have to pass it to the API explicitly.
@@ -284,10 +288,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Asciidoctor Reducer
       run: sudo gem install asciidoctor-reducer
     - name: Reduce README
+      # to preserve preprocessor conditionals, add the --preserve-conditionals option
       run: asciidoctor-reducer -o README.adoc README-source.adoc
     - name: Commit and Push README
       uses: EndBug/add-and-commit@v9
@@ -335,7 +340,7 @@ The tests are based on RSpec.
 
 You can run all of the tests using Rake:
 
- $ bundle exec spec
+ $ bundle exec rake spec
 
 For more fine-grained control, you can also run the tests directly using RSpec:
 
@@ -376,7 +381,7 @@ RSpec will only run the specifications that have a description containing the te
 
 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
+ $ COVERAGE=deep bundle exec rake spec
 
 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.

data/asciidoctor-reducer.gemspec

@@ -34,6 +34,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'asciidoctor', '~> 2.0'
 
-  s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'rspec', '~> 3.11.0'
+  s.add_development_dependency 'rake', '~> 13.1.0'
+  s.add_development_dependency 'rspec', '~> 3.13.0'
 end

data/lib/asciidoctor/reducer/conditional_directive_tracker.rb

@@ -10,17 +10,17 @@ module Asciidoctor::Reducer
       return result if @skipping && skip_active
       curr_inc_replacement = @include_replacements.current
       drop = curr_inc_replacement[:drop] ||= []
-      directive_lineno -= (curr_inc_replacement[:offset] ||= 0)
+      adjusted_directive_lineno = directive_lineno - (curr_inc_replacement[:offset] ||= 0)
       if (depth_change = @conditional_stack.size - depth) < 0
         if skip_active
-          drop.push(*(drop.pop..directive_lineno))
+          drop.push(*(drop.pop..adjusted_directive_lineno))
         else
-          drop << directive_lineno
+          drop << adjusted_directive_lineno
         end
       elsif depth_change > 0 || directive_lineno == @lineno
-        drop << directive_lineno
+        drop << adjusted_directive_lineno
       else
-        drop << [directive_lineno, text]
+        drop << [adjusted_directive_lineno, text]
       end
       result
     end

data/lib/asciidoctor/reducer/include_directive_tracker.rb

@@ -15,8 +15,8 @@ module Asciidoctor::Reducer
       result = super
       unless @x_reducer[:include_pushed]
         if ((ln = peek_line true)&.end_with? ']') && !(unresolved = ln.start_with? 'Unresolved directive in ') &&
-            directive_lineno == @lineno && (unresolved = ln.start_with? 'link:') && (ln.end_with? '[]')
-          ln = %(#{ln.chop}role=include])
+            directive_lineno == @lineno && (unresolved = ln.start_with? 'link:') && !(ln.include? '[role=')
+          ln = ln.sub '[', %([role=include#{ln[-2] == '[' ? '' : ','})
         end
         push_include_replacement directive_lineno, (unresolved ? [ln] : []), 0, unresolved
       end
@@ -38,13 +38,13 @@ module Asciidoctor::Reducer
       result
     end
 
+    private
+
     def pop_include
       @include_replacements.up unless @x_reducer[:include_pushed]
       super
     end
 
-    private
-
     def push_include_replacement lineno, lines, offset, unresolved = false
       (inc_replacements = @include_replacements) << {
         into: inc_replacements.pointer,

data/lib/asciidoctor/reducer/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Reducer
-    VERSION = '1.0.4'
+    VERSION = '1.0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-reducer
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 13.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.0
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.13.0
 description: A tool that reduces an AsciiDoc document containing preprocessor directives
   (includes and conditionals) to a single AsciiDoc document by expanding all includes
   and evaluating all conditionals.
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Reduces an AsciiDoc document containing includes and conditionals to a single