asciidoctor-reducer 1.0.0-rc.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de2091cf932e336783f5622831333d3461fc8ee8cf1b47431fe48ba257e759ef
-  data.tar.gz: 07e125f547be6892cba77ba5af468ab86a5b37009abe9da4167f3a2f71f45a5e
+  metadata.gz: b5316a1e0a22871599401171fc8f5104e4a03cf09598eacee8670153354e6050
+  data.tar.gz: 02cc09578b9798e53f3e8a23f81b2e051ef2b6714c39bee99d043a6cbee2acc5
 SHA512:
-  metadata.gz: 9bfa607af1fe8339e4b8925d5e68d793d992c069b674ee40d00234b8e06c254b0d473f7ec4db140b1c95f4446218d347661872eaa72e306785fa9e6d8f593f13
-  data.tar.gz: 0ed27e9fbe39fd738cb7a48b22b2f5ea1d967a8cb0077e79dd4ec0e86a3328d9e546f249fb0debda4984485bcf2538905ba8b5da44485b79cd50e2e05001780a
+  metadata.gz: a2ef54d4a37f4c1f2205cb191735a1d6462ad271faa75db4ea87305c5ba25f2ba08885057f5c56006703ad745fc2c55928ac0c6db9205e9ee35284fab245f395
+  data.tar.gz: '0018183fd91c359a67ad0a6e5b60901f5f868bc4223bd9fc27c639eb5fb05a684c938480507a9ff445bdd00ad260ff385c29d68a6359c2498cc6a4d9cee0320a'

data/CHANGELOG.adoc

@@ -4,6 +4,35 @@
 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
+
+* Use summary from gemspec in help text for `asciidoctor-reducer` command
+* Consistently access `source_lines` from document; use `#replace` to update
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.1[git tag] | {url-repo}/compare/v1.0.0\...v1.0.1[full diff]
+
+== 1.0.0 (2022-04-22) - @mojavelinux
+
+_No changes since previous release._
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0[git tag] | {url-repo}/compare/v1.0.0-rc.1\...v1.0.0[full diff]
+
 == 1.0.0-rc.1 (2022-04-22) - @mojavelinux
 
 _No changes since previous release._

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0-rc.1, 2022-04-22
+v1.0.2, 2022-05-09
 :idprefix:
 :idseparator: -
 ifndef::env-github[:icons: font]
@@ -38,7 +38,7 @@ We generally recommend using RVM as it allows you to install gems without requir
 
 You can install the latest version of the gem using the following command:
 
- $ gem install asciidoctor-reducer --pre
+ $ gem install asciidoctor-reducer
 
 Installing this gem makes the `asciidoctor-reducer` command available on your $PATH.
 You can also require the gem into the Ruby runtime to use it as a library or Asciidoctor extension.

data/lib/asciidoctor/reducer/cli.rb

@@ -14,7 +14,7 @@ module Asciidoctor::Reducer
           opts.banner = <<~END
           Usage: #{opts.program_name} [OPTION]... FILE
 
-          Reduces a composite AsciiDoc document containing includes and conditionals to a single AsciiDoc document.
+          #{::Gem.loaded_specs['asciidoctor-reducer'].summary}
 
           END
 

data/lib/asciidoctor/reducer/conditional_directive_tracker.rb

@@ -5,20 +5,22 @@ module Asciidoctor::Reducer
     def preprocess_conditional_directive keyword, target, delimiter, text
       skip_active = @skipping
       depth = @conditional_stack.size
-      cond_lineno = @lineno
+      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..cond_lineno))
+          drop.push(*(drop.pop..directive_lineno))
         else
-          drop << cond_lineno
+          drop << directive_lineno
         end
-      elsif depth_change > 0 || cond_lineno == @lineno
-        drop << cond_lineno
+      elsif depth_change > 0 || directive_lineno == @lineno
+        drop << directive_lineno
       else
-        drop << [cond_lineno, text]
+        drop << [directive_lineno, text]
       end
       result
     end

data/lib/asciidoctor/reducer/include_directive_tracker.rb

@@ -2,10 +2,8 @@
 
 module Asciidoctor::Reducer
   module IncludeDirectiveTracker
