asciidoctor-reducer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28901fa8f69c6cffe25cac501f7242980cd50dce1ad0586ccff44ed66c4eee30
-  data.tar.gz: a8c80c18c767ba36a0c3642b69e166532c191d0f5772e884fb86d3341dc1889b
+  metadata.gz: '042939f0b251163208b57a67bed8a7b16d15d0972a616e67c171b8462a5ae61b'
+  data.tar.gz: 9065fc1b7a742f057441f873956883e6c87ba88afb1984496c821f378e666e2b
 SHA512:
-  metadata.gz: b00cbaa7e4d145ed571dfe282f4b440dd61472feabdd79338ca27e2ceaf795593e0efb7e3f86cb05d021176328d4a20a37adf4f6ffdefb3b30fad480672e2821
-  data.tar.gz: a923404fe5ed452e3a4145ba15f8512a441c6d8b47986a22bc1485edc6c8672f28f31dba30ad2e224ae2a3f98d7b383b1d5cefa81ae70af7779205ea300d6d1a
+  metadata.gz: 53e3e2cd52cf60ff810b93c5409cf521c1e5509106c8cece15ac89262d5a7d0ac998b2369ebb1cd8854675de930ea3a2f10c762bf072f758db663f3b6e7aa0ed
+  data.tar.gz: 1785df7825bd0fb902dd619bf42b2de90360acdf975f3356ca5ad8ed7b65a32c71c8824b51b966aecce774078d14d5c6dcdf281d899eb6f54e61307dbec0b0ce

data/CHANGELOG.adoc

@@ -4,6 +4,17 @@
 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.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._

data/README.adoc

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

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,20 @@ 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] ||= []
       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] : []), unresolved
       end
       @x_reducer.clear
       result
@@ -28,10 +26,10 @@ 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
       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 : [])
       result
     end
 
@@ -55,9 +53,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

@@ -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'
+    VERSION = '1.0.1'
   end
 end

metadata

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