jekyll_aspec 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0afc1da878314d89be5c796fa7267d6c6b398db2
-  data.tar.gz: 719b5c319e30eb964ed3ccba41ea12d66a29fa56
+  metadata.gz: 0e64513f8119c3b6a54b206808fe4061aed4a1e6
+  data.tar.gz: 3d574f4b337b6bd11189ff2aead1b3c7f5240181
 SHA512:
-  metadata.gz: bf4f4e382abf729f92a5ec609e03edb1ecdff09205e495b1e758b829241004c085407ff3c5ca89c5dedd8223bee66de66a79a355116f21d55dcb22dbc40f0478
-  data.tar.gz: dc00fb2199e5c32a2dd10feda3421d741a8bd7d57ca81699f3b7dcc77c396cd7104ab8604c7d63f718a44e2ca0d622afeee8047819b1588314543a977047d49c
+  metadata.gz: bf2f1b4017dfd7e558c087b24e39bd3dc1d64ff22e5b00107e2029e947aa4e3d734390255418d271aa39955d62ddf02902c7bb5a14829d4f9fb901f0c23f7dcd
+  data.tar.gz: 286f49684d8b767419a2b4333427b158f2294ea4291907de78e051a349ce18e022d062688269ee7541c11bb4df7e65ad2c1117c7d5cc2d26f104bc65a6e82a92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll_aspec (1.0.7)
+    jekyll_aspec (1.0.8)
       asciidoctor (>= 1.5.0)
 
 GEM

data/lib/extensions/req_refs.rb

@@ -5,13 +5,9 @@ include ::Asciidoctor
 # Find all Adoc Files
 adoc_files = Dir.glob('**/*.adoc')
 exts = "(\.adoc|\.md|\.html)"
-# make some empty vars globally available
-rpath = nil
-rtext = nil
-reqs = []
-inc_reqs = []
-incs = []
-xrefs = []
+
+rpath, rtext = nil
+reqs, inc_reqs, incs, xrefs = [], [], [], []
 xref_base = ''
 
 # Retrieve this via document attribute
@@ -23,12 +19,9 @@ def trim(s)
 end
 
 adoc_files.each do |file_name|
-  lc = 0
   inc = false
 
   File.read(file_name).each_line do |li|
-    lc += 1
-
     inc = true if li[/published: false/]
 
     # Match Requirement Blocks [req,ABC-123,version=n]
@@ -37,7 +30,7 @@ adoc_files.each do |file_name|
       rid = li.chop.match(/id\s*=\s*\w+-?([0-9]+)/i).captures[0]
       path = file_name.sub(/^#{docsdir}\//, '')
       path = path.sub!(/#{exts}/, '')
-      item = [rid, li.chop, path, file_name, lc]
+      item = [rid, li.chop, path, file_name]
 
       if inc
         inc_reqs.push item
@@ -51,7 +44,7 @@ adoc_files.each do |file_name|
       xref = li.chop.match(/\<\<(\S.+?)(\,\S)?\>\>/i)
       path = file_name.sub(/^#{docsdir}\//, '')
       path = path.sub!(/#{exts}/, '')
-      item = [xref, path, file_name, lc]
+      item = [xref, path, file_name]
       xrefs.push item
 
     # Collect all includes
@@ -61,7 +54,7 @@ adoc_files.each do |file_name|
       path = inc_file.sub(/^#{docsdir}\//, '')
       path = path.sub(/#{exts}/, '')
       parent = file_name
-      item = [inc_file, path, parent, lc]
+      item = [inc_file, path, parent]
       incs.push item
 
     end
@@ -70,10 +63,10 @@ end
 
 # Sort included reqs and correct the path to the include parent
 inc_reqs.each do |rid, rli, rpath, _rfile, _rline|
-  incs.each do |incfile, incpath, parent, lc|
+  incs.each do |incfile, incpath, parent|
     next unless rpath == incpath
     trim(parent)
-    item = [rid, rli, parent, incfile, lc]
+    item = [rid, rli, parent, incfile]
     reqs.push item
   end
 end
@@ -81,16 +74,21 @@ end
 # Sort (in-place) by numberic ID
 reqs.sort_by!(&:first)
 
-# Preprocessor that strips the << tags - NOTE: may break conversion if line ends with >>
+# Preprocessor that strips the << tags
 Extensions.register do
   preprocessor do
     process do |_document, reader|
       Reader.new reader.readlines.map { |li|
         if li[/\<\<Req-.+?\>\>/]
-          openb = li.match(/(\<\<)Req-.+?\>\>/).captures[0]
-          closeb = li.match(/\<\<Req-.+?(\>\>)/).captures[0]
-          li.gsub!(/#{openb}/, ' ')
-          li.gsub!(/#{closeb}/, ' ')
+          # Handle multiple reqs per line
+          spl = li.split(/ /)
+          spl.each {|x|
+            if x[/\<\<Req-.+?\>\>/] 
+              x.gsub!(/<</, ' ')
+              x.gsub!(/>>/, ' ')
+            end
+          }
+          spl.join(' ')
         else
           li
         end
@@ -122,7 +120,7 @@ Extensions.register do
       xref_base = (parent.document.attr 'xref-base')
       uri = "#{xref_base}/#{rpath}/index.html##{link}"
       o = ' <span class="label label-info">'
-      c = ' </span>'
+      c = ' </span> '
 
       (create_anchor parent, %(#{o} Req. #{rtext} #{c}), type: :link, target: uri).convert
     end

data/lib/jekyll_aspec/version.rb

@@ -2,5 +2,5 @@
 module JekyllAspec
   # After updating the version, publishing can be done by running
   # rake release in the project root
-  VERSION = '1.0.7'.freeze
+  VERSION = '1.0.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_aspec
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - bsmith-n4