-    attr_reader :include_replacements
-    attr_writer :source_lines
-
     def self.extended instance
+      instance.singleton_class.send :attr_reader, :include_replacements
       instance.instance_variable_set :@include_replacements, ([{}].extend CurrentPosition)
       instance.instance_variable_set :@x_reducer, {}
     end
@@ -13,14 +11,14 @@ module Asciidoctor::Reducer
     def preprocess_include_directive target, attrlist
       @x_reducer[:include_directive_line] = %(include::#{target}[#{attrlist}])
       @x_reducer[:include_pushed] = false
-      inc_lineno = @lineno # we're currently on the include line, which is 1-based
+      directive_lineno = @lineno # we're currently on the include line, which is 1-based
       result = super
       unless @x_reducer[:include_pushed]
         if ((ln = peek_line true)&.end_with? ']') && !(unresolved = ln.start_with? 'Unresolved directive in ') &&
-            inc_lineno == @lineno && (unresolved = ln.start_with? 'link:')
+            directive_lineno == @lineno && (unresolved = ln.start_with? 'link:')
           ln = %(#{ln.slice 0, (ln.length - 1)}role=include])
         end
-        push_include_replacement inc_lineno, (unresolved ? [ln] : []), unresolved
+        push_include_replacement directive_lineno, (unresolved ? [ln] : []), 0, unresolved
       end
       @x_reducer.clear
       result
@@ -28,10 +26,11 @@ module Asciidoctor::Reducer
 
     def push_include data, file, path, lineno, attrs
       @x_reducer[:include_pushed] = true
-      inc_lineno = @lineno - 1 # we're below the include line, which is 1-based
+      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 inc_lineno, (@include_stack.size > prev_inc_depth ? lines : [])
+      push_include_replacement directive_lineno, (@include_stack.size > prev_inc_depth ? lines : []), offset
       result
     end
 
@@ -42,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
@@ -55,9 +55,8 @@ module Asciidoctor::Reducer
   end
 
   module CurrentPosition
-    attr_reader :pointer
-
     def self.extended instance
+      instance.singleton_class.send :attr_reader, :pointer
       instance.to_end
     end
 

data/lib/asciidoctor/reducer/preprocessor.rb

@@ -7,7 +7,8 @@ module Asciidoctor::Reducer
   class Preprocessor < ::Asciidoctor::Extensions::Preprocessor
     def process doc, reader
       doc.options[:preserve_conditionals] ?
-        (reader.extend IncludeDirectiveTracker) : (reader.extend ConditionalDirectiveTracker, IncludeDirectiveTracker)
+        (reader.extend IncludeDirectiveTracker) :
+        (reader.extend ConditionalDirectiveTracker, IncludeDirectiveTracker)
     end
   end
 end

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]
@@ -19,7 +19,7 @@ module Asciidoctor::Reducer
           end
           target_lines[idx] = lines if target_lines
         end
-        source_lines = inc_replacements[0][:lines].flatten
+        reduced_source_lines = inc_replacements[0][:lines].flatten
         if doc.sourcemap
           logger = ::Asciidoctor::LoggerManager.logger
           opts = doc.options.merge logger: nil, parse: false, reduced: true
@@ -27,13 +27,13 @@ module Asciidoctor::Reducer
             opts[:extension_registry] = ::Asciidoctor::Extensions::Registry.new ext_reg.groups
           end
           includes = doc.catalog[:includes]
-          doc = ::Asciidoctor.load source_lines, opts
+          doc = ::Asciidoctor.load reduced_source_lines, opts
           doc.catalog[:includes] = includes
           doc.parse
           ::Asciidoctor::LoggerManager.logger = logger
         else
-          source_lines.pop while (source_lines[-1] || :eof).empty?
-          doc.reader.source_lines = source_lines
+          reduced_source_lines.pop while reduced_source_lines[-1] == ''
+          doc.source_lines.replace reduced_source_lines
         end
       end
       doc

data/lib/asciidoctor/reducer/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Reducer
-    VERSION = '1.0.0-rc.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.0-rc.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -97,9 +97,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: