jekyll_aspec 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74bc1e1a248d3671df75c73837618c84f6af4343
-  data.tar.gz: 6c0e8b24415954e6b8d1fba0d3790649b7f2b67b
+  metadata.gz: 0afc1da878314d89be5c796fa7267d6c6b398db2
+  data.tar.gz: 719b5c319e30eb964ed3ccba41ea12d66a29fa56
 SHA512:
-  metadata.gz: 34690448559fd2b64a3e8cc7038345673b6a0b51c8b02a0332f49adceaa8557f5d980b1064c2f13060c39098f19ea5ff11553f1c4f976c2e3f50d08b2630a80e
-  data.tar.gz: 7d004d0a4c9ba6042657f111c75944171855aca0486fb8b449b6a08b9035dba5514698d95eb06761077be19bec879b5f63eb688666542029baa4cc4101c5be30
+  metadata.gz: bf4f4e382abf729f92a5ec609e03edb1ecdff09205e495b1e758b829241004c085407ff3c5ca89c5dedd8223bee66de66a79a355116f21d55dcb22dbc40f0478
+  data.tar.gz: dc00fb2199e5c32a2dd10feda3421d741a8bd7d57ca81699f3b7dcc77c396cd7104ab8604c7d63f718a44e2ca0d622afeee8047819b1588314543a977047d49c

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    jekyll_aspec (1.0.6)
+    jekyll_aspec (1.0.7)
       asciidoctor (>= 1.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     asciidoctor (1.5.6.1)
-    power_assert (1.1.0)
-    rake (12.1.0)
+    power_assert (1.1.1)
+    rake (12.2.1)
     test-unit (3.2.6)
       power_assert
 
@@ -23,4 +23,4 @@ DEPENDENCIES
   test-unit (>= 3.2.6)
 
 BUNDLED WITH
-   1.16.0.pre.3
+   1.16.0

data/lib/extensions/autoxrefs.rb

@@ -7,59 +7,67 @@ include ::Asciidoctor
 adoc_files = Dir.glob('**/*.adoc')
 invoc = Dir.pwd
 
-# Make some arrays available
-titles = []
-anchors = []
-xrefs = []
-mismatches = []
-
+titles, xrefs, mismatches = [], [], []
 replacement = ''
 
 def trim(s)
-  s.gsub!(/_docs\//, '')
-  s.gsub!(/(\.adoc|\.md|\.html)/, '')
+  s = s.gsub(/^_docs\//, '')
+  s = s.gsub(/(\.adoc|\.md|\.html)/, '')
 end
 
 def targetify(t)
-  # make all chars lowercase and substitute spaces with hyphens
-  t.downcase.gsub(/\s/, '-')
+  t.downcase.gsub(/(\s|-)/, '_')
+end
+
+def underscorify(t)
+  t = t.downcase.gsub(/(\s|-)/, '_')
+  t = t.prepend('_') unless t.match(/^_/)
+  t = t.gsub(/___/, '_').delete('`')
+end
+
+def titleify(t)
+  t = t.gsub(/\_/, ' ')
+  t = t.lstrip
+  t = t.split.map(&:capitalize).join(' ')
 end
 
 adoc_files.each do |file_name|
   lc = 0
 
   File.read(file_name).each_line do |li|
+    h1 = false
     lc += 1
+    path = trim(file_name)
 
-    # Match all <<xrefs>> exluding Requirements
+    # Match all <<xrefs>> (Excluding Requirements! - handled separately)
     if li[/\<\<(?!Req)(.+?)\>\>/]
 
-      text = ''
-      target = ''
-      path = trim(file_name)
-      xref = li.chop.match(/\<\<(?!Req)(\S.+?)\>\>/i).captures[0].to_s
-
-      if xref[/,/]
-        target = xref.downcase.gsub(/,.+/, '').gsub(/\s/, '-')
-        text = xref.gsub(/.+,/, '').lstrip!
-        xref = xref.sub(/,.+/, '')
-        path = file_name
-      else
-        target = xref.downcase.gsub(/\s/, '-')
-        text = xref
-      end
-
-      item = [xref, path, file_name, text, target]
-      xrefs.push item
+      num_refs = li.scan(/(?=\<\<(?!Req)(.+?)\>\>)/).count
+      
+      li.scan(/(?=\<\<(?!Req)(.+?)\>\>)/) {|xref| 
+        xref = xref[0].to_s
+        text, target = '', ''
+        #xref = xref.chop.match(/\<\<(?!Req)(\S.+?)\>\>/i).captures[0].to_s
+        if xref[/,/]
+          target = xref.gsub(/,.+/, '').gsub(/\s/, '-')
+          text = xref.gsub(/.+,/, '').lstrip
+          xref = xref.sub(/,.+/, '')
+        else
+          target = xref.gsub(/\s/, '-')
+          text = xref
+        end
+        item = [xref, path, file_name, text, target]
+        xrefs.push item
+      }
 
-      # Match .Titles and = Section Titles
+    # Match Block .Titles and = Section Titles
     elsif li[/(^(\.\S\w+)|^(\=+\s+?\S+.+))/]
 
-      # Add check if none found (captures nil)
+      h1 = true if li[/^(\=+\s+?\S+.+)/]
       title = li.chop.match(/(?!=+\s)(\S+.+?)$/i).captures[0]
       title.sub!(/\.(?=\w+?)/, '') if title[/\.(?=\w+?)/]
-      path = trim(file_name)
-      item = [title, path, file_name]
+      title = title.strip   
+      item = [title, path, file_name, underscorify(title).strip, h1]
       titles.push item
 
     # Match [[anchors]]
@@ -73,7 +81,6 @@ adoc_files.each do |file_name|
         text = anchor.sub(/.+?,/, '')
         text = text.sub(/\]\]$/, '')
       end
-      path = trim(file_name)
       item = [anchor, path, file_name, text]
       titles.push item
 
@@ -84,19 +91,18 @@ end
 # Run through each xref and check for matching titles
 xrefs.each do |xref, xpath, xfile, xtext, xtarget|
   # check xrefs against titles
-  titles.each do |ttext, tpath, tfile, _tdisp|
-    # puts "checking #{ttext} against #{xref}"
-    next unless ttext == xref
-    # puts "MATCHED #{ttext} with #{xref}"
+  titles.each do |ttext, tpath, tfile, alt, h1|
 
-    # If the paths are not the same (xref and title not the same document) do the following
+    # IMPORTANT - If unnecessary matches are made here, there are exponentially large performance knocks
+    # xrefs / alt / title text must be handled properly
+    next unless ttext == xtext || ttext == xref || alt == xref || alt == xtarget
     next unless tpath != xpath
     tpath = 'index' if tpath.to_s.empty?
-    # puts "Title \"#{ttext}\" in #{tfile} - mismatched xref \"#{xref}\" to different doc - #{xpath}"
-
-    xtform = targetify(xtarget)
-    detail = [xref, xtarget, xtext, xpath, xfile, ttext, tpath, tfile, xtform]
+    xtform = underscorify(xtarget) if h1
+    xfile = trim(xfile)
+    detail = [xref, xtarget, xtext, xpath, xfile, ttext, tpath, tfile, xtform, alt, h1]
     mismatches.push detail
+
   end
 end
 
@@ -104,23 +110,20 @@ Extensions.register do
   preprocessor do
     process do |document, reader|
       fixes = []
-      i = 0
-
-      # Block is loaded once per document!!!
-      # for each malformed xref
-      mismatches.each do |_xref, _xtarget, xtext, _xpath, xfile, _ttext, _tpath, tfile, xtform|
-        # FIXME: This directory is empty in POSTS - breaks conversion
+      
+      mismatches.each do |_xref, _xtarget, xtext, _xpath, xfile, _ttext, _tpath, tfile, xtform, alt, h1|
         docfile = document.attributes['docfile'].sub(/^#{invoc}\//, '')
         trim(docfile)
-
         next unless docfile.to_s == xfile
-
         # calculate the relative path between source and target
+        # TODO - abstract the following
         first = Pathname.new xfile.to_s
         second = Pathname.new tfile.to_s
         relpath = second.relative_path_from first
-
         relpath = relpath.sub(/^\.\.\//, '') if docfile == 'index'
+        xtform = _xref if xtform.to_s.empty?
+        xtform = underscorify(xtform) if xtform[/\s/] || h1
+        xtext = titleify(xtext) if xtext[/\_/]
         fix = "#{relpath}/index##{xtform},#{xtext}"
         fixes.push fix
       end
@@ -128,24 +131,26 @@ Extensions.register do
       Reader.new reader.readlines.map { |li|
         # If the line contains an xref (not to requirements)
         if li[/\<\<(?!Req)(.+?)\>\>/]
-
-          mismatches.each do |xref, xtarget, xtext, _xpath, _xfile, _ttext, _tpath, _tfile, _relpath|
-            # check if the line contains the original xref
-
-            next unless li[/\<\<#{xref}(,.+)?\>\>/]
-            fixes.each do |x|
-              if x[/#{xtarget}/]
+          num_refs = li.scan(/(?=\<\<(?!Req)(.+?)\>\>)/).count
+          num_refs.times do
+            mismatches.each do |xref, xtarget, xtext, _xpath, _xfile, _ttext, _tpath, _tfile, _relpath, alt, h1|
+              # check if the line contains the original xref
+              next unless li[/\<\<#{xref}(,.+)?\>\>/]      
+              alt = xref if alt.to_s.empty?
+              fixes.each do |x|
+                next unless x[/(#{xtarget}|#{alt})/]
                 t = xref if xtext.to_s.empty?
-                replacement = li.sub(/\<\<#{xref}(,.+)?\>\>/, "icon:expand[] <<#{x}#{t}>> ")
+                x = x.gsub(/_docs\//, '')
+                x = x.gsub(/(\.adoc|\.md|\.html)/, '')
+                #x = x.sub(/(?!=index.html#).+/, '') if h1
+                li = li.sub(/\<\<#{xref}(,.+)?\>\>/, "icon:expand[] <<#{x}#{t}>> ")
+                replacement = li
               end
             end
-            i += 1
           end
-
         else
           replacement = ''
         end
-
         if replacement.to_s.empty?
           li
         else

data/lib/extensions/inline_task_macro.rb

@@ -33,7 +33,7 @@ Extensions.register do
       end
 
       if pattern.nil?
-        warn "asciidoctor: WARNING: Task pattern not defined for #{target}"
+        warn "asciidoctor: WARNING: Task pattern not defined for #{target.delete(':')}"
         pattern = 'unknown'
       end
 

data/lib/extensions/requirement_appendix.rb

@@ -95,7 +95,7 @@ reqs.each do |req, f, title, chapter, doctitle|
   link = "#{f}/index##{id}"
   ref = "<a class=\"link\" href=\"#{link}\"><emphasis role=\"strong\">#{title}</emphasis>  </a>"
   breadcrumb = "<a href=\"#{f}\">#{chapter} / #{doctitle}</a>"
-  row = "<tr> <th scope=\"row\">#{i}</th> <td>#{id}</td><td>#{version}</td> <td>#{ref}</td> <td>#{breadcrumb}</td> </tr>"
+  row = "<tr> <th scope=\"row\">#{i}</th> <td style=\"white-space:pre;\">#{id}</td><td>#{version}</td> <td>#{ref}</td> <td>#{breadcrumb}</td> </tr>"
 
   rows.push(row)
 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.6'.freeze
+  VERSION = '1.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_aspec
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - bsmith-n4
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler