asciidoctor-reducer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '042939f0b251163208b57a67bed8a7b16d15d0972a616e67c171b8462a5ae61b'
-  data.tar.gz: 9065fc1b7a742f057441f873956883e6c87ba88afb1984496c821f378e666e2b
+  metadata.gz: b5316a1e0a22871599401171fc8f5104e4a03cf09598eacee8670153354e6050
+  data.tar.gz: 02cc09578b9798e53f3e8a23f81b2e051ef2b6714c39bee99d043a6cbee2acc5
 SHA512:
-  metadata.gz: 53e3e2cd52cf60ff810b93c5409cf521c1e5509106c8cece15ac89262d5a7d0ac998b2369ebb1cd8854675de930ea3a2f10c762bf072f758db663f3b6e7aa0ed
-  data.tar.gz: 1785df7825bd0fb902dd619bf42b2de90360acdf975f3356ca5ad8ed7b65a32c71c8824b51b966aecce774078d14d5c6dcdf281d899eb6f54e61307dbec0b0ce
+  metadata.gz: a2ef54d4a37f4c1f2205cb191735a1d6462ad271faa75db4ea87305c5ba25f2ba08885057f5c56006703ad745fc2c55928ac0c6db9205e9ee35284fab245f395
+  data.tar.gz: '0018183fd91c359a67ad0a6e5b60901f5f868bc4223bd9fc27c639eb5fb05a684c938480507a9ff445bdd00ad260ff385c29d68a6359c2498cc6a4d9cee0320a'

data/CHANGELOG.adoc

@@ -4,6 +4,16 @@
 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.2 (2022-05-09) - @mojavelinux
+
+=== Fixed
+
+* Replace include and conditional directives inside a file that has been included partially (i.e., has an offset) (#43)
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.2[git tag] | {url-repo}/compare/v1.0.1\...v1.0.2[full diff]
+
 == 1.0.1 (2022-05-08) - @mojavelinux
 
 === Changed

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.1, 2022-05-08
+v1.0.2, 2022-05-09
 :idprefix:
 :idseparator: -
 ifndef::env-github[:icons: font]

data/lib/asciidoctor/reducer/conditional_directive_tracker.rb

@@ -8,7 +8,9 @@ module Asciidoctor::Reducer
       directive_lineno = @lineno
       result = super
       return result if @skipping && skip_active
-      drop = @include_replacements.current[:drop] ||= []
+      curr_inc_replacement = @include_replacements.current
+      drop = curr_inc_replacement[:drop] ||= []
+      directive_lineno -= (curr_inc_replacement[:offset] ||= 0)
       if (depth_change = @conditional_stack.size - depth) < 0
         if skip_active
           drop.push(*(drop.pop..directive_lineno))

data/lib/asciidoctor/reducer/include_directive_tracker.rb

@@ -18,7 +18,7 @@ module Asciidoctor::Reducer
             directive_lineno == @lineno && (unresolved = ln.start_with? 'link:')
           ln = %(#{ln.slice 0, (ln.length - 1)}role=include])
         end
-        push_include_replacement directive_lineno, (unresolved ? [ln] : []), unresolved
+        push_include_replacement directive_lineno, (unresolved ? [ln] : []), 0, unresolved
       end
       @x_reducer.clear
       result
@@ -28,8 +28,9 @@ module Asciidoctor::Reducer
       @x_reducer[:include_pushed] = true
       directive_lineno = @lineno - 1 # we're below the include line, which is 1-based
       prev_inc_depth = @include_stack.size
+      offset = lineno > 1 ? lineno - 1 : 0
       result = super
-      push_include_replacement directive_lineno, (@include_stack.size > prev_inc_depth ? lines : [])
+      push_include_replacement directive_lineno, (@include_stack.size > prev_inc_depth ? lines : []), offset
       result
     end
 
@@ -40,12 +41,13 @@ module Asciidoctor::Reducer
 
     private
 
-    def push_include_replacement lineno, lines, unresolved = false
+    def push_include_replacement lineno, lines, offset, unresolved = false
       (inc_replacements = @include_replacements) << {
         into: inc_replacements.pointer,
-        lineno: lineno,
+        lineno: lineno - (inc_replacements.current[:offset] ||= 0),
         line: @x_reducer[:include_directive_line],
         lines: lines,
+        offset: offset,
       }
       inc_replacements.to_end unless unresolved || lines.empty?
       nil

data/lib/asciidoctor/reducer/tree_processor.rb

@@ -8,7 +8,7 @@ module Asciidoctor::Reducer
         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
+            # adds extra assurance that we're replacing the correct line
             next unless target_lines[(idx = it[:lineno] - 1)] == it[:line]
           end
           lines = it[:lines]

data/lib/asciidoctor/reducer/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Reducer
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-reducer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor