aspec_rb 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6243468a5b596117cdcada689105e7e49657f9dc2bdb25e75d7b25464e46b20e
-  data.tar.gz: f6f33c72752b20bd12b1f5beaeced038d32fa818320d48c2d30df8278758e63e
+  metadata.gz: d2a1b3abea25b1809963996414935a74ba305e1a39b6ceabf4d9d1d766221501
+  data.tar.gz: b6cf95dd90879fc7c6c634c7f2af4a44239d9f682d3958770644324dfb92871c
 SHA512:
-  metadata.gz: 6ba50b1e54f9e2a3df06abf095422c9e3d0c9636dcd173f5308736a629dd2280ab5087529c0eb6f4deeb57c40e9af5264604b271dd34601884f73441951609ce
-  data.tar.gz: 01b04622209bd03ce0ac6ab7a35c2f9939be5ea19fb9fc08600b10f0143650732795283da15182db821c157429881934b9847169e5745a2a2ad3fdc69a88f45f
+  metadata.gz: 25a21dc3e280b85c37b50aa2dea3d5da6d97f6ac5b5a25ebb545a739455f7c53e83e50c9b9af0740039f567c3915bdf225067bb7182393afb97629409af670c0
+  data.tar.gz: 952538cec2c9062ad300b65b3a1536ceb81b0254f53336a3d5840cdbb6212e9330434ffeec79c72c7b946a66437ba6abeb350272aaef0408abdb310a9f46bc89

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aspec_rb (0.0.12)
+    aspec_rb (0.0.13)
       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.12'
+  VERSION = '0.0.13'
 end

data/lib/extensions/requirement_appendix.rb

@@ -87,8 +87,8 @@ reqs.each do |req, f, title, chapter, doctitle|
   icon = '<i class="fa fa-external-link-square" aria-hidden="true"></i>'
   ref = "<a class=\"link\" href=\"#{link}\"><emphasis role=\"strong\">#{icon} #{title}</emphasis>  </a>"
   breadcrumb = "<a href=\"#{f}\">#{chapter} / #{doctitle}</a>"
-  # anchor = "<a class=\"link\" href=\"#Req-#{rid}\">#{rid}</a>"
-  row = %(<tr id="Req-#{rid}"> <th scope="row">#{i}</th> <td style="white-space:pre;">#{rid}</td>
+  anchor = "<a class=\"link\" href=\"#Req-#{rid}\">#{rid}</a>"
+  row = %(<tr id="Req-#{rid}"> <th scope="row">#{i}</th> <td style="white-space:pre;">#{anchor}</td>
   <td><span class="badge badge-primary badge-pill">#{version}</span></td> <td>#{ref}</td> <td>#{f}</td> </tr>)
 
   rows.push(row)
@@ -97,16 +97,25 @@ end
 Asciidoctor::Extensions.register do
   block_macro :requirements do
     process do |parent, _target, _attrs|
-      content = %(<h2 id="requirements"><a class="anchor" href="#requirements"></a>
-      <a class="link" href="#requirements">Requirements</a></h2>
-<div class="panel panel-default reqlist"> <div class="panel-heading"><h4>Requirements</h4></div>
-<table class="table"> <thead> <tr>
+      content = %(<div class="panel panel-default reqlist"> <div class="panel-heading"><h4>Requirements</h4></div>
+<input class="form-control" id="tableFilter" type="text" placeholder="Filter..">
+<table class="table" id="reqTable"> <thead> <tr>
 <th>#</th> <th>ID</th><th>Version</th> <th>Title</th> <th>Source Document</th>
 </tr> </thead>
 <tbody>
 #{rows.join}
 </tbody>
-</table> </div>)
+</table> </div>
+<script>
+$(document).ready(function(){
+  $("#tableFilter").on("keyup", function() {
+    var value = $(this).val().toLowerCase();
+    $("#reqTable tr").filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+    });
+  });
+});
+</script>)
 
       create_pass_block parent, content, {}
     end

data/lib/extensions/utils/search.rb

@@ -1,13 +1,24 @@
 # frozen_string_literal: true
 
 module Search
+  # Some special handling for sanitizing the search json
+  def self.sanitize_json(str)  
+    special_chars = /"|\n|«|»
|\{|\}|…/
+    str.gsub!(special_chars, ' ')
+    str.gsub!(/\s+/, ' ')
+    str.gsub!(/Unresolved directive.+\[\]/, '')
+    str.gsub!(/\</, '&lt;') if str[/\</]
+    str.gsub!(/\>/, '&gt;') if str[/\>/]
+    str
+  end
+
   def self.add_to_index(file, slug, title, content)
     section = %(
     "#{slug}": {
         "id": "#{slug}",
         "title": "#{title}",
         "url": "#{file}",
-        "content": "#{content}"
+        "content": "#{sanitize_json(content)}"
       },\n)
   end
 end

data/lib/postprocessors/fulltext_search.rb

@@ -7,10 +7,15 @@ require_relative '../extensions/utils/utils'
 
 @json = ''
 gendir = 'generated-docs' # TODO: - do not hardcode
-replacements = /"|\n|«|»
|\s+|\{|\}|…/
 
 html_files = Dir.glob("#{gendir}/**/*.html")
 
+def add_heading(subsection, url, level)
+  id = subsection.at(level).attr('id')
+  sub_url = url + '#' + id
+  @json += Search.add_to_index(sub_url, id, subsection.at(level).text, subsection.text)
+end
+
 html_files.each do |file|
   next if file == "#{gendir}/search.html" || file[%r{^#{gendir}\/index}]
 
@@ -22,34 +27,29 @@ html_files.each do |file|
   page.xpath("//div[@class='sect1']").each do |section|
     if section.at_css('div.sect2')
 
-      section.xpath("//div[@class='sect2']").each do |subsection|
+      section.xpath("//div[@class='sect2' or @class='sect2 language-n4js']").each do |subsection| 
         if subsection.at_css('div.sect3')
-          title = subsection.at('h4').text
-          id = "\##{subsection.at('h4').attr('id')}"
-          sub_url = url + id
-          text = subsection.text.gsub(replacements, ' ')
-          @json += Search.add_to_index(sub_url, id, title, text)
-        else
 
-          title = subsection.at('h3').text
-          id = "\##{subsection.at('h3').attr('id')}"
-          sub_url = url + id
-          text = subsection.text.gsub(replacements, ' ')
-          @json += Search.add_to_index(sub_url, id, title, text)
+          section.xpath("//div[@class='sect3']").each do |subsection|  
+            if subsection.at_css('div.sect4')
+              add_heading(subsection, url, 'h5')
+            else
+              add_heading(subsection, url, 'h4')
+            end
+          end
+
+        else
+          add_heading(subsection, url, 'h3')
         end
       end
 
     else
-      text = section.xpath("//div[@class='sect1']").css('p').text.gsub(replacements, ' ')
+      text = section.xpath("//div[@class='sect1' or @class='sect1 language-n4js']").css('p').text
       @json += Search.add_to_index(url, slug, title, text)
     end
   end
 end
 
-@json.gsub!(/\</, '&lt;')
-@json.gsub!(/\>/, '&gt;')
-
-puts @json
 jsonindex = %(<script>
 window.data = {
 

data/lib/postprocessors/generate_toc.rb

@@ -25,6 +25,9 @@ appendices = []
 
 html_files.each do |file|
   next if file == "#{gendir}/search.html" || file[%r{^#{gendir}\/index}]
+  if file == "#{gendir}/revision_history.html"
+    toc += %(<li><a href="revision_history.html">Revision History</a></li>)
+  end
   page = Nokogiri::HTML(open(file))
   filename = file.sub(%r{^#{gendir}\/}, '')
 
@@ -75,8 +78,7 @@ anchors.each do |file, id, text, level|
   if level > prev_level
     if i != 0
       toc = toc.chomp("</li>\n")
-      toc += " <a href=\"#\" data-toggle=\"collapse\" data-target=\"#tocnav_#{id}\"><i class=\"fa fa-plus-square\" aria-hidden=\"true\"></i></a>
-      <ul>
+      toc += " <a href=\"#\" data-toggle=\"collapse\" data-target=\"#tocnav_#{id}\"><i class=\"fa fa-plus-square\" aria-hidden=\"true\"></i></a><ul>
       <div id=\"tocnav_#{id}\" class=\"collapse\">
       <li><a href=\"#{file}##{id}\">#{text}</a></li>\n"
       li = ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspec_rb
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - tcob
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler