aspec_rb 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ad7297aa73ebc76ef0ad387bc284b4217a5f5bd40f016893557adcbbd90b27
-  data.tar.gz: 5a966be236ce43e042aff058e1f950794bbe486c557e66d3730dba7983f58d94
+  metadata.gz: 088352333e584fe8f6a3601c5e0d83602c070a3c07b9552277f81b0a8dd40425
+  data.tar.gz: cd6f49f6528e6cf1a756736d6e896a33384314e62d18bbe398bef984d6cc3418
 SHA512:
-  metadata.gz: ee0d04929e673a3db700d26a9f23f6ffd890261009b7843fce630642ca207a1cceca1d50fb41f4f9a5594b17603f84afbd979f44a2b6a0705c7ba2f3b5367986
-  data.tar.gz: a84bfcbb1032dbc4fdf1a5bc69963d58a65ba507356810a1d43014952e70f3b470f4c38fd717fe3f7f6e3b9c8aacbb33da8f2ddfb6fe09e54316b301ed63ecab
+  metadata.gz: f3230d5ce8706b6971b5603a6e575a76bb149058b2da4d2e21b72e9f39de9ed7e3523771539e07740aa84cb3ceb91cba81143790c52c365eef1065e148c6a126
+  data.tar.gz: 19ea0ba20ace56a88dd5f1b35dd43ad6b7b327b02d57ab3e90e9e12ab1782d0c95402269d4881391326f70139183ff3a41e7ce3e99bd3da199bee44c5fe3e305

data/Gemfile.lock

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

data/lib/aspec_rb.rb

@@ -9,6 +9,7 @@ require_relative 'extensions/inline_repo_macro'
 require_relative 'extensions/inline_task_macro'
 require_relative 'extensions/req_refs'
 require_relative 'extensions/requirement_block'
+require_relative 'extensions/source_block'
 require_relative 'extensions/todo_block'
 require_relative 'html_chunker'
 require 'asciidoctor-latex'

data/lib/extensions/autoxrefs.rb

@@ -167,12 +167,12 @@ Extensions.register do
         if line[/\<\<(?!Req)(.+?)\>\>/]
           anchorfixes.each do |original, fix|
             next unless line[/\<\<#{original}(,.+?)?\>\>/]
-            line = line.sub(/\<\<#{original}(,.+?)?\>\>/, "icon:angle-double-up[] <<#{fix}>>")
+            line = line.sub(/\<\<#{original}(,.+?)?\>\>/, "\<\<#{fix}\>\>")
           end
         elsif line[/^(\=+\s+?\S+.+)/]
           line.delete!('`')
         elsif line[/^(\.\S\w+)/]
-          line.delete!('\*_')
+          line.delete!('\*_`')
         elsif line[/`.+`\s?::/]
           2.times { line.sub!(/`/, '') }
         end

data/lib/extensions/req_refs.rb

@@ -141,7 +141,6 @@ $reqs.each do |rid, _line, path, _filename, _main, _chapter|
   end
 end
 
-# RexRx = /(?<=(?<!\\)&lt;&lt;)(Req-\w+-?.+?)(?=&gt;&gt;)/
 RexRx = /(?<=&lt;&lt;)(Req-\w+-?.+?)(?=&gt;&gt;)/
 
 # TODO: consider a more performant way of matching the requirements here
@@ -152,36 +151,33 @@ Extensions.register do
     match RexRx
     process do |parent, target|
       id = target.sub(/^Req-/, '')
-      msg = ''
       fix = ''
+      linktext = ''
 
+      # if the target contains displaytext
       if target[/,/]
-        msg = target.match(/(?<=,).+/).to_s.strip
+        linktext = target.match(/(?<=,).+/).to_s.strip
         id = target.sub(/^Req-/, '').sub(/,.+/, '')
-        icon = '<i class="fa fa-info-circle" aria-hidden="true"></i>'
       end
 
-      displaytext = id
-
       $reqfixes.each do |fixid, file|
         next unless fixid == id
         fix = file
         break
       end
 
-      tooltip = if msg != ''
-                  "data-toggle=\"tooltip\" data-placement=\"top\" title=\"#{msg}\""
-                else
-                  ''
-                end
-
       fix = fix.sub(/^_/, '') if fix[/^_/]
       link = id.sub(/^Req-/, '')
       uri = "#{fix}.html##{link}"
       uri = "##{link}" if fix == ''
-      o = "<span class=\"label label-info\" #{tooltip}>"
-      c = '</span>'
-      (create_anchor parent, %(#{o} #{icon} #{displaytext}#{c}), type: :link, target: uri).convert
+
+      final_link = if linktext != ''
+                     linktext
+                   else
+                     "<span class=\"label label-info\">#{id}</span>"
+                end
+
+      (create_anchor parent, final_link, type: :link, target: uri).convert
     end
   end
 end

data/lib/extensions/requirement_block.rb

@@ -14,7 +14,8 @@ Extensions.register do
       # Add pass characters here to prevent html character replacements for < > tags
       pass = '++++'
       attrs['name'] = 'requirement'
-      attrs['caption'] = 'Requirement: '
+      attrs['caption'] = ''
+      attrs['title'] = ''
       id = attrs['id']
       nl = ''
 
@@ -35,7 +36,7 @@ Extensions.register do
 <div class=\"panel-heading\">
 <h3 class=\"panel-title\" data-toc-skip>
 <a class=\"anchor\" href=\"##{id}\"></a>
-<a class=\"link\" href=\"##{id}\"><emphasis role=\"strong\">Requirement: #{id}:</emphasis> #{san_title} </a> (ver. #{attrs['version']})
+<a class=\"link\" href=\"##{id}\"><emphasis role=\"strong\">Requirement #{id}:</emphasis> #{san_title} </a> (ver. #{attrs['version']})
 </h3>
 </div>
 <div class=\"panel-body\">)

data/lib/extensions/source_block.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
+
+Extensions.register do
+  treeprocessor do
+    process do |document|
+      document.find_by context: :listing, style: 'source' do |src|
+        src.lines.each do |li|
+          li.gsub!(/\<\</, '«
')
+          li.gsub!(/\>\>/, '»

')
+        end
+        src
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspec_rb
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - tcob
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ files:
 - lib/extensions/req_refs.rb
 - lib/extensions/requirement_appendix.rb
 - lib/extensions/requirement_block.rb
+- lib/extensions/source_block.rb
 - lib/extensions/todo_block.rb
 - lib/extensions/utils/block.rb
 - lib/extensions/utils/index.rb