aspec_rb 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6a5bc897689e791b6d5745261606cad1c72a515c1675cbc50685aaffd7b4cb
-  data.tar.gz: 5798e3a071a58d51f2d1b4248613cbc49f4813c837324075ea1699cbeea2048b
+  metadata.gz: 6243468a5b596117cdcada689105e7e49657f9dc2bdb25e75d7b25464e46b20e
+  data.tar.gz: f6f33c72752b20bd12b1f5beaeced038d32fa818320d48c2d30df8278758e63e
 SHA512:
-  metadata.gz: 6fbbb24a7a25c565c070e4f2d485b672341defc776866664f6a5d8878f6821ecd13e2b1207fa132e6f669bb39e00a7432e3b5d5246896833f2e7e6b17499ecff
-  data.tar.gz: 049355809fdaa91fbe891df9d1b3811bceee0657686739feb9868db9f245bc005c069052c3ddc7774ee1c044016b6db25c986aff63d6ff03c6fbc0a36da38ef8
+  metadata.gz: 6ba50b1e54f9e2a3df06abf095422c9e3d0c9636dcd173f5308736a629dd2280ab5087529c0eb6f4deeb57c40e9af5264604b271dd34601884f73441951609ce
+  data.tar.gz: 01b04622209bd03ce0ac6ab7a35c2f9939be5ea19fb9fc08600b10f0143650732795283da15182db821c157429881934b9847169e5745a2a2ad3fdc69a88f45f

data/Gemfile.lock

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

data/lib/extensions/requirement_appendix.rb

@@ -89,7 +89,7 @@ reqs.each do |req, f, title, chapter, doctitle|
   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>
-  <td>#{version}</td> <td>#{ref}</td> <td>#{f}</td> </tr>)
+  <td><span class="badge badge-primary badge-pill">#{version}</span></td> <td>#{ref}</td> <td>#{f}</td> </tr>)
 
   rows.push(row)
 end
@@ -99,7 +99,7 @@ Asciidoctor::Extensions.register 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"> <div class="panel-heading"><h4>Requirements</h4></div>
+<div class="panel panel-default reqlist"> <div class="panel-heading"><h4>Requirements</h4></div>
 <table class="table"> <thead> <tr>
 <th>#</th> <th>ID</th><th>Version</th> <th>Title</th> <th>Source Document</th>
 </tr> </thead>

data/lib/extensions/utils/block.rb

@@ -24,7 +24,7 @@ module Context
              if pattern == 'unknown'
                "<div style=\"float:right;padding-left:0.1em;\"><span class=\"label label-#{label}\" data-toggle=\"tooltip\" title=\"Missing config\">#{target}</span></div>"
              else
-               "<div style=\"float:right;padding-left:0.1em;\"><a href=\"#{url}\"><span class=\"label label-#{label}\">#{target}</span></a></div>"
+               "<div style=\"float:right;padding-left:0.1em;\"><a href=\"#{url}\"><span class=\"label label-#{label} task\">#{target}</span></a></div>"
              end
            else
              if pattern == 'unknown'

data/lib/extensions/utils/search.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Search
+  def self.add_to_index(file, slug, title, content)
+    section = %(
+    "#{slug}": {
+        "id": "#{slug}",
+        "title": "#{title}",
+        "url": "#{file}",
+        "content": "#{content}"
+      },\n)
+  end
+end

data/lib/extensions/utils/utils.rb

@@ -4,3 +4,4 @@ require_relative 'block'
 require_relative 'index'
 require_relative 'labels'
 require_relative 'scanner'
+require_relative 'search'

data/lib/postprocessors/fulltext_search.rb

@@ -3,38 +3,57 @@
 require 'nokogiri'
 require 'fileutils'
 require 'open-uri'
+require_relative '../extensions/utils/utils'
 
-json = ''
+@json = ''
 gendir = 'generated-docs' # TODO: - do not hardcode
-replacements = /"|\n|«|»
|\s\s/
+replacements = /"|\n|«|»
|\s+|\{|\}|…/
 
 html_files = Dir.glob("#{gendir}/**/*.html")
 
 html_files.each do |file|
-  # Skip the search results and index pages
   next if file == "#{gendir}/search.html" || file[%r{^#{gendir}\/index}]
 
   page = Nokogiri::HTML(open(file))
-  file.sub!(%r{^#{gendir}\/}, '')
+  url = file.sub!(%r{^#{gendir}\/}, '')
   slug = file.sub(/\.html$/, '')
+  title = page.css('h2').text
 
-  h2 = page.css('h2').text
-  text = page.css('p').text.gsub(replacements, ' ')
-
-  content = %(
-  "#{slug}": {
-      "id": "#{slug}",
-      "title": "#{h2}",
-      "url": "#{file}",
-      "content": "#{text}"
-    },\n)
-  json += content
+  page.xpath("//div[@class='sect1']").each do |section|
+    if section.at_css('div.sect2')
+
+      section.xpath("//div[@class='sect2']").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)
+        end
+      end
+
+    else
+      text = section.xpath("//div[@class='sect1']").css('p').text.gsub(replacements, ' ')
+      @json += Search.add_to_index(url, slug, title, text)
+    end
+  end
 end
 
+@json.gsub!(/\</, '&lt;')
+@json.gsub!(/\>/, '&gt;')
+
+puts @json
 jsonindex = %(<script>
 window.data = {
 
-#{json}
+#{@json}
 
 };
 </script>)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspec_rb
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - tcob
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,7 @@ files:
 - lib/extensions/utils/index.rb
 - lib/extensions/utils/labels.rb
 - lib/extensions/utils/scanner.rb
+- lib/extensions/utils/search.rb
 - lib/extensions/utils/utils.rb
 - lib/html_chunker.rb
 - lib/postprocessors/fulltext_search.rb