asciidoctor-interdoc-reftext 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bab4c1588499a362eaa32a4e6b31ab22868542221a71c3f03527b9dafb22862
-  data.tar.gz: 86e4299efd390de7db998eeb095fbcb1f05f5a852056cfe15cce3ab15aaaee38
+  metadata.gz: def75f94d48c725ab1a5011c5b54bf4c8be73276c7698d304ab20827b94d8842
+  data.tar.gz: 913f3cfa1cd2488db2a53d7cee46bec82d49fe52ce79bea650374c90dc23e12f
 SHA512:
-  metadata.gz: ca1a5ccd4222e9cb076b96039ee54197e9fd8d1bca0b1e6b990ca6df3f515df66f515a9a7b162ab40dab96449daba71c743147401c6b0fe470bfc92dea416dac
-  data.tar.gz: e176d06b13f26be0638e5a752fb980b675e32655672013598451dec587040fb46991ea328c1001368124aa48fc951e96995f3154fcd6947c9c54e3d972c8d594
+  metadata.gz: 8d5c53526ed579480541f25077d9af8a0094eb1504e2ef6d36d4e8291cbaa4b6a525a8731eb1b57d78874c02dee216dfb48a9af0cd989ded5dfeba6a052dc14f
+  data.tar.gz: a56c12233cd442a01194d8afd505529bd0954c7e5daba4a77e6c61ac060aea7f0f7ce37931cb5e5b60d1a177cd145cbab636243227def621e8e22addacb6d4c7

data/README.adoc

@@ -1,5 +1,4 @@
 = Asciidoctor Inter-doc Reference Text
-:source-language: shell
 // custom
 :gem-name: asciidoctor-interdoc-reftext
 :gh-name: jirutka/{gem-name}
@@ -62,20 +61,22 @@ where “The First Section” is *title* of the section with id _sec1_ in _other
 
 == Installation
 
+ifndef::npm-readme[]
 === Ruby
 
 Install {gem-name} from Rubygems:
 
-[source, subs="+attributes"]
+[source, sh, subs="+attributes"]
 gem install {gem-name}
 
 or to install the latest development version:
 
-[source, subs="+attributes"]
+[source, sh, subs="+attributes"]
 gem install {gem-name} --pre
 
 
 === Node.js
+endif::npm-readme[]
 
 Install {gem-name} from npmjs.com:
 
@@ -85,11 +86,12 @@ npm install --save {gem-name}
 
 == Usage
 
+ifndef::npm-readme[]
 === CLI
 
 If you invoke Asciidoctor from command-line, use option `-r` to load the extension:
 
-[source, subs="+attributes"]
+[source, sh, subs="+attributes"]
 asciidoctor -r {gem-name} README.adoc
 
 
@@ -104,6 +106,7 @@ IMPORTANT: Bundler automatically _requires_ all the specified gems.
 
 
 === Node.js
+endif::npm-readme[]
 
 [source, js, subs="+attributes"]
 ----

data/asciidoctor-interdoc-reftext.gemspec

@@ -20,10 +20,10 @@ text (label) for inter-document cross references"
   s.add_development_dependency 'corefines', '~> 1.11'
   s.add_development_dependency 'kramdown', '~> 1.16'
   s.add_development_dependency 'pandoc-ruby', '~> 2.0'
-  s.add_development_dependency 'rake', '~> 12.0'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.7'
   s.add_development_dependency 'rspec-html-matchers', '~> 0.9.1'
   s.add_development_dependency 'rubocop', '~> 0.51.0'
-  s.add_development_dependency 'simplecov', '~> 0.15'
+  s.add_development_dependency 'simplecov', '~> 0.17.1'
   s.add_development_dependency 'yard', '~> 0.9'
 end

data/lib/asciidoctor/interdoc_reftext/inline_node_mixin.rb

@@ -39,10 +39,23 @@ module Asciidoctor::InterdocReftext
       # If this node is not an inter-document cross reference...
       return if @node_name != 'inline_anchor' || @attributes['path'].nil?
 
-      # This variable is injected into the document by {Processor}.
-      if (resolver = @document.instance_variable_get(Processor::RESOLVER_VAR_NAME))
+      # interdoc_reftext_resolver may return nil when the extension was loaded,
+      # but is disabled for the current document.
+      if (resolver = interdoc_reftext_resolver)
         @text = resolver.call(@attributes['refid'])
       end
     end
+
+    # @return [Asciidoctor::InterdocReftext::Resolver, nil]
+    def interdoc_reftext_resolver
+      # This variable is injected into the document by {Processor} or this method.
+      @document.instance_variable_get(Processor::RESOLVER_VAR_NAME) || begin
+        doc = @document
+        until (resolver = doc.instance_variable_get(Processor::RESOLVER_VAR_NAME))
+          doc = doc.parent_document or return nil
+        end
+        doc.instance_variable_set(Processor::RESOLVER_VAR_NAME, resolver)
+      end
+    end
   end
 end

data/lib/asciidoctor/interdoc_reftext/processor.rb

@@ -82,7 +82,7 @@ module Asciidoctor::InterdocReftext
 
     # @param document [Asciidoctor::Document] the document to process.
     def process(document)
-      resolver = @resolver_class.new(document, @resolver_opts)
+      resolver = @resolver_class.new(document, **@resolver_opts)
       document.instance_variable_set(RESOLVER_VAR_NAME, resolver)
       nil
     end

data/lib/asciidoctor/interdoc_reftext/version.rb

@@ -3,6 +3,6 @@
 module Asciidoctor
   module InterdocReftext
     # Version of the asciidoctor-interdoc-reftext gem.
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-interdoc-reftext
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jakub Jirutka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement