aspec_rb 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81629ea54e2cfed1b38309c4f2cef083a4b174c199f801f2f43db23a1a8db1c0
-  data.tar.gz: d97546374ffc196faa146acb0117d35f020250a39ce659f67aa5a5188af13f49
+  metadata.gz: 427cbb8b59cafd0a51f3253e03a53c29a9893699cb7607a95815cdb384d57d45
+  data.tar.gz: 25d2bcc8d6bcb9a528b153cdba5a6286ff47fa4adfafbf8f5a000859f61be18c
 SHA512:
-  metadata.gz: 474bd5d638e8eebd902d3b8bc0dbd4aabc9bda65fc4667e1a8e1be1c5135d01e5f2abc880d16c3dce8c55481f4ed08f912cf8badda361c3f643ed81c9e15ae2f
-  data.tar.gz: c6f33e16bdd177198faa7571ac6297eb2714fb560c2955ed37d301249552be52953fa37e4b4125f0fb39cbc078a799450f367aa4d44ffa95968dce05826bb381
+  metadata.gz: 70f61d330bcddef4927e4cc5c7d3ca1ef19757a3b49418e698ae40d3c671a3e1efa59e0bdfdc67476b4829fcaa6f406755963aa8f73b82a5d3d7bb8a097bc748
+  data.tar.gz: 3a7b1ffabfd31002e268abaa8bab909e46897794afc383bf094c0b3ec49fc13ebc90775993cb59433207a81d3391281f9e49282895bf8b7725cf4453a8cade54

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aspec_rb (0.0.16)
+    aspec_rb (0.0.18)
       asciidoctor
 
 GEM
@@ -10,7 +10,7 @@ GEM
     asciidoctor (1.5.7.1)
     docile (1.3.1)
     json (2.1.0)
-    power_assert (1.1.1)
+    power_assert (1.1.2)
     rake (12.3.1)
     simplecov (0.16.1)
       docile (~> 1.1)

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.16'
+  VERSION = '0.0.18'
 end

data/lib/extensions/autoxrefs.rb

@@ -9,28 +9,29 @@ include ::Asciidoctor
 $srcdir = 'chapters'
 
 AnchorRx = /\[\[(?:|([\w+?_:][\w+?:.-]*)(?:, *(.+))?)\]\]/
+ImageRx = /^(\.\S\w+)/
+SectitleRx = /^(\=+\s+?\S+.+)/
+XrefRx = /\<\<(?!Req)(.+?)\>\>/
 
 ni_includes, includes, doclinks, anchorfixes, intrachapter, interchapter, anchors, xrefs = Array.new(9) { [] }
 
-# Don't do this!
 adoc_files = Dir.glob("#{$srcdir}/**/*.adoc")
 
 indexincludes = Index.includes
 
-adoc_files.each do |filename|
-  main = false
+# Scan adoc files and store some arrays of xrefs and anchors
+adoc_files.each do |filename, main=false|
   path = Sform.trim(filename)
   chapter = path.match(/.+?(?=\/)/).to_s
 
-  # Add a switch if the current document is an include within the index.adoc
-  indexincludes.each do |inc|
-    main = true if inc == filename
-  end
+  # If the current document is an include within the index.adoc
+  indexincludes.each { |inc| main = true if inc == filename }
 
   File.read(filename).each_line do |li|
     h1 = false
 
-    if li[/\<\<(?!Req)(.+?)\>\>/]
+    # Look for xrefs
+    if li[XrefRx]
       # Handle multiple cross refs per line
       li.scan(/(?=\<\<(?!Req)(.+?)\>\>)/) do |xref|
         text = ''
@@ -50,20 +51,22 @@ adoc_files.each do |filename|
         xrefs.push([xref, path, filename, text, target, chapter])
       end
 
-    elsif li[/^(\=+\s+?\S+.+)/]
+    # Section Titles
+    elsif li[SectitleRx]
       h1 = true if li[/^=\s+?\S+.+/]
       title = li.chop.match(/(?!=+\s)(\S+.+?)$/i).captures[0].strip
       title.sub!(/\.(?=\w+?)/, '') if title[/\.(?=\w+?)/]
       link = Sform.underscorify(title)
       anchors.push([title, path, filename, link, chapter, main, h1])
 
-    # Handle images separately
-    elsif li[/^(\.\S\w+)/]
+    # Images
+    elsif li[ImageRx]
       title = li.chop.match(/(?!=+\s)(\S+.+?)$/i).captures[0].strip
       title.sub!(/\.(?=\w+?)/, '') if title[/\.(?=\w+?)/]
       anchors.push([title, path, filename, title, chapter, main, h1])
 
-    elsif li[/\[\[(?:|([\w+?_:][\w+?:.-]*)(?:, *(.+))?)\]\]/]
+    # Anchors
+    elsif li[AnchorRx]
       anchor = li.chop.match(/(?<=\[\[).+?(?=\]\])/).to_s
 
       if anchor[/,/]
@@ -76,36 +79,37 @@ adoc_files.each do |filename|
 
       anchors.push([anchor, path, filename, text, chapter, main, h1, true])
 
-    # Match for sub includes
+    # Match for includes
     elsif li[IncludeDirectiveRx]
       child = li.match(/(?<=^include::).+?\.adoc(?=\[\])/).to_s
       child = child.sub(/^\{find\}/, '')
       childpath = "#{filename.sub(/[^\/]+?\.adoc/, '')}#{child}"
-      includes.push([Sform.trim(filename), child, Sform.trim(childpath)])
+      trim_childpath = Sform.trim(childpath)
+      trim_parent = Sform.trim(filename)
+      includes.push([filename, child, childpath, trim_childpath, trim_parent])
 
     end
   end
 end
 
-# Create array of non-indexed includes
+# Create array of non-index includes
 adoc_files.each do |filename|
-  includes.each do |parent, child, childpath|
+  includes.each do |parent, child, childpath, trim_childpath, trim_parent|
     next unless childpath == filename
-    ni_includes.push([parent, child, filename])
+    ni_includes.push([parent, child, filename, trim_childpath, trim_parent])
   end
 end
 
-
-# For each main include, store a target link
+# For each "main" include, store a target link
+# This is where the generated HTML for each chapter will live
 anchors.each do |_anchor, full, _filename, link, chapter, main, h1|
   next unless main && h1
   doc = full.gsub(/^#{chapter}\//, '')
   doclinks.push([doc, link, chapter])
 end
 
-o_anchors = []
-
 # If a section title has an overriding anchor on the previous line, perform the following fix
+o_anchors = []
 doclinks.delete_if do |doc, _link, mchapter|
   topleveldoc = "#{$srcdir}/#{mchapter}/#{doc}.adoc"
   lines = File.foreach(topleveldoc).first(10).join
@@ -118,25 +122,30 @@ end
 doclinks += o_anchors
 doclinks.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
+# Edit the array of Anchors to point to the parent document if it is included.
 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|
+  includes.each do |parent, _child, childpath, trim_childpath, trim_parent|
     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])
+      # TODO - this is a huge bottleneck!
+      # remove string operations inside iterators!!!
+      next unless trim_childpath == Sform.trim(filename)
+      tempanchors.push([anchor, path, trim_parent, text, chapter, main])
       true
     end
   end
+
   anchors += tempanchors
   anchors.uniq!
+  
 end
 
+tempanchors.clear
+
 anchors.delete_if do |anchor, apath, trim_parent, parent, amain, achapter|
   doclinks.each do |doc, link, dchapter|
     next unless apath == "#{dchapter}/#{doc}" || trim_parent == "#{dchapter}/#{doc}"
@@ -145,31 +154,29 @@ anchors.delete_if do |anchor, apath, trim_parent, parent, amain, achapter|
   end
 end
 
-
-tempanchors.uniq!
 anchors += tempanchors
 anchors.uniq!
 
 # For all requirements, check which chapter they should finally be in with includes catered for
 # match with a main document name - should be a main chapter title
-xrefs.each do |xref, xpath, _xfilename, _xtext, xtarget, _xchapter|
+xrefs.each do |xref, xpath, _xfilename, xtext, xtarget, _xchapter|
   anchors.each do |anchor, apath, afilename, atext, _achapter, _amain, _h1|
     next unless xref == anchor
     # if in same chapter, dont link to other HTML file
     afilename = '' if xpath == apath
     # xtext = xref if xtext.empty?
     afilename.sub!(/^_/, '') if afilename[/^_/]
-    fix = "#{afilename}##{atext},#{_xtext}"
+    fix = "#{afilename}##{atext},#{xtext}"
     anchorfixes.push([anchor, fix, xref])
   end
 end
 
+anchorfixes.uniq!
+
 Extensions.register do
   preprocessor do
     process do |_document, reader|
-      # return reader if reader.eof?
-      
-      replacement_lines = reader.read_lines.map do |line|
+      Reader.new reader.readlines.map { |line|
         if line[/\<\<(?!Req)(.+?)\>\>/]
           anchorfixes.each do |original, fix|
             next unless line[/\<\<#{original}(,.+?)?\>\>/]
@@ -183,9 +190,7 @@ Extensions.register do
           2.times { line.sub!(/`/, '') }
         end
         line
-      end
-      reader.unshift_lines replacement_lines
-      reader
+      }
     end
   end
 end

metadata

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