aspec_rb 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ceaae8abf8a8ed63c0e9d7a58b5065ad8d56a3e13a6d9b4ca43be3367ff4869
-  data.tar.gz: 456c514ec27c3e61b97ec3486415d71be01f38c8809e2c59fb20a3bf44ab823a
+  metadata.gz: 81629ea54e2cfed1b38309c4f2cef083a4b174c199f801f2f43db23a1a8db1c0
+  data.tar.gz: d97546374ffc196faa146acb0117d35f020250a39ce659f67aa5a5188af13f49
 SHA512:
-  metadata.gz: 0a95bbc8b021c3811a318fc2e270e12dc2e61520d77dfdf5870a1d333ff68d5192a11a66c890a4de7f6f52f3ff4e1322d5442cba81eb4896573f57bed4dc087b
-  data.tar.gz: 9053d5e8942fe690eb61df5370fa76ea5191c060d18b1e7c0df390f30dbc0370b41175558cde69655f7e5092697581c89409a5061b61eb1d3105ca73f6bd3f0e
+  metadata.gz: 474bd5d638e8eebd902d3b8bc0dbd4aabc9bda65fc4667e1a8e1be1c5135d01e5f2abc880d16c3dce8c55481f4ed08f912cf8badda361c3f643ed81c9e15ae2f
+  data.tar.gz: c6f33e16bdd177198faa7571ac6297eb2714fb560c2955ed37d301249552be52953fa37e4b4125f0fb39cbc078a799450f367aa4d44ffa95968dce05826bb381

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aspec_rb (0.0.15)
+    aspec_rb (0.0.16)
       asciidoctor
 
 GEM

data/lib/aspec_rb/version.rb

@@ -7,5 +7,5 @@ module AspecRb
   # For this deploy config, see https://github.com/tcob/aspec_rb/blob/master/.travis.yml
   #
   # Manual release can be performed by running 'bundle install && rake release'
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/lib/extensions/autoxrefs.rb

@@ -118,15 +118,24 @@ end
 doclinks += o_anchors
 doclinks.uniq!
 
-includes.each do |parent, _child, childpath|
-  anchors.map! { |anchor, path, filename, text, chapter, main, _h1|
-    filename = parent if childpath == path
-    [anchor, path, filename, text, chapter, main, _h1]
-  }
-end
-
-anchors.uniq!
+# Edit the array of Anchors to point to the parent document *if* it is included.
+# TODO use a while loop, repeat until no changes made
 tempanchors = []
+3.times do
+  tempanchors.clear
+
+  # Loop through all includes, if the anchor is contained in an include,
+  # edit the anchors array to point to its parent instead
+  includes.each do |parent, _child, childpath|
+    anchors.delete_if do |anchor, path, filename, text, chapter, main, _h1|
+      next unless Sform.trim(childpath) == Sform.trim(filename)
+      tempanchors.push([anchor, path, Sform.trim(parent), text, chapter, main])
+      true
+    end
+  end
+  anchors += tempanchors
+  anchors.uniq!
+end
 
 anchors.delete_if do |anchor, apath, trim_parent, parent, amain, achapter|
   doclinks.each do |doc, link, dchapter|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspec_rb
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - tcob
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler