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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28c5a3097f098dfdcbbc424988e182c7acbab7d7c75e3c9e2db5794e029bac71
-  data.tar.gz: 74202ca198cc1503a1b0db4e0a2a874d767eb04928e162f3f2c5922a94e1823f
+  metadata.gz: 8e5bfad3f3b343a1fd2741938d31812feac3218e8b6998d43b3614b6800874b0
+  data.tar.gz: 443bcb83342bb51cf3537b9b5cba497b7a1f5340eb7e7fb0956e85746344f917
 SHA512:
-  metadata.gz: d2610fb6c16abd5a154c91afc7497c268c221891bb184114afecf1d5a514dd03a738677e0faff1041d8214b2cf051bda07735d2fbe07a5b0dc6a9c3ac05275b6
-  data.tar.gz: 996d453168c7701e1f6f84e63fcda510d99ef6c18a7c89196edcae233114e007b525bd3ffb9b10b9c93940391ff2e9395e990562e0181051c27bacb1a7ef03c4
+  metadata.gz: b52ca3132349b059d672bab08dd1b1c5a2586d88e8f4f31eb8d2ae7f0f9891917f0ee0cd46bd63826e7127cb8a64fda650bc5a13815760d299c06c6e5181e02b
+  data.tar.gz: 6bdb49618d5adb7b1ce702d266ee8d6a229545b6ca8676931083df9362b21aaedabf539c7d1c4ea5c2fabecbb25426a9bcc140d80ffce93cd9b6da52bdc0e4cd

data/CHANGELOG.adoc

@@ -4,6 +4,19 @@
 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
@@ -57,3 +70,7 @@ Initial release.
 === 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 @@
 = {project-name}
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0.alpha.4, 2022-02-03
+v1.0.0.alpha.5, 2022-02-06
 :idprefix:
 :idseparator: -
 ifndef::env-github[:icons: font]

data/lib/asciidoctor/reducer/preprocessor_directive_tracker.rb

@@ -6,8 +6,9 @@ module Asciidoctor::Reducer
     attr_reader :x_include_replacements
 
     def self.extended instance
-      instance.instance_variable_set :@x_include_replacements, ([{ drop: [] }].extend CurrentPointer)
-      instance.instance_variable_set :@x_parents, [0]
+      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
@@ -34,71 +35,58 @@ module Asciidoctor::Reducer
 
     def preprocess_include_directive target, attrlist
       @x_include_directive_line = %(include::#{target}[#{attrlist}])
-      @x_push_include_called = false
+      @x_include_pushed = 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 is guaranteed to be >= 0 under normal conditions
-      unless @include_stack.length < parent_depth
-        parents << @x_include_replacements.length.pred
-        parent_depth += 1
+      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_lines, parent_depth, inc_lineno
+      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_push_include_called = true
+      @x_include_pushed = 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
       result = super
-      parent_depth = (parents = @x_parents).length
-      # push_include did not push to the stack
-      if (inc_depth = @include_stack.length) == prev_inc_depth
-        depth_change = inc_depth - (parent_depth - 1)
-      else
-        depth_change = inc_depth - parent_depth
-        inc_lines = lines
-      end
-      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
-      push_include_replacement inc_lines, parent_depth, inc_lineno
+      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.current = @x_include_replacements[@x_include_replacements.current[:into] || 0]
+      @x_include_replacements.pos = @x_include_replacements.current[:into] unless @x_include_pushed
       super
     end
 
     private
 
-    def push_include_replacement inc_lines, parent_depth, inc_lineno
+    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: [],
-        into: @x_parents[parent_depth - 1],
-        index: inc_lineno,
-        replace: @x_include_directive_line,
       }
-      @x_include_replacements.current = @x_include_replacements[-1] if inc_lines
+      @x_include_replacements.pos = @x_include_replacements.length - 1 if inc_lines
       nil
     end
   end
 
-  module CurrentPointer
-    attr_accessor :current
+  module CurrentPosition
+    attr_accessor :pos
 
     def self.extended instance
-      instance.current = instance[-1]
+      instance.pos = instance.length - 1
+    end
+
+    def current
+      self[@pos]
     end
   end
 end

data/lib/asciidoctor/reducer/tree_processor.rb

@@ -4,14 +4,13 @@ module Asciidoctor::Reducer
   class TreeProcessor < ::Asciidoctor::Extensions::TreeProcessor
     def process doc
       return if doc.options[:reduced]
-      inc_replacements = doc.reader.x_include_replacements
-      unless inc_replacements.length == 1 && inc_replacements[0][:drop].empty?
+      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|
           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[:index])] == it[:replace]
+            next unless target_lines[(index = it[:lineno])] == it[:line]
           end
           lines = it[:lines]
           unless (drop = it[:drop]).empty?
@@ -21,9 +20,11 @@ module Asciidoctor::Reducer
         end
         source_lines = inc_replacements[0][:lines].flatten
         if doc.sourcemap
-          # WARNING: if include directives remain that can still be resolved, the sourcemap won't match the source lines
-          doc = ::Asciidoctor.load source_lines, (doc.options.merge reduced: true)
+          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
       end

data/lib/asciidoctor/reducer/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Reducer
-    VERSION = '1.0.0.alpha.4'
+    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.4
+  version: 1.0.0.alpha.5
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